aboutsummaryrefslogtreecommitdiff
path: root/modern/src/App.js
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2021-05-11 21:19:08 -0700
committerGitHub <noreply@github.com>2021-05-11 21:19:08 -0700
commita6525b4560838e7d0d843f4f9edbaad9ad1ad245 (patch)
treea99bc33abf3b73223be3a9230a8c5693fc554bb3 /modern/src/App.js
parent17e1f8c7b67a36c4e9384b7c7b930b68c8bfd6f4 (diff)
parentca9d842c875c8867aca8ec7c5f533bde1be3f975 (diff)
downloadetbsa-traccar-web-a6525b4560838e7d0d843f4f9edbaad9ad1ad245.tar.gz
etbsa-traccar-web-a6525b4560838e7d0d843f4f9edbaad9ad1ad245.tar.bz2
etbsa-traccar-web-a6525b4560838e7d0d843f4f9edbaad9ad1ad245.zip
Merge pull request #848 from mail2bishnoi/login_screen
Login screen update
Diffstat (limited to 'modern/src/App.js')
-rw-r--r--modern/src/App.js7
1 files changed, 5 insertions, 2 deletions
diff --git a/modern/src/App.js b/modern/src/App.js
index 5fd10de..7db5f12 100644
--- a/modern/src/App.js
+++ b/modern/src/App.js
@@ -1,4 +1,5 @@
import React from 'react';
+import { ThemeProvider } from '@material-ui/core/styles';
import { Switch, Route } from 'react-router-dom'
import CssBaseline from '@material-ui/core/CssBaseline';
import MainPage from './MainPage';
@@ -31,11 +32,13 @@ import MaintenancePage from './settings/MaintenancePage';
import StatisticsPage from './admin/StatisticsPage';
import CachingController from './CachingController';
+import theme from './theme';
+
const App = () => {
const initialized = useSelector(state => !!state.session.server && !!state.session.user);
return (
- <>
+ <ThemeProvider theme={theme}>
<CssBaseline />
<SocketController />
<CachingController />
@@ -72,7 +75,7 @@ const App = () => {
)}
</Route>
</Switch>
- </>
+ </ThemeProvider>
);
}