Merge branch 'master' of github.com:traccar/traccar-web into fix-key-issue

1 files changed, 26 insertions, 12 deletions

diff --git a/modern/src/index.js b/modern/src/index.js
index cb6710d5..547e39ef 100644
--- a/modern/src/index.js
+++ b/modern/src/index.js
@@ -3,22 +3,36 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { BrowserRouter } from 'react-router-dom';
 import { Provider } from 'react-redux';
-
-import App from './App';
+import { CssBaseline, ThemeProvider, StyledEngineProvider } from '@mui/material';
 import * as serviceWorker from './serviceWorker';
 import store from './store';
 import { LocalizationProvider } from './common/components/LocalizationProvider';
+import ErrorHandler from './common/components/ErrorHandler';
+import CachingController from './CachingController';
+import SocketController from './SocketController';
+import theme from './common/theme';
+import Navigation from './Navigation';
 
-const base = window.location.href.indexOf('modern') >= 0 ? '/modern' : null;
+const base = window.location.href.indexOf('modern') >= 0 ? '/modern' : '/';
 
-ReactDOM.render((
-  <Provider store={store}>
-    <LocalizationProvider>
-      <BrowserRouter basename={base}>
-        <App />
-      </BrowserRouter>
-    </LocalizationProvider>
-  </Provider>
-), document.getElementById('root'));
+ReactDOM.render(
+  (
+    <Provider store={store}>
+      <LocalizationProvider>
+        <StyledEngineProvider injectFirst>
+          <ThemeProvider theme={theme}>
+            <CssBaseline />
+            <BrowserRouter basename={base}>
+              <SocketController />
+              <CachingController />
+              <Navigation />
+            </BrowserRouter>
+            <ErrorHandler />
+          </ThemeProvider>
+        </StyledEngineProvider>
+      </LocalizationProvider>
+    </Provider>
+  ), document.getElementById('root'),
+);
 
 serviceWorker.register();