Merge branch 'master' into add_country_flags

# Conflicts:
#	modern/package-lock.json

1 files changed, 42 insertions, 0 deletions

diff --git a/modern/src/index.jsx b/modern/src/index.jsx
new file mode 100644
index 00000000..3eb96d2f
--- /dev/null
+++ b/modern/src/index.jsx
@@ -0,0 +1,42 @@
+import '@fontsource/roboto/300.css';
+import '@fontsource/roboto/400.css';
+import '@fontsource/roboto/500.css';
+import '@fontsource/roboto/700.css';
+import React from 'react';
+import { createRoot } from 'react-dom/client';
+import { BrowserRouter } from 'react-router-dom';
+import { Provider } from 'react-redux';
+import { CssBaseline, StyledEngineProvider } from '@mui/material';
+import store from './store';
+import { LocalizationProvider } from './common/components/LocalizationProvider';
+import ErrorHandler from './common/components/ErrorHandler';
+import Navigation from './Navigation';
+import preloadImages from './map/core/preloadImages';
+import NativeInterface from './common/components/NativeInterface';
+import ServerProvider from './ServerProvider';
+import ErrorBoundary from './ErrorBoundary';
+import AppThemeProvider from './AppThemeProvider';
+
+preloadImages();
+
+const root = createRoot(document.getElementById('root'));
+root.render(
+  <ErrorBoundary>
+    <Provider store={store}>
+      <LocalizationProvider>
+        <StyledEngineProvider injectFirst>
+          <AppThemeProvider>
+            <CssBaseline />
+            <ServerProvider>
+              <BrowserRouter>
+                <Navigation />
+              </BrowserRouter>
+              <ErrorHandler />
+              <NativeInterface />
+            </ServerProvider>
+          </AppThemeProvider>
+        </StyledEngineProvider>
+      </LocalizationProvider>
+    </Provider>
+  </ErrorBoundary>,
+);