From f75cf89d3b4bdb160b4cc7f0a938fe074aed7192 Mon Sep 17 00:00:00 2001 From: Ashutosh Bishnoi Date: Fri, 30 Oct 2020 14:02:16 +0530 Subject: Added Event report with Report Filter as a seperate component --- modern/src/App.js | 68 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 29 deletions(-) (limited to 'modern/src/App.js') diff --git a/modern/src/App.js b/modern/src/App.js index 1f6b55a..a173a50 100644 --- a/modern/src/App.js +++ b/modern/src/App.js @@ -1,19 +1,20 @@ -import React from 'react'; -import { Switch, Route } from 'react-router-dom' -import CssBaseline from '@material-ui/core/CssBaseline'; -import MainPage from './MainPage'; -import LoginPage from './LoginPage'; -import RouteReportPage from './reports/RouteReportPage'; -import ServerPage from './admin/ServerPage'; -import UsersPage from './admin/UsersPage'; -import DevicePage from './DevicePage'; -import UserPage from './UserPage'; -import SocketController from './SocketController'; -import NotificationsPage from './settings/NotificationsPage'; -import NotificationPage from './settings/NotificationPage'; -import GroupsPage from './settings/GroupsPage'; -import GroupPage from './settings/GroupPage'; -import PositionPage from './PositionPage'; +import React from "react"; +import { Switch, Route } from "react-router-dom"; +import CssBaseline from "@material-ui/core/CssBaseline"; +import MainPage from "./MainPage"; +import LoginPage from "./LoginPage"; +import RouteReportPage from "./reports/RouteReportPage"; +import EventReportPage from "./reports/EventReportPage"; +import ServerPage from "./admin/ServerPage"; +import UsersPage from "./admin/UsersPage"; +import DevicePage from "./DevicePage"; +import UserPage from "./UserPage"; +import SocketController from "./SocketController"; +import NotificationsPage from "./settings/NotificationsPage"; +import NotificationPage from "./settings/NotificationPage"; +import GroupsPage from "./settings/GroupsPage"; +import GroupPage from "./settings/GroupPage"; +import PositionPage from "./PositionPage"; const App = () => { return ( @@ -21,21 +22,30 @@ const App = () => { - - - - - - - - - - - - + + + + + + + + + + + + + ); -} +}; export default App; -- cgit v1.2.3