diff options
Diffstat (limited to 'modern')
| -rw-r--r-- | modern/src/App.js | 21 | ||||
| -rw-r--r-- | modern/src/other/ChangeServerPage.js | 4 |
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}`; |