From b8ebab9caedae9516f1a95432ee02fa90072b97e Mon Sep 17 00:00:00 2001
From: Lucas Leite <lbl.lucasleite@gmail.com>
Date: Fri, 11 Feb 2022 17:32:43 -0300
Subject: Fix multiple events issue

---
 modern/src/App.js | 94 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 52 insertions(+), 42 deletions(-)

(limited to 'modern/src/App.js')

diff --git a/modern/src/App.js b/modern/src/App.js
index a53ffc6c..67c74b30 100644
--- a/modern/src/App.js
+++ b/modern/src/App.js
@@ -1,4 +1,6 @@
 import React from 'react';
+import Slide from '@material-ui/core/Slide';
+import { SnackbarProvider } from 'notistack';
 import { ThemeProvider } from '@material-ui/core/styles';
 import { Switch, Route } from 'react-router-dom';
 import CssBaseline from '@material-ui/core/CssBaseline';
@@ -48,48 +50,56 @@ const App = () => {
   return (
     <LocalizationProvider>
       <ThemeProvider theme={theme}>
-        <CssBaseline />
-        <SocketController />
-        <CachingController />
-        <Switch>
-          <Route exact path="/login" component={LoginForm} />
-          <Route exact path="/register" component={RegisterForm} />
-          <Route exact path="/reset-password" component={ResetPasswordForm} />
-          <Route>
-            {!initialized ? (<LinearProgress />) : (
-              <Switch>
-                <Route exact path="/" component={MainPage} />
-                <Route exact path="/replay" component={ReplayPage} />
-                <Route exact path="/position/:id?" component={PositionPage} />
-                <Route exact path="/user/:id?" component={UserPage} />
-                <Route exact path="/device/:id?" component={DevicePage} />
-                <Route exact path="/geofence/:id?" component={GeofencePage} />
-                <Route exact path="/geofences" component={GeofencesPage} />
-                <Route exact path="/settings/notifications" component={NotificationsPage} />
-                <Route exact path="/settings/notification/:id?" component={NotificationPage} />
-                <Route exact path="/settings/groups" component={GroupsPage} />
-                <Route exact path="/settings/group/:id?" component={GroupPage} />
-                <Route exact path="/settings/drivers" component={DriversPage} />
-                <Route exact path="/settings/driver/:id?" component={DriverPage} />
-                <Route exact path="/settings/calendars" component={CalendarsPage} />
-                <Route exact path="/settings/calendar/:id?" component={CalendarPage} />
-                <Route exact path="/settings/attributes" component={ComputedAttributesPage} />
-                <Route exact path="/settings/attribute/:id?" component={ComputedAttributePage} />
-                <Route exact path="/settings/maintenances" component={MaintenancesPage} />
-                <Route exact path="/settings/maintenance/:id?" component={MaintenancePage} />
-                <Route exact path="/admin/server" component={ServerPage} />
-                <Route exact path="/admin/users" component={UsersPage} />
-                <Route exact path="/admin/statistics" component={StatisticsPage} />
-                <Route exact path="/reports/route" component={RouteReportPage} />
-                <Route exact path="/reports/event" component={EventReportPage} />
-                <Route exact path="/reports/trip" component={TripReportPage} />
-                <Route exact path="/reports/stop" component={StopReportPage} />
-                <Route exact path="/reports/summary" component={SummaryReportPage} />
-                <Route exact path="/reports/chart" component={ChartReportPage} />
-              </Switch>
-            )}
-          </Route>
-        </Switch>
+        <SnackbarProvider
+          anchorOrigin={{
+            vertical: 'bottom',
+            horizontal: 'right',
+          }}
+          TransitionComponent={Slide}
+        >
+          <CssBaseline />
+          <SocketController />
+          <CachingController />
+          <Switch>
+            <Route exact path="/login" component={LoginForm} />
+            <Route exact path="/register" component={RegisterForm} />
+            <Route exact path="/reset-password" component={ResetPasswordForm} />
+            <Route>
+              {!initialized ? (<LinearProgress />) : (
+                <Switch>
+                  <Route exact path="/" component={MainPage} />
+                  <Route exact path="/replay" component={ReplayPage} />
+                  <Route exact path="/position/:id?" component={PositionPage} />
+                  <Route exact path="/user/:id?" component={UserPage} />
+                  <Route exact path="/device/:id?" component={DevicePage} />
+                  <Route exact path="/geofence/:id?" component={GeofencePage} />
+                  <Route exact path="/geofences" component={GeofencesPage} />
+                  <Route exact path="/settings/notifications" component={NotificationsPage} />
+                  <Route exact path="/settings/notification/:id?" component={NotificationPage} />
+                  <Route exact path="/settings/groups" component={GroupsPage} />
+                  <Route exact path="/settings/group/:id?" component={GroupPage} />
+                  <Route exact path="/settings/drivers" component={DriversPage} />
+                  <Route exact path="/settings/driver/:id?" component={DriverPage} />
+                  <Route exact path="/settings/calendars" component={CalendarsPage} />
+                  <Route exact path="/settings/calendar/:id?" component={CalendarPage} />
+                  <Route exact path="/settings/attributes" component={ComputedAttributesPage} />
+                  <Route exact path="/settings/attribute/:id?" component={ComputedAttributePage} />
+                  <Route exact path="/settings/maintenances" component={MaintenancesPage} />
+                  <Route exact path="/settings/maintenance/:id?" component={MaintenancePage} />
+                  <Route exact path="/admin/server" component={ServerPage} />
+                  <Route exact path="/admin/users" component={UsersPage} />
+                  <Route exact path="/admin/statistics" component={StatisticsPage} />
+                  <Route exact path="/reports/route" component={RouteReportPage} />
+                  <Route exact path="/reports/event" component={EventReportPage} />
+                  <Route exact path="/reports/trip" component={TripReportPage} />
+                  <Route exact path="/reports/stop" component={StopReportPage} />
+                  <Route exact path="/reports/summary" component={SummaryReportPage} />
+                  <Route exact path="/reports/chart" component={ChartReportPage} />
+                </Switch>
+              )}
+            </Route>
+          </Switch>
+        </SnackbarProvider>
       </ThemeProvider>
     </LocalizationProvider>
   );
-- 
cgit v1.2.3