From d941131d85cfd6c4fada44208a7a03a23749737e Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 4 Feb 2023 13:28:23 -0800 Subject: Hide combined report --- modern/src/Navigation.js | 2 -- modern/src/common/components/BottomMenu.js | 2 +- modern/src/reports/components/ReportsMenu.js | 7 ------- 3 files changed, 1 insertion(+), 10 deletions(-) (limited to 'modern') diff --git a/modern/src/Navigation.js b/modern/src/Navigation.js index 6d467dc0..f5b21dd9 100644 --- a/modern/src/Navigation.js +++ b/modern/src/Navigation.js @@ -49,7 +49,6 @@ import App from './App'; import ChangeServerPage from './other/ChangeServerPage'; import DevicesPage from './settings/DevicesPage'; import ScheduledPage from './reports/ScheduledPage'; -import CombinedReportPage from './reports/CombinedReportPage'; const Navigation = () => { const navigate = useNavigate(); @@ -140,7 +139,6 @@ const Navigation = () => { - } /> } /> } /> } /> diff --git a/modern/src/common/components/BottomMenu.js b/modern/src/common/components/BottomMenu.js index cb9e34e1..e2b75959 100644 --- a/modern/src/common/components/BottomMenu.js +++ b/modern/src/common/components/BottomMenu.js @@ -82,7 +82,7 @@ const BottomMenu = () => { navigate('/'); break; case 'reports': - navigate('/reports/combined'); + navigate('/reports/route'); break; case 'settings': navigate('/settings/preferences'); diff --git a/modern/src/reports/components/ReportsMenu.js b/modern/src/reports/components/ReportsMenu.js index c65a4c12..a31c3afe 100644 --- a/modern/src/reports/components/ReportsMenu.js +++ b/modern/src/reports/components/ReportsMenu.js @@ -11,7 +11,6 @@ import TrendingUpIcon from '@mui/icons-material/TrendingUp'; import BarChartIcon from '@mui/icons-material/BarChart'; import RouteIcon from '@mui/icons-material/Route'; import EventRepeatIcon from '@mui/icons-material/EventRepeat'; -import StarIcon from '@mui/icons-material/Star'; import { Link, useLocation } from 'react-router-dom'; import { useTranslation } from '../../common/components/LocalizationProvider'; import { useAdministrator, useRestriction } from '../../common/util/permissions'; @@ -35,12 +34,6 @@ const ReportsMenu = () => { return ( <> - } - selected={location.pathname === '/reports/combined'} - />