diff options
| author | ditoaugusta <dt_ap@ymail.com> | 2020-03-27 18:30:47 +0700 |
|---|---|---|
| committer | ditoaugusta <dt_ap@ymail.com> | 2020-03-27 18:30:47 +0700 |
| commit | 114604e02eea84d3de78fb340f1c91c72b46e904 (patch) | |
| tree | 8ef061009cd1823ccadd06d28113c254dde0ec5a /modern/src/MainPage.js | |
| parent | 8bef4f04c2b0b203450fe5753b6109a0b0d04e82 (diff) | |
| parent | 79c36b9a84623fb99db0ab71cc9a31391f06489e (diff) | |
| download | trackermap-web-114604e02eea84d3de78fb340f1c91c72b46e904.tar.gz trackermap-web-114604e02eea84d3de78fb340f1c91c72b46e904.tar.bz2 trackermap-web-114604e02eea84d3de78fb340f1c91c72b46e904.zip | |
Merge branch 'master' of https://github.com/traccar/traccar-web into experimental/hooks
Diffstat (limited to 'modern/src/MainPage.js')
| -rw-r--r-- | modern/src/MainPage.js | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/modern/src/MainPage.js b/modern/src/MainPage.js index 8e9b695f..b2ac34aa 100644 --- a/modern/src/MainPage.js +++ b/modern/src/MainPage.js @@ -1,12 +1,13 @@ import React, { useState, useEffect } from 'react'; +import { useHistory } from 'react-router-dom'; +import { makeStyles } from '@material-ui/core'; +import Drawer from '@material-ui/core/Drawer'; import ContainerDimensions from 'react-container-dimensions'; -import MainToobar from './MainToolbar'; + import MainMap from './MainMap'; -import Drawer from '@material-ui/core/Drawer'; import SocketController from './SocketController'; +import MainToobar from './MainToolbar'; import DeviceList from './DeviceList'; -import { makeStyles } from '@material-ui/core'; -import { useHistory } from 'react-router-dom'; const useStyles = makeStyles(theme => ({ root: { |