aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton@traccar.org>2022-06-19 09:35:59 -0700
committerAnton Tananaev <anton@traccar.org>2022-06-19 09:35:59 -0700
commite67aafb900f474da2381ea418c3e8eb09bc4683b (patch)
tree02c885e13383ea2a8000f74a43e74219aa2a7eb6
parent15a72336f2f38d6175e90d01973515b5573f3ed8 (diff)
downloadtrackermap-web-e67aafb900f474da2381ea418c3e8eb09bc4683b.tar.gz
trackermap-web-e67aafb900f474da2381ea418c3e8eb09bc4683b.tar.bz2
trackermap-web-e67aafb900f474da2381ea418c3e8eb09bc4683b.zip
Fix issues
-rw-r--r--modern/src/App.js21
-rw-r--r--modern/src/other/ChangeServerPage.js4
2 files changed, 14 insertions, 11 deletions
diff --git a/modern/src/App.js b/modern/src/App.js
index aac6979e..74a9acc0 100644
--- a/modern/src/App.js
+++ b/modern/src/App.js
@@ -25,20 +25,21 @@ const App = () => {
const initialized = useSelector((state) => !!state.session.user);
- if (!initialized) {
- return (<LinearProgress />);
- }
return (
<>
<SocketController />
<CachingController />
- <div className={classes.page}>
- <Outlet />
- </div>
- {!desktop && (
- <div className={classes.menu}>
- <BottomMenu />
- </div>
+ {!initialized ? (<LinearProgress />) : (
+ <>
+ <div className={classes.page}>
+ <Outlet />
+ </div>
+ {!desktop && (
+ <div className={classes.menu}>
+ <BottomMenu />
+ </div>
+ )}
+ </>
)}
</>
);
diff --git a/modern/src/other/ChangeServerPage.js b/modern/src/other/ChangeServerPage.js
index 1862ecbd..edce3cd7 100644
--- a/modern/src/other/ChangeServerPage.js
+++ b/modern/src/other/ChangeServerPage.js
@@ -1,7 +1,9 @@
import React, { useState } from 'react';
import ElectricalServicesIcon from '@mui/icons-material/ElectricalServices';
import { makeStyles } from '@mui/styles';
-import { Autocomplete, Button, Container, TextField } from '@mui/material';
+import {
+ Autocomplete, Button, Container, TextField,
+} from '@mui/material';
import { useTranslation } from '../common/components/LocalizationProvider';
const currentServer = `${window.location.protocol}//${window.location.host}`;