From bbc54a464a8a3cf41904c5335fb1845ff8af1887 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Tue, 22 Sep 2020 23:01:32 -0700 Subject: Add server settings page --- modern/src/App.js | 2 + modern/src/EditItemView.js | 4 +- modern/src/MainPage.js | 4 +- modern/src/MainToolbar.js | 7 +++ modern/src/SocketController.js | 3 +- modern/src/admin/ServerPage.js | 109 ++++++++++++++++++++++++++++++++++ modern/src/admin/UsersPage.js | 4 +- modern/src/reports/RouteReportPage.js | 4 +- 8 files changed, 127 insertions(+), 10 deletions(-) create mode 100644 modern/src/admin/ServerPage.js (limited to 'modern') diff --git a/modern/src/App.js b/modern/src/App.js index a4c00e2..4d78639 100644 --- a/modern/src/App.js +++ b/modern/src/App.js @@ -4,6 +4,7 @@ import CssBaseline from '@material-ui/core/CssBaseline'; import MainPage from './MainPage'; import LoginPage from './LoginPage'; import RouteReportPage from './reports/RouteReportPage'; +import ServerPage from './admin/ServerPage'; import UsersPage from './admin/UsersPage'; import DevicePage from './DevicePage'; import UserPage from './UserPage'; @@ -20,6 +21,7 @@ const App = () => { + diff --git a/modern/src/EditItemView.js b/modern/src/EditItemView.js index 096b80d..f67927a 100644 --- a/modern/src/EditItemView.js +++ b/modern/src/EditItemView.js @@ -1,5 +1,5 @@ import React from 'react'; -import MainToobar from './MainToolbar'; +import MainToolbar from './MainToolbar'; import { useHistory, useParams } from 'react-router-dom'; import { makeStyles } from '@material-ui/core/styles'; import Container from '@material-ui/core/Container'; @@ -57,7 +57,7 @@ const EditItemView = ({ children, endpoint, setItem, getItem }) => { return ( <> - +
{children} diff --git a/modern/src/MainPage.js b/modern/src/MainPage.js index 3032f93..aec7846 100644 --- a/modern/src/MainPage.js +++ b/modern/src/MainPage.js @@ -6,7 +6,7 @@ import ContainerDimensions from 'react-container-dimensions'; import LinearProgress from '@material-ui/core/LinearProgress'; import DevicesList from './DevicesList'; import MainMap from './MainMap'; -import MainToobar from './MainToolbar'; +import MainToolbar from './MainToolbar'; const useStyles = makeStyles(theme => ({ root: { @@ -43,7 +43,7 @@ const MainPage = ({ width }) => { return !initialized ? () : (
- +
({ @@ -167,6 +168,12 @@ const MainToolbar = () => { {t('userAdmin')} }> + history.push('/admin/server')}> + + + + + history.push('/admin/users')}> diff --git a/modern/src/SocketController.js b/modern/src/SocketController.js index 73df6d0..cda693a 100644 --- a/modern/src/SocketController.js +++ b/modern/src/SocketController.js @@ -51,8 +51,7 @@ const SocketController = () => { useEffectAsync(async () => { const response = await fetch('/api/server'); if (response.ok) { - const server = await response.json(); - dispatch(sessionActions.updateServer(server)); + dispatch(sessionActions.updateServer(await response.json())); } }, []); diff --git a/modern/src/admin/ServerPage.js b/modern/src/admin/ServerPage.js new file mode 100644 index 0000000..01b8db1 --- /dev/null +++ b/modern/src/admin/ServerPage.js @@ -0,0 +1,109 @@ +import React from 'react'; +import TextField from '@material-ui/core/TextField'; + +import t from '../common/localization'; +import { Accordion, AccordionSummary, AccordionDetails, makeStyles, Typography, Button, FormControl, Container, Checkbox, FormControlLabel } from '@material-ui/core'; +import ExpandMoreIcon from '@material-ui/icons/ExpandMore'; +import { useHistory } from 'react-router-dom'; +import { useDispatch, useSelector } from 'react-redux'; +import MainToolbar from '../MainToolbar'; +import { sessionActions } from '../store'; + +const useStyles = makeStyles(theme => ({ + container: { + marginTop: theme.spacing(2), + }, + buttons: { + display: 'flex', + justifyContent: 'space-evenly', + '& > *': { + flexBasis: '33%', + }, + }, + details: { + flexDirection: 'column', + }, +})); + +const ServerPage = () => { + const history = useHistory(); + const dispatch = useDispatch(); + const classes = useStyles(); + + const item = useSelector(state => state.session.server); + const setItem = (updatedItem) => dispatch(sessionActions.updateServer(updatedItem)); + + const handleSave = async () => { + const response = await fetch('/api/server', { + method: 'PUT', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify(item), + }); + + if (response.ok) { + history.goBack(); + } + }; + + return ( + <> + + + + {item && + <> + + }> + + {t('sharedPreferences')} + + + + setItem({...item, announcement: event.target.value})} + label={t('serverAnnouncement')} + variant="filled" /> + + + + }> + + {t('sharedPermissions')} + + + + setItem({...item, registration: event.target.checked})} />} + label={t('serverRegistration')} /> + setItem({...item, readonly: event.target.checked})} />} + label={t('serverReadonly')} /> + setItem({...item, deviceReadonly: event.target.checked})} />} + label={t('userDeviceReadonly')} /> + setItem({...item, limitCommands: event.target.checked})} />} + label={t('userLimitCommands')} /> + + + + } + +
+ + +
+
+ +
+ + ); +} + +export default ServerPage; diff --git a/modern/src/admin/UsersPage.js b/modern/src/admin/UsersPage.js index e4b2146..d0861f1 100644 --- a/modern/src/admin/UsersPage.js +++ b/modern/src/admin/UsersPage.js @@ -1,5 +1,5 @@ import React, { useState } from 'react'; -import MainToobar from '../MainToolbar'; +import MainToolbar from '../MainToolbar'; 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'; @@ -66,7 +66,7 @@ const UsersPage = () => { return (
- +
); diff --git a/modern/src/reports/RouteReportPage.js b/modern/src/reports/RouteReportPage.js index 406cc42..a478ddb 100644 --- a/modern/src/reports/RouteReportPage.js +++ b/modern/src/reports/RouteReportPage.js @@ -1,5 +1,5 @@ import React, { useState } from 'react'; -import MainToobar from '../MainToolbar'; +import MainToolbar from '../MainToolbar'; 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'; @@ -79,7 +79,7 @@ const RouteReportPage = () => { return (
- +
-- cgit v1.2.3