diff options
| -rw-r--r-- | modern/src/EditCollectionView.js | 10 | ||||
| -rw-r--r-- | modern/src/reports/ReplayPage.js | 1 | ||||
| -rw-r--r-- | modern/src/settings/OptionsLayout.js | 12 |
3 files changed, 11 insertions, 12 deletions
diff --git a/modern/src/EditCollectionView.js b/modern/src/EditCollectionView.js index 6bb9cb3e..5d1d4e74 100644 --- a/modern/src/EditCollectionView.js +++ b/modern/src/EditCollectionView.js @@ -65,11 +65,11 @@ const EditCollectionView = ({ return ( <> <Content updateTimestamp={updateTimestamp} onMenuClick={menuShow} filter={filter} /> - {adminEnabled && !disableAdd && ( - <Fab size="medium" color="primary" className={classes.fab} onClick={handleAdd}> - <AddIcon /> - </Fab> - )} + {adminEnabled && !disableAdd && ( + <Fab size="medium" color="primary" className={classes.fab} onClick={handleAdd}> + <AddIcon /> + </Fab> + )} <Menu open={!!selectedAnchorEl} anchorEl={selectedAnchorEl} onClose={menuHide}> <MenuItem onClick={handleEdit}>{t('sharedEdit')}</MenuItem> <MenuItem onClick={handleRemove}>{t('sharedRemove')}</MenuItem> diff --git a/modern/src/reports/ReplayPage.js b/modern/src/reports/ReplayPage.js index 4ffab49d..53c223d8 100644 --- a/modern/src/reports/ReplayPage.js +++ b/modern/src/reports/ReplayPage.js @@ -86,7 +86,6 @@ const ReplayPage = () => { useEffect(() => { if (isPlaying && positions.length > 0) { timerRef.current = setInterval(() => { - console.log('in setInterval func'); setIndex((index) => index + 1); }, 500); } else { diff --git a/modern/src/settings/OptionsLayout.js b/modern/src/settings/OptionsLayout.js index eef9cabb..e588cafb 100644 --- a/modern/src/settings/OptionsLayout.js +++ b/modern/src/settings/OptionsLayout.js @@ -9,13 +9,9 @@ import { Hidden, } from '@material-ui/core'; -import ArrowBackIcon from '@material-ui/icons/ArrowBack'; - -import SideNav from '../components/SideNav'; -import NavBar from '../components/NavBar'; -import { useTranslation } from '../LocalizationProvider'; import { useSelector } from 'react-redux'; import CreateIcon from '@material-ui/icons/Create'; +import ArrowBackIcon from '@material-ui/icons/ArrowBack'; import NotificationsIcon from '@material-ui/icons/Notifications'; import FolderIcon from '@material-ui/icons/Folder'; import PersonIcon from '@material-ui/icons/Person'; @@ -25,6 +21,10 @@ import PeopleIcon from '@material-ui/icons/People'; import BarChartIcon from '@material-ui/icons/BarChart'; import TodayIcon from '@material-ui/icons/Today'; +import SideNav from '../components/SideNav'; +import NavBar from '../components/NavBar'; +import { useTranslation } from '../LocalizationProvider'; + const useStyles = makeStyles((theme) => ({ root: { display: 'flex', @@ -77,7 +77,7 @@ const OptionsLayout = ({ children }) => { { name: t('settingsUsers'), href: '/admin/users', icon: <PeopleIcon /> }, { name: t('statisticsTitle'), href: '/admin/statistics', icon: <BarChartIcon /> }, ], [t]); - + const mainRoutes = useMemo(() => [ { name: t('settingsUser'), href: `/user/${userId}`, icon: <PersonIcon /> }, { name: t('sharedGeofences'), href: '/geofences', icon: <CreateIcon /> }, |