aboutsummaryrefslogtreecommitdiff
path: root/modern
diff options
context:
space:
mode:
Diffstat (limited to 'modern')
-rw-r--r--modern/src/EditItemView.js2
-rw-r--r--modern/src/admin/UsersPage.js4
-rw-r--r--modern/src/reports/RouteReportPage.js4
3 files changed, 3 insertions, 7 deletions
diff --git a/modern/src/EditItemView.js b/modern/src/EditItemView.js
index db8cd0dc..096b80d3 100644
--- a/modern/src/EditItemView.js
+++ b/modern/src/EditItemView.js
@@ -57,7 +57,7 @@ const EditItemView = ({ children, endpoint, setItem, getItem }) => {
return (
<>
- <MainToobar history={history} />
+ <MainToobar />
<Container maxWidth='xs' className={classes.container}>
<form>
{children}
diff --git a/modern/src/admin/UsersPage.js b/modern/src/admin/UsersPage.js
index 529cdc64..e4b21467 100644
--- a/modern/src/admin/UsersPage.js
+++ b/modern/src/admin/UsersPage.js
@@ -1,6 +1,5 @@
import React, { useState } from 'react';
import MainToobar from '../MainToolbar';
-import { useHistory } from 'react-router-dom';
import { TableContainer, Table, TableRow, TableCell, TableHead, TableBody, makeStyles, IconButton } from '@material-ui/core';
import MoreVertIcon from '@material-ui/icons/MoreVert';
import t from '../common/localization';
@@ -63,12 +62,11 @@ const UsersView = ({ updateTimestamp, onMenuClick }) => {
}
const UsersPage = () => {
- const history = useHistory();
const classes = useStyles();
return (
<div className={classes.root}>
- <MainToobar history={history} />
+ <MainToobar />
<EditCollectionView content={UsersView} editPath="/user" endpoint="users" />
</div>
);
diff --git a/modern/src/reports/RouteReportPage.js b/modern/src/reports/RouteReportPage.js
index eb0ccc55..406cc422 100644
--- a/modern/src/reports/RouteReportPage.js
+++ b/modern/src/reports/RouteReportPage.js
@@ -1,6 +1,5 @@
import React, { useState } from 'react';
import MainToobar from '../MainToolbar';
-import { useHistory } from 'react-router-dom';
import { Grid, TableContainer, Table, TableRow, TableCell, TableHead, TableBody, Paper, makeStyles, FormControl, InputLabel, Select, MenuItem, Button, TextField } from '@material-ui/core';
import t from '../common/localization';
import { useSelector } from 'react-redux';
@@ -24,7 +23,6 @@ const useStyles = makeStyles(theme => ({
}));
const RouteReportPage = () => {
- const history = useHistory();
const classes = useStyles();
const devices = useSelector(state => Object.values(state.devices.items));
const [deviceId, setDeviceId] = useState();
@@ -81,7 +79,7 @@ const RouteReportPage = () => {
return (
<div className={classes.root}>
- <MainToobar history={history} />
+ <MainToobar />
<div className={classes.content}>
<Grid container spacing={2}>
<Grid item xs={12} md={3} lg={2}>