From 81ad6a0e5c8ed4f35ccac0cd271b8923e686c060 Mon Sep 17 00:00:00 2001 From: Ashutosh Bishnoi Date: Mon, 24 May 2021 14:47:57 +0530 Subject: Resolved some comments on the reports --- modern/src/components/reports/ReportNavbar.js | 16 ++++------------ modern/src/components/reports/ReportSidebar.js | 9 ++++----- 2 files changed, 8 insertions(+), 17 deletions(-) (limited to 'modern/src/components') diff --git a/modern/src/components/reports/ReportNavbar.js b/modern/src/components/reports/ReportNavbar.js index 93c01a0..674db3a 100644 --- a/modern/src/components/reports/ReportNavbar.js +++ b/modern/src/components/reports/ReportNavbar.js @@ -1,16 +1,9 @@ import React from 'react'; -import { AppBar, Toolbar, Typography, List, ListItem, ListItemText, ListItemIcon, Divider, Drawer, makeStyles, IconButton, Hidden } 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 useStyles = makeStyles(theme => ({ - menuButton: { - } -})); -const ReportNavbar = ({ openDrawer, setOpenDrawer, reportName }) => { - - const classes = useStyles(); +const ReportNavbar = ({ openDrawer, setOpenDrawer }) => { return ( @@ -19,12 +12,11 @@ const ReportNavbar = ({ openDrawer, setOpenDrawer, reportName }) => { color="inherit" aria-label="open drawer" edge="start" - onClick={() => setOpenDrawer(!openDrawer)} - className={classes.menuButton}> + onClick={() => setOpenDrawer(!openDrawer)}> - {t('reportTitle')} / {reportName} + {t('reportTitle')} diff --git a/modern/src/components/reports/ReportSidebar.js b/modern/src/components/reports/ReportSidebar.js index e42c36e..a71ac4b 100644 --- a/modern/src/components/reports/ReportSidebar.js +++ b/modern/src/components/reports/ReportSidebar.js @@ -1,8 +1,8 @@ import React from 'react'; -import { AppBar, Toolbar, Typography, List, ListItem, ListItemText, ListItemIcon, Divider, Drawer, makeStyles, IconButton, Hidden } from '@material-ui/core'; -import { Link, useHistory, useLocation } from 'react-router-dom'; +import { List, ListItem, ListItemText, ListItemIcon } from '@material-ui/core'; +import { Link, useLocation } from 'react-router-dom'; -const ReportNavbar = ({ routes, setReportName }) => { +const ReportNavbar = ({ routes }) => { const location = useLocation(); @@ -15,8 +15,7 @@ const ReportNavbar = ({ routes, setReportName }) => { key={`${route}${index}`} button to={route.href} - selected={route.href === location.pathname} - onClick={() => setReportName(route.name)}> + selected={route.href === location.pathname}> {route.icon} -- cgit v1.2.3