Merge branch 'emsesp:dev' into dev

This commit is contained in:
PopaSchKing
2022-12-14 17:16:13 +01:00
committed by GitHub
52 changed files with 988 additions and 704 deletions

View File

@@ -37,9 +37,9 @@ const DeviceIcon: FC<DeviceIconProps> = ({ type }) => {
case 'Gateway':
return <AiOutlineGateway />;
case 'Alert':
return <AiOutlineAlert />;
return <AiOutlineAlert />;
case 'Pump':
return <AiOutlineChrome />;
return <AiOutlineChrome />;
default:
return null;
}

View File

@@ -72,11 +72,11 @@ export const createSettingsValidator = (settings: Settings) =>
syslog_host: [{ required: true, message: 'Host is required' }, IP_OR_HOSTNAME_VALIDATOR],
syslog_port: [
{ required: true, message: 'Port is required' },
{ type: 'number', min: 0, max: 65535, message: 'Port must be between 0 and 65535' }
{ type: 'number', min: 0, max: 65535, message: 'Invalid Port' }
],
syslog_mark_interval: [
{ required: true, message: 'Mark interval is required' },
{ type: 'number', min: 0, max: 10, message: 'Port must be between 0 and 10' }
{ type: 'number', min: 0, max: 10, message: ' must be between 0 and 10' }
]
}),
...(settings.shower_alert && {