diff options
author | Desmond Kyeremeh <elDekyfin@gmail.com> | 2021-07-20 16:02:48 +0000 |
---|---|---|
committer | Desmond Kyeremeh <elDekyfin@gmail.com> | 2021-07-20 16:02:48 +0000 |
commit | fbf1be890ad30cd3a294c969fed3efe61ad59974 (patch) | |
tree | b6b014e98b6f79bd3d9b05aac4a1da355a11804b /modern/src/admin/ServerPage.js | |
parent | 4a6ed2462ed5ed2960fc8245ac3c5bae967e685b (diff) | |
parent | 16d579d1628bd8aa4a8d1f262ed70face50af907 (diff) | |
download | etbsa-traccar-web-fbf1be890ad30cd3a294c969fed3efe61ad59974.tar.gz etbsa-traccar-web-fbf1be890ad30cd3a294c969fed3efe61ad59974.tar.bz2 etbsa-traccar-web-fbf1be890ad30cd3a294c969fed3efe61ad59974.zip |
Merge remote-tracking branch 'origin/master' into device_list
Diffstat (limited to 'modern/src/admin/ServerPage.js')
-rw-r--r-- | modern/src/admin/ServerPage.js | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/modern/src/admin/ServerPage.js b/modern/src/admin/ServerPage.js index 7decac1..ec0034f 100644 --- a/modern/src/admin/ServerPage.js +++ b/modern/src/admin/ServerPage.js @@ -8,11 +8,11 @@ import ExpandMoreIcon from '@material-ui/icons/ExpandMore'; import { useHistory } from 'react-router-dom'; import { useDispatch, useSelector } from 'react-redux'; import t from '../common/localization'; -import MainToolbar from '../MainToolbar'; import { sessionActions } from '../store'; import EditAttributesView from '../attributes/EditAttributesView'; import deviceAttributes from '../attributes/deviceAttributes'; import userAttributes from '../attributes/userAttributes'; +import OptionsLayout from '../settings/OptionsLayout'; const useStyles = makeStyles((theme) => ({ container: { @@ -51,11 +51,9 @@ const ServerPage = () => { }; return ( - <> - <MainToolbar /> + <OptionsLayout> <Container maxWidth="xs" className={classes.container}> - {item - && ( + {item && ( <> <Accordion defaultExpanded> <AccordionSummary expandIcon={<ExpandMoreIcon />}> @@ -113,7 +111,7 @@ const ServerPage = () => { </AccordionDetails> </Accordion> </> - )} + )} <FormControl fullWidth margin="normal"> <div className={classes.buttons}> <Button type="button" color="primary" variant="outlined" onClick={() => history.goBack()}> @@ -125,7 +123,7 @@ const ServerPage = () => { </div> </FormControl> </Container> - </> + </OptionsLayout> ); }; |