diff options
Diffstat (limited to 'modern/src/components/reports')
-rw-r--r-- | modern/src/components/reports/ReportNavbar.js | 42 | ||||
-rw-r--r-- | modern/src/components/reports/ReportSidebar.js | 18 |
2 files changed, 32 insertions, 28 deletions
diff --git a/modern/src/components/reports/ReportNavbar.js b/modern/src/components/reports/ReportNavbar.js index ac01fad..16807e8 100644 --- a/modern/src/components/reports/ReportNavbar.js +++ b/modern/src/components/reports/ReportNavbar.js @@ -1,26 +1,28 @@ import React from 'react'; -import { AppBar, Toolbar, Typography, IconButton } from '@material-ui/core'; +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> - ) -} +const ReportNavbar = ({ setOpenDrawer, reportTitle }) => ( + <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 index 90e20c0..686fc04 100644 --- a/modern/src/components/reports/ReportSidebar.js +++ b/modern/src/components/reports/ReportSidebar.js @@ -1,21 +1,23 @@ import React from 'react'; -import { List, ListItem, ListItemText, ListItemIcon } from '@material-ui/core'; +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) => ( + <List disablePadding style={{ paddingTop: '16px' }}> + {routes.map((route) => ( <ListItem disableRipple component={Link} - key={`${route}${index}`} + key={route} button to={route.href} - selected={route.href === location.pathname}> + selected={route.href === location.pathname} + > <ListItemIcon> {route.icon} </ListItemIcon> @@ -23,7 +25,7 @@ const ReportSidebar = ({ routes }) => { </ListItem> ))} </List> - ) -} + ); +}; export default ReportSidebar; |