aboutsummaryrefslogtreecommitdiff
path: root/modern/src
diff options
context:
space:
mode:
authorDesmond Kyeremeh <elDekyfin@gmail.com>2021-07-02 15:53:52 +0000
committerDesmond Kyeremeh <elDekyfin@gmail.com>2021-07-02 15:53:52 +0000
commit529e51405db4a086a8eae8e63602f46c3e67fab4 (patch)
tree75f76794157e8959209c81d42bedbbd7116cce47 /modern/src
parenta474d75a7cbb65f25fe6332df70b4fbc8dcb7707 (diff)
downloadtrackermap-web-529e51405db4a086a8eae8e63602f46c3e67fab4.tar.gz
trackermap-web-529e51405db4a086a8eae8e63602f46c3e67fab4.tar.bz2
trackermap-web-529e51405db4a086a8eae8e63602f46c3e67fab4.zip
Minor fixes
Diffstat (limited to 'modern/src')
-rw-r--r--modern/src/MainToolbar.js89
-rw-r--r--modern/src/settings/OptionsLayout/index.js5
2 files changed, 7 insertions, 87 deletions
diff --git a/modern/src/MainToolbar.js b/modern/src/MainToolbar.js
index c11ca96b..311f024d 100644
--- a/modern/src/MainToolbar.js
+++ b/modern/src/MainToolbar.js
@@ -17,18 +17,11 @@ import ListItem from '@material-ui/core/ListItem';
import ListItemIcon from '@material-ui/core/ListItemIcon';
import ListItemText from '@material-ui/core/ListItemText';
import MapIcon from '@material-ui/icons/Map';
-import BarChartIcon from '@material-ui/icons/BarChart';
-import PeopleIcon from '@material-ui/icons/People';
-import StorageIcon from '@material-ui/icons/Storage';
import PersonIcon from '@material-ui/icons/Person';
-import NotificationsIcon from '@material-ui/icons/Notifications';
import DescriptionIcon from '@material-ui/icons/Description';
-import FolderIcon from '@material-ui/icons/Folder';
-import CreateIcon from '@material-ui/icons/Create';
import ReplayIcon from '@material-ui/icons/Replay';
-import BuildIcon from '@material-ui/icons/Build';
import t from './common/localization';
-import * as selectors from './selectors'
+import * as selectors from './selectors';
const useStyles = makeStyles(theme => ({
flex: {
@@ -115,93 +108,17 @@ const MainToolbar = () => {
</ListItemIcon>
<ListItemText primary={t('reportTitle')} />
</ListItem>
- </List>
- <Divider />
- <List subheader={<ListSubheader>{t('settingsTitle')}</ListSubheader>}>
<ListItem
button
disabled={!userId}
- onClick={() => history.push(`/user/${userId}`)}
+ onClick={() => history.push(`/settings/notifications`)}
>
<ListItemIcon>
<PersonIcon />
</ListItemIcon>
- <ListItemText primary={t('settingsUser')} />
- </ListItem>
- <ListItem button onClick={() => history.push('/geofences')}>
- <ListItemIcon>
- <CreateIcon />
- </ListItemIcon>
- <ListItemText primary={t('sharedGeofences')} />
- </ListItem>
- <ListItem
- button
- onClick={() => history.push('/settings/notifications')}
- >
- <ListItemIcon>
- <NotificationsIcon />
- </ListItemIcon>
- <ListItemText primary={t('sharedNotifications')} />
- </ListItem>
- <ListItem button onClick={() => history.push('/settings/groups')}>
- <ListItemIcon>
- <FolderIcon />
- </ListItemIcon>
- <ListItemText primary={t('settingsGroups')} />
- </ListItem>
- <ListItem button onClick={() => history.push('/settings/drivers')}>
- <ListItemIcon>
- <PersonIcon />
- </ListItemIcon>
- <ListItemText primary={t('sharedDrivers')} />
- </ListItem>
- <ListItem
- button
- onClick={() => history.push('/settings/attributes')}
- >
- <ListItemIcon>
- <StorageIcon />
- </ListItemIcon>
- <ListItemText primary={t('sharedComputedAttributes')} />
- </ListItem>
- <ListItem
- button
- onClick={() => history.push('/settings/maintenances')}
- >
- <ListItemIcon>
- <BuildIcon />
- </ListItemIcon>
- <ListItemText primary={t('sharedMaintenance')} />
+ <ListItemText primary={t('settingsTitle')} />
</ListItem>
</List>
- {adminEnabled && (
- <>
- <Divider />
- <List subheader={<ListSubheader>{t('userAdmin')}</ListSubheader>}>
- <ListItem button onClick={() => history.push('/admin/server')}>
- <ListItemIcon>
- <StorageIcon />
- </ListItemIcon>
- <ListItemText primary={t('settingsServer')} />
- </ListItem>
- <ListItem button onClick={() => history.push('/admin/users')}>
- <ListItemIcon>
- <PeopleIcon />
- </ListItemIcon>
- <ListItemText primary={t('settingsUsers')} />
- </ListItem>
- <ListItem
- button
- onClick={() => history.push('/admin/statistics')}
- >
- <ListItemIcon>
- <BarChartIcon />
- </ListItemIcon>
- <ListItemText primary={t('statisticsTitle')} />
- </ListItem>
- </List>
- </>
- )}
</div>
</Drawer>
</>
diff --git a/modern/src/settings/OptionsLayout/index.js b/modern/src/settings/OptionsLayout/index.js
index 4bcb380e..37b63551 100644
--- a/modern/src/settings/OptionsLayout/index.js
+++ b/modern/src/settings/OptionsLayout/index.js
@@ -32,7 +32,10 @@ const useStyles = makeStyles(theme => ({
},
content: {
flex: 1,
- padding: theme.spacing(5, 3, 3, 3)
+ padding: theme.spacing(5, 3, 3, 3),
+ [theme.breakpoints.down('md')]:{
+ paddingTop: theme.spacing(10)
+ }
},
drawerHeader: {
...theme.mixins.toolbar,