diff options
Diffstat (limited to 'modern/src/components')
-rw-r--r-- | modern/src/components/BottomMenu.js | 10 | ||||
-rw-r--r-- | modern/src/components/registration/LoginForm.js | 11 |
2 files changed, 10 insertions, 11 deletions
diff --git a/modern/src/components/BottomMenu.js b/modern/src/components/BottomMenu.js index a1e9625..59ad96e 100644 --- a/modern/src/components/BottomMenu.js +++ b/modern/src/components/BottomMenu.js @@ -10,7 +10,7 @@ import ShuffleIcon from '@material-ui/icons/Shuffle'; import MapIcon from '@material-ui/icons/Map'; import LogoutIcon from '@material-ui/icons/ExitToApp'; -import { sessionActions } from '../store'; +import { sessionActions, uiActions } from '../store'; import { useTranslation } from '../LocalizationProvider'; const useStyles = makeStyles((theme) => ({ @@ -20,10 +20,10 @@ const useStyles = makeStyles((theme) => ({ width: '100%', position: 'fixed', zIndex: 1301, - [theme.breakpoints.up('lg')]: { + [theme.breakpoints.up('md')]: { left: theme.spacing(1.5), bottom: theme.spacing(1.5), - width: theme.dimensions.drawerWidthDesktop, + width: '450px', }, }, })); @@ -37,6 +37,9 @@ const BottomMenu = () => { const handleSelection = async (_, value) => { switch (value) { + case 0: + dispatch(uiActions.setCollapsed(true)); + break; case 1: history.push('/reports/route'); break; @@ -47,6 +50,7 @@ const BottomMenu = () => { await fetch('/api/session', { method: 'DELETE' }); history.push('/login'); dispatch(sessionActions.updateUser(null)); + window.location.reload(); break; default: break; diff --git a/modern/src/components/registration/LoginForm.js b/modern/src/components/registration/LoginForm.js index bbb5d5f..9c1fbb4 100644 --- a/modern/src/components/registration/LoginForm.js +++ b/modern/src/components/registration/LoginForm.js @@ -63,14 +63,9 @@ const LoginForm = () => { return ( <StartPage> <Grid container direction="column" spacing={2}> - {useMediaQuery(theme.breakpoints.down('md')) - && ( - <Grid item className={classes.logoContainer}> - <svg height="64" width="240"> - <use xlinkHref="/logo.svg#img" /> - </svg> - </Grid> - )} + <Grid item className={classes.logoContainer}> + <img src="/logo.svg" height="64" width="240" /> + </Grid> <Grid item> <TextField required |