Minor UI Updates (#93)
* simplify props set to constant true * reduce icon size in users table for better small screen compatibility * use lib_compat_mode property over library exclusion * get travis to build esp32 environment in addition to esp8266 during CI build
This commit is contained in:
parent
245a713a9f
commit
a042633d8f
@ -16,4 +16,4 @@ install:
|
|||||||
- platformio update
|
- platformio update
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- platformio run
|
- platformio run -e esp12e -e node32s
|
||||||
|
@ -26,8 +26,8 @@ class AccessPoint extends Component<AccessPointProps> {
|
|||||||
<Tab value="/ap/settings" label="Access Point Settings" disabled={!authenticatedContext.me.admin} />
|
<Tab value="/ap/settings" label="Access Point Settings" disabled={!authenticatedContext.me.admin} />
|
||||||
</Tabs>
|
</Tabs>
|
||||||
<Switch>
|
<Switch>
|
||||||
<AuthenticatedRoute exact={true} path="/ap/status" component={APStatusController} />
|
<AuthenticatedRoute exact path="/ap/status" component={APStatusController} />
|
||||||
<AuthenticatedRoute exact={true} path="/ap/settings" component={APSettingsController} />
|
<AuthenticatedRoute exact path="/ap/settings" component={APSettingsController} />
|
||||||
<Redirect to="/ap/status" />
|
<Redirect to="/ap/status" />
|
||||||
</Switch>
|
</Switch>
|
||||||
</MenuAppBar>
|
</MenuAppBar>
|
||||||
|
@ -65,7 +65,7 @@ class NTPSettingsForm extends React.Component<NTPSettingsFormProps> {
|
|||||||
onChange={this.changeTimeZone}
|
onChange={this.changeTimeZone}
|
||||||
margin="normal"
|
margin="normal"
|
||||||
>
|
>
|
||||||
<MenuItem disabled={true}>Time zone...</MenuItem>
|
<MenuItem disabled>Time zone...</MenuItem>
|
||||||
{timeZoneSelectItems()}
|
{timeZoneSelectItems()}
|
||||||
</SelectValidator>
|
</SelectValidator>
|
||||||
<FormActions>
|
<FormActions>
|
||||||
|
@ -26,8 +26,8 @@ class NetworkTime extends Component<NetworkTimeProps> {
|
|||||||
<Tab value="/ntp/settings" label="NTP Settings" disabled={!authenticatedContext.me.admin} />
|
<Tab value="/ntp/settings" label="NTP Settings" disabled={!authenticatedContext.me.admin} />
|
||||||
</Tabs>
|
</Tabs>
|
||||||
<Switch>
|
<Switch>
|
||||||
<AuthenticatedRoute exact={true} path="/ntp/status" component={NTPStatusController} />
|
<AuthenticatedRoute exact path="/ntp/status" component={NTPStatusController} />
|
||||||
<AuthenticatedRoute exact={true} path="/ntp/settings" component={NTPSettingsController} />
|
<AuthenticatedRoute exact path="/ntp/settings" component={NTPSettingsController} />
|
||||||
<Redirect to="/ntp/status" />
|
<Redirect to="/ntp/status" />
|
||||||
</Switch>
|
</Switch>
|
||||||
</MenuAppBar>
|
</MenuAppBar>
|
||||||
|
@ -131,10 +131,10 @@ class ManageUsersForm extends React.Component<ManageUsersFormProps, ManageUsersF
|
|||||||
}
|
}
|
||||||
</TableCell>
|
</TableCell>
|
||||||
<TableCell align="center">
|
<TableCell align="center">
|
||||||
<IconButton aria-label="Delete" onClick={() => this.removeUser(user)}>
|
<IconButton size="small" aria-label="Delete" onClick={() => this.removeUser(user)}>
|
||||||
<DeleteIcon />
|
<DeleteIcon />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
<IconButton aria-label="Edit" onClick={() => this.startEditingUser(user)}>
|
<IconButton size="small" aria-label="Edit" onClick={() => this.startEditingUser(user)}>
|
||||||
<EditIcon />
|
<EditIcon />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
</TableCell>
|
</TableCell>
|
||||||
|
@ -25,8 +25,8 @@ class Security extends Component<SecurityProps> {
|
|||||||
<Tab value="/security/settings" label="Security Settings" />
|
<Tab value="/security/settings" label="Security Settings" />
|
||||||
</Tabs>
|
</Tabs>
|
||||||
<Switch>
|
<Switch>
|
||||||
<AuthenticatedRoute exact={true} path="/security/users" component={ManageUsersController} />
|
<AuthenticatedRoute exact path="/security/users" component={ManageUsersController} />
|
||||||
<AuthenticatedRoute exact={true} path="/security/settings" component={SecuritySettingsController} />
|
<AuthenticatedRoute exact path="/security/settings" component={SecuritySettingsController} />
|
||||||
<Redirect to="/security/users" />
|
<Redirect to="/security/users" />
|
||||||
</Switch>
|
</Switch>
|
||||||
</MenuAppBar>
|
</MenuAppBar>
|
||||||
|
@ -33,9 +33,9 @@ class UserForm extends React.Component<UserFormProps> {
|
|||||||
const { user, creating, handleValueChange, handleCheckboxChange, onDoneEditing, onCancelEditing } = this.props;
|
const { user, creating, handleValueChange, handleCheckboxChange, onDoneEditing, onCancelEditing } = this.props;
|
||||||
return (
|
return (
|
||||||
<ValidatorForm onSubmit={onDoneEditing} ref={this.formRef}>
|
<ValidatorForm onSubmit={onDoneEditing} ref={this.formRef}>
|
||||||
<Dialog onClose={onCancelEditing} aria-labelledby="user-form-dialog-title" open={true}>
|
<Dialog onClose={onCancelEditing} aria-labelledby="user-form-dialog-title" open>
|
||||||
<DialogTitle id="user-form-dialog-title">{creating ? 'Add' : 'Modify'} User</DialogTitle>
|
<DialogTitle id="user-form-dialog-title">{creating ? 'Add' : 'Modify'} User</DialogTitle>
|
||||||
<DialogContent dividers={true}>
|
<DialogContent dividers>
|
||||||
<TextValidator
|
<TextValidator
|
||||||
validators={creating ? ['required', 'uniqueUsername', 'matchRegexp:^[a-zA-Z0-9_\\.]{1,24}$'] : []}
|
validators={creating ? ['required', 'uniqueUsername', 'matchRegexp:^[a-zA-Z0-9_\\.]{1,24}$'] : []}
|
||||||
errorMessages={creating ? ['Username is required', "Username already exists", "Must be 1-24 characters: alpha numeric, '_' or '.'"] : []}
|
errorMessages={creating ? ['Username is required', "Username already exists", "Must be 1-24 characters: alpha numeric, '_' or '.'"] : []}
|
||||||
|
@ -26,8 +26,8 @@ class System extends Component<SystemProps> {
|
|||||||
<Tab value="/system/ota" label="OTA Settings" disabled={!authenticatedContext.me.admin} />
|
<Tab value="/system/ota" label="OTA Settings" disabled={!authenticatedContext.me.admin} />
|
||||||
</Tabs>
|
</Tabs>
|
||||||
<Switch>
|
<Switch>
|
||||||
<AuthenticatedRoute exact={true} path="/system/status" component={SystemStatusController} />
|
<AuthenticatedRoute exact path="/system/status" component={SystemStatusController} />
|
||||||
<AuthenticatedRoute exact={true} path="/system/ota" component={OTASettingsController} />
|
<AuthenticatedRoute exact path="/system/ota" component={OTASettingsController} />
|
||||||
<Redirect to="/system/status" />
|
<Redirect to="/system/status" />
|
||||||
</Switch>
|
</Switch>
|
||||||
</MenuAppBar>
|
</MenuAppBar>
|
||||||
|
@ -91,7 +91,7 @@ class SystemStatusForm extends Component<SystemStatusFormProps, SystemStatusForm
|
|||||||
onClose={this.onRestartRejected}
|
onClose={this.onRestartRejected}
|
||||||
>
|
>
|
||||||
<DialogTitle>Confirm Restart</DialogTitle>
|
<DialogTitle>Confirm Restart</DialogTitle>
|
||||||
<DialogContent dividers={true}>
|
<DialogContent dividers>
|
||||||
Are you sure you want to restart the device?
|
Are you sure you want to restart the device?
|
||||||
</DialogContent>
|
</DialogContent>
|
||||||
<DialogActions>
|
<DialogActions>
|
||||||
|
@ -48,9 +48,9 @@ class WiFiConnection extends Component<WiFiConnectionProps, WiFiConnectionContex
|
|||||||
<Tab value="/wifi/settings" label="WiFi Settings" disabled={!authenticatedContext.me.admin} />
|
<Tab value="/wifi/settings" label="WiFi Settings" disabled={!authenticatedContext.me.admin} />
|
||||||
</Tabs>
|
</Tabs>
|
||||||
<Switch>
|
<Switch>
|
||||||
<AuthenticatedRoute exact={true} path="/wifi/status" component={WiFiStatusController} />
|
<AuthenticatedRoute exact path="/wifi/status" component={WiFiStatusController} />
|
||||||
<AuthenticatedRoute exact={true} path="/wifi/scan" component={WiFiNetworkScanner} />
|
<AuthenticatedRoute exact path="/wifi/scan" component={WiFiNetworkScanner} />
|
||||||
<AuthenticatedRoute exact={true} path="/wifi/settings" component={WiFiSettingsController} />
|
<AuthenticatedRoute exact path="/wifi/settings" component={WiFiSettingsController} />
|
||||||
<Redirect to="/wifi/status" />
|
<Redirect to="/wifi/status" />
|
||||||
</Switch>
|
</Switch>
|
||||||
</MenuAppBar>
|
</MenuAppBar>
|
||||||
|
@ -11,6 +11,9 @@ build_flags=
|
|||||||
; Uncomment PROGMEM_WWW to enable the storage of the WWW data in PROGMEM
|
; Uncomment PROGMEM_WWW to enable the storage of the WWW data in PROGMEM
|
||||||
;-D PROGMEM_WWW
|
;-D PROGMEM_WWW
|
||||||
|
|
||||||
|
; ensure transitive dependencies are included for correct platforms only
|
||||||
|
lib_compat_mode = strict
|
||||||
|
|
||||||
; Uncomment & modify the lines below in order to configure OTA updates
|
; Uncomment & modify the lines below in order to configure OTA updates
|
||||||
;upload_flags =
|
;upload_flags =
|
||||||
; --port=8266
|
; --port=8266
|
||||||
@ -31,10 +34,8 @@ lib_deps =
|
|||||||
platform = espressif8266
|
platform = espressif8266
|
||||||
board = esp12e
|
board = esp12e
|
||||||
board_build.f_cpu = 160000000L
|
board_build.f_cpu = 160000000L
|
||||||
lib_ignore = AsyncTCP
|
|
||||||
|
|
||||||
[env:node32s]
|
[env:node32s]
|
||||||
;board_build.partitions = min_spiffs.csv
|
;board_build.partitions = min_spiffs.csv
|
||||||
platform = espressif32
|
platform = espressif32
|
||||||
board = node32s
|
board = node32s
|
||||||
lib_ignore = ESPAsyncTCP
|
|
||||||
|
Loading…
Reference in New Issue
Block a user