aboutsummaryrefslogtreecommitdiff
path: root/modern/src/admin
diff options
context:
space:
mode:
authorDesmond Kyeremeh <elDekyfin@gmail.com>2021-07-11 23:39:30 +0000
committerDesmond Kyeremeh <elDekyfin@gmail.com>2021-07-11 23:39:30 +0000
commit004367fc1fd389b169821eb2d73266490f409999 (patch)
tree1b7e6f13c03326a957bdb78351853f429156b3ae /modern/src/admin
parent1b93de84e2bf6a6532bdb03e1ae75e47061a4dca (diff)
parent702e674ecce7de1a4f4318ef8f30c572264a4560 (diff)
downloadetbsa-traccar-web-004367fc1fd389b169821eb2d73266490f409999.tar.gz
etbsa-traccar-web-004367fc1fd389b169821eb2d73266490f409999.tar.bz2
etbsa-traccar-web-004367fc1fd389b169821eb2d73266490f409999.zip
Merge remote-tracking branch 'upstream/master' into group-config
Diffstat (limited to 'modern/src/admin')
-rw-r--r--modern/src/admin/ServerPage.js48
-rw-r--r--modern/src/admin/StatisticsPage.js9
-rw-r--r--modern/src/admin/UsersPage.js4
3 files changed, 8 insertions, 53 deletions
diff --git a/modern/src/admin/ServerPage.js b/modern/src/admin/ServerPage.js
index 6d5b575..ec0034f 100644
--- a/modern/src/admin/ServerPage.js
+++ b/modern/src/admin/ServerPage.js
@@ -79,45 +79,19 @@ const ServerPage = () => {
</AccordionSummary>
<AccordionDetails className={classes.details}>
<FormControlLabel
- control={(
- <Checkbox
- checked={item.registration}
- onChange={(event) => setItem({ ...item, registration: event.target.checked })}
- />
- )}
+ control={<Checkbox checked={item.registration} onChange={(event) => setItem({ ...item, registration: event.target.checked })} />}
label={t('serverRegistration')}
/>
<FormControlLabel
- control={(
- <Checkbox
- checked={item.readonly}
- onChange={(event) => setItem({ ...item, readonly: event.target.checked })}
- />
- )}
+ control={<Checkbox checked={item.readonly} onChange={(event) => setItem({ ...item, readonly: event.target.checked })} />}
label={t('serverReadonly')}
/>
<FormControlLabel
- control={(
- <Checkbox
- checked={item.deviceReadonly}
- onChange={(event) => setItem({
- ...item,
- deviceReadonly: event.target.checked,
- })}
- />
- )}
+ control={<Checkbox checked={item.deviceReadonly} onChange={(event) => setItem({ ...item, deviceReadonly: event.target.checked })} />}
label={t('userDeviceReadonly')}
/>
<FormControlLabel
- control={(
- <Checkbox
- checked={item.limitCommands}
- onChange={(event) => setItem({
- ...item,
- limitCommands: event.target.checked,
- })}
- />
- )}
+ control={<Checkbox checked={item.limitCommands} onChange={(event) => setItem({ ...item, limitCommands: event.target.checked })} />}
label={t('userLimitCommands')}
/>
</AccordionDetails>
@@ -140,20 +114,10 @@ const ServerPage = () => {
)}
<FormControl fullWidth margin="normal">
<div className={classes.buttons}>
- <Button
- type="button"
- color="primary"
- variant="outlined"
- onClick={() => history.goBack()}
- >
+ <Button type="button" color="primary" variant="outlined" onClick={() => history.goBack()}>
{t('sharedCancel')}
</Button>
- <Button
- type="button"
- color="primary"
- variant="contained"
- onClick={handleSave}
- >
+ <Button type="button" color="primary" variant="contained" onClick={handleSave}>
{t('sharedSave')}
</Button>
</div>
diff --git a/modern/src/admin/StatisticsPage.js b/modern/src/admin/StatisticsPage.js
index 8a6e601..20974f4 100644
--- a/modern/src/admin/StatisticsPage.js
+++ b/modern/src/admin/StatisticsPage.js
@@ -106,14 +106,7 @@ const Filter = ({ setItems }) => {
fullWidth
/>
)}
- <Button
- variant="contained"
- color="primary"
- onClick={handleClick}
- fullWidth
- >
- {t('reportShow')}
- </Button>
+ <Button variant="contained" color="primary" onClick={handleClick} fullWidth>{t('reportShow')}</Button>
</>
);
};
diff --git a/modern/src/admin/UsersPage.js b/modern/src/admin/UsersPage.js
index 6afe099..9b51cdd 100644
--- a/modern/src/admin/UsersPage.js
+++ b/modern/src/admin/UsersPage.js
@@ -44,9 +44,7 @@ const UsersView = ({ updateTimestamp, onMenuClick }) => {
{items.map((item) => (
<TableRow key={item.id}>
<TableCell className={classes.columnAction} padding="none">
- <IconButton
- onClick={(event) => onMenuClick(event.currentTarget, item.id)}
- >
+ <IconButton onClick={(event) => onMenuClick(event.currentTarget, item.id)}>
<MoreVertIcon />
</IconButton>
</TableCell>