Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 29 additions & 20 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,33 @@
import logo from './logo.svg';
import './App.css';
import Dashboard from './pages/Dashboard'
import Categories from './pages/Categories'
import Products from './pages/Products'
import Login from './pages/Login'
import {Navigate, Route, Routes} from 'react-router-dom'
import {useEffect,useState} from 'react'
import Drawer from './components/Drawer'
import "./App.css";
import routes, { renderRoutes } from "./routes";
import { Router } from "react-router-dom";
import { AuthProvider } from "./contexts/AuthContext";
import { createBrowserHistory } from "history";
import { createTheme } from "./theme";
import { create } from "jss";
import rtl from "jss-rtl";
import { useContext } from "react";
import { jssPreset, StylesProvider, ThemeProvider } from "@material-ui/core";
import SettingsContext from './contexts/SettingsContext'
const history = createBrowserHistory();
const jss = create({ plugins: [...jssPreset().plugins, rtl()] });


function App(props) {


return <Routes>
<Route path="/dashboard" element={<Drawer/>}/>
<Route path="/categories" element={<Drawer {...props}/>}/>
<Route path="/products" element={<Drawer/>}/>
<Route path="/login" element={<Login/>}/>

</Routes>
function App() {
const { settings } = useContext(SettingsContext);
const theme = createTheme({
direction: settings.direction,
responsiveFontSizes: settings.responsiveFontSizes,
theme: settings.theme,
});
return (
<ThemeProvider theme={theme}>
<StylesProvider jss={jss}>
<Router history={history}>
<AuthProvider>{renderRoutes(routes)}</AuthProvider>
</Router>
</StylesProvider>
</ThemeProvider>
);
}

export default App;
Binary file removed src/assets/images/1.jpg
Binary file not shown.
8 changes: 8 additions & 0 deletions src/common/Constants.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
export const SESSION_KEY = "CompUserData";
export const BASE_URL = "https://website-backend.computiq.tech";

export const THEMES = {
LIGHT: 'LIGHT',
ONE_DARK: 'ONE_DARK'
};

11 changes: 0 additions & 11 deletions src/components/Avatar.jsx

This file was deleted.

47 changes: 47 additions & 0 deletions src/components/BoardItems.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import React from 'react'
import { Box,makeStyles, Typography } from '@material-ui/core';


const useStyles = makeStyles(()=>({
flx:{
color: '#575756',
display: 'flex',
justifyContent: 'space-between',
alignItems:'center'
},

box: {
display: 'flex',
alignItems:'center'
},

img: {
fontSize: 35,
marginLeft: 5
}

}))


export default function BoardItems(props) {
const classes = useStyles()
return (
<>
<Typography variant="h4" component="div">SCORE BOARD</Typography>
{
props.dataP.map((item,i)=>{
return (
<Box className={classes.flx} key={i}>
<Box className={classes.box}>
<Typography variant="h6" component="div">#{props.data.findIndex((data)=> (data.user__first_name+' '+data.user__last_name)===(item.user__first_name+' '+item.user__last_name) )}</Typography>
<Typography variant="h6" component="div" className={classes.img}>{item.user__score_profile__photo}</Typography>
</Box>
<Typography variant="h6" component="div">{item.user__first_name+' '+item.user__last_name}</Typography>
<Typography variant="h6" component="div">{item.total_score} points</Typography>
</Box>
)
})
}
</>
)
}
240 changes: 0 additions & 240 deletions src/components/Drawer.jsx

This file was deleted.

11 changes: 11 additions & 0 deletions src/components/LoadingScreen.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import React from 'react';

function LoadingScreen(props) {
return (
<div>
LoadingScreen
</div>
);
}

export default LoadingScreen;
Loading