diff options
| author | Ashutosh Bishnoi <mail2bishnoi@gmail.com> | 2021-05-24 11:25:48 +0530 |
|---|---|---|
| committer | Ashutosh Bishnoi <mail2bishnoi@gmail.com> | 2021-05-24 11:25:48 +0530 |
| commit | 10b8e1d6f4ed63c43da2cd71bf21f34b31071cd1 (patch) | |
| tree | dc195ad10777e9459f4365ab7a817f8f3db5c331 | |
| parent | f15034e5fe4e5c702975b8a0f583a9917c4b1b3b (diff) | |
| download | etbsa-traccar-web-10b8e1d6f4ed63c43da2cd71bf21f34b31071cd1.tar.gz etbsa-traccar-web-10b8e1d6f4ed63c43da2cd71bf21f34b31071cd1.tar.bz2 etbsa-traccar-web-10b8e1d6f4ed63c43da2cd71bf21f34b31071cd1.zip | |
Revert to last commit
| -rw-r--r-- | modern/package.json | 1 | ||||
| -rw-r--r-- | modern/src/reports/ReportLayoutPage.js | 14 |
2 files changed, 10 insertions, 5 deletions
diff --git a/modern/package.json b/modern/package.json index b796e17..8e5edc6 100644 --- a/modern/package.json +++ b/modern/package.json @@ -18,6 +18,7 @@ "react": "^16.13.1", "react-container-dimensions": "^1.4.1", "react-dom": "^16.13.1", + "react-perfect-scrollbar": "^1.5.8", "react-redux": "^7.2.1", "react-router-dom": "^5.2.0", "react-scripts": "^3.4.3", diff --git a/modern/src/reports/ReportLayoutPage.js b/modern/src/reports/ReportLayoutPage.js index fbb8a30..23ac6d7 100644 --- a/modern/src/reports/ReportLayoutPage.js +++ b/modern/src/reports/ReportLayoutPage.js @@ -1,7 +1,5 @@ import React, { useState } from 'react'; -import { AppBar, Toolbar, Typography, List, ListItem, ListItemText, ListItemIcon, Divider, Drawer, makeStyles, IconButton, Hidden } from '@material-ui/core'; -import { useTheme } from "@material-ui/core/styles"; -import MenuIcon from '@material-ui/icons/Menu'; +import { Grid, Box, Typography, Divider, Drawer, makeStyles, IconButton, Hidden } from '@material-ui/core'; import TimelineIcon from '@material-ui/icons/Timeline'; import PauseCircleFilledIcon from '@material-ui/icons/PauseCircleFilled'; import PlayCircleFilledIcon from '@material-ui/icons/PlayCircleFilled'; @@ -102,8 +100,14 @@ const ReportLayoutPage = ({ children, filter }) => { </Hidden> <div className={classes.content}> <div className={classes.toolbar} /> - {filter} - {children} + <Grid container direction="column" spacing={2}> + <Grid item>{filter}</Grid> + <Grid item> + <Box sx={{ minWidth: 1050 }}> + {children} + </Box> + </Grid> + </Grid> </div> </div> ); |