From 0fbc8fa98e345c3740fb4e05db8fd13c102f10cd Mon Sep 17 00:00:00 2001 From: bmodee <bjomo323@student.liu.se> Date: Tue, 13 Apr 2021 09:31:41 +0200 Subject: [PATCH] add dashboard file and widget folder --- client/src/pages/admin/AdminPage.tsx | 5 ++--- client/src/pages/admin/dashboard/Dashboard.tsx | 16 ++++++++++++++++ .../admin/dashboard/widgets/CurrentUser.tsx | 16 ++++++++++++++++ 3 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 client/src/pages/admin/dashboard/Dashboard.tsx create mode 100644 client/src/pages/admin/dashboard/widgets/CurrentUser.tsx diff --git a/client/src/pages/admin/AdminPage.tsx b/client/src/pages/admin/AdminPage.tsx index 921f721d..c4e43b6d 100644 --- a/client/src/pages/admin/AdminPage.tsx +++ b/client/src/pages/admin/AdminPage.tsx @@ -23,6 +23,7 @@ import { getRoles } from '../../actions/roles' import { logoutUser } from '../../actions/user' import { useAppDispatch, useAppSelector } from '../../hooks' import CompetitionManager from './competitions/CompetitionManager' +import Dashboard from './dashboard/Dashboard' import RegionManager from './regions/Regions' import { LeftDrawer } from './styled' import UserManager from './users/UserManager' @@ -138,9 +139,7 @@ const AdminView: React.FC = () => { <div className={classes.toolbar} /> <Switch> <Route exact path={[path, `${path}/startsida`]}> - <Typography variant="h1" noWrap> - Startsida - </Typography> + <Dashboard /> </Route> <Route path={`${path}/regioner`}> <RegionManager /> diff --git a/client/src/pages/admin/dashboard/Dashboard.tsx b/client/src/pages/admin/dashboard/Dashboard.tsx new file mode 100644 index 00000000..a8cd1ff5 --- /dev/null +++ b/client/src/pages/admin/dashboard/Dashboard.tsx @@ -0,0 +1,16 @@ +import Box from '@material-ui/core/Box' +import React from 'react' +import CurrentUser from './widgets/CurrentUser' +// import * from '@material-ui/core' + +const Dashboard: React.FC = () => { + return ( + <div className="widget-container"> + <Box display="flex" flexDirection="row" p={1} m={1} bgcolor="text.disabled"> + <CurrentUser /> + </Box> + </div> + ) +} + +export default Dashboard diff --git a/client/src/pages/admin/dashboard/widgets/CurrentUser.tsx b/client/src/pages/admin/dashboard/widgets/CurrentUser.tsx new file mode 100644 index 00000000..f81be4eb --- /dev/null +++ b/client/src/pages/admin/dashboard/widgets/CurrentUser.tsx @@ -0,0 +1,16 @@ +import { Box } from '@material-ui/core' +import React from 'react' + +// import * from '@material-ui/core' + +const CurrentUser: React.FC = () => { + return ( + <div> + <Box color="text.primary" bgcolor="secondary.main" fontFamily="h3.fontFamily" width="200%" height="200%"> + Current User Widget + </Box> + </div> + ) +} + +export default CurrentUser -- GitLab