Merge pull request #1250 from proddy/dev

small changes

.gitignore

@@ -1,6 +1,6 @@
 # vscode
 .vscode/c_cpp_properties.json
-# .vscode/extensions.json
+.vscode/extensions.json
 .vscode/launch.json
 # .vscode/settings.json
 

.prettierignore

@@ -1,4 +1,5 @@
 node_modules/
 build/
+dist/
 .prettierrc
 .yarn/

interface/.eslintrc.json

@@ -97,6 +97,12 @@
           "{}": false
         }
       }
+    ],
+    "prettier/prettier": [
+      "error",
+      {
+        "endOfLine": "auto"
+      }
     ]
   }
 }

interface/package.json

@@ -23,13 +23,13 @@
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
     "@mui/icons-material": "^5.14.3",
-    "@mui/material": "^5.14.3",
+    "@mui/material": "^5.14.4",
     "@preact/compat": "^17.1.2",
     "@prefresh/vite": "^2.4.1",
-    "@table-library/react-table-library": "4.1.4",
+    "@table-library/react-table-library": "4.1.6",
     "@types/lodash-es": "^4.17.8",
     "@types/node": "^20.4.8",
-    "@types/react": "^18.2.18",
+    "@types/react": "^18.2.19",
     "@types/react-dom": "^18.2.7",
     "@types/react-router-dom": "^5.3.3",
     "alova": "^2.9.3",

interface/src/CustomTheme.tsx

@@ -1,10 +1,19 @@
 import { CssBaseline } from '@mui/material';
-import { blueGrey, blue } from '@mui/material/colors';
 import { createTheme, responsiveFontSizes, ThemeProvider } from '@mui/material/styles';
 import type { FC } from 'react';
 
 import type { RequiredChildrenProps } from 'utils';
 
+export const dialogStyle = {
+  '& .MuiDialog-paper': {
+    borderRadius: '8px',
+    borderColor: '#565656',
+    borderStyle: 'solid',
+    borderWidth: '1px'
+  },
+  backdropFilter: 'blur(1px)'
+};
+
 const theme = responsiveFontSizes(
   createTheme({
     typography: {
@@ -13,10 +22,10 @@ const theme = responsiveFontSizes(
     palette: {
       mode: 'dark',
       secondary: {
-        main: blue[500]
+        main: '#2196f3' // blue[500]
       },
       info: {
-        main: blueGrey[500]
+        main: '#607d8b' // blueGrey[500]
       }
     }
   })

interface/src/components/inputs/ValidatedPasswordField.tsx

@@ -20,11 +20,7 @@ const ValidatedPasswordField: FC<ValidatedPasswordFieldProps> = ({ InputProps, .
         ...InputProps,
         endAdornment: (
           <InputAdornment position="end">
-            <IconButton
-              aria-label="toggle password visibility"
-              onClick={() => setShowPassword(!showPassword)}
-              edge="end"
-            >
+            <IconButton onClick={() => setShowPassword(!showPassword)} edge="end">
               {showPassword ? <VisibilityIcon /> : <VisibilityOffIcon />}
             </IconButton>
           </InputAdornment>

interface/src/components/layout/LayoutAppBar.tsx

@@ -21,13 +21,7 @@ const LayoutAppBar: FC<LayoutAppBarProps> = ({ title, onToggleDrawer }) => (
     }}
   >
     <Toolbar>
-      <IconButton
-        color="inherit"
-        aria-label="open drawer"
-        edge="start"
-        onClick={onToggleDrawer}
-        sx={{ mr: 2, display: { md: 'none' } }}
-      >
+      <IconButton color="inherit" edge="start" onClick={onToggleDrawer} sx={{ mr: 2, display: { md: 'none' } }}>
         <MenuIcon />
       </IconButton>
       <Typography variant="h6" noWrap component="div">

interface/src/components/layout/LayoutMenuItem.tsx

@@ -1,5 +1,4 @@
 import { ListItem, ListItemButton, ListItemIcon, ListItemText } from '@mui/material';
-import { grey } from '@mui/material/colors';
 import { Link, useLocation } from 'react-router-dom';
 import type { SvgIconProps } from '@mui/material';
 import type { FC } from 'react';
@@ -21,10 +20,10 @@ const LayoutMenuItem: FC<LayoutMenuItemProps> = ({ icon: Icon, label, to, disabl
   return (
     <ListItem disablePadding>
       <ListItemButton component={Link} to={to} disabled={disabled} selected={selected}>
-        <ListItemIcon sx={{ color: selected ? '#90caf9' : grey[500] }}>
+        <ListItemIcon sx={{ color: selected ? '#90caf9' : '#9e9e9e' }}>
           <Icon />
         </ListItemIcon>
-        <ListItemText sx={{ color: selected ? '#90caf9' : grey[100] }}>{label}</ListItemText>
+        <ListItemText sx={{ color: selected ? '#90caf9' : '#f5f5f5' }}>{label}</ListItemText>
       </ListItemButton>
     </ListItem>
   );

interface/src/components/routing/BlockNavigation.tsx

@@ -3,6 +3,7 @@ import type { FC } from 'react';
 
 import type { unstable_Blocker as Blocker } from 'react-router-dom';
 
+import { dialogStyle } from 'CustomTheme';
 import { useI18nContext } from 'i18n/i18n-react';
 
 interface BlockNavigationProps {
@@ -13,7 +14,7 @@ const BlockNavigation: FC<BlockNavigationProps> = ({ blocker }) => {
   const { LL } = useI18nContext();
 
   return (
-    <Dialog open={blocker.state === 'blocked'}>
+    <Dialog sx={dialogStyle} open={blocker.state === 'blocked'}>
       <DialogTitle>{LL.BLOCK_NAVIGATE_1()}</DialogTitle>
       <DialogContent dividers>{LL.BLOCK_NAVIGATE_2()}</DialogContent>
       <DialogActions>

interface/src/framework/mqtt/MqttSettingsForm.tsx

@@ -310,7 +310,7 @@ const MqttSettingsForm: FC = () => {
             <ValidatedTextField
               fieldErrors={fieldErrors}
               name="publish_time_heartbeat"
-              label={LL.MQTT_INT_HEARTBEAT()}
+              label="Heartbeat"
               InputProps={{
                 endAdornment: <InputAdornment position="end">{LL.SECONDS()}</InputAdornment>
               }}

interface/src/framework/network/NetworkSettingsForm.tsx

@@ -142,7 +142,7 @@ const WiFiSettingsForm: FC = () => {
                 secondary={'Security: ' + networkSecurityMode(selectedNetwork) + ', Ch: ' + selectedNetwork.channel}
               />
               <ListItemSecondaryAction>
-                <IconButton aria-label="Manual Config" onClick={deselectNetwork}>
+                <IconButton onClick={deselectNetwork}>
                   <DeleteIcon />
                 </IconButton>
               </ListItemSecondaryAction>

interface/src/framework/ntp/NTPStatusForm.tsx

@@ -28,6 +28,7 @@ import type { Theme } from '@mui/material';
 import type { FC } from 'react';
 
 import type { NTPStatus } from 'types';
+import { dialogStyle } from 'CustomTheme';
 import * as NTPApi from 'api/ntp';
 import { ButtonRow, FormLoader, SectionContent } from 'components';
 import { AuthenticatedContext } from 'contexts/authentication';
@@ -108,7 +109,7 @@ const NTPStatusForm: FC = () => {
   };
 
   const renderSetTimeDialog = () => (
-    <Dialog open={settingTime} onClose={() => setSettingTime(false)}>
+    <Dialog sx={dialogStyle} open={settingTime} onClose={() => setSettingTime(false)}>
       <DialogTitle>{LL.SET_TIME(1)}</DialogTitle>
       <DialogContent dividers>
         <Box color="warning.main" p={0} pl={0} pr={0} mt={0} mb={2}>

interface/src/framework/security/GenerateToken.tsx

@@ -14,6 +14,7 @@ import { useRequest } from 'alova';
 import { useEffect } from 'react';
 
 import type { FC } from 'react';
+import { dialogStyle } from 'CustomTheme';
 import * as SecurityApi from 'api/security';
 import { MessageBox } from 'components';
 
@@ -39,8 +40,8 @@ const GenerateToken: FC<GenerateTokenProps> = ({ username, onClose }) => {
   }, [open, generateToken]);
 
   return (
-    <Dialog onClose={onClose} aria-labelledby="generate-token-dialog-title" open={!!username} fullWidth maxWidth="sm">
-      <DialogTitle id="generate-token-dialog-title">{LL.ACCESS_TOKEN_FOR() + ' ' + username}</DialogTitle>
+    <Dialog sx={dialogStyle} onClose={onClose} open={!!username} fullWidth maxWidth="sm">
+      <DialogTitle>{LL.ACCESS_TOKEN_FOR() + ' ' + username}</DialogTitle>
       <DialogContent dividers>
         {token ? (
           <>

interface/src/framework/security/ManageUsersForm.tsx

@@ -161,15 +161,14 @@ const ManageUsersForm: FC = () => {
                       <IconButton
                         size="small"
                         disabled={!authenticatedContext.me.admin}
-                        aria-label="Generate Token"
                         onClick={() => generateToken(u.username)}
                       >
                         <VpnKeyIcon />
                       </IconButton>
-                      <IconButton size="small" aria-label="Delete" onClick={() => removeUser(u)}>
+                      <IconButton size="small" onClick={() => removeUser(u)}>
                         <DeleteIcon />
                       </IconButton>
-                      <IconButton size="small" aria-label="Edit" onClick={() => editUser(u)}>
+                      <IconButton size="small" onClick={() => editUser(u)}>
                         <EditIcon />
                       </IconButton>
                     </Cell>

interface/src/framework/security/UserForm.tsx

@@ -9,6 +9,7 @@ import type { ValidateFieldsError } from 'async-validator';
 import type { FC } from 'react';
 
 import type { User } from 'types';
+import { dialogStyle } from 'CustomTheme';
 import { BlockFormControlLabel, ValidatedPasswordField, ValidatedTextField } from 'components';
 import { useI18nContext } from 'i18n/i18n-react';
 import { updateValue } from 'utils';
@@ -51,7 +52,7 @@ const UserForm: FC<UserFormProps> = ({ creating, validator, user, setUser, onDon
   };
 
   return (
-    <Dialog onClose={onCancelEditing} open={!!user} fullWidth maxWidth="sm">
+    <Dialog sx={dialogStyle} onClose={onCancelEditing} open={!!user} fullWidth maxWidth="sm">
       {user && (
         <>
           <DialogTitle id="user-form-dialog-title">

interface/src/framework/system/SystemStatusForm.tsx

@@ -34,6 +34,7 @@ import RestartMonitor from './RestartMonitor';
 import SystemStatusVersionDialog from './SystemStatusVersionDialog';
 import type { FC } from 'react';
 
+import { dialogStyle } from 'CustomTheme';
 import * as SystemApi from 'api/system';
 import { ButtonRow, FormLoader, SectionContent } from 'components';
 import { AuthenticatedContext } from 'contexts/authentication';
@@ -115,7 +116,7 @@ const SystemStatusForm: FC = () => {
   };
 
   const renderRestartDialog = () => (
-    <Dialog open={confirmRestart} onClose={() => setConfirmRestart(false)}>
+    <Dialog sx={dialogStyle} open={confirmRestart} onClose={() => setConfirmRestart(false)}>
       <DialogTitle>{LL.RESTART()}</DialogTitle>
       <DialogContent dividers>{LL.RESTART_CONFIRM()}</DialogContent>
       <DialogActions>
@@ -153,7 +154,7 @@ const SystemStatusForm: FC = () => {
   );
 
   const renderFactoryResetDialog = () => (
-    <Dialog open={confirmFactoryReset} onClose={() => setConfirmFactoryReset(false)}>
+    <Dialog sx={dialogStyle} open={confirmFactoryReset} onClose={() => setConfirmFactoryReset(false)}>
       <DialogTitle>{LL.FACTORY_RESET()}</DialogTitle>
       <DialogContent dividers>{LL.SYSTEM_FACTORY_TEXT_DIALOG()}</DialogContent>
       <DialogActions>

interface/src/framework/system/SystemStatusVersionDialog.tsx

@@ -1,6 +1,7 @@
 import { Box, Button, Dialog, DialogActions, DialogContent, DialogTitle, Link, Typography } from '@mui/material';
 import { useRequest } from 'alova';
 import { useCallback, useEffect } from 'react';
+import { dialogStyle } from 'CustomTheme';
 import * as SystemApi from 'api/system';
 
 import MessageBox from 'components/MessageBox';
@@ -49,7 +50,7 @@ const SystemStatusVersionDialog = ({ open, onClose, version, platform }: SystemS
   const getBinURL = (v: string) => 'EMS-ESP-' + v.replaceAll('.', '_') + '-' + platform.replaceAll('-', '_') + '.bin';
 
   return (
-    <Dialog open={open} onClose={onClose}>
+    <Dialog sx={dialogStyle} open={open} onClose={onClose}>
       <DialogTitle>{LL.VERSION_CHECK(1)}</DialogTitle>
       <DialogContent dividers>
         <MessageBox my={0} level="info" message={LL.VERSION_ON() + ' ' + version + ' (' + platform + ')'} />

interface/src/i18n/de/index.ts

@@ -246,7 +246,6 @@ const de: Translation = {
   MQTT_INT_THERMOSTATS: 'Thermostate',
   MQTT_INT_SOLAR: 'Solarmodule',
   MQTT_INT_MIXER: 'Mischermodule',
-  MQTT_INT_HEARTBEAT: 'Heartbeat',
   MQTT_QUEUE: 'MQTT Queue',
   DEFAULT: 'Standard',
   MQTT_ENTITY_FORMAT: 'Entitäts-ID Format',

interface/src/i18n/en/index.ts

@@ -186,7 +186,7 @@ const en: Translation = {
   USE: 'Use',
   FACTORY_RESET: 'Factory Reset',
   SYSTEM_FACTORY_TEXT: 'Device has been factory reset and will now restart',
-  SYSTEM_FACTORY_TEXT_DIALOG: 'Are you sure you want to reset the device to its factory defaults?',
+  SYSTEM_FACTORY_TEXT_DIALOG: 'Are you sure you want to reset EMS-ESP to its factory defaults?',
   VERSION_CHECK: 'Version Check',
   THE_LATEST: 'The latest',
   OFFICIAL: 'official',
@@ -246,7 +246,6 @@ const en: Translation = {
   MQTT_INT_THERMOSTATS: 'Thermostats',
   MQTT_INT_SOLAR: 'Solar Modules',
   MQTT_INT_MIXER: 'Mixer Modules',
-  MQTT_INT_HEARTBEAT: 'Heartbeat',
   MQTT_QUEUE: 'MQTT Queue',
   DEFAULT: 'Default',
   MQTT_ENTITY_FORMAT: 'Entity ID format',

interface/src/i18n/fr/index.ts

@@ -246,7 +246,6 @@ const fr: Translation = {
   MQTT_INT_THERMOSTATS: 'Thermostats',
   MQTT_INT_SOLAR: 'Modules solaires',
   MQTT_INT_MIXER: 'Modules mélangeurs',
-  MQTT_INT_HEARTBEAT: 'Battements',
   MQTT_QUEUE: 'Queue MQTT',
   DEFAULT: 'Défaut',
   MQTT_ENTITY_FORMAT: 'Entity ID format', // TODO translate

interface/src/i18n/it/index.ts

@@ -248,7 +248,6 @@ const it: Translation = {
   MQTT_INT_THERMOSTATS: 'Termostati',
   MQTT_INT_SOLAR: 'Moduli solari',
   MQTT_INT_MIXER: 'Moduli Mixer',
-  MQTT_INT_HEARTBEAT: 'Heartbeat',
   MQTT_QUEUE: 'Coda MQTT',
   DEFAULT: 'Predefinito',
   MQTT_ENTITY_FORMAT: 'Formato ID entità',

interface/src/i18n/nl/index.ts

@@ -193,7 +193,7 @@ const nl: Translation = {
   DEVELOPMENT: 'development',
   RELEASE_IS: 'release is',
   RELEASE_NOTES: 'release notes',
-  EMS_ESP_VER: 'EMS-ESP Version',
+  EMS_ESP_VER: 'EMS-ESP Versie',
   PLATFORM: 'Apparaat (Platform / SDK)',
   UPTIME: 'Systeem Uptime',
   CPU_FREQ: 'CPU Frequency',
@@ -246,7 +246,6 @@ const nl: Translation = {
   MQTT_INT_THERMOSTATS: 'Thermostaten',
   MQTT_INT_SOLAR: 'Solar Modules',
   MQTT_INT_MIXER: 'Mixer Modules',
-  MQTT_INT_HEARTBEAT: 'Heartbeat',
   MQTT_QUEUE: 'MQTT Queue',
   DEFAULT: 'Default',
   MQTT_ENTITY_FORMAT: 'Entity ID formaat',
@@ -282,7 +281,7 @@ const nl: Translation = {
   SCAN_AGAIN: 'Opnieuw scannen',
   NETWORK_SCANNER: 'Netwerk Scanner',
   NETWORK_NO_WIFI: 'Geen WiFi networken gevonden',
-  NETWORK_BLANK_SSID: 'laat leeg om WiFi uit te schakelen', // and enable ETH // TODO translate
+  NETWORK_BLANK_SSID: 'laat leeg om WiFi uit te schakelen',
   TX_POWER: 'Tx Vermogen',
   HOSTNAME: 'Hostname',
   NETWORK_DISABLE_SLEEP: 'WiFi Sleep Mode uitzetten',
@@ -323,7 +322,7 @@ const nl: Translation = {
   WRITEABLE: 'Beschrijfbare',
   SHOWING: 'Tonen',
   SEARCH: 'Zoek',
-  CERT: 'TSL root certificate (leave blank to disable TSL)' // TODO translate
+  CERT: 'TSL rootcertificaat (laat leeg om TSL uit te schakelen)'
 };
 
 export default nl;

interface/src/i18n/no/index.ts

@@ -246,7 +246,6 @@ const no: Translation = {
   MQTT_INT_THERMOSTATS: 'Termostat',
   MQTT_INT_SOLAR: 'Solpaneler',
   MQTT_INT_MIXER: 'Blandeventil',
-  MQTT_INT_HEARTBEAT: 'Heartbeat',
   MQTT_QUEUE: 'MQTT Queue',
   DEFAULT: 'Standard',
   MQTT_ENTITY_FORMAT: 'Enhets ID format',

interface/src/i18n/pl/index.ts

@@ -246,7 +246,6 @@ const pl: BaseTranslation = {
   MQTT_INT_THERMOSTATS: 'Termostaty',
   MQTT_INT_SOLAR: 'Panele solarne',
   MQTT_INT_MIXER: 'Mieszacze',
-  MQTT_INT_HEARTBEAT: '"Heartbeat" (aktywność)',
   MQTT_QUEUE: 'Kolejka MQTT',
   DEFAULT: '{{Pozostałe|Domyślna|}}',
   MQTT_ENTITY_FORMAT: 'Format "Entity ID"',

interface/src/i18n/sv/index.ts

@@ -246,7 +246,6 @@ const sv: Translation = {
   MQTT_INT_THERMOSTATS: 'Termostater',
   MQTT_INT_SOLAR: 'Solpaneler',
   MQTT_INT_MIXER: 'Blandningsventiler',
-  MQTT_INT_HEARTBEAT: 'Heartbeat',
   MQTT_QUEUE: 'MQTT-kö',
   DEFAULT: 'Standard',
   MQTT_ENTITY_FORMAT: 'Entitets-ID format',

interface/src/i18n/tr/index.ts

@@ -246,7 +246,6 @@ const tr: Translation = {
   MQTT_INT_THERMOSTATS: 'Termostatlar',
   MQTT_INT_SOLAR: 'Güneş Enerjisi Modülleri',
   MQTT_INT_MIXER: 'Karışım Modülleri',
-  MQTT_INT_HEARTBEAT: 'Kalp atışı',
   MQTT_QUEUE: 'MQTT Sırası',
   DEFAULT: 'Varsayılan',
   MQTT_ENTITY_FORMAT: 'Varlık Kimlik biçimi',