Upgrade router and navigation

1 files changed, 16 insertions, 6 deletions

diff --git a/modern/src/index.js b/modern/src/index.js
index 43462d35..07ac7e3f 100644
--- a/modern/src/index.js
+++ b/modern/src/index.js
@@ -3,21 +3,31 @@ 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 } from '@material-ui/core';
 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>
+        <ThemeProvider theme={theme}>
+          <CssBaseline />
+          <BrowserRouter basename={base}>
+            <SocketController />
+            <CachingController />
+            <Navigation />
+          </BrowserRouter>
+          <ErrorHandler />
+        </ThemeProvider>
       </LocalizationProvider>
     </Provider>
   ), document.getElementById('root'),