diff options
22 files changed, 0 insertions, 83 deletions
diff --git a/modern/src/common/components/ErrorHandler.js b/modern/src/common/components/ErrorHandler.js index d6735885..757a78ef 100644 --- a/modern/src/common/components/ErrorHandler.js +++ b/modern/src/common/components/ErrorHandler.js @@ -14,7 +14,6 @@ const ErrorHandler = () => { <Snackbar open={!!error}> <Alert elevation={6} - onClose={() => dispatch(errorsActions.pop())} severity="error" > diff --git a/modern/src/common/theme/index.js b/modern/src/common/theme/index.js index de0a7efd..eb9635db 100644 --- a/modern/src/common/theme/index.js +++ b/modern/src/common/theme/index.js @@ -1,11 +1,9 @@ import { createTheme, adaptV4Theme } from '@mui/material/styles'; import palette from './palette'; -import overrides from './overrides'; import dimensions from './dimensions'; const theme = createTheme(adaptV4Theme({ palette, - //overrides, dimensions, })); diff --git a/modern/src/login/LoginPage.js b/modern/src/login/LoginPage.js index e7a110de..8e5467ac 100644 --- a/modern/src/login/LoginPage.js +++ b/modern/src/login/LoginPage.js @@ -118,7 +118,6 @@ const LoginPage = () => { onChange={(e) => setEmail(e.target.value)} onKeyUp={handleSpecialKey} helperText={failed && 'Invalid username or password'} - /> </Grid> <Grid item> @@ -134,7 +133,6 @@ const LoginPage = () => { autoFocus={!!email} onChange={(e) => setPassword(e.target.value)} onKeyUp={handleSpecialKey} - /> </Grid> <Grid item> diff --git a/modern/src/login/RegisterPage.js b/modern/src/login/RegisterPage.js index e0b408f4..986bf894 100644 --- a/modern/src/login/RegisterPage.js +++ b/modern/src/login/RegisterPage.js @@ -81,7 +81,6 @@ const RegisterPage = () => { autoComplete="name" autoFocus onChange={(event) => setName(event.target.value)} - /> </Grid> <Grid item> @@ -94,7 +93,6 @@ const RegisterPage = () => { value={email} autoComplete="email" onChange={(event) => setEmail(event.target.value)} - /> </Grid> <Grid item> @@ -107,7 +105,6 @@ const RegisterPage = () => { type="password" autoComplete="current-password" onChange={(event) => setPassword(event.target.value)} - /> </Grid> <Grid item> diff --git a/modern/src/login/ResetPasswordPage.js b/modern/src/login/ResetPasswordPage.js index c74d3396..c3e91fe6 100644 --- a/modern/src/login/ResetPasswordPage.js +++ b/modern/src/login/ResetPasswordPage.js @@ -94,7 +94,6 @@ const ResetPasswordPage = () => { value={email} autoComplete="email" onChange={(event) => setEmail(event.target.value)} - /> </Grid> ) @@ -109,7 +108,6 @@ const ResetPasswordPage = () => { type="password" autoComplete="current-password" onChange={(event) => setPassword(event.target.value)} - /> </Grid> )} diff --git a/modern/src/main/MainPage.js b/modern/src/main/MainPage.js index 2805ecd1..7235d1b4 100644 --- a/modern/src/main/MainPage.js +++ b/modern/src/main/MainPage.js @@ -178,7 +178,6 @@ const MainPage = () => { autoComplete="searchKeyword" onChange={(event) => setSearchKeyword(event.target.value)} placeholder={t('sharedSearchDevices')} - /> <IconButton size="large" diff --git a/modern/src/reports/components/ReportFilter.js b/modern/src/reports/components/ReportFilter.js index 95502688..f4d2b1a0 100644 --- a/modern/src/reports/components/ReportFilter.js +++ b/modern/src/reports/components/ReportFilter.js @@ -117,7 +117,6 @@ const ReportFilter = ({ {period === 'custom' && ( <div className={classes.item}> <TextField - label={t('reportFrom')} type="datetime-local" value={from.format(moment.HTML5_FMT.DATETIME_LOCAL)} @@ -129,7 +128,6 @@ const ReportFilter = ({ {period === 'custom' && ( <div className={classes.item}> <TextField - label={t('reportTo')} type="datetime-local" value={to.format(moment.HTML5_FMT.DATETIME_LOCAL)} diff --git a/modern/src/settings/AccumulatorsPage.js b/modern/src/settings/AccumulatorsPage.js index 73091e50..ce2d18a2 100644 --- a/modern/src/settings/AccumulatorsPage.js +++ b/modern/src/settings/AccumulatorsPage.js @@ -85,7 +85,6 @@ const AccumulatorsPage = () => { value={item.hours} onChange={(event) => setItem({ ...item, hours: Number(event.target.value) })} label={t('positionHours')} - /> <TextField margin="normal" @@ -93,7 +92,6 @@ const AccumulatorsPage = () => { value={item.totalDistance} onChange={(event) => setItem({ ...item, totalDistance: Number(event.target.value) })} label={t('deviceTotalDistance')} - /> </AccordionDetails> </Accordion> diff --git a/modern/src/settings/CalendarPage.js b/modern/src/settings/CalendarPage.js index f2f2da32..1d967a35 100644 --- a/modern/src/settings/CalendarPage.js +++ b/modern/src/settings/CalendarPage.js @@ -61,7 +61,6 @@ const CalendarPage = () => { value={item.name || ''} onChange={(event) => setItem({ ...item, name: event.target.value })} label={t('sharedName')} - /> <DropzoneArea filesLimit={1} diff --git a/modern/src/settings/CommandPage.js b/modern/src/settings/CommandPage.js index 0f3522bd..5c306e4c 100644 --- a/modern/src/settings/CommandPage.js +++ b/modern/src/settings/CommandPage.js @@ -45,7 +45,6 @@ const CommandPage = () => { value={item.description || ''} onChange={(event) => setItem({ ...item, description: event.target.value })} label={t('sharedDescription')} - /> <BaseCommandView item={item} setItem={setItem} /> </AccordionDetails> diff --git a/modern/src/settings/CommandSendPage.js b/modern/src/settings/CommandSendPage.js index 88519791..29c9df46 100644 --- a/modern/src/settings/CommandSendPage.js +++ b/modern/src/settings/CommandSendPage.js @@ -92,7 +92,6 @@ const CommandSendPage = () => { endpoint={`/api/commands/send?deviceId=${deviceId}`} titleGetter={(it) => it.description} label={t('sharedSavedCommand')} - /> {!savedId && ( <BaseCommandView item={item} setItem={setItem} /> diff --git a/modern/src/settings/ComputedAttributePage.js b/modern/src/settings/ComputedAttributePage.js index 826fe422..28b0f41e 100644 --- a/modern/src/settings/ComputedAttributePage.js +++ b/modern/src/settings/ComputedAttributePage.js @@ -73,7 +73,6 @@ const ComputedAttributePage = () => { value={item.description || ''} onChange={(event) => setItem({ ...item, description: event.target.value })} label={t('sharedDescription')} - /> <FormControl margin="normal" fullWidth> <InputLabel>{t('sharedAttribute')}</InputLabel> @@ -93,10 +92,8 @@ const ComputedAttributePage = () => { label={t('sharedExpression')} multiline rows={4} - /> <FormControl - margin="normal" fullWidth disabled={key in positionAttributes} diff --git a/modern/src/settings/DevicePage.js b/modern/src/settings/DevicePage.js index 2d45dff4..3f194570 100644 --- a/modern/src/settings/DevicePage.js +++ b/modern/src/settings/DevicePage.js @@ -65,14 +65,12 @@ const DevicePage = () => { value={item.name || ''} onChange={(event) => setItem({ ...item, name: event.target.value })} label={t('sharedName')} - /> <TextField margin="normal" value={item.uniqueId || ''} onChange={(event) => setItem({ ...item, uniqueId: event.target.value })} label={t('deviceIdentifier')} - /> </AccordionDetails> </Accordion> @@ -89,28 +87,24 @@ const DevicePage = () => { onChange={(event) => setItem({ ...item, groupId: Number(event.target.value) })} endpoint="/api/groups" label={t('groupParent')} - /> <TextField margin="normal" value={item.phone || ''} onChange={(event) => setItem({ ...item, phone: event.target.value })} label={t('sharedPhone')} - /> <TextField margin="normal" value={item.model || ''} onChange={(event) => setItem({ ...item, model: event.target.value })} label={t('deviceModel')} - /> <TextField margin="normal" value={item.contact || ''} onChange={(event) => setItem({ ...item, contact: event.target.value })} label={t('deviceContact')} - /> <SelectField margin="normal" @@ -122,7 +116,6 @@ const DevicePage = () => { name: t(`category${category.replace(/^\w/, (c) => c.toUpperCase())}`), }))} label={t('deviceCategory')} - /> {admin && ( <FormControlLabel @@ -162,7 +155,6 @@ const DevicePage = () => { keyBase="deviceId" keyLink="geofenceId" label={t('sharedGeofences')} - /> <LinkField margin="normal" @@ -173,7 +165,6 @@ const DevicePage = () => { keyLink="notificationId" titleGetter={(it) => t(prefixString('event', it.type))} label={t('sharedNotifications')} - /> <LinkField margin="normal" @@ -183,7 +174,6 @@ const DevicePage = () => { keyBase="deviceId" keyLink="driverId" label={t('sharedDrivers')} - /> <LinkField margin="normal" @@ -194,7 +184,6 @@ const DevicePage = () => { keyLink="attributeId" titleGetter={(it) => it.description} label={t('sharedComputedAttributes')} - /> <LinkField margin="normal" @@ -205,7 +194,6 @@ const DevicePage = () => { keyLink="commandId" titleGetter={(it) => it.description} label={t('sharedSavedCommands')} - /> <LinkField margin="normal" @@ -215,7 +203,6 @@ const DevicePage = () => { keyBase="deviceId" keyLink="maintenanceId" label={t('sharedMaintenance')} - /> </AccordionDetails> </Accordion> diff --git a/modern/src/settings/DriverPage.js b/modern/src/settings/DriverPage.js index c072c52b..707e2977 100644 --- a/modern/src/settings/DriverPage.js +++ b/modern/src/settings/DriverPage.js @@ -47,14 +47,12 @@ const DriverPage = () => { value={item.name || ''} onChange={(event) => setItem({ ...item, name: event.target.value })} label={t('sharedName')} - /> <TextField margin="normal" value={item.uniqueId || ''} onChange={(event) => setItem({ ...item, uniqueId: event.target.value })} label={t('deviceIdentifier')} - /> </AccordionDetails> </Accordion> diff --git a/modern/src/settings/GeofencePage.js b/modern/src/settings/GeofencePage.js index 7dd47527..353eb2b8 100644 --- a/modern/src/settings/GeofencePage.js +++ b/modern/src/settings/GeofencePage.js @@ -51,7 +51,6 @@ const GeofencePage = () => { value={item.name || ''} onChange={(event) => setItem({ ...item, name: event.target.value })} label={t('sharedName')} - /> </AccordionDetails> </Accordion> diff --git a/modern/src/settings/GroupPage.js b/modern/src/settings/GroupPage.js index 5cb0474d..3f4cc8d8 100644 --- a/modern/src/settings/GroupPage.js +++ b/modern/src/settings/GroupPage.js @@ -56,7 +56,6 @@ const GroupPage = () => { value={item.name || ''} onChange={(event) => setItem({ ...item, name: event.target.value })} label={t('sharedName')} - /> </AccordionDetails> </Accordion> @@ -73,7 +72,6 @@ const GroupPage = () => { onChange={(event) => setItem({ ...item, groupId: Number(event.target.value) })} endpoint="/api/groups" label={t('groupParent')} - /> </AccordionDetails> </Accordion> @@ -107,7 +105,6 @@ const GroupPage = () => { keyBase="groupId" keyLink="geofenceId" label={t('sharedGeofences')} - /> <LinkField margin="normal" @@ -118,7 +115,6 @@ const GroupPage = () => { keyLink="notificationId" titleGetter={(it) => t(prefixString('event', it.type))} label={t('sharedNotifications')} - /> <LinkField margin="normal" @@ -128,7 +124,6 @@ const GroupPage = () => { keyBase="groupId" keyLink="driverId" label={t('sharedDrivers')} - /> <LinkField margin="normal" @@ -139,7 +134,6 @@ const GroupPage = () => { keyLink="attributeId" titleGetter={(it) => it.description} label={t('sharedComputedAttributes')} - /> <LinkField margin="normal" @@ -150,7 +144,6 @@ const GroupPage = () => { keyLink="commandId" titleGetter={(it) => it.description} label={t('sharedSavedCommands')} - /> <LinkField margin="normal" @@ -160,7 +153,6 @@ const GroupPage = () => { keyBase="groupId" keyLink="maintenanceId" label={t('sharedMaintenance')} - /> </AccordionDetails> </Accordion> diff --git a/modern/src/settings/MaintenancePage.js b/modern/src/settings/MaintenancePage.js index 599d600d..67448fb7 100644 --- a/modern/src/settings/MaintenancePage.js +++ b/modern/src/settings/MaintenancePage.js @@ -129,7 +129,6 @@ const MaintenancePage = () => { value={item.name || ''} onChange={(event) => setItem({ ...item, name: event.target.value })} label={t('sharedName')} - /> <FormControl margin="normal" fullWidth> <InputLabel>{t('sharedType')}</InputLabel> @@ -148,7 +147,6 @@ const MaintenancePage = () => { value={rawToValue(item.start) || ''} onChange={(event) => setItem({ ...item, start: valueToRaw(event.target.value) })} label={t('maintenanceStart')} - InputProps={{ endAdornment: <InputAdornment position="start">{labels.start}</InputAdornment>, }} @@ -159,7 +157,6 @@ const MaintenancePage = () => { value={rawToValue(item.period) || ''} onChange={(event) => setItem({ ...item, period: valueToRaw(event.target.value) })} label={t('maintenancePeriod')} - InputProps={{ endAdornment: <InputAdornment position="start">{labels.period}</InputAdornment>, }} diff --git a/modern/src/settings/NotificationPage.js b/modern/src/settings/NotificationPage.js index a98330c2..a7c06f68 100644 --- a/modern/src/settings/NotificationPage.js +++ b/modern/src/settings/NotificationPage.js @@ -61,7 +61,6 @@ const NotificationPage = () => { keyGetter={(it) => it.type} titleGetter={(it) => t(prefixString('event', it.type))} label={t('sharedType')} - /> <SelectField multiple @@ -72,7 +71,6 @@ const NotificationPage = () => { keyGetter={(it) => it.type} titleGetter={(it) => t(prefixString('notificator', it.type))} label={t('notificationNotificators')} - /> {(!item.type || item.type === 'alarm') && ( <SelectField @@ -83,7 +81,6 @@ const NotificationPage = () => { data={alarms} keyGetter={(it) => it.key} label={t('sharedAlarms')} - /> )} <FormControlLabel diff --git a/modern/src/settings/ServerPage.js b/modern/src/settings/ServerPage.js index 1f51d530..8432e657 100644 --- a/modern/src/settings/ServerPage.js +++ b/modern/src/settings/ServerPage.js @@ -89,7 +89,6 @@ const ServerPage = () => { value={item.mapUrl || ''} onChange={(event) => setItem({ ...item, mapUrl: event.target.value })} label={t('mapCustomLabel')} - /> <TextField margin="normal" @@ -97,7 +96,6 @@ const ServerPage = () => { value={item.latitude || 0} onChange={(event) => setItem({ ...item, latitude: Number(event.target.value) })} label={t('positionLatitude')} - /> <TextField margin="normal" @@ -105,7 +103,6 @@ const ServerPage = () => { value={item.longitude || 0} onChange={(event) => setItem({ ...item, longitude: Number(event.target.value) })} label={t('positionLongitude')} - /> <TextField margin="normal" @@ -113,7 +110,6 @@ const ServerPage = () => { value={item.zoom || 0} onChange={(event) => setItem({ ...item, zoom: Number(event.target.value) })} label={t('serverZoom')} - /> <FormControl margin="normal" fullWidth> <InputLabel>{t('settingsCoordinateFormat')}</InputLabel> @@ -168,21 +164,18 @@ const ServerPage = () => { keyGetter={(it) => it} titleGetter={(it) => it} label={t('sharedTimezone')} - /> <TextField margin="normal" value={item.poiLayer || ''} onChange={(event) => setItem({ ...item, poiLayer: event.target.value })} label={t('mapPoiLayer')} - /> <TextField margin="normal" value={item.announcement || ''} onChange={(event) => setItem({ ...item, announcement: event.target.value })} label={t('serverAnnouncement')} - /> <FormControlLabel control={<Checkbox checked={item.twelveHourFormat} onChange={(event) => setItem({ ...item, twelveHourFormat: event.target.checked })} />} diff --git a/modern/src/settings/UserPage.js b/modern/src/settings/UserPage.js index 8b2dc933..d279fce3 100644 --- a/modern/src/settings/UserPage.js +++ b/modern/src/settings/UserPage.js @@ -87,21 +87,18 @@ const UserPage = () => { value={item.name || ''} onChange={(event) => setItem({ ...item, name: event.target.value })} label={t('sharedName')} - /> <TextField margin="normal" value={item.email || ''} onChange={(event) => setItem({ ...item, email: event.target.value })} label={t('userEmail')} - /> <TextField margin="normal" type="password" onChange={(event) => setItem({ ...item, password: event.target.value })} label={t('userPassword')} - /> </AccordionDetails> </Accordion> @@ -117,7 +114,6 @@ const UserPage = () => { value={item.phone || ''} onChange={(event) => setItem({ ...item, phone: event.target.value })} label={t('sharedPhone')} - /> <TextField margin="normal" @@ -125,7 +121,6 @@ const UserPage = () => { value={item.latitude || 0} onChange={(event) => setItem({ ...item, latitude: Number(event.target.value) })} label={t('positionLatitude')} - /> <TextField margin="normal" @@ -133,7 +128,6 @@ const UserPage = () => { value={item.longitude || 0} onChange={(event) => setItem({ ...item, longitude: Number(event.target.value) })} label={t('positionLongitude')} - /> <TextField margin="normal" @@ -141,7 +135,6 @@ const UserPage = () => { value={item.zoom || 0} onChange={(event) => setItem({ ...item, zoom: Number(event.target.value) })} label={t('serverZoom')} - /> <FormControl margin="normal" fullWidth> <InputLabel>{t('settingsCoordinateFormat')}</InputLabel> @@ -196,14 +189,12 @@ const UserPage = () => { keyGetter={(it) => it} titleGetter={(it) => it} label={t('sharedTimezone')} - /> <TextField margin="normal" value={item.poiLayer || ''} onChange={(event) => setItem({ ...item, poiLayer: event.target.value })} label={t('mapPoiLayer')} - /> <FormControlLabel control={<Checkbox checked={item.twelveHourFormat} onChange={(event) => setItem({ ...item, twelveHourFormat: event.target.checked })} />} @@ -241,7 +232,6 @@ const UserPage = () => { </FormControl> <TextField margin="normal" - label={t('userExpirationTime')} type="date" value={(item.expirationTime && item.expirationTime.format(moment.HTML5_FMT.DATE)) || '2999-01-01'} @@ -254,7 +244,6 @@ const UserPage = () => { value={item.deviceLimit || 0} onChange={(e) => setItem({ ...item, deviceLimit: Number(e.target.value) })} label={t('userDeviceLimit')} - disabled={!admin} /> <TextField @@ -263,7 +252,6 @@ const UserPage = () => { value={item.userLimit || 0} onChange={(e) => setItem({ ...item, userLimit: Number(e.target.value) })} label={t('userUserLimit')} - disabled={!admin} /> <FormControlLabel @@ -328,7 +316,6 @@ const UserPage = () => { keyBase="userId" keyLink="deviceId" label={t('deviceTitle')} - /> <LinkField margin="normal" @@ -338,7 +325,6 @@ const UserPage = () => { keyBase="userId" keyLink="groupId" label={t('settingsGroups')} - /> <LinkField margin="normal" @@ -348,7 +334,6 @@ const UserPage = () => { keyBase="userId" keyLink="geofenceId" label={t('sharedGeofences')} - /> <LinkField margin="normal" @@ -359,7 +344,6 @@ const UserPage = () => { keyLink="notificationId" titleGetter={(it) => t(prefixString('event', it.type))} label={t('sharedNotifications')} - /> <LinkField margin="normal" @@ -369,7 +353,6 @@ const UserPage = () => { keyBase="userId" keyLink="calendarId" label={t('sharedCalendars')} - /> <LinkField margin="normal" @@ -379,7 +362,6 @@ const UserPage = () => { keyBase="userId" keyLink="managedUserId" label={t('settingsUsers')} - /> <LinkField margin="normal" @@ -390,7 +372,6 @@ const UserPage = () => { keyLink="attributeId" titleGetter={(it) => it.description} label={t('sharedComputedAttributes')} - /> <LinkField margin="normal" @@ -400,7 +381,6 @@ const UserPage = () => { keyBase="userId" keyLink="driverId" label={t('sharedDrivers')} - /> <LinkField margin="normal" @@ -411,7 +391,6 @@ const UserPage = () => { keyLink="commandId" titleGetter={(it) => it.description} label={t('sharedSavedCommands')} - /> <LinkField margin="normal" @@ -421,7 +400,6 @@ const UserPage = () => { keyBase="userId" keyLink="maintenanceId" label={t('sharedMaintenance')} - /> </AccordionDetails> </Accordion> diff --git a/modern/src/settings/components/AddAttributeDialog.js b/modern/src/settings/components/AddAttributeDialog.js index d0ac5f46..150fc008 100644 --- a/modern/src/settings/components/AddAttributeDialog.js +++ b/modern/src/settings/components/AddAttributeDialog.js @@ -52,7 +52,6 @@ const AddAttributeDialog = ({ open, onResult, definitions }) => { )} /> <FormControl - margin="normal" fullWidth disabled={key in definitions} diff --git a/modern/src/settings/components/BaseCommandView.js b/modern/src/settings/components/BaseCommandView.js index 5f89ac2b..c578e111 100644 --- a/modern/src/settings/components/BaseCommandView.js +++ b/modern/src/settings/components/BaseCommandView.js @@ -32,7 +32,6 @@ const BaseCommandView = ({ item, setItem }) => { keyGetter={(it) => it.type} titleGetter={(it) => t(prefixString('command', it.type))} label={t('sharedType')} - /> {attributes.map(({ key, name, type }) => { if (type === 'boolean') { @@ -63,7 +62,6 @@ const BaseCommandView = ({ item, setItem }) => { setItem(updateItem); }} label={name} - /> ); })} |