diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2021-06-12 10:53:58 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-12 10:53:58 -0700 |
commit | b7928f760ab557be29ade8c4b8e1605feed6fd7f (patch) | |
tree | 3a416c82c71d71adf661c65e937047c78b986a95 /modern/src/components | |
parent | 6936f6debf0e122feae8caca0547a7949f05ff6f (diff) | |
parent | 94b0d73ce01f9c437e2fa9b0dfafca5bcb86f2e9 (diff) | |
download | etbsa-traccar-web-b7928f760ab557be29ade8c4b8e1605feed6fd7f.tar.gz etbsa-traccar-web-b7928f760ab557be29ade8c4b8e1605feed6fd7f.tar.bz2 etbsa-traccar-web-b7928f760ab557be29ade8c4b8e1605feed6fd7f.zip |
Merge pull request #852 from mail2bishnoi/reports
Update reports design
Diffstat (limited to 'modern/src/components')
-rw-r--r-- | modern/src/components/registration/LoginForm.js (renamed from modern/src/components/LoginForm.js) | 4 | ||||
-rw-r--r-- | modern/src/components/registration/RegisterForm.js (renamed from modern/src/components/RegisterForm.js) | 2 | ||||
-rw-r--r-- | modern/src/components/registration/ResetPasswordForm.js (renamed from modern/src/components/ResetPasswordForm.js) | 0 | ||||
-rw-r--r-- | modern/src/components/reports/ReportNavbar.js | 26 | ||||
-rw-r--r-- | modern/src/components/reports/ReportSidebar.js | 29 |
5 files changed, 58 insertions, 3 deletions
diff --git a/modern/src/components/LoginForm.js b/modern/src/components/registration/LoginForm.js index bb76213..235f0ef 100644 --- a/modern/src/components/LoginForm.js +++ b/modern/src/components/registration/LoginForm.js @@ -3,8 +3,8 @@ import { Grid, useMediaQuery, makeStyles, InputLabel, Select, MenuItem, FormCont import { useTheme } from '@material-ui/core/styles'; import { useDispatch, useSelector } from 'react-redux'; import { useHistory } from 'react-router-dom'; -import { sessionActions } from './../store'; -import t from './../common/localization'; +import { sessionActions } from '../../store'; +import t from '../../common/localization'; import RegisterForm from './RegisterForm'; import ResetPasswordForm from './ResetPasswordForm'; diff --git a/modern/src/components/RegisterForm.js b/modern/src/components/registration/RegisterForm.js index 6d013f7..c2af04b 100644 --- a/modern/src/components/RegisterForm.js +++ b/modern/src/components/registration/RegisterForm.js @@ -2,7 +2,7 @@ import React, { useState } from 'react'; import { Grid, Button, TextField, Typography, Link, makeStyles, Snackbar } from '@material-ui/core'; import ArrowBackIcon from '@material-ui/icons/ArrowBack'; import LoginForm from './LoginForm'; -import t from './../common/localization'; +import t from './../../common/localization'; const useStyles = makeStyles(theme => ({ register: { diff --git a/modern/src/components/ResetPasswordForm.js b/modern/src/components/registration/ResetPasswordForm.js index c268f80..c268f80 100644 --- a/modern/src/components/ResetPasswordForm.js +++ b/modern/src/components/registration/ResetPasswordForm.js diff --git a/modern/src/components/reports/ReportNavbar.js b/modern/src/components/reports/ReportNavbar.js new file mode 100644 index 0000000..ac01fad --- /dev/null +++ b/modern/src/components/reports/ReportNavbar.js @@ -0,0 +1,26 @@ +import React from 'react'; +import { AppBar, Toolbar, Typography, IconButton } from '@material-ui/core'; +import MenuIcon from '@material-ui/icons/Menu'; +import t from '../../common/localization'; + +const ReportNavbar = ({ setOpenDrawer, reportTitle }) => { + + return ( + <AppBar position="fixed" color="inherit"> + <Toolbar> + <IconButton + color="inherit" + aria-label="open drawer" + edge="start" + onClick={() => setOpenDrawer(true)}> + <MenuIcon /> + </IconButton> + <Typography variant="h6" noWrap> + {t('reportTitle')} {` / ${reportTitle}`} + </Typography> + </Toolbar> + </AppBar> + ) +} + +export default ReportNavbar; diff --git a/modern/src/components/reports/ReportSidebar.js b/modern/src/components/reports/ReportSidebar.js new file mode 100644 index 0000000..90e20c0 --- /dev/null +++ b/modern/src/components/reports/ReportSidebar.js @@ -0,0 +1,29 @@ +import React from 'react'; +import { List, ListItem, ListItemText, ListItemIcon } from '@material-ui/core'; +import { Link, useLocation } from 'react-router-dom'; + +const ReportSidebar = ({ routes }) => { + + const location = useLocation(); + + return ( + <List disablePadding style={{paddingTop: '16px'}}> + {routes.map((route, index) => ( + <ListItem + disableRipple + component={Link} + key={`${route}${index}`} + button + to={route.href} + selected={route.href === location.pathname}> + <ListItemIcon> + {route.icon} + </ListItemIcon> + <ListItemText primary={route.name} /> + </ListItem> + ))} + </List> + ) +} + +export default ReportSidebar; |