1 files changed, 43 insertions, 41 deletions
diff --git a/modern/src/App.js b/modern/src/App.js
index 228fe55..5197a07 100644
--- a/modern/src/App.js
+++ b/modern/src/App.js
@@ -35,56 +35,58 @@ import LoginForm from './components/registration/LoginForm';
 import RegisterForm from './components/registration/RegisterForm';
 import ResetPasswordForm from './components/registration/ResetPasswordForm';
 
-import theme from './theme';
 import GeofencesPage from './GeofencesPage';
 import GeofencePage from './GeofencePage';
 import { LocalizationProvider } from './common/localization';
+import theme from './theme';
 
 const App = () => {
   const initialized = useSelector((state) => !!state.session.server && !!state.session.user);
 
   return (
     <LocalizationProvider>
-      <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/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>
+      <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/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>
+      </ThemeProvider>
     </LocalizationProvider>
 
   );