diff options
Diffstat (limited to 'modern')
| -rw-r--r-- | modern/src/GeofencesPage.js | 4 | ||||
| -rw-r--r-- | modern/src/reports/ReportLayout.js | 4 | ||||
| -rw-r--r-- | modern/src/settings/OptionsLayout/index.js | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/modern/src/GeofencesPage.js b/modern/src/GeofencesPage.js index 71219c16..f441a2fd 100644 --- a/modern/src/GeofencesPage.js +++ b/modern/src/GeofencesPage.js @@ -5,6 +5,7 @@ import { import Drawer from '@material-ui/core/Drawer'; import ContainerDimensions from 'react-container-dimensions'; import ArrowBackIcon from '@material-ui/icons/ArrowBack'; +import { useHistory } from 'react-router-dom'; import Map from './map/Map'; import CurrentLocationMap from './map/CurrentLocationMap'; import GeofenceEditMap from './map/GeofenceEditMap'; @@ -49,6 +50,7 @@ const useStyles = makeStyles((theme) => ({ const GeofencesPage = ({ width }) => { const classes = useStyles(); + const history = useHistory(); return ( <div className={classes.root}> @@ -59,7 +61,7 @@ const GeofencesPage = ({ width }) => { classes={{ paper: classes.drawerPaper }} > <div className={classes.drawerHeader}> - <IconButton component="a" href="/"> + <IconButton onClick={() => history.goBack()}> <ArrowBackIcon /> </IconButton> <Typography variant="h6" color="inherit" noWrap> diff --git a/modern/src/reports/ReportLayout.js b/modern/src/reports/ReportLayout.js index c231cd80..69487f28 100644 --- a/modern/src/reports/ReportLayout.js +++ b/modern/src/reports/ReportLayout.js @@ -100,9 +100,7 @@ const ReportLayout = ({ children, filter }) => { classes={{ root: classes.drawerContainer, paper: classes.drawer }} > <div className={classes.drawerHeader}> - <IconButton - onClick={() => history.push('/')} - > + <IconButton onClick={() => history.push('/')}> <ArrowBackIcon /> </IconButton> <Typography variant="h6" color="inherit" noWrap> diff --git a/modern/src/settings/OptionsLayout/index.js b/modern/src/settings/OptionsLayout/index.js index 4a42e583..625148d0 100644 --- a/modern/src/settings/OptionsLayout/index.js +++ b/modern/src/settings/OptionsLayout/index.js @@ -1,5 +1,5 @@ import React, { useState, useEffect } from 'react'; -import { useLocation } from 'react-router-dom'; +import { useHistory, useLocation } from 'react-router-dom'; import { Typography, Divider, @@ -53,6 +53,7 @@ const useStyles = makeStyles((theme) => ({ const OptionsLayout = ({ children }) => { const classes = useStyles(); const location = useLocation(); + const history = useHistory(); const [openDrawer, setOpenDrawer] = useState(false); const [optionTitle, setOptionTitle] = useState(); const routes = useRoutes(); @@ -86,7 +87,7 @@ const OptionsLayout = ({ children }) => { classes={{ root: classes.drawerContainer, paper: classes.drawer }} > <div className={classes.drawerHeader}> - <IconButton component="a" href="/"> + <IconButton onClick={() => history.push('/')}> <ArrowBackIcon /> </IconButton> <Typography variant="h6" color="inherit" noWrap> |