Merge pull request #1533 from proddy/https_36

keeping branch update. still memory and performance issues

.github/workflows/pre_release.yml

@@ -13,12 +13,12 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
         with:
           python-version: '3.11'
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v3
         with:
-          node-version: '20'
+          node-version: '18'
 
       - name: Get EMS-ESP source code and version
         id: build_info
@@ -48,10 +48,6 @@ jobs:
         run: |
           platformio run -e ci_s3
 
-      - name: Build E32V2 firmware
-        run: |
-          platformio run -e ci_16M
-
       - name: Create a GH Release
         id: 'automatic_releases'
         uses: 'marvinpinto/action-automatic-releases@latest'

.github/workflows/tagged_release.yml

@@ -12,12 +12,12 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
         with:
           python-version: '3.11'
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v3
         with:
-          node-version: '20'
+          node-version: '18'
 
       - name: Install PlatformIO
         run: |

.github/workflows/test_release.yml

@@ -13,12 +13,12 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
         with:
           python-version: '3.11'
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v3
         with:
-          node-version: '20'
+          node-version: '18'
 
       - name: Get EMS-ESP source code and version
         id: build_info

.gitignore

@@ -2,7 +2,7 @@
 .vscode/c_cpp_properties.json
 .vscode/extensions.json
 .vscode/launch.json
-#.vscode/settings.json
+# .vscode/settings.json
 
 # c++ compiling
 .clang_complete
@@ -12,11 +12,11 @@ cppcheck.out.xml
 # platformio
 .pio
 pio_local.ini
-*_old
 
 # OS specific
 .DS_Store
 *Thumbs.db
+emsesp
 
 # web specfic
 build/
@@ -37,14 +37,13 @@ stats.html
 !.yarn/sdks
 !.yarn/versions
 yarn.lock
-analyse.html
+interface/analyse.html
-interface/vite.config.ts.timestamp*
 
 # scripts
 test.sh
 scripts/run.sh
 scripts/__pycache__
-scripts/stackdmp.txt
+/scripts/stackdmp.txt
 
 # i18n generated files
 interface/src/i18n/i18n-react.tsx
@@ -58,6 +57,8 @@ interface/src/i18n/i18n-util.async.ts
 sonar/
 bw-output/
 
-# testing
+# entity dump results
-emsesp
+# dump_entities.csv
+# dump_entities.xls*
 
+benchmark/*.log

.vscode/extensions.json

@@ -2,6 +2,8 @@
     // See http://go.microsoft.com/fwlink/?LinkId=827846
     // for the documentation about the extensions.json format
     "recommendations": [
+        "dbaeumer.vscode-eslint",
+        "esbenp.prettier-vscode",
         "platformio.platformio-ide"
     ],
     "unwantedRecommendations": [

.vscode/settings.json

@@ -84,8 +84,5 @@
     "**/*.map",
     "**/ArduinoJson/**"
   ],
-    "cSpell.enableFiletypes": [
+  "cSpell.enableFiletypes": ["!cpp"]
-      "!cpp",
+}
-      "!typescript"
-    ]
-  }

.vscode/tasks.json

@@ -0,0 +1,18 @@
+{
+  // See https://go.microsoft.com/fwlink/?LinkId=733558
+  // for the documentation about the tasks.json format
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "type": "shell",
+      "label": "build standalone emsesp",
+      "command": "make",
+      "args": [],
+      "problemMatcher": ["$gcc"],
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      }
+    }
+  ]
+}

CHANGELOG.md

@@ -5,56 +5,6 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [3.6.5] March 23 2024
-
-## **IMPORTANT! BREAKING CHANGES**
-
-- The Wifi Tx Power setting in Network Settings will be reset to Auto
-
-## Added
-
-- thermostat boost mode and boost time [#1446](https://github.com/emsesp/EMS-ESP32/issues/1446)
-- heatpump energy meters [#1463](https://github.com/emsesp/EMS-ESP32/issues/1463)
-- heatpump max power [#1475](https://github.com/emsesp/EMS-ESP32/issues/1475)
-- checkbox for MQTT-TLS enable [#1474](https://github.com/emsesp/EMS-ESP32/issues/1474)
-- added SK (Slovak) language. Thanks @misa1515
-- CPU info [#1497](https://github.com/emsesp/EMS-ESP32/pull/1497)
-- Show network hostname in Web UI under Network Status
-- Improved HA Discovery so each section (EMS device, Scheduler, Analog, Temperature, Custom, Shower) have their own section
-- boiler Bosch C1200W, id 12, [#1536](https://github.com/emsesp/EMS-ESP32/issues/1536)
-- mixer MM100 telegram 0x2CC [#1554](https://github.com/emsesp/EMS-ESP32/issues/1554)
-- boiler hpSetDiffPressure [#1563](https://github.com/emsesp/EMS-ESP32/issues/1563)
-- custom variables [#1423](https://github.com/emsesp/EMS-ESP32/issues/1423)
-- weather compensation [#1642](https://github.com/emsesp/EMS-ESP32/issues/1642)
-- env and partitions for DevKitC-1-N32R8 [#1635](https://github.com/emsesp/EMS-ESP32/discussions/1635)
-- command `restart partitionname` and button long press to start with other partition [#1657](https://github.com/emsesp/EMS-ESP32/issues/1657)
-- command `set service  <mqtt|ota|ntp|ap> <enable|disable>` [#1663](https://github.com/emsesp/EMS-ESP32/issues/1663)
-
-## Fixed
-
-- exhaust temperature for some boilers
-- add back boil2hyst [#1477](https://github.com/emsesp/EMS-ESP32/issues/1477)
-- subscribed MQTT topics not detecting changes by EMS-ESP [#1494](https://github.com/emsesp/EMS-ESP32/issues/1494)
-- changed HA name and grouping to be consistent [#1528](https://github.com/emsesp/EMS-ESP32/issues/1528)
-- MQTT autodiscovery in Domoticz not working [#1360](https://github.com/emsesp/EMS-ESP32/issues/1528)
-- dhw comfort for new ems+, [#1495](https://github.com/emsesp/EMS-ESP32/issues/1495)
-- added writeable icon to Web's Custom Entity page for each entity shown in the table
-- Wifi Tx Power not adjusted [#1614](https://github.com/emsesp/EMS-ESP32/issues/1614)
-- MQTT discovery of custom entity doesn't consider type of data [#1587](https://github.com/emsesp/EMS-ESP32/issues/1587)
-- WiFi TxPower wasn't correctly used. Added an 'Auto' setting, which is the default.
-- dns w/wo IPv6 [#1644](https://github.com/emsesp/EMS-ESP32/issues/1644)
-
-## Changed
-
-- HA don't set entity_category to Diagnostic/Configuration for EMS entities [#1459](https://github.com/emsesp/EMS-ESP32/discussions/1459)
-- upgraded ArduinoJson to 7.0.0 #1538 and then 7.0.2
-- small changes to the API for analog and temperature sensors
-- Length of mqtt Broker adress [#1619](https://github.com/emsesp/EMS-ESP32/issues/1619)
-- C++ optimizations - see <https://github.com/emsesp/EMS-ESP32/pull/1615>
-- Send MQTT heartbeat immediately after connection [#1628](https://github.com/emsesp/EMS-ESP32/issues/1628)
-- 16MB partitions with second nvs, larger FS, Coredump, optional factory partition
-- stop fetching empty telegrams after 5 min
-
 ## [3.6.4] November 24 2023
 
 ## **IMPORTANT! BREAKING CHANGES**
@@ -286,7 +236,7 @@ There are breaking changes between 3.5.x and earlier versions of 3.6.0. Please r
 
 - fix Table resizing in WebUI [#519](https://github.com/emsesp/EMS-ESP32/issues/519)
 - allow larger customization files [#570](https://github.com/emsesp/EMS-ESP32/issues/570)
-- losing entity wwcomfort [#581](https://github.com/emsesp/EMS-ESP32/issues/581)
+- losing entitiy wwcomfort [#581](https://github.com/emsesp/EMS-ESP32/issues/581)
 
 ## Changed
 

CHANGELOG_LATEST.md

@@ -1,23 +1,24 @@
 # Changelog
 
-## [3.7.0]
+## [3.6.5]
 
 ## **IMPORTANT! BREAKING CHANGES**
 
-- new device WATER shows dhw entities from MM100 and SM100 in dhw setting
-
 ## Added
 
-- some more entities for dhw with SM100 module
+- thermostat boost mode and boost time [#1446](https://github.com/emsesp/EMS-ESP32/issues/1446)
-- thermostat second dhw circuit [#1634](https://github.com/emsesp/EMS-ESP32/issues/1634)
+- heatpump energy meters [#1463](https://github.com/emsesp/EMS-ESP32/issues/1463)
-- remote thermostat emulation for RC100H, RC200 and FB10 [#1287](https://github.com/emsesp/EMS-ESP32/discussions/1287), [#1602](https://github.com/emsesp/EMS-ESP32/discussions/1602), [#1551](https://github.com/emsesp/EMS-ESP32/discussions/1551)
+- heatpump max power [#1475](https://github.com/emsesp/EMS-ESP32/issues/1475)
-- heatpump dhw stop temperatures [#1624](https://github.com/emsesp/EMS-ESP32/issues/1624)
+- checkbox for MQTT-TLS enable [#1474](https://github.com/emsesp/EMS-ESP32/issues/1474)
+- added SK (Slovencina) language. Thanks @misa1515
+- CPU info [#1497](https://github.com/emsesp/EMS-ESP32/pull/1497)
 
 ## Fixed
 
+- exhaust temperature for some boilers
+- add back boil2hyst [#1477](https://github.com/emsesp/EMS-ESP32/issues/1477)
+- subscribed MQTT topics not detecting changes by EMS-ESP [#1494](https://github.com/emsesp/EMS-ESP32/issues/1494)
+
 ## Changed
 
-- use flag for BC400 compatible thermostats, manage different mode settings
+- HA don't set entity_category to Diagnostic/Configuration for EMS entities [#1459](https://github.com/emsesp/EMS-ESP32/discussions/1459)
-- use factory partition for 16M flash
-- store digital out states to nvs
-- Refresh UI - moving settings to one location [#1665](https://github.com/emsesp/EMS-ESP32/issues/1665)

Makefile

@@ -42,7 +42,7 @@ DEFINES += -DARDUINOJSON_ENABLE_STD_STRING=1 -DARDUINOJSON_ENABLE_PROGMEM=1 -DAR
 DEFINES += -DEMSESP_DEBUG -DEMSESP_STANDALONE -DEMSESP_TEST -D__linux__ -DEMC_RX_BUFFER_SIZE=1500
 DEFINES += $(ARGS)
 
-DEFAULTS = -DEMSESP_DEFAULT_LOCALE=\"en\" -DEMSESP_DEFAULT_TX_MODE=8 -DEMSESP_DEFAULT_VERSION=\"3.7.0-dev\" -DEMSESP_DEFAULT_BOARD_PROFILE=\"S32\"
+DEFAULTS = -DEMSESP_DEFAULT_LOCALE=\"en\" -DEMSESP_DEFAULT_TX_MODE=8 -DEMSESP_DEFAULT_VERSION=\"3.6.4-dev\" -DEMSESP_DEFAULT_BOARD_PROFILE=\"S32\"
 
 #----------------------------------------------------------------------
 # Sources & Files

README.md

@@ -47,7 +47,6 @@ EMS-ESP is a project owned and maintained by [proddy](https://github.com/proddy)
 - [uuid-\*](https://github.com/nomis/mcu-uuid-console) from @nomis. The console, syslog, telnet and logging are based off these open source libraries
 - [ArduinoJson](https://github.com/bblanchon/ArduinoJson) for all the JSON
 - [espMqttClient](https://github.com/bertmelis/espMqttClient) for the MQTT client, with custom modifications from @MichaelDvP and @proddy
-- ESPAsyncWebServer and AsyncTCP for the Web server and TCP backends, with custom modifications for performance
 
 ## **License**
 

benchmark/http-client-test.js

@@ -0,0 +1,39 @@
+#!/usr/bin/env node
+
+const axios = require('axios');
+
+const url = 'http://10.10.10.135/api/system/commands';
+const queryParams = {
+  entity: 'commands',
+  id: 0
+};
+
+const totalRequests = 1000000;
+const requestsPerCount = 100;
+
+let requestCount = 0;
+
+function fetchData() {
+  axios
+    .get(url, { params: queryParams })
+    .then((response) => {
+      requestCount++;
+
+      if (requestCount % requestsPerCount === 0) {
+        console.log(`Requests completed: ${requestCount}`);
+      }
+
+      if (requestCount < totalRequests) {
+        fetchData();
+      } else {
+        console.log('All requests completed.');
+      }
+    })
+    .catch((error) => {
+      console.error('Error making request:', error.message);
+    });
+}
+
+// Start making requests
+console.log(`Starting test`);
+fetchData();

benchmark/loadtest-http.sh

@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+# Install:
+#  npm install -g autocannon
+#  yarn global add autocannon
+#
+# or run https://github.com/nearform/autocannon-ui
+
+TEST_IP="10.10.10.135"
+TEST_TIME=60
+LOG_FILE=http-loadtest.log
+TIMEOUT=10000
+PROTOCOL=http
+#PROTOCOL=https
+
+if test -f "$LOG_FILE"; then
+  rm $LOG_FILE
+fi
+
+# for CONCURRENCY in 1 2 3 4 5 6 7 8 9 10 15 20
+for CONCURRENCY in 1
+#for CONCURRENCY in 20
+do
+  printf "\n\nCLIENTS: *** $CONCURRENCY ***\n\n" >> $LOG_FILE
+  echo "Testing $CONCURRENCY clients on $PROTOCOL://$TEST_IP/"
+  autocannon -c $CONCURRENCY -w 1 -d $TEST_TIME --renderStatusCodes "$PROTOCOL://$TEST_IP/" >> $LOG_FILE 2>&1
+  printf "\n\n----------------\n\n" >> $LOG_FILE
+  sleep 1
+
+  echo "Testing $CONCURRENCY clients on $PROTOCOL://$TEST_IP/api/system/commands"
+  autocannon -c $CONCURRENCY -w 1 -d $TEST_TIME --renderStatusCodes "$PROTOCOL://$TEST_IP/api/system/commands" >> $LOG_FILE 2>&1
+  printf "\n\n----------------\n\n" >> $LOG_FILE
+  sleep 1
+
+  echo "Testing $CONCURRENCY clients on $PROTOCOL://$TEST_IP/app/icon.png"
+  autocannon -c $CONCURRENCY -w 1 -d $TEST_TIME --renderStatusCodes "$PROTOCOL://$TEST_IP/app/icon.png" >> $LOG_FILE 2>&1
+  printf "\n\n----------------\n\n" >> $LOG_FILE
+  sleep 1
+done

benchmark/package.json

@@ -0,0 +1,8 @@
+{
+  "dependencies": {
+    "autocannon": "^7.14.0",
+    "axios": "^1.6.2",
+    "eventsource": "^2.0.2",
+    "ws": "^8.14.2"
+  }
+}

esp32_partition_16M.csv

@@ -1,9 +1,6 @@
 # Name,   Type, SubType, Offset,   Size,    Flags
-nvs,      data, nvs,     0x9000,   0x005000,
+nvs,      data, nvs,     0x9000,   0x5000,
-otadata,  data, ota,     ,         0x002000,
+otadata,  data, ota,     ,         0x2000,
-boot,     app, factory,  ,         0x280000,
+app0,     app,  ota_0,   ,         0x7F0000,
-app0,     app,  ota_0,   ,         0x590000,
+app1,     app,  ota_1,   ,         0x7F0000,
-app1,     app,  ota_1,   ,         0x590000,
+spiffs,   data, spiffs,  ,         64K,
-nvs1,     data, nvs,     ,         0x040000,
-spiffs,   data, spiffs,  ,         0x200000,
-coredump, data, coredump,,         0x010000,

esp32_partition_32M.csv

@@ -1,8 +0,0 @@
-# Name,   Type, SubType, Offset,   Size,    Flags
-nvs,      data, nvs,     0x9000,   0x005000,
-otadata,  data, ota,     ,         0x002000,
-app0,     app,  ota_0,   ,         0xDD0000,
-app1,     app,  ota_1,   ,         0xDD0000,
-nvs1,     data, nvs,     ,         0x040000,
-spiffs,   data, spiffs,  ,         0x400000,
-coredump, data, coredump,,         0x010000,

factory_settings.ini

@@ -36,6 +36,7 @@ build_flags =
     -D FACTORY_MQTT_PORT=1883
     -D FACTORY_MQTT_USERNAME=\"\"
     -D FACTORY_MQTT_PASSWORD=\"\"
+    -D FACTORY_MQTT_CLIENT_ID=\"ems-esp\"
     -D FACTORY_MQTT_KEEP_ALIVE=60
     -D FACTORY_MQTT_CLEAN_SESSION=false
     -D FACTORY_MQTT_MAX_TOPIC_LENGTH=128

interface/.eslintrc.json

@@ -5,8 +5,8 @@
   },
   "extends": [
     "eslint:recommended",
-    // "airbnb/hooks",
+    "airbnb/hooks",
-    // "airbnb-typescript",
+    "airbnb-typescript",
     "plugin:react/recommended",
     "plugin:react/jsx-runtime",
     "plugin:@typescript-eslint/recommended",

interface/.yarnrc.yml

@@ -4,4 +4,4 @@ enableGlobalCache: false
 
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.1.1.cjs
+yarnPath: .yarn/releases/yarn-4.0.2.cjs

interface/package.json

@@ -1,6 +1,6 @@
 {
   "name": "EMS-ESP",
-  "version": "3.7",
+  "version": "3.6.5",
   "description": "build EMS-ESP WebUI",
   "homepage": "https://emsesp.github.io/docs",
   "author": "proddy",
@@ -13,29 +13,27 @@
     "build-hosted": "typesafe-i18n --no-watch && vite build --mode hosted",
     "preview-standalone": "typesafe-i18n --no-watch && vite build && concurrently -c \"auto\" \"npm:mock-api\" \"vite preview\"",
     "mock-api": "bun --watch ../mock-api/server.ts",
-    "old_mock-api": "bun --watch ../mock-api/server.js",
     "standalone": "concurrently -c \"auto\" \"typesafe-i18n\" \"npm:mock-api\" \"vite\"",
-    "old_standalone": "concurrently -c \"auto\" \"typesafe-i18n\" \"npm:old_mock-api\" \"vite\"",
     "typesafe-i18n": "typesafe-i18n --no-watch",
     "webUI": "node progmem-generator.js",
     "format": "prettier --write '**/*.{ts,tsx,js,css,json,md}'",
     "lint": "eslint . --cache --fix"
   },
   "dependencies": {
-    "@alova/adapter-xhr": "^1.0.3",
+    "@alova/adapter-xhr": "^1.0.2",
-    "@babel/core": "^7.24.3",
+    "@babel/core": "^7.23.7",
-    "@emotion/react": "^11.11.4",
+    "@emotion/react": "^11.11.3",
     "@emotion/styled": "^11.11.0",
-    "@mui/icons-material": "^5.15.14",
+    "@mui/icons-material": "^5.15.2",
-    "@mui/material": "^5.15.14",
+    "@mui/material": "^5.15.2",
     "@table-library/react-table-library": "4.1.7",
     "@types/imagemin": "^8.0.5",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^20.11.30",
+    "@types/node": "^20.10.6",
-    "@types/react": "^18.2.72",
+    "@types/react": "^18.2.46",
-    "@types/react-dom": "^18.2.22",
+    "@types/react-dom": "^18.2.18",
     "@types/react-router-dom": "^5.3.3",
-    "alova": "^2.18.0",
+    "alova": "^2.16.2",
     "async-validator": "^4.2.5",
     "history": "^5.3.0",
     "jwt-decode": "^4.0.0",
@@ -44,35 +42,37 @@
     "react": "latest",
     "react-dom": "latest",
     "react-dropzone": "^14.2.3",
-    "react-icons": "^5.0.1",
+    "react-icons": "^4.12.0",
-    "react-router-dom": "^6.22.3",
+    "react-router-dom": "^6.21.1",
-    "react-toastify": "^10.0.5",
+    "react-toastify": "^9.1.3",
     "sockette": "^2.0.6",
     "typesafe-i18n": "^5.26.2",
-    "typescript": "^5.4.3"
+    "typescript": "^5.3.3"
   },
   "devDependencies": {
     "@preact/compat": "^17.1.2",
-    "@preact/preset-vite": "^2.8.2",
+    "@preact/preset-vite": "^2.7.0",
-    "@typescript-eslint/eslint-plugin": "^7.4.0",
+    "@typescript-eslint/eslint-plugin": "^6.17.0",
-    "@typescript-eslint/parser": "^7.4.0",
+    "@typescript-eslint/parser": "^6.17.0",
     "concurrently": "^8.2.2",
-    "eslint": "^8.57.0",
+    "eslint": "^8.56.0",
+    "eslint-config-airbnb": "^19.0.4",
+    "eslint-config-airbnb-typescript": "^17.1.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-autofix": "^1.1.0",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-jsx-a11y": "^6.8.0",
     "eslint-plugin-prettier": "alpha",
-    "eslint-plugin-react": "^7.34.1",
+    "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "preact": "^10.20.1",
+    "preact": "^10.19.3",
-    "prettier": "^3.2.5",
+    "prettier": "^3.1.1",
     "rollup-plugin-visualizer": "^5.12.0",
-    "terser": "^5.29.2",
+    "terser": "^5.26.0",
-    "vite": "^5.2.6",
+    "vite": "^5.0.10",
     "vite-plugin-imagemin": "^0.6.1",
-    "vite-tsconfig-paths": "^4.3.2"
+    "vite-tsconfig-paths": "^4.2.3"
   },
-  "packageManager": "yarn@4.1.1"
+  "packageManager": "yarn@4.0.2"
 }

interface/progmem-generator.js

@@ -2,7 +2,6 @@ import { readdirSync, existsSync, unlinkSync, readFileSync, createWriteStream }
 import { resolve, relative, sep } from 'path';
 import zlib from 'zlib';
 import mime from 'mime-types';
-import crypto from 'crypto';
 
 const ARDUINO_INCLUDES = '#include <Arduino.h>\n\n';
 const INDENT = '  ';
@@ -12,17 +11,14 @@ const bytesPerLine = 20;
 var totalSize = 0;
 
 const generateWWWClass = () =>
-  `typedef std::function<void(const char * uri, const String & contentType, const uint8_t * content, size_t len, const String & hash)> RouteRegistrationHandler;
+  `typedef std::function<void(const String &, const String & contentType, const uint8_t * content, size_t len)> RouteRegistrationHandler;
 // Total size is ${totalSize} bytes
 
 class WWWData {
 ${indent}public:
 ${indent.repeat(2)}static void registerRoutes(RouteRegistrationHandler handler) {
 ${fileInfo
-  .map(
+  .map((file) => `${indent.repeat(3)}handler("${file.uri}", "${file.mimeType}", ${file.variable}, ${file.size});`)
-    (file) =>
-      `${indent.repeat(3)}handler("${file.uri}", "${file.mimeType}", ${file.variable}, ${file.size}, "${file.hash}");`
-  )
   .join('\n')}
 ${indent.repeat(2)}}
 };
@@ -54,12 +50,6 @@ const writeFile = (relativeFilePath, buffer) => {
   writeStream.write('const uint8_t ' + variable + '[] = {');
   // const zipBuffer = zlib.brotliCompressSync(buffer, { quality: 1 });
   const zipBuffer = zlib.gzipSync(buffer, { level: 9 });
-
-  // create sha
-  const hashSum = crypto.createHash('sha256');
-  hashSum.update(zipBuffer);
-  const hash = hashSum.digest('hex');
-
   zipBuffer.forEach((b) => {
     if (!(size % bytesPerLine)) {
       writeStream.write('\n');
@@ -68,19 +58,15 @@ const writeFile = (relativeFilePath, buffer) => {
     writeStream.write('0x' + ('00' + b.toString(16).toUpperCase()).slice(-2) + ',');
     size++;
   });
-
   if (size % bytesPerLine) {
     writeStream.write('\n');
   }
-
   writeStream.write('};\n\n');
-
   fileInfo.push({
     uri: '/' + relativeFilePath.replace(sep, '/'),
     mimeType,
     variable,
-    size,
+    size
-    hash
   });
 
   // console.log(relativeFilePath + ' (size ' + size + ' bytes)');

interface/src/App.tsx

@@ -4,6 +4,7 @@ import { ToastContainer, Slide } from 'react-toastify';
 import 'react-toastify/dist/ReactToastify.min.css';
 
 import { localStorageDetector } from 'typesafe-i18n/detectors';
+import { FeaturesLoader } from './contexts/features';
 import type { FC } from 'react';
 import AppRouting from 'AppRouting';
 import CustomTheme from 'CustomTheme';
@@ -26,9 +27,11 @@ const App: FC = () => {
   return (
     <TypesafeI18n locale={detectedLocale}>
       <CustomTheme>
+        <FeaturesLoader>
           <AppRouting />
+        </FeaturesLoader>
         <ToastContainer
-          position="bottom-right"
+          position="bottom-left"
           autoClose={3000}
           hideProgressBar={false}
           newestOnTop={false}

interface/src/AuthenticatedRouting.tsx

@@ -1,55 +1,64 @@
-import { useContext, type FC } from 'react';
 import { Navigate, Routes, Route } from 'react-router-dom';
+import Dashboard from './project/Dashboard';
 import Help from './project/Help';
-import { Layout } from 'components';
+import Settings from './project/Settings';
-import { AuthenticatedContext } from 'contexts/authentication';
+import type { FC } from 'react';
-import Settings from 'framework/Settings';
+
+import { Layout, RequireAdmin } from 'components';
 import AccessPoint from 'framework/ap/AccessPoint';
 import Mqtt from 'framework/mqtt/Mqtt';
-import Network from 'framework/network/Network';
+import NetworkConnection from 'framework/network/NetworkConnection';
 import NetworkTime from 'framework/ntp/NetworkTime';
-import OTASettings from 'framework/ota/OTASettings';
 import Security from 'framework/security/Security';
-import ESPSystemStatus from 'framework/system/ESPSystemStatus';
 import System from 'framework/system/System';
-import UploadDownload from 'framework/system/UploadDownload';
-import ApplicationSettings from 'project/ApplicationSettings';
-import CustomEntities from 'project/CustomEntities';
-import Customization from 'project/Customization';
-import Devices from 'project/Devices';
-import Scheduler from 'project/Scheduler';
-import Sensors from 'project/Sensors';
 
-const AuthenticatedRouting: FC = () => {
+const AuthenticatedRouting: FC = () => (
-  const { me } = useContext(AuthenticatedContext);
+  // const location = useLocation();
-  return (
+  // const navigate = useNavigate();
+  // const handleApiResponseError = useCallback(
+  //   (error: AxiosError) => {
+  //     if (error.response && error.response.status === 401) {
+  //       AuthenticationApi.storeLoginRedirect(location);
+  //       navigate('/unauthorized');
+  //     }
+  //     return Promise.reject(error);
+  //   },
+  //   [location, navigate]
+  // );
+  // useEffect(() => {
+  //   const axiosHandlerId = AXIOS.interceptors.response.use((response) => response, handleApiResponseError);
+  //   return () => AXIOS.interceptors.response.eject(axiosHandlerId);
+  // }, [handleApiResponseError]);
+
   <Layout>
     <Routes>
-        <Route path="/devices/*" element={<Devices />} />
+      <Route path="/dashboard/*" element={<Dashboard />} />
-        <Route path="/sensors/*" element={<Sensors />} />
+      <Route
-        <Route path="/system/*" element={<System />} />
+        path="/settings/*"
+        element={
+          <RequireAdmin>
+            <Settings />
+          </RequireAdmin>
+        }
+      />
       <Route path="/help/*" element={<Help />} />
+
+      <Route path="/network/*" element={<NetworkConnection />} />
+      <Route path="/ap/*" element={<AccessPoint />} />
+      <Route path="/ntp/*" element={<NetworkTime />} />
+      <Route path="/mqtt/*" element={<Mqtt />} />
+      <Route
+        path="/security/*"
+        element={
+          <RequireAdmin>
+            <Security />
+          </RequireAdmin>
+        }
+      />
+      <Route path="/system/*" element={<System />} />
       <Route path="/*" element={<Navigate to="/" />} />
-        {me.admin && (
-          <>
-            <Route path="/customizations/*" element={<Customization />} />
-            <Route path="/scheduler/*" element={<Scheduler />} />
-            <Route path="/customentities/*" element={<CustomEntities />} />
-            <Route path="/settings/*" element={<Settings />} />
-            <Route path="/settings/network/*" element={<Network />} />
-            <Route path="/settings/ems-esp/*" element={<ApplicationSettings />} />
-            <Route path="/settings/ap/*" element={<AccessPoint />} />
-            <Route path="/settings/ntp/*" element={<NetworkTime />} />
-            <Route path="/settings/mqtt/*" element={<Mqtt />} />
-            <Route path="/settings/ota/*" element={<OTASettings />} />
-            <Route path="/settings/security/*" element={<Security />} />
-            <Route path="/settings/espsystemstatus/*" element={<ESPSystemStatus />} />
-            <Route path="/settings/upload/*" element={<UploadDownload />} />
-          </>
-        )}
     </Routes>
   </Layout>
-  );
+);
-};
 
 export default AuthenticatedRouting;

interface/src/SignIn.tsx

@@ -3,6 +3,7 @@ import { Box, Paper, Typography, MenuItem, TextField, Button } from '@mui/materi
 import { useRequest } from 'alova';
 import { useContext, useState } from 'react';
 import { toast } from 'react-toastify';
+import { FeaturesContext } from './contexts/features';
 import type { ValidateFieldsError } from 'async-validator';
 
 import type { Locales } from 'i18n/i18n-types';
@@ -34,6 +35,8 @@ const SignIn: FC = () => {
 
   const { LL, setLocale, locale } = useContext(I18nContext);
 
+  const { features } = useContext(FeaturesContext);
+
   const [signInRequest, setSignInRequest] = useState<SignInRequest>({
     username: '',
     password: ''
@@ -109,6 +112,7 @@ const SignIn: FC = () => {
         })}
       >
         <Typography variant="h4">{PROJECT_NAME}</Typography>
+        <Typography variant="subtitle2">{features.version}</Typography>
 
         <TextField name="locale" variant="outlined" value={locale} onChange={onLocaleSelected} size="small" select>
           <MenuItem key="de" value="de">

interface/src/api/authentication.ts

@@ -32,7 +32,7 @@ export function fetchLoginRedirect(): Partial<Path> {
   const signInSearch = getStorage().getItem(SIGN_IN_SEARCH);
   clearLoginRedirect();
   return {
-    pathname: signInPathname || `/devices`,
+    pathname: signInPathname || `/dashboard`,
     search: (signInPathname && signInSearch) || undefined
   };
 }

interface/src/api/features.ts

@@ -0,0 +1,5 @@
+import { alovaInstance } from './endpoints';
+
+import type { Features } from 'types';
+
+export const readFeatures = () => alovaInstance.Get<Features>('/rest/features');

interface/src/api/mqtt.ts

@@ -1,7 +1,6 @@
 import { alovaInstance } from './endpoints';
-import type { MqttSettingsType, MqttStatusType } from 'types';
+import type { MqttSettings, MqttStatus } from 'types';
 
-export const readMqttStatus = () => alovaInstance.Get<MqttStatusType>('/rest/mqttStatus');
+export const readMqttStatus = () => alovaInstance.Get<MqttStatus>('/rest/mqttStatus');
-export const readMqttSettings = () => alovaInstance.Get<MqttSettingsType>('/rest/mqttSettings');
+export const readMqttSettings = () => alovaInstance.Get<MqttSettings>('/rest/mqttSettings');
-export const updateMqttSettings = (data: MqttSettingsType) =>
+export const updateMqttSettings = (data: MqttSettings) => alovaInstance.Post<MqttSettings>('/rest/mqttSettings', data);
-  alovaInstance.Post<MqttSettingsType>('/rest/mqttSettings', data);

interface/src/api/system.ts

@@ -1,10 +1,7 @@
 import { alovaInstance, alovaInstanceGH } from './endpoints';
-import type { OTASettings, SystemStatus, LogSettings, ESPSystemStatus } from 'types';
+import type { OTASettings, SystemStatus, LogSettings } from 'types';
 
-// ESPSystemStatus - also used to ping in Restart monitor for pinging
+// SystemStatus - also used to ping in Restart monitor for pinging
-export const readESPSystemStatus = () => alovaInstance.Get<ESPSystemStatus>('/rest/ESPSystemStatus');
-
-// SystemStatus
 export const readSystemStatus = () => alovaInstance.Get<SystemStatus>('/rest/systemStatus');
 
 // commands

interface/src/components/SectionContent.tsx

@@ -4,7 +4,8 @@ import type { FC } from 'react';
 import type { RequiredChildrenProps } from 'utils';
 
 interface SectionContentProps extends RequiredChildrenProps {
-  title?: string;
+  title: string;
+  titleGutter?: boolean;
   id?: string;
 }
 
@@ -12,9 +13,7 @@ const SectionContent: FC<SectionContentProps> = (props) => {
   const { children, title, id } = props;
   return (
     <Paper id={id} sx={{ p: 2, m: 2 }}>
-      {title && (
       <Divider sx={{ pb: 2, borderColor: 'primary.main', fontSize: 20, color: 'primary.main' }}>{title}</Divider>
-      )}
       {children}
     </Paper>
   );

interface/src/components/layout/LayoutAppBar.tsx

@@ -1,5 +1,6 @@
 import MenuIcon from '@mui/icons-material/Menu';
-import { AppBar, IconButton, Toolbar, Typography } from '@mui/material';
+import { AppBar, Box, IconButton, Toolbar, Typography } from '@mui/material';
+import LayoutAuthMenu from './LayoutAuthMenu';
 import type { FC } from 'react';
 
 export const DRAWER_WIDTH = 210;
@@ -26,6 +27,8 @@ const LayoutAppBar: FC<LayoutAppBarProps> = ({ title, onToggleDrawer }) => (
       <Typography variant="h6" noWrap component="div">
         {title}
       </Typography>
+      <Box flexGrow={1} />
+      <LayoutAuthMenu />
     </Toolbar>
   </AppBar>
 );

interface/src/components/layout/LayoutAuthMenu.tsx

@@ -0,0 +1,165 @@
+import AccountCircleIcon from '@mui/icons-material/AccountCircle';
+import PersonIcon from '@mui/icons-material/Person';
+import {
+  Box,
+  Button,
+  Divider,
+  IconButton,
+  Popover,
+  Typography,
+  Avatar,
+  styled,
+  MenuItem,
+  TextField
+} from '@mui/material';
+import { useState, useContext } from 'react';
+import type { TypographyProps } from '@mui/material';
+import type { Locales } from 'i18n/i18n-types';
+import type { FC, ChangeEventHandler } from 'react';
+import { AuthenticatedContext } from 'contexts/authentication';
+import DEflag from 'i18n/DE.svg';
+import FRflag from 'i18n/FR.svg';
+import GBflag from 'i18n/GB.svg';
+import ITflag from 'i18n/IT.svg';
+import NLflag from 'i18n/NL.svg';
+import NOflag from 'i18n/NO.svg';
+import PLflag from 'i18n/PL.svg';
+import SKflag from 'i18n/SK.svg';
+import SVflag from 'i18n/SV.svg';
+import TRflag from 'i18n/TR.svg';
+
+import { I18nContext } from 'i18n/i18n-react';
+import { loadLocaleAsync } from 'i18n/i18n-util.async';
+
+const ItemTypography = styled(Typography)<TypographyProps>({
+  maxWidth: '250px',
+  whiteSpace: 'nowrap',
+  overflow: 'hidden',
+  textOverflow: 'ellipsis'
+});
+
+const LayoutAuthMenu: FC = () => {
+  const { me, signOut } = useContext(AuthenticatedContext);
+
+  const [anchorEl, setAnchorEl] = useState<HTMLButtonElement | null>(null);
+
+  const handleClick = (event: React.MouseEvent<HTMLButtonElement>) => {
+    setAnchorEl(event.currentTarget);
+  };
+
+  const { locale, LL, setLocale } = useContext(I18nContext);
+
+  const onLocaleSelected: ChangeEventHandler<HTMLInputElement> = async ({ target }) => {
+    const loc = target.value as Locales;
+    localStorage.setItem('lang', loc);
+    await loadLocaleAsync(loc);
+    setLocale(loc);
+  };
+
+  const handleClose = () => {
+    setAnchorEl(null);
+  };
+
+  const open = Boolean(anchorEl);
+  const id = anchorEl ? 'app-menu-popover' : undefined;
+
+  return (
+    <>
+      <TextField
+        name="locale"
+        InputProps={{ style: { fontSize: 10 } }}
+        variant="outlined"
+        value={locale}
+        onChange={onLocaleSelected}
+        size="small"
+        select
+      >
+        <MenuItem key="de" value="de">
+          <img src={DEflag} style={{ width: 16, verticalAlign: 'middle' }} />
+          &nbsp;DE
+        </MenuItem>
+        <MenuItem key="en" value="en">
+          <img src={GBflag} style={{ width: 16, verticalAlign: 'middle' }} />
+          &nbsp;EN
+        </MenuItem>
+        <MenuItem key="fr" value="fr">
+          <img src={FRflag} style={{ width: 16, verticalAlign: 'middle' }} />
+          &nbsp;FR
+        </MenuItem>
+        <MenuItem key="it" value="it">
+          <img src={ITflag} style={{ width: 16, verticalAlign: 'middle' }} />
+          &nbsp;IT
+        </MenuItem>
+        <MenuItem key="nl" value="nl">
+          <img src={NLflag} style={{ width: 16, verticalAlign: 'middle' }} />
+          &nbsp;NL
+        </MenuItem>
+        <MenuItem key="no" value="no">
+          <img src={NOflag} style={{ width: 16, verticalAlign: 'middle' }} />
+          &nbsp;NO
+        </MenuItem>
+        <MenuItem key="pl" value="pl">
+          <img src={PLflag} style={{ width: 16, verticalAlign: 'middle' }} />
+          &nbsp;PL
+        </MenuItem>
+        <MenuItem key="sk" value="sk">
+          <img src={SKflag} style={{ width: 16, verticalAlign: 'middle' }} />
+          &nbsp;SK
+        </MenuItem>
+        <MenuItem key="sv" value="sv">
+          <img src={SVflag} style={{ width: 16, verticalAlign: 'middle' }} />
+          &nbsp;SV
+        </MenuItem>
+        <MenuItem key="tr" value="tr">
+          <img src={TRflag} style={{ width: 16, verticalAlign: 'middle' }} />
+          &nbsp;TR
+        </MenuItem>
+      </TextField>
+
+      <IconButton
+        id="open-auth-menu"
+        sx={{ ml: 1, padding: 0 }}
+        aria-describedby={id}
+        color="inherit"
+        onClick={handleClick}
+      >
+        <AccountCircleIcon />
+      </IconButton>
+      <Popover
+        id="app-menu-popover"
+        sx={{ mt: 1 }}
+        open={open}
+        anchorEl={anchorEl}
+        onClose={handleClose}
+        anchorOrigin={{
+          vertical: 'bottom',
+          horizontal: 'center'
+        }}
+        transformOrigin={{
+          vertical: 'top',
+          horizontal: 'center'
+        }}
+      >
+        <Box display="flex" flexDirection="row" alignItems="center" p={2}>
+          <Avatar sx={{ width: 80, height: 80 }}>
+            <PersonIcon fontSize="large" />
+          </Avatar>
+          <Box pl={2}>
+            <ItemTypography variant="h6">{me.username}</ItemTypography>
+            <ItemTypography variant="body1">
+              {me.admin ? LL.ADMIN() : LL.GUEST()}&nbsp;{LL.USER(2)}
+            </ItemTypography>
+          </Box>
+        </Box>
+        <Divider />
+        <Box p={1.5}>
+          <Button variant="outlined" fullWidth color="primary" onClick={() => signOut(true)}>
+            {LL.SIGN_OUT()}
+          </Button>
+        </Box>
+      </Popover>
+    </>
+  );
+};
+
+export default LayoutAuthMenu;

interface/src/components/layout/LayoutDrawer.tsx

@@ -1,8 +1,6 @@
 import { Box, Divider, Drawer, Toolbar, Typography, styled } from '@mui/material';
 import { DRAWER_WIDTH } from './Layout';
-
 import LayoutMenu from './LayoutMenu';
-
 import type { FC } from 'react';
 
 import { PROJECT_NAME } from 'api/env';

interface/src/components/layout/LayoutMenu.tsx

@@ -1,254 +1,53 @@
-import AccountCircleIcon from '@mui/icons-material/AccountCircle';
+import AccessTimeIcon from '@mui/icons-material/AccessTime';
-import AssessmentIcon from '@mui/icons-material/Assessment';
+
-import CategoryIcon from '@mui/icons-material/Category';
+import DashboardIcon from '@mui/icons-material/Dashboard';
-import ConstructionIcon from '@mui/icons-material/Construction';
+import DeviceHubIcon from '@mui/icons-material/DeviceHub';
-import KeyboardArrowDown from '@mui/icons-material/KeyboardArrowDown';
+import InfoIcon from '@mui/icons-material/Info';
-import LiveHelpIcon from '@mui/icons-material/LiveHelp';
+import LockIcon from '@mui/icons-material/Lock';
-import MoreTimeIcon from '@mui/icons-material/MoreTime';
-import PersonIcon from '@mui/icons-material/Person';
-import PlaylistAddIcon from '@mui/icons-material/PlaylistAdd';
-import SensorsIcon from '@mui/icons-material/Sensors';
 import SettingsIcon from '@mui/icons-material/Settings';
+import SettingsEthernetIcon from '@mui/icons-material/SettingsEthernet';
+import SettingsInputAntennaIcon from '@mui/icons-material/SettingsInputAntenna';
+import TuneIcon from '@mui/icons-material/Tune';
+import { Divider, List } from '@mui/material';
+import { useContext } from 'react';
+import type { FC } from 'react';
 
-import {
-  Divider,
-  List,
-  Box,
-  Button,
-  Popover,
-  Avatar,
-  MenuItem,
-  TextField,
-  ListItem,
-  ListItemButton,
-  ListItemIcon,
-  ListItemText
-} from '@mui/material';
-
-import { useContext, useState } from 'react';
-import type { Locales } from 'i18n/i18n-types';
-import type { FC, ChangeEventHandler } from 'react';
 import LayoutMenuItem from 'components/layout/LayoutMenuItem';
+
 import { AuthenticatedContext } from 'contexts/authentication';
 
-import DEflag from 'i18n/DE.svg';
+import { useI18nContext } from 'i18n/i18n-react';
-import FRflag from 'i18n/FR.svg';
-import GBflag from 'i18n/GB.svg';
-import ITflag from 'i18n/IT.svg';
-import NLflag from 'i18n/NL.svg';
-import NOflag from 'i18n/NO.svg';
-import PLflag from 'i18n/PL.svg';
-import SKflag from 'i18n/SK.svg';
-import SVflag from 'i18n/SV.svg';
-import TRflag from 'i18n/TR.svg';
-
-import { I18nContext } from 'i18n/i18n-react';
-import { loadLocaleAsync } from 'i18n/i18n-util.async';
 
 const LayoutMenu: FC = () => {
-  const { me, signOut } = useContext(AuthenticatedContext);
+  const authenticatedContext = useContext(AuthenticatedContext);
-  const { locale, LL, setLocale } = useContext(I18nContext);
+  const { LL } = useI18nContext();
-
-  const [anchorEl, setAnchorEl] = useState<HTMLButtonElement | null>(null);
-
-  const open = Boolean(anchorEl);
-  const id = anchorEl ? 'app-menu-popover' : undefined;
-
-  const [menuOpen, setMenuOpen] = useState(true);
-
-  const onLocaleSelected: ChangeEventHandler<HTMLInputElement> = async ({ target }) => {
-    const loc = target.value as Locales;
-    localStorage.setItem('lang', loc);
-    await loadLocaleAsync(loc);
-    setLocale(loc);
-  };
-
-  const handleClick = (event: any) => {
-    setAnchorEl(event.currentTarget);
-  };
-
-  const handleClose = () => {
-    setAnchorEl(null);
-  };
 
   return (
     <>
-      <List component="nav">
+      <List disablePadding component="nav">
-        <LayoutMenuItem icon={CategoryIcon} label={LL.DEVICES()} to={`/devices`} />
+        <LayoutMenuItem icon={DashboardIcon} label={LL.DASHBOARD()} to={`/dashboard`} />
-        <LayoutMenuItem icon={SensorsIcon} label={LL.SENSORS()} to={`/sensors`} />
-        <Divider />
-
-        <Box
-          sx={{
-            bgcolor: menuOpen ? 'rgba(71, 98, 130, 0.2)' : null,
-            pb: menuOpen ? 2 : 0
-          }}
-        >
-          <ListItemButton
-            alignItems="flex-start"
-            onClick={() => setMenuOpen(!menuOpen)}
-            sx={{
-              pt: 2.5,
-              pb: menuOpen ? 0 : 2.5,
-              '&:hover, &:focus': { '& svg': { opacity: 1 } }
-            }}
-          >
-            <ListItemText
-              // TODO: translate
-              primary="Customize"
-              primaryTypographyProps={{
-                fontWeight: '600',
-                mb: '2px',
-                color: 'lightblue'
-              }}
-              // TODO: translate
-              secondary="Customizations, Scheduler and Custom Entities"
-              secondaryTypographyProps={{
-                noWrap: true,
-                fontSize: 12,
-                color: menuOpen ? 'rgba(0,0,0,0)' : 'rgba(255,255,255,0.5)'
-              }}
-              sx={{ my: 0 }}
-            />
-            <KeyboardArrowDown
-              sx={{
-                mr: -1,
-                opacity: 0,
-                transform: menuOpen ? 'rotate(-180deg)' : 'rotate(0)',
-                transition: '0.2s'
-              }}
-            />
-          </ListItemButton>
-          {menuOpen && (
-            <>
         <LayoutMenuItem
-                icon={ConstructionIcon}
+          icon={TuneIcon}
-                label={LL.CUSTOMIZATIONS()}
+          label={LL.SETTINGS_OF('')}
-                disabled={!me.admin}
+          to={`/settings`}
-                to={`/customizations`}
+          disabled={!authenticatedContext.me.admin}
         />
-              <LayoutMenuItem icon={MoreTimeIcon} label={LL.SCHEDULER()} disabled={!me.admin} to={`/scheduler`} />
+        <LayoutMenuItem icon={InfoIcon} label={LL.HELP_OF('')} to={`/help`} />
-              <LayoutMenuItem
-                icon={PlaylistAddIcon}
-                label={LL.CUSTOM_ENTITIES(0)}
-                disabled={!me.admin}
-                to={`/customentities`}
-              />
-            </>
-          )}
-        </Box>
-      </List>
-
-      <List style={{ marginTop: `auto` }}>
-        <LayoutMenuItem icon={AssessmentIcon} label={LL.SYSTEM(0)} to="/system" />
-        <LayoutMenuItem icon={SettingsIcon} label={LL.SETTINGS(0)} disabled={!me.admin} to="/settings" />
-        <LayoutMenuItem icon={LiveHelpIcon} label={LL.HELP_OF('')} to={`/help`} />
-      </List>
         <Divider />
-      <List>
-        <ListItem disablePadding onClick={handleClick}>
-          <ListItemButton>
-            <ListItemIcon>
-              <AccountCircleIcon />
-            </ListItemIcon>
-            <ListItemText>{me.username}</ListItemText>
-          </ListItemButton>
-        </ListItem>
       </List>
-
+      <List disablePadding component="nav">
-      <Popover
+        <LayoutMenuItem icon={SettingsEthernetIcon} label={LL.NETWORK(0)} to="/network" />
-        id={id}
+        <LayoutMenuItem icon={SettingsInputAntennaIcon} label={LL.ACCESS_POINT(0)} to="/ap" />
-        sx={{ mt: 1 }}
+        <LayoutMenuItem icon={AccessTimeIcon} label="NTP" to="/ntp" />
-        open={open}
+        <LayoutMenuItem icon={DeviceHubIcon} label="MQTT" to="/mqtt" />
-        anchorEl={anchorEl}
+        <LayoutMenuItem
-        onClose={handleClose}
+          icon={LockIcon}
-        anchorOrigin={{
+          label={LL.SECURITY(0)}
-          vertical: 'bottom',
+          to="/security"
-          horizontal: 'center'
+          disabled={!authenticatedContext.me.admin}
-        }}
-        transformOrigin={{
-          vertical: 'top',
-          horizontal: 'center'
-        }}
-      >
-        <Box
-          p={2}
-          sx={{
-            borderRadius: 2,
-            border: '2px solid grey'
-          }}
-        >
-          <List>
-            <ListItem disablePadding>
-              <Avatar sx={{ bgcolor: '#b1395f', color: 'white' }}>
-                <PersonIcon />
-              </Avatar>
-              <ListItemText
-                sx={{ pl: 2 }}
-                primary={me.username}
-                secondary={(me.admin ? LL.ADMIN() : LL.GUEST()) + ' Account'}
         />
-            </ListItem>
+        <LayoutMenuItem icon={SettingsIcon} label={LL.SYSTEM(0)} to="/system" />
       </List>
-          <Box p={2}>
-            <TextField
-              name="locale"
-              InputProps={{ style: { fontSize: 10 } }}
-              variant="outlined"
-              value={locale}
-              onChange={onLocaleSelected}
-              size="small"
-              select
-            >
-              <MenuItem key="de" value="de">
-                <img src={DEflag} style={{ width: 16, verticalAlign: 'middle' }} />
-                &nbsp;DE
-              </MenuItem>
-              <MenuItem key="en" value="en">
-                <img src={GBflag} style={{ width: 16, verticalAlign: 'middle' }} />
-                &nbsp;EN
-              </MenuItem>
-              <MenuItem key="fr" value="fr">
-                <img src={FRflag} style={{ width: 16, verticalAlign: 'middle' }} />
-                &nbsp;FR
-              </MenuItem>
-              <MenuItem key="it" value="it">
-                <img src={ITflag} style={{ width: 16, verticalAlign: 'middle' }} />
-                &nbsp;IT
-              </MenuItem>
-              <MenuItem key="nl" value="nl">
-                <img src={NLflag} style={{ width: 16, verticalAlign: 'middle' }} />
-                &nbsp;NL
-              </MenuItem>
-              <MenuItem key="no" value="no">
-                <img src={NOflag} style={{ width: 16, verticalAlign: 'middle' }} />
-                &nbsp;NO
-              </MenuItem>
-              <MenuItem key="pl" value="pl">
-                <img src={PLflag} style={{ width: 16, verticalAlign: 'middle' }} />
-                &nbsp;PL
-              </MenuItem>
-              <MenuItem key="sk" value="sk">
-                <img src={SKflag} style={{ width: 16, verticalAlign: 'middle' }} />
-                &nbsp;SK
-              </MenuItem>
-              <MenuItem key="sv" value="sv">
-                <img src={SVflag} style={{ width: 16, verticalAlign: 'middle' }} />
-                &nbsp;SV
-              </MenuItem>
-              <MenuItem key="tr" value="tr">
-                <img src={TRflag} style={{ width: 16, verticalAlign: 'middle' }} />
-                &nbsp;TR
-              </MenuItem>
-            </TextField>
-          </Box>
-          <Box>
-            <Button variant="outlined" fullWidth color="primary" onClick={() => signOut(true)}>
-              {LL.SIGN_OUT()}
-            </Button>
-          </Box>
-        </Box>
-      </Popover>
     </>
   );
 };

interface/src/components/layout/LayoutMenuItem.tsx

@@ -1,4 +1,4 @@
-import { ListItemButton, ListItemIcon, ListItemText } from '@mui/material';
+import { ListItem, ListItemButton, ListItemIcon, ListItemText } from '@mui/material';
 import { Link, useLocation } from 'react-router-dom';
 import type { SvgIconProps } from '@mui/material';
 import type { FC } from 'react';
@@ -18,12 +18,14 @@ const LayoutMenuItem: FC<LayoutMenuItemProps> = ({ icon: Icon, label, to, disabl
   const selected = routeMatches(to, pathname);
 
   return (
+    <ListItem disablePadding>
       <ListItemButton component={Link} to={to} disabled={disabled} selected={selected}>
         <ListItemIcon sx={{ color: selected ? '#90caf9' : '#9e9e9e' }}>
           <Icon />
         </ListItemIcon>
         <ListItemText sx={{ color: selected ? '#90caf9' : '#f5f5f5' }}>{label}</ListItemText>
       </ListItemButton>
+    </ListItem>
   );
 };
 

interface/src/components/layout/ListMenuItem.tsx

@@ -1,52 +0,0 @@
-import NavigateNextIcon from '@mui/icons-material/NavigateNext';
-import { Avatar, ListItem, ListItemAvatar, ListItemButton, ListItemIcon, ListItemText } from '@mui/material';
-import { Link } from 'react-router-dom';
-import type { SvgIconProps } from '@mui/material';
-import type { FC } from 'react';
-
-interface ListMenuItemProps {
-  icon: React.ComponentType<SvgIconProps>;
-  bgcolor?: string;
-  label: string;
-  text: string;
-  to?: string;
-  disabled?: boolean;
-}
-
-function RenderIcon({ icon: Icon, bgcolor, label, text }: ListMenuItemProps) {
-  return (
-    <>
-      <ListItemAvatar>
-        <Avatar sx={{ bgcolor, color: 'white' }}>
-          <Icon />
-        </Avatar>
-      </ListItemAvatar>
-      <ListItemText primary={label} secondary={text} />
-    </>
-  );
-}
-
-const LayoutMenuItem: FC<ListMenuItemProps> = ({ icon, bgcolor, label, text, to, disabled }) => (
-  <>
-    {to && !disabled ? (
-      <ListItem
-        disablePadding
-        secondaryAction={
-          <ListItemIcon style={{ justifyContent: 'right', color: 'lightblue', verticalAlign: 'middle' }}>
-            <NavigateNextIcon />
-          </ListItemIcon>
-        }
-      >
-        <ListItemButton component={Link} to={to}>
-          <RenderIcon icon={icon} bgcolor={bgcolor} label={label} text={text} to="" />
-        </ListItemButton>
-      </ListItem>
-    ) : (
-      <ListItem>
-        <RenderIcon icon={icon} bgcolor={bgcolor} label={label} text={text} to="" />
-      </ListItem>
-    )}
-  </>
-);
-
-export default LayoutMenuItem;

interface/src/components/routing/useRouterTab.ts

@@ -1,8 +1,12 @@
-import { useMatch, useResolvedPath } from 'react-router-dom';
+import { useLocation } from 'react-router-dom';
 
 export const useRouterTab = () => {
-  const routerTabPathMatch = useMatch(useResolvedPath(':tab').pathname);
+  const loc = useLocation().pathname;
-  const routerTab = routerTabPathMatch?.params?.tab || false;
+  const routerTab = loc.substring(0, loc.lastIndexOf('/')) ? loc : false;
+
+  // const routerTabPath = useResolvedPath(':tab');
+  // const routerTabPathMatch = useMatch(routerTabPath.pathname);
+  // const routerTab = routerTabPathMatch?.params?.tab || false;
 
   return { routerTab } as const;
 };

interface/src/components/upload/SingleUpload.tsx

@@ -50,10 +50,8 @@ const SingleUpload: FC<SingleUploadProps> = ({ onDrop, onCancel, isUploading, pr
 
   const progressText = () => {
     if (uploading) {
-      if (progress.total && progress.loaded) {
+      if (progress.total) {
-        return progress.loaded <= progress.total
+        return LL.UPLOADING() + ': ' + Math.round((progress.loaded * 100) / progress.total) + '%';
-          ? LL.UPLOADING() + ': ' + Math.round((progress.loaded * 100) / progress.total) + '%'
-          : LL.UPLOADING() + ': ' + Math.round((progress.total * 100) / progress.loaded) + '%';
       }
     }
     return LL.UPLOAD_DROP_TEXT();
@@ -63,7 +61,7 @@ const SingleUpload: FC<SingleUploadProps> = ({ onDrop, onCancel, isUploading, pr
     <Box
       {...getRootProps({
         sx: {
-          py: 4,
+          py: 8,
           px: 2,
           borderWidth: 2,
           borderRadius: 2,
@@ -85,13 +83,7 @@ const SingleUpload: FC<SingleUploadProps> = ({ onDrop, onCancel, isUploading, pr
             <Box width="100%" p={2}>
               <LinearProgress
                 variant="determinate"
-                value={
+                value={progress.total === 0 ? 0 : Math.round((progress.loaded * 100) / progress.total)}
-                  progress.total === 0 || progress.loaded === 0
-                    ? 0
-                    : progress.loaded <= progress.total
-                      ? Math.round((progress.loaded * 100) / progress.total)
-                      : Math.round((progress.total * 100) / progress.loaded)
-                }
               />
             </Box>
             <Button startIcon={<CancelIcon />} variant="outlined" color="secondary" onClick={onCancel}>

interface/src/contexts/features/FeaturesLoader.tsx

@@ -0,0 +1,25 @@
+import { useRequest } from 'alova';
+
+import { FeaturesContext } from '.';
+import type { FC } from 'react';
+
+import type { RequiredChildrenProps } from 'utils';
+import * as FeaturesApi from 'api/features';
+
+const FeaturesLoader: FC<RequiredChildrenProps> = (props) => {
+  const { data: features } = useRequest(FeaturesApi.readFeatures);
+
+  if (features) {
+    return (
+      <FeaturesContext.Provider
+        value={{
+          features
+        }}
+      >
+        {props.children}
+      </FeaturesContext.Provider>
+    );
+  }
+};
+
+export default FeaturesLoader;

interface/src/contexts/features/context.ts

@@ -0,0 +1,10 @@
+import { createContext } from 'react';
+
+import type { Features } from 'types';
+
+export interface FeaturesContextValue {
+  features: Features;
+}
+
+const FeaturesContextDefaultValue = {} as FeaturesContextValue;
+export const FeaturesContext = createContext(FeaturesContextDefaultValue);

interface/src/contexts/features/index.ts

@@ -0,0 +1,2 @@
+export * from './context';
+export { default as FeaturesLoader } from './FeaturesLoader';

interface/src/framework/Settings.tsx

@@ -1,250 +0,0 @@
-import AccessTimeIcon from '@mui/icons-material/AccessTime';
-import CancelIcon from '@mui/icons-material/Cancel';
-import CastIcon from '@mui/icons-material/Cast';
-import DeviceHubIcon from '@mui/icons-material/DeviceHub';
-import ImportExportIcon from '@mui/icons-material/ImportExport';
-import LockIcon from '@mui/icons-material/Lock';
-import MemoryIcon from '@mui/icons-material/Memory';
-import PowerSettingsNewIcon from '@mui/icons-material/PowerSettingsNew';
-import SettingsBackupRestoreIcon from '@mui/icons-material/SettingsBackupRestore';
-import SettingsEthernetIcon from '@mui/icons-material/SettingsEthernet';
-import SettingsInputAntennaIcon from '@mui/icons-material/SettingsInputAntenna';
-import TuneIcon from '@mui/icons-material/Tune';
-
-import { List, Button, Dialog, DialogActions, DialogContent, DialogTitle, Box } from '@mui/material';
-import { useRequest } from 'alova';
-import { useState, type FC } from 'react';
-import { toast } from 'react-toastify';
-import RestartMonitor from './system/RestartMonitor';
-import { dialogStyle } from 'CustomTheme';
-import * as SystemApi from 'api/system';
-import { ButtonRow, SectionContent, useLayoutTitle } from 'components';
-import ListMenuItem from 'components/layout/ListMenuItem';
-import { useI18nContext } from 'i18n/i18n-react';
-
-const Settings: FC = () => {
-  const { LL } = useI18nContext();
-  useLayoutTitle(LL.SETTINGS(0));
-
-  const [confirmRestart, setConfirmRestart] = useState<boolean>(false);
-  const [confirmFactoryReset, setConfirmFactoryReset] = useState<boolean>(false);
-  const [processing, setProcessing] = useState<boolean>(false);
-  const [restarting, setRestarting] = useState<boolean>();
-
-  const { send: restartCommand } = useRequest(SystemApi.restart(), {
-    immediate: false
-  });
-
-  const { send: factoryResetCommand } = useRequest(SystemApi.factoryReset(), {
-    immediate: false
-  });
-
-  const { send: partitionCommand } = useRequest(SystemApi.partition(), {
-    immediate: false
-  });
-
-  const restart = async () => {
-    setProcessing(true);
-    await restartCommand()
-      .then(() => {
-        setRestarting(true);
-      })
-      .catch((err) => {
-        toast.error(err.message);
-      })
-      .finally(() => {
-        setConfirmRestart(false);
-        setProcessing(false);
-      });
-  };
-
-  const factoryReset = async () => {
-    setProcessing(true);
-    await factoryResetCommand()
-      .then(() => {
-        setRestarting(true);
-      })
-      .catch((err) => {
-        toast.error(err.message);
-      })
-      .finally(() => {
-        setConfirmFactoryReset(false);
-        setProcessing(false);
-      });
-  };
-
-  const partition = async () => {
-    setProcessing(true);
-    await partitionCommand()
-      .then(() => {
-        setRestarting(true);
-      })
-      .catch((err) => {
-        toast.error(err.message);
-      })
-      .finally(() => {
-        setConfirmRestart(false);
-        setProcessing(false);
-      });
-  };
-
-  const renderRestartDialog = () => (
-    <Dialog sx={dialogStyle} open={confirmRestart} onClose={() => setConfirmRestart(false)}>
-      <DialogTitle>{LL.RESTART()}</DialogTitle>
-      <DialogContent dividers>{LL.RESTART_CONFIRM()}</DialogContent>
-      <DialogActions>
-        <Button
-          startIcon={<CancelIcon />}
-          variant="outlined"
-          onClick={() => setConfirmRestart(false)}
-          disabled={processing}
-          color="secondary"
-        >
-          {LL.CANCEL()}
-        </Button>
-        <Button
-          startIcon={<PowerSettingsNewIcon />}
-          variant="outlined"
-          onClick={restart}
-          disabled={processing}
-          color="primary"
-        >
-          {LL.RESTART()}
-        </Button>
-        <Button
-          startIcon={<PowerSettingsNewIcon />}
-          variant="outlined"
-          onClick={partition}
-          disabled={processing}
-          color="primary"
-        >
-          EMS-ESP Loader
-        </Button>
-      </DialogActions>
-    </Dialog>
-  );
-
-  const renderFactoryResetDialog = () => (
-    <Dialog sx={dialogStyle} open={confirmFactoryReset} onClose={() => setConfirmFactoryReset(false)}>
-      <DialogTitle>{LL.FACTORY_RESET()}</DialogTitle>
-      <DialogContent dividers>{LL.SYSTEM_FACTORY_TEXT_DIALOG()}</DialogContent>
-      <DialogActions>
-        <Button
-          startIcon={<CancelIcon />}
-          variant="outlined"
-          onClick={() => setConfirmFactoryReset(false)}
-          disabled={processing}
-          color="secondary"
-        >
-          {LL.CANCEL()}
-        </Button>
-        <Button
-          startIcon={<SettingsBackupRestoreIcon />}
-          variant="outlined"
-          onClick={factoryReset}
-          disabled={processing}
-          color="error"
-        >
-          {LL.FACTORY_RESET()}
-        </Button>
-      </DialogActions>
-    </Dialog>
-  );
-
-  const content = () => (
-    <>
-      <List sx={{ borderRadius: 3, border: '2px solid grey' }}>
-        {/* TODO: translate */}
-        <ListMenuItem
-          icon={TuneIcon}
-          bgcolor="#134ba2"
-          label={LL.APPLICATION_SETTINGS()}
-          text="Modify EMS-ESP Application Settings"
-          to="ems-esp"
-        />
-
-        <ListMenuItem
-          icon={SettingsEthernetIcon}
-          bgcolor="#40828f"
-          label={LL.NETWORK(0)}
-          text={LL.CONFIGURE(LL.SETTINGS_OF(LL.NETWORK(0)))}
-          to="network"
-        />
-
-        <ListMenuItem
-          icon={SettingsInputAntennaIcon}
-          bgcolor="#5f9a5f"
-          label={LL.ACCESS_POINT(0)}
-          text={LL.CONFIGURE(LL.ACCESS_POINT(0))}
-          to="ap"
-        />
-
-        <ListMenuItem
-          icon={AccessTimeIcon}
-          bgcolor="#c5572c"
-          label="NTP"
-          text={LL.CONFIGURE(LL.LOCAL_TIME())}
-          to="ntp"
-        />
-
-        <ListMenuItem icon={DeviceHubIcon} bgcolor="#68374d" label="MQTT" text={LL.CONFIGURE('MQTT')} to="mqtt" />
-
-        <ListMenuItem icon={CastIcon} bgcolor="#efc34b" label="OTA" text={LL.CONFIGURE('OTA')} to="ota" />
-
-        {/* TODO: translate */}
-        <ListMenuItem icon={LockIcon} label={LL.SECURITY(0)} text="Add/Remove Users" to="security" />
-
-        <ListMenuItem
-          icon={MemoryIcon}
-          bgcolor="#b1395f"
-          label={LL.STATUS_OF('ESP32')}
-          text="ESP32 Information"
-          to="espsystemstatus"
-        />
-
-        {/* TODO: translate */}
-        <ListMenuItem
-          icon={ImportExportIcon}
-          bgcolor="#5d89f7"
-          label={LL.UPLOAD_DOWNLOAD()}
-          text="Upload/Download Settings and Firmware"
-          to="upload"
-        />
-      </List>
-
-      {renderRestartDialog()}
-      {renderFactoryResetDialog()}
-
-      <Box mt={1} display="flex" flexWrap="wrap">
-        <Box flexGrow={1} sx={{ '& button': { mt: 2 } }}>
-          <ButtonRow>
-            <Button
-              startIcon={<PowerSettingsNewIcon />}
-              variant="outlined"
-              color="primary"
-              onClick={() => setConfirmRestart(true)}
-            >
-              {LL.RESTART()}
-            </Button>
-          </ButtonRow>
-        </Box>
-        <Box flexWrap="nowrap" whiteSpace="nowrap">
-          <ButtonRow>
-            <Button
-              startIcon={<SettingsBackupRestoreIcon />}
-              variant="outlined"
-              onClick={() => setConfirmFactoryReset(true)}
-              color="error"
-            >
-              {LL.FACTORY_RESET()}
-            </Button>
-          </ButtonRow>
-        </Box>
-      </Box>
-    </>
-  );
-
-  return <SectionContent>{restarting ? <RestartMonitor /> : content()}</SectionContent>;
-};
-
-export default Settings;

interface/src/framework/ap/APSettingsForm.tsx

@@ -6,7 +6,7 @@ import { useState } from 'react';
 import type { ValidateFieldsError } from 'async-validator';
 import type { FC } from 'react';
 
-import type { APSettingsType } from 'types';
+import type { APSettings } from 'types';
 import * as APApi from 'api/ap';
 import {
   BlockFormControlLabel,
@@ -24,10 +24,10 @@ import { numberValue, updateValueDirty, useRest } from 'utils';
 
 import { createAPSettingsValidator, validate } from 'validators';
 
-export const isAPEnabled = ({ provision_mode }: APSettingsType) =>
+export const isAPEnabled = ({ provision_mode }: APSettings) =>
   provision_mode === APProvisionMode.AP_MODE_ALWAYS || provision_mode === APProvisionMode.AP_MODE_DISCONNECTED;
 
-const APSettings: FC = () => {
+const APSettingsForm: FC = () => {
   const {
     loadData,
     saving,
@@ -39,7 +39,7 @@ const APSettings: FC = () => {
     blocker,
     saveData,
     errorMessage
-  } = useRest<APSettingsType>({
+  } = useRest<APSettings>({
     read: APApi.readAPSettings,
     update: APApi.updateAPSettings
   });
@@ -205,11 +205,11 @@ const APSettings: FC = () => {
   };
 
   return (
-    <SectionContent>
+    <SectionContent title={LL.SETTINGS_OF(LL.ACCESS_POINT(1))} titleGutter>
       {blocker ? <BlockNavigation blocker={blocker} /> : null}
       {content()}
     </SectionContent>
   );
 };
 
-export default APSettings;
+export default APSettingsForm;

interface/src/framework/ap/APStatusForm.tsx

@@ -7,14 +7,14 @@ import { useRequest } from 'alova';
 import type { Theme } from '@mui/material';
 import type { FC } from 'react';
 
-import type { APStatusType } from 'types';
+import type { APStatus } from 'types';
 import * as APApi from 'api/ap';
 import { ButtonRow, FormLoader, SectionContent } from 'components';
 
 import { useI18nContext } from 'i18n/i18n-react';
 import { APNetworkStatus } from 'types';
 
-export const apStatusHighlight = ({ status }: APStatusType, theme: Theme) => {
+export const apStatusHighlight = ({ status }: APStatus, theme: Theme) => {
   switch (status) {
     case APNetworkStatus.ACTIVE:
       return theme.palette.success.main;
@@ -27,14 +27,14 @@ export const apStatusHighlight = ({ status }: APStatusType, theme: Theme) => {
   }
 };
 
-const APStatus: FC = () => {
+const APStatusForm: FC = () => {
   const { data: data, send: loadData, error } = useRequest(APApi.readAPStatus);
 
   const { LL } = useI18nContext();
 
   const theme = useTheme();
 
-  const apStatus = ({ status }: APStatusType) => {
+  const apStatus = ({ status }: APStatus) => {
     switch (status) {
       case APNetworkStatus.ACTIVE:
         return LL.ACTIVE();
@@ -99,7 +99,11 @@ const APStatus: FC = () => {
     );
   };
 
-  return <SectionContent>{content()}</SectionContent>;
+  return (
+    <SectionContent title={LL.STATUS_OF(LL.ACCESS_POINT(1))} titleGutter>
+      {content()}
+    </SectionContent>
+  );
 };
 
-export default APStatus;
+export default APStatusForm;

interface/src/framework/ap/AccessPoint.tsx

@@ -1,10 +1,12 @@
 import { Tab } from '@mui/material';
+import { useContext } from 'react';
 import { Navigate, Routes, Route } from 'react-router-dom';
 
-import APSettings from './APSettings';
+import APSettingsForm from './APSettingsForm';
-import APStatus from './APStatus';
+import APStatusForm from './APStatusForm';
 import type { FC } from 'react';
-import { RouterTabs, useLayoutTitle, useRouterTab } from 'components';
+import { RequireAdmin, RouterTabs, useLayoutTitle, useRouterTab } from 'components';
+import { AuthenticatedContext } from 'contexts/authentication';
 
 import { useI18nContext } from 'i18n/i18n-react';
 
@@ -13,18 +15,32 @@ const AccessPoint: FC = () => {
 
   useLayoutTitle(LL.ACCESS_POINT(0));
 
+  const authenticatedContext = useContext(AuthenticatedContext);
+
   const { routerTab } = useRouterTab();
 
   return (
     <>
       <RouterTabs value={routerTab}>
-        <Tab value="settings" label={LL.SETTINGS_OF(LL.ACCESS_POINT(1))} />
+        <Tab value="/ap/status" label={LL.STATUS_OF(LL.ACCESS_POINT(1))} />
-        <Tab value="status" label={LL.STATUS_OF(LL.ACCESS_POINT(1))} />
+        <Tab
+          value="/ap/settings"
+          label={LL.SETTINGS_OF(LL.ACCESS_POINT(1))}
+          disabled={!authenticatedContext.me.admin}
+        />
       </RouterTabs>
       <Routes>
-        <Route path="status" element={<APStatus />} />
+        <Route path="status" element={<APStatusForm />} />
-        <Route path="settings" element={<APSettings />} />
+        <Route index element={<Navigate to="status" />} />
-        <Route path="*" element={<Navigate replace to="settings" />} />
+        <Route
+          path="settings"
+          element={
+            <RequireAdmin>
+              <APSettingsForm />
+            </RequireAdmin>
+          }
+        />
+        <Route path="*" element={<Navigate replace to="/ap/status" />} />
       </Routes>
     </>
   );

interface/src/framework/mqtt/Mqtt.tsx

@@ -1,10 +1,12 @@
 import { Tab } from '@mui/material';
+import { useContext } from 'react';
 import { Navigate, Route, Routes } from 'react-router-dom';
-import MqttSettings from './MqttSettings';
+import MqttSettingsForm from './MqttSettingsForm';
-import MqttStatus from './MqttStatus';
+import MqttStatusForm from './MqttStatusForm';
 import type { FC } from 'react';
 
-import { RouterTabs, useLayoutTitle, useRouterTab } from 'components';
+import { RequireAdmin, RouterTabs, useLayoutTitle, useRouterTab } from 'components';
+import { AuthenticatedContext } from 'contexts/authentication';
 
 import { useI18nContext } from 'i18n/i18n-react';
 
@@ -13,18 +15,26 @@ const Mqtt: FC = () => {
 
   useLayoutTitle('MQTT');
 
+  const authenticatedContext = useContext(AuthenticatedContext);
   const { routerTab } = useRouterTab();
 
   return (
     <>
       <RouterTabs value={routerTab}>
-        <Tab value="settings" label={LL.SETTINGS_OF('MQTT')} />
+        <Tab value="/mqtt/status" label={LL.STATUS_OF('MQTT')} />
-        <Tab value="status" label={LL.STATUS_OF('MQTT')} />
+        <Tab value="/mqtt/settings" label={LL.SETTINGS_OF('MQTT')} disabled={!authenticatedContext.me.admin} />
       </RouterTabs>
       <Routes>
-        <Route path="status" element={<MqttStatus />} />
+        <Route path="status" element={<MqttStatusForm />} />
-        <Route path="settings" element={<MqttSettings />} />
+        <Route
-        <Route path="*" element={<Navigate replace to="settings" />} />
+          path="settings"
+          element={
+            <RequireAdmin>
+              <MqttSettingsForm />
+            </RequireAdmin>
+          }
+        />
+        <Route path="*" element={<Navigate replace to="/mqtt/status" />} />
       </Routes>
     </>
   );

interface/src/framework/mqtt/MqttSettingsForm.tsx

@@ -5,7 +5,7 @@ import { useState } from 'react';
 import type { ValidateFieldsError } from 'async-validator';
 import type { FC } from 'react';
 
-import type { MqttSettingsType } from 'types';
+import type { MqttSettings } from 'types';
 import * as MqttApi from 'api/mqtt';
 import {
   BlockFormControlLabel,
@@ -21,7 +21,7 @@ import { numberValue, updateValueDirty, useRest } from 'utils';
 
 import { createMqttSettingsValidator, validate } from 'validators';
 
-const MqttSettings: FC = () => {
+const MqttSettingsForm: FC = () => {
   const {
     loadData,
     saving,
@@ -33,7 +33,7 @@ const MqttSettings: FC = () => {
     blocker,
     saveData,
     errorMessage
-  } = useRest<MqttSettingsType>({
+  } = useRest<MqttSettings>({
     read: MqttApi.readMqttSettings,
     update: MqttApi.updateMqttSettings
   });
@@ -72,7 +72,6 @@ const MqttSettings: FC = () => {
               name="host"
               label={LL.ADDRESS_OF(LL.BROKER())}
               fullWidth
-              multiline
               variant="outlined"
               value={data.host}
               onChange={updateFormValue}
@@ -274,7 +273,6 @@ const MqttSettings: FC = () => {
                   >
                     <MenuItem value={0}>Home Assistant</MenuItem>
                     <MenuItem value={1}>Domoticz</MenuItem>
-                    <MenuItem value={2}>Domoticz (latest)</MenuItem>
                   </TextField>
                 </Grid>
                 <Grid item xs={12} sm={6} md={4}>
@@ -388,21 +386,6 @@ const MqttSettings: FC = () => {
               margin="normal"
             />
           </Grid>
-          <Grid item xs={12} sm={6} md={4}>
-            <TextField
-              name="publish_time_water"
-              label={LL.MQTT_INT_WATER()}
-              InputProps={{
-                endAdornment: <InputAdornment position="end">{LL.SECONDS()}</InputAdornment>
-              }}
-              fullWidth
-              variant="outlined"
-              value={numberValue(data.publish_time_water)}
-              type="number"
-              onChange={updateFormValue}
-              margin="normal"
-            />
-          </Grid>
           <Grid item xs={12} sm={6} md={4}>
             <TextField
               name="publish_time_sensor"
@@ -464,11 +447,11 @@ const MqttSettings: FC = () => {
   };
 
   return (
-    <SectionContent>
+    <SectionContent title={LL.SETTINGS_OF('MQTT')} titleGutter>
       {blocker ? <BlockNavigation blocker={blocker} /> : null}
       {content()}
     </SectionContent>
   );
 };
 
-export default MqttSettings;
+export default MqttSettingsForm;

interface/src/framework/mqtt/MqttStatusForm.tsx

@@ -8,13 +8,13 @@ import { useRequest } from 'alova';
 import type { Theme } from '@mui/material';
 import type { FC } from 'react';
 
-import type { MqttStatusType } from 'types';
+import type { MqttStatus } from 'types';
 import * as MqttApi from 'api/mqtt';
 import { ButtonRow, FormLoader, SectionContent } from 'components';
 import { useI18nContext } from 'i18n/i18n-react';
 import { MqttDisconnectReason } from 'types';
 
-export const mqttStatusHighlight = ({ enabled, connected }: MqttStatusType, theme: Theme) => {
+export const mqttStatusHighlight = ({ enabled, connected }: MqttStatus, theme: Theme) => {
   if (!enabled) {
     return theme.palette.info.main;
   }
@@ -24,27 +24,27 @@ export const mqttStatusHighlight = ({ enabled, connected }: MqttStatusType, them
   return theme.palette.error.main;
 };
 
-export const mqttPublishHighlight = ({ mqtt_fails }: MqttStatusType, theme: Theme) => {
+export const mqttPublishHighlight = ({ mqtt_fails }: MqttStatus, theme: Theme) => {
   if (mqtt_fails === 0) return theme.palette.success.main;
   if (mqtt_fails < 10) return theme.palette.warning.main;
 
   return theme.palette.error.main;
 };
 
-export const mqttQueueHighlight = ({ mqtt_queued }: MqttStatusType, theme: Theme) => {
+export const mqttQueueHighlight = ({ mqtt_queued }: MqttStatus, theme: Theme) => {
   if (mqtt_queued <= 1) return theme.palette.success.main;
 
   return theme.palette.warning.main;
 };
 
-const MqttStatus: FC = () => {
+const MqttStatusForm: FC = () => {
   const { data: data, send: loadData, error } = useRequest(MqttApi.readMqttStatus);
 
   const { LL } = useI18nContext();
 
   const theme = useTheme();
 
-  const mqttStatus = ({ enabled, connected, connect_count }: MqttStatusType) => {
+  const mqttStatus = ({ enabled, connected, connect_count }: MqttStatus) => {
     if (!enabled) {
       return LL.NOT_ENABLED();
     }
@@ -54,7 +54,7 @@ const MqttStatus: FC = () => {
     return LL.DISCONNECTED() + (connect_count > 1 ? ' (' + connect_count + ')' : '');
   };
 
-  const disconnectReason = ({ disconnect_reason }: MqttStatusType) => {
+  const disconnectReason = ({ disconnect_reason }: MqttStatus) => {
     switch (disconnect_reason) {
       case MqttDisconnectReason.TCP_DISCONNECTED:
         return 'TCP disconnected';
@@ -146,7 +146,11 @@ const MqttStatus: FC = () => {
     );
   };
 
-  return <SectionContent>{content()}</SectionContent>;
+  return (
+    <SectionContent title={LL.STATUS_OF('MQTT')} titleGutter>
+      {content()}
+    </SectionContent>
+  );
 };
 
-export default MqttStatus;
+export default MqttStatusForm;

interface/src/framework/network/Network.tsx

@@ -1,59 +0,0 @@
-import { Tab } from '@mui/material';
-import { useCallback, useState } from 'react';
-import { Navigate, Routes, Route, useNavigate } from 'react-router-dom';
-import NetworkSettings from './NetworkSettings';
-import NetworkStatus from './NetworkStatus';
-import { WiFiConnectionContext } from './WiFiConnectionContext';
-import WiFiNetworkScanner from './WiFiNetworkScanner';
-import type { FC } from 'react';
-
-import type { WiFiNetwork } from 'types';
-import { RouterTabs, useLayoutTitle, useRouterTab } from 'components';
-import { useI18nContext } from 'i18n/i18n-react';
-
-const Network: FC = () => {
-  const { LL } = useI18nContext();
-  useLayoutTitle(LL.NETWORK(0));
-
-  const { routerTab } = useRouterTab();
-
-  const navigate = useNavigate();
-
-  const [selectedNetwork, setSelectedNetwork] = useState<WiFiNetwork>();
-
-  const selectNetwork = useCallback(
-    (network: WiFiNetwork) => {
-      setSelectedNetwork(network);
-      navigate('settings');
-    },
-    [navigate]
-  );
-
-  const deselectNetwork = useCallback(() => {
-    setSelectedNetwork(undefined);
-  }, []);
-
-  return (
-    <WiFiConnectionContext.Provider
-      value={{
-        selectedNetwork,
-        selectNetwork,
-        deselectNetwork
-      }}
-    >
-      <RouterTabs value={routerTab}>
-        <Tab value="settings" label={LL.SETTINGS_OF(LL.NETWORK(1))} />
-        <Tab value="status" label={LL.STATUS_OF(LL.NETWORK(1))} />
-        <Tab value="scan" label={LL.NETWORK_SCAN()} />
-      </RouterTabs>
-      <Routes>
-        <Route path="status" element={<NetworkStatus />} />
-        <Route path="scan" element={<WiFiNetworkScanner />} />
-        <Route path="settings" element={<NetworkSettings />} />
-        <Route path="*" element={<Navigate replace to="settings" />} />
-      </Routes>
-    </WiFiConnectionContext.Provider>
-  );
-};
-
-export default Network;

interface/src/framework/network/NetworkConnection.tsx

@@ -0,0 +1,79 @@
+import { Tab } from '@mui/material';
+import { useCallback, useContext, useState } from 'react';
+import { Navigate, Routes, Route, useNavigate } from 'react-router-dom';
+import NetworkSettingsForm from './NetworkSettingsForm';
+import NetworkStatusForm from './NetworkStatusForm';
+import { WiFiConnectionContext } from './WiFiConnectionContext';
+import WiFiNetworkScanner from './WiFiNetworkScanner';
+import type { FC } from 'react';
+
+import type { WiFiNetwork } from 'types';
+import { RequireAdmin, RouterTabs, useLayoutTitle, useRouterTab } from 'components';
+import { AuthenticatedContext } from 'contexts/authentication';
+import { useI18nContext } from 'i18n/i18n-react';
+
+const NetworkConnection: FC = () => {
+  const { LL } = useI18nContext();
+  useLayoutTitle(LL.NETWORK(0));
+
+  const { routerTab } = useRouterTab();
+
+  const authenticatedContext = useContext(AuthenticatedContext);
+  const navigate = useNavigate();
+
+  const [selectedNetwork, setSelectedNetwork] = useState<WiFiNetwork>();
+
+  const selectNetwork = useCallback(
+    (network: WiFiNetwork) => {
+      setSelectedNetwork(network);
+      navigate('settings');
+    },
+    [navigate]
+  );
+
+  const deselectNetwork = useCallback(() => {
+    setSelectedNetwork(undefined);
+  }, []);
+
+  return (
+    <WiFiConnectionContext.Provider
+      value={{
+        selectedNetwork,
+        selectNetwork,
+        deselectNetwork
+      }}
+    >
+      <RouterTabs value={routerTab}>
+        <Tab value="/network/status" label={LL.STATUS_OF(LL.NETWORK(1))} />
+        <Tab value="/network/scan" label={LL.NETWORK_SCAN()} disabled={!authenticatedContext.me.admin} />
+        <Tab
+          value="/network/settings"
+          label={LL.SETTINGS_OF(LL.NETWORK(1))}
+          disabled={!authenticatedContext.me.admin}
+        />
+      </RouterTabs>
+      <Routes>
+        <Route path="status" element={<NetworkStatusForm />} />
+        <Route
+          path="scan"
+          element={
+            <RequireAdmin>
+              <WiFiNetworkScanner />
+            </RequireAdmin>
+          }
+        />
+        <Route
+          path="settings"
+          element={
+            <RequireAdmin>
+              <NetworkSettingsForm />
+            </RequireAdmin>
+          }
+        />
+        <Route path="*" element={<Navigate replace to="/network/status" />} />
+      </Routes>
+    </WiFiConnectionContext.Provider>
+  );
+};
+
+export default NetworkConnection;

interface/src/framework/network/NetworkSettingsForm.tsx

@@ -15,8 +15,8 @@ import {
   ListItemSecondaryAction,
   ListItemText,
   Typography,
-  TextField,
+  InputAdornment,
-  MenuItem
+  TextField
 } from '@mui/material';
 // eslint-disable-next-line import/named
 import { updateState, useRequest } from 'alova';
@@ -28,7 +28,7 @@ import { isNetworkOpen, networkSecurityMode } from './WiFiNetworkSelector';
 import type { ValidateFieldsError } from 'async-validator';
 import type { FC } from 'react';
 
-import type { NetworkSettingsType } from 'types';
+import type { NetworkSettings } from 'types';
 import * as NetworkApi from 'api/network';
 import * as SystemApi from 'api/system';
 import {
@@ -43,12 +43,12 @@ import {
 } from 'components';
 import { useI18nContext } from 'i18n/i18n-react';
 
-import { updateValueDirty, useRest } from 'utils';
+import { numberValue, updateValueDirty, useRest } from 'utils';
 
 import { validate } from 'validators';
 import { createNetworkSettingsValidator } from 'validators/network';
 
-const NetworkSettings: FC = () => {
+const WiFiSettingsForm: FC = () => {
   const { LL } = useI18nContext();
 
   const { selectedNetwork, deselectNetwork } = useContext(WiFiConnectionContext);
@@ -68,7 +68,7 @@ const NetworkSettings: FC = () => {
     saveData,
     errorMessage,
     restartNeeded
-  } = useRest<NetworkSettingsType>({
+  } = useRest<NetworkSettings>({
     read: NetworkApi.readNetworkSettings,
     update: NetworkApi.updateNetworkSettings
   });
@@ -88,7 +88,7 @@ const NetworkSettings: FC = () => {
           static_ip_config: false,
           enableIPv6: false,
           bandwidth20: false,
-          tx_power: 0,
+          tx_power: 20,
           nosleep: false,
           enableMDNS: true,
           enableCORS: false,
@@ -135,7 +135,7 @@ const NetworkSettings: FC = () => {
 
     return (
       <>
-        <Typography variant="h6" color="primary">
+        <Typography sx={{ pt: 2 }} variant="h6" color="primary">
           WiFi
         </Typography>
         {selectedNetwork ? (
@@ -196,29 +196,20 @@ const NetworkSettings: FC = () => {
             margin="normal"
           />
         )}
-        <TextField
+        <ValidatedTextField
+          fieldErrors={fieldErrors}
           name="tx_power"
           label={LL.TX_POWER()}
+          InputProps={{
+            endAdornment: <InputAdornment position="end">dBm</InputAdornment>
+          }}
           fullWidth
           variant="outlined"
-          value={data.tx_power}
+          value={numberValue(data.tx_power)}
           onChange={updateFormValue}
+          type="number"
           margin="normal"
-          select
+        />
-        >
-          <MenuItem value={0}>Auto</MenuItem>
-          <MenuItem value={78}>19.5 dBm</MenuItem>
-          <MenuItem value={76}>19 dBm</MenuItem>
-          <MenuItem value={74}>18.5 dBm</MenuItem>
-          <MenuItem value={68}>17 dBm</MenuItem>
-          <MenuItem value={60}>15 dBm</MenuItem>
-          <MenuItem value={52}>13 dBm</MenuItem>
-          <MenuItem value={44}>11 dBm</MenuItem>
-          <MenuItem value={34}>8.5 dBm</MenuItem>
-          <MenuItem value={28}>7 dBm</MenuItem>
-          <MenuItem value={20}>5 dBm</MenuItem>
-          <MenuItem value={8}>2 dBm</MenuItem>
-        </TextField>
         <BlockFormControlLabel
           control={<Checkbox name="nosleep" checked={data.nosleep} onChange={updateFormValue} />}
           label={LL.NETWORK_DISABLE_SLEEP()}
@@ -259,12 +250,10 @@ const NetworkSettings: FC = () => {
             margin="normal"
           />
         )}
-        {data.enableIPv6 !== undefined && (
         <BlockFormControlLabel
           control={<Checkbox name="enableIPv6" checked={data.enableIPv6} onChange={updateFormValue} />}
           label={LL.NETWORK_ENABLE_IPV6()}
         />
-        )}
         <BlockFormControlLabel
           control={<Checkbox name="static_ip_config" checked={data.static_ip_config} onChange={updateFormValue} />}
           label={LL.NETWORK_FIXED_IP()}
@@ -360,11 +349,11 @@ const NetworkSettings: FC = () => {
   };
 
   return (
-    <SectionContent>
+    <SectionContent title={LL.SETTINGS_OF(LL.NETWORK(1))} titleGutter>
       {blocker ? <BlockNavigation blocker={blocker} /> : null}
       {restarting ? <RestartMonitor /> : content()}
     </SectionContent>
   );
 };
 
-export default NetworkSettings;
+export default WiFiSettingsForm;

interface/src/framework/network/NetworkStatusForm.tsx

@@ -1,6 +1,5 @@
 import DeviceHubIcon from '@mui/icons-material/DeviceHub';
 import DnsIcon from '@mui/icons-material/Dns';
-import GiteIcon from '@mui/icons-material/Gite';
 import RefreshIcon from '@mui/icons-material/Refresh';
 import RouterIcon from '@mui/icons-material/Router';
 import SettingsInputAntennaIcon from '@mui/icons-material/SettingsInputAntenna';
@@ -11,18 +10,18 @@ import { useRequest } from 'alova';
 import type { Theme } from '@mui/material';
 import type { FC } from 'react';
 
-import type { NetworkStatusType } from 'types';
+import type { NetworkStatus } from 'types';
 import * as NetworkApi from 'api/network';
 import { ButtonRow, FormLoader, SectionContent } from 'components';
 
 import { useI18nContext } from 'i18n/i18n-react';
 import { NetworkConnectionStatus } from 'types';
 
-const isConnected = ({ status }: NetworkStatusType) =>
+const isConnected = ({ status }: NetworkStatus) =>
   status === NetworkConnectionStatus.WIFI_STATUS_CONNECTED ||
   status === NetworkConnectionStatus.ETHERNET_STATUS_CONNECTED;
 
-const networkStatusHighlight = ({ status }: NetworkStatusType, theme: Theme) => {
+const networkStatusHighlight = ({ status }: NetworkStatus, theme: Theme) => {
   switch (status) {
     case NetworkConnectionStatus.WIFI_STATUS_IDLE:
     case NetworkConnectionStatus.WIFI_STATUS_DISCONNECTED:
@@ -39,7 +38,7 @@ const networkStatusHighlight = ({ status }: NetworkStatusType, theme: Theme) =>
   }
 };
 
-const networkQualityHighlight = ({ rssi }: NetworkStatusType, theme: Theme) => {
+const networkQualityHighlight = ({ rssi }: NetworkStatus, theme: Theme) => {
   if (rssi <= -85) {
     return theme.palette.error.main;
   } else if (rssi <= -75) {
@@ -48,18 +47,17 @@ const networkQualityHighlight = ({ rssi }: NetworkStatusType, theme: Theme) => {
   return theme.palette.success.main;
 };
 
-export const isWiFi = ({ status }: NetworkStatusType) => status === NetworkConnectionStatus.WIFI_STATUS_CONNECTED;
+export const isWiFi = ({ status }: NetworkStatus) => status === NetworkConnectionStatus.WIFI_STATUS_CONNECTED;
-export const isEthernet = ({ status }: NetworkStatusType) =>
+export const isEthernet = ({ status }: NetworkStatus) => status === NetworkConnectionStatus.ETHERNET_STATUS_CONNECTED;
-  status === NetworkConnectionStatus.ETHERNET_STATUS_CONNECTED;
 
-const dnsServers = ({ dns_ip_1, dns_ip_2 }: NetworkStatusType) => {
+const dnsServers = ({ dns_ip_1, dns_ip_2 }: NetworkStatus) => {
   if (!dns_ip_1) {
     return 'none';
   }
   return dns_ip_1 + (!dns_ip_2 || dns_ip_2 === '0.0.0.0' ? '' : ',' + dns_ip_2);
 };
 
-const IPs = (status: NetworkStatusType) => {
+const IPs = (status: NetworkStatus) => {
   if (!status.local_ipv6 || status.local_ipv6 === '0000:0000:0000:0000:0000:0000:0000:0000') {
     return status.local_ip;
   }
@@ -69,14 +67,14 @@ const IPs = (status: NetworkStatusType) => {
   return status.local_ip + ', ' + status.local_ipv6;
 };
 
-const NetworkStatus: FC = () => {
+const NetworkStatusForm: FC = () => {
   const { data: data, send: loadData, error } = useRequest(NetworkApi.readNetworkStatus);
 
   const { LL } = useI18nContext();
 
   const theme = useTheme();
 
-  const networkStatus = ({ status }: NetworkStatusType) => {
+  const networkStatus = ({ status }: NetworkStatus) => {
     switch (status) {
       case NetworkConnectionStatus.WIFI_STATUS_NO_SHIELD:
         return LL.INACTIVE(1);
@@ -117,15 +115,6 @@ const NetworkStatus: FC = () => {
             <ListItemText primary="Status" secondary={networkStatus(data)} />
           </ListItem>
           <Divider variant="inset" component="li" />
-          <ListItem>
-            <ListItemAvatar>
-              <Avatar sx={{ bgcolor: networkStatusHighlight(data, theme) }}>
-                <GiteIcon />
-              </Avatar>
-            </ListItemAvatar>
-            <ListItemText primary="Hostname" secondary={data.hostname} />
-          </ListItem>
-          <Divider variant="inset" component="li" />
           {isWiFi(data) && (
             <>
               <ListItem>
@@ -194,7 +183,11 @@ const NetworkStatus: FC = () => {
     );
   };
 
-  return <SectionContent>{content()}</SectionContent>;
+  return (
+    <SectionContent title={LL.STATUS_OF(LL.NETWORK(1))} titleGutter>
+      {content()}
+    </SectionContent>
+  );
 };
 
-export default NetworkStatus;
+export default NetworkStatusForm;

interface/src/framework/network/WiFiNetworkScanner.tsx

@@ -56,7 +56,7 @@ const WiFiNetworkScanner: FC = () => {
   };
 
   return (
-    <SectionContent>
+    <SectionContent title={LL.NETWORK_SCANNER()}>
       {renderNetworkScanner()}
       <ButtonRow>
         <Button

interface/src/framework/ntp/NTPSettingsForm.tsx

@@ -8,7 +8,7 @@ import { selectedTimeZone, timeZoneSelectItems, TIME_ZONES } from './TZ';
 import type { ValidateFieldsError } from 'async-validator';
 import type { FC } from 'react';
 
-import type { NTPSettingsType } from 'types';
+import type { NTPSettings } from 'types';
 import * as NTPApi from 'api/ntp';
 import {
   BlockFormControlLabel,
@@ -23,7 +23,7 @@ import { updateValueDirty, useRest } from 'utils';
 import { validate } from 'validators';
 import { NTP_SETTINGS_VALIDATOR } from 'validators/ntp';
 
-const NTPSettings: FC = () => {
+const NTPSettingsForm: FC = () => {
   const {
     loadData,
     saving,
@@ -35,7 +35,7 @@ const NTPSettings: FC = () => {
     blocker,
     saveData,
     errorMessage
-  } = useRest<NTPSettingsType>({
+  } = useRest<NTPSettings>({
     read: NTPApi.readNTPSettings,
     update: NTPApi.updateNTPSettings
   });
@@ -130,11 +130,11 @@ const NTPSettings: FC = () => {
   };
 
   return (
-    <SectionContent>
+    <SectionContent title={LL.SETTINGS_OF('NTP')} titleGutter>
       {blocker ? <BlockNavigation blocker={blocker} /> : null}
       {content()}
     </SectionContent>
   );
 };
 
-export default NTPSettings;
+export default NTPSettingsForm;

interface/src/framework/ntp/NTPStatusForm.tsx

@@ -22,39 +22,25 @@ import {
   Typography
 } from '@mui/material';
 import { useRequest } from 'alova';
-import { useState } from 'react';
+import { useContext, useState } from 'react';
 import { toast } from 'react-toastify';
 import type { Theme } from '@mui/material';
 import type { FC } from 'react';
 
-import type { NTPStatusType } from 'types';
+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';
 
 import { useI18nContext } from 'i18n/i18n-react';
 import { NTPSyncStatus } from 'types';
 import { formatDateTime, formatLocalDateTime } from 'utils';
 
-const NTPStatus: FC = () => {
+export const isNtpActive = ({ status }: NTPStatus) => status === NTPSyncStatus.NTP_ACTIVE;
-  const { data: data, send: loadData, error } = useRequest(NTPApi.readNTPStatus);
+export const isNtpEnabled = ({ status }: NTPStatus) => status !== NTPSyncStatus.NTP_DISABLED;
 
-  const [localTime, setLocalTime] = useState<string>('');
+export const ntpStatusHighlight = ({ status }: NTPStatus, theme: Theme) => {
-  const [settingTime, setSettingTime] = useState<boolean>(false);
-  const [processing, setProcessing] = useState<boolean>(false);
-
-  const { LL } = useI18nContext();
-
-  const { send: updateTime } = useRequest((local_time) => NTPApi.updateTime(local_time), {
-    immediate: false
-  });
-
-  NTPApi.updateTime;
-
-  const isNtpActive = ({ status }: NTPStatusType) => status === NTPSyncStatus.NTP_ACTIVE;
-  const isNtpEnabled = ({ status }: NTPStatusType) => status !== NTPSyncStatus.NTP_DISABLED;
-
-  const ntpStatusHighlight = ({ status }: NTPStatusType, theme: Theme) => {
   switch (status) {
     case NTPSyncStatus.NTP_DISABLED:
       return theme.palette.info.main;
@@ -65,7 +51,23 @@ const NTPStatus: FC = () => {
     default:
       return theme.palette.error.main;
   }
-  };
+};
+
+const NTPStatusForm: FC = () => {
+  const { data: data, send: loadData, error } = useRequest(NTPApi.readNTPStatus);
+
+  const [localTime, setLocalTime] = useState<string>('');
+  const [settingTime, setSettingTime] = useState<boolean>(false);
+  const [processing, setProcessing] = useState<boolean>(false);
+  const { me } = useContext(AuthenticatedContext);
+
+  const { LL } = useI18nContext();
+
+  const { send: updateTime } = useRequest((local_time) => NTPApi.updateTime(local_time), {
+    immediate: false
+  });
+
+  NTPApi.updateTime;
 
   const updateLocalTime = (event: React.ChangeEvent<HTMLInputElement>) => setLocalTime(event.target.value);
 
@@ -76,7 +78,7 @@ const NTPStatus: FC = () => {
 
   const theme = useTheme();
 
-  const ntpStatus = ({ status }: NTPStatusType) => {
+  const ntpStatus = ({ status }: NTPStatus) => {
     switch (status) {
       case NTPSyncStatus.NTP_DISABLED:
         return LL.NOT_ENABLED();
@@ -199,7 +201,7 @@ const NTPStatus: FC = () => {
               </Button>
             </ButtonRow>
           </Box>
-          {data && !isNtpActive(data) && (
+          {me.admin && data && !isNtpActive(data) && (
             <Box flexWrap="nowrap" whiteSpace="nowrap">
               <ButtonRow>
                 <Button onClick={openSetTime} variant="outlined" color="primary" startIcon={<AccessTimeIcon />}>
@@ -214,7 +216,11 @@ const NTPStatus: FC = () => {
     );
   };
 
-  return <SectionContent>{content()}</SectionContent>;
+  return (
+    <SectionContent title={LL.STATUS_OF('NTP')} titleGutter>
+      {content()}
+    </SectionContent>
+  );
 };
 
-export default NTPStatus;
+export default NTPStatusForm;

interface/src/framework/ntp/NetworkTime.tsx

@@ -1,10 +1,12 @@
 import { Tab } from '@mui/material';
+import { useContext } from 'react';
 import { Navigate, Route, Routes } from 'react-router-dom';
-import NTPSettings from './NTPSettings';
+import NTPSettingsForm from './NTPSettingsForm';
-import NTPStatus from './NTPStatus';
+import NTPStatusForm from './NTPStatusForm';
 import type { FC } from 'react';
 
-import { RouterTabs, useLayoutTitle, useRouterTab } from 'components';
+import { RequireAdmin, RouterTabs, useLayoutTitle, useRouterTab } from 'components';
+import { AuthenticatedContext } from 'contexts/authentication';
 
 import { useI18nContext } from 'i18n/i18n-react';
 
@@ -12,18 +14,26 @@ const NetworkTime: FC = () => {
   const { LL } = useI18nContext();
   useLayoutTitle('NTP');
 
+  const authenticatedContext = useContext(AuthenticatedContext);
   const { routerTab } = useRouterTab();
 
   return (
     <>
       <RouterTabs value={routerTab}>
-        <Tab value="settings" label={LL.SETTINGS_OF('NTP')} />
+        <Tab value="/ntp/status" label={LL.STATUS_OF('NTP')} />
-        <Tab value="status" label={LL.STATUS_OF('NTP')} />
+        <Tab value="/ntp/settings" label={LL.SETTINGS_OF('NTP')} disabled={!authenticatedContext.me.admin} />
       </RouterTabs>
       <Routes>
-        <Route path="status" element={<NTPStatus />} />
+        <Route path="status" element={<NTPStatusForm />} />
-        <Route path="settings" element={<NTPSettings />} />
+        <Route
-        <Route path="*" element={<Navigate replace to="settings" />} />
+          path="settings"
+          element={
+            <RequireAdmin>
+              <NTPSettingsForm />
+            </RequireAdmin>
+          }
+        />
+        <Route path="*" element={<Navigate replace to="/ntp/status" />} />
       </Routes>
     </>
   );

interface/src/framework/security/GenerateToken.tsx

@@ -37,8 +37,7 @@ const GenerateToken: FC<GenerateTokenProps> = ({ username, onClose }) => {
     if (open) {
       void generateToken();
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [open, generateToken]);
-  }, [open]);
 
   return (
     <Dialog sx={dialogStyle} onClose={onClose} open={!!username} fullWidth maxWidth="sm">

interface/src/framework/security/ManageUsersForm.tsx

@@ -14,9 +14,9 @@ import { useContext, useState } from 'react';
 
 import { useBlocker } from 'react-router-dom';
 import GenerateToken from './GenerateToken';
-import User from './User';
+import UserForm from './UserForm';
 import type { FC } from 'react';
-import type { SecuritySettingsType, UserType } from 'types';
+import type { SecuritySettings, User } from 'types';
 import * as SecurityApi from 'api/security';
 import { ButtonRow, FormLoader, MessageBox, SectionContent, BlockNavigation } from 'components';
 import { AuthenticatedContext } from 'contexts/authentication';
@@ -24,13 +24,13 @@ import { useI18nContext } from 'i18n/i18n-react';
 import { useRest } from 'utils';
 import { createUserValidator } from 'validators';
 
-const ManageUsers: FC = () => {
+const ManageUsersForm: FC = () => {
-  const { loadData, saveData, saving, data, updateDataValue, errorMessage } = useRest<SecuritySettingsType>({
+  const { loadData, saveData, saving, data, updateDataValue, errorMessage } = useRest<SecuritySettings>({
     read: SecurityApi.readSecuritySettings,
     update: SecurityApi.updateSecuritySettings
   });
 
-  const [user, setUser] = useState<UserType>();
+  const [user, setUser] = useState<User>();
   const [creating, setCreating] = useState<boolean>(false);
   const [changed, setChanged] = useState<number>(0);
   const [generatingToken, setGeneratingToken] = useState<string>();
@@ -86,7 +86,7 @@ const ManageUsers: FC = () => {
 
     const noAdminConfigured = () => !data.users.find((u) => u.admin);
 
-    const removeUser = (toRemove: UserType) => {
+    const removeUser = (toRemove: User) => {
       const users = data.users.filter((u) => u.username !== toRemove.username);
       updateDataValue({ ...data, users });
       setChanged(changed + 1);
@@ -101,7 +101,7 @@ const ManageUsers: FC = () => {
       });
     };
 
-    const editUser = (toEdit: UserType) => {
+    const editUser = (toEdit: User) => {
       setCreating(false);
       setUser({ ...toEdit });
     };
@@ -219,7 +219,7 @@ const ManageUsers: FC = () => {
         </Box>
 
         <GenerateToken username={generatingToken} onClose={closeGenerateToken} />
-        <User
+        <UserForm
           user={user}
           setUser={setUser}
           creating={creating}
@@ -232,11 +232,11 @@ const ManageUsers: FC = () => {
   };
 
   return (
-    <SectionContent>
+    <SectionContent title={LL.MANAGE_USERS()} titleGutter>
       {blocker ? <BlockNavigation blocker={blocker} /> : null}
       {content()}
     </SectionContent>
   );
 };
 
-export default ManageUsers;
+export default ManageUsersForm;

interface/src/framework/security/Security.tsx

@@ -1,7 +1,7 @@
 import { Tab } from '@mui/material';
 import { Navigate, Routes, Route } from 'react-router-dom';
-import ManageUsers from './ManageUsers';
+import ManageUsersForm from './ManageUsersForm';
-import SecuritySettings from './SecuritySettings';
+import SecuritySettingsForm from './SecuritySettingsForm';
 import type { FC } from 'react';
 
 import { RouterTabs, useRouterTab, useLayoutTitle } from 'components';
@@ -17,13 +17,13 @@ const Security: FC = () => {
   return (
     <>
       <RouterTabs value={routerTab}>
-        <Tab value="settings" label={LL.SETTINGS_OF(LL.SECURITY(1))} />
+        <Tab value="/security/users" label={LL.MANAGE_USERS()} />
-        <Tab value="users" label={LL.MANAGE_USERS()} />
+        <Tab value="/security/settings" label={LL.SETTINGS_OF(LL.SECURITY(1))} />
       </RouterTabs>
       <Routes>
-        <Route path="users" element={<ManageUsers />} />
+        <Route path="users" element={<ManageUsersForm />} />
-        <Route path="settings" element={<SecuritySettings />} />
+        <Route path="settings" element={<SecuritySettingsForm />} />
-        <Route path="*" element={<Navigate replace to="settings" />} />
+        <Route path="*" element={<Navigate replace to="/security/users" />} />
       </Routes>
     </>
   );

interface/src/framework/security/SecuritySettingsForm.tsx

@@ -5,16 +5,16 @@ import { useContext, useState } from 'react';
 import type { ValidateFieldsError } from 'async-validator';
 import type { FC } from 'react';
 
-import type { SecuritySettingsType } from 'types';
+import type { SecuritySettings } from 'types';
 import * as SecurityApi from 'api/security';
 import { ButtonRow, FormLoader, MessageBox, SectionContent, ValidatedPasswordField, BlockNavigation } from 'components';
-
 import { AuthenticatedContext } from 'contexts/authentication';
+
 import { useI18nContext } from 'i18n/i18n-react';
 import { updateValueDirty, useRest } from 'utils';
 import { SECURITY_SETTINGS_VALIDATOR, validate } from 'validators';
 
-const SecuritySettings: FC = () => {
+const SecuritySettingsForm: FC = () => {
   const { LL } = useI18nContext();
 
   const [fieldErrors, setFieldErrors] = useState<ValidateFieldsError>();
@@ -29,7 +29,7 @@ const SecuritySettings: FC = () => {
     blocker,
     saveData,
     errorMessage
-  } = useRest<SecuritySettingsType>({
+  } = useRest<SecuritySettings>({
     read: SecurityApi.readSecuritySettings,
     update: SecurityApi.updateSecuritySettings
   });
@@ -96,11 +96,11 @@ const SecuritySettings: FC = () => {
   };
 
   return (
-    <SectionContent>
+    <SectionContent title={LL.SETTINGS_OF(LL.SECURITY(1))} titleGutter>
       {blocker ? <BlockNavigation blocker={blocker} /> : null}
       {content()}
     </SectionContent>
   );
 };
 
-export default SecuritySettings;
+export default SecuritySettingsForm;

interface/src/framework/security/UserForm.tsx

@@ -8,7 +8,7 @@ import type Schema from 'async-validator';
 import type { ValidateFieldsError } from 'async-validator';
 import type { FC } from 'react';
 
-import type { UserType } from 'types';
+import type { User } from 'types';
 import { dialogStyle } from 'CustomTheme';
 import { BlockFormControlLabel, ValidatedPasswordField, ValidatedTextField } from 'components';
 import { useI18nContext } from 'i18n/i18n-react';
@@ -19,14 +19,14 @@ interface UserFormProps {
   creating: boolean;
   validator: Schema;
 
-  user?: UserType;
+  user?: User;
-  setUser: React.Dispatch<React.SetStateAction<UserType | undefined>>;
+  setUser: React.Dispatch<React.SetStateAction<User | undefined>>;
 
   onDoneEditing: () => void;
   onCancelEditing: () => void;
 }
 
-const User: FC<UserFormProps> = ({ creating, validator, user, setUser, onDoneEditing, onCancelEditing }) => {
+const UserForm: FC<UserFormProps> = ({ creating, validator, user, setUser, onDoneEditing, onCancelEditing }) => {
   const { LL } = useI18nContext();
 
   const updateFormValue = updateValue(setUser);
@@ -104,4 +104,4 @@ const User: FC<UserFormProps> = ({ creating, validator, user, setUser, onDoneEdi
   );
 };
 
-export default User;
+export default UserForm;

interface/src/framework/system/ESPSystemStatus.tsx

@@ -1,154 +0,0 @@
-import AppsIcon from '@mui/icons-material/Apps';
-import DeveloperBoardIcon from '@mui/icons-material/DeveloperBoard';
-import DevicesIcon from '@mui/icons-material/Devices';
-import FolderIcon from '@mui/icons-material/Folder';
-import MemoryIcon from '@mui/icons-material/Memory';
-import RefreshIcon from '@mui/icons-material/Refresh';
-import SdCardAlertIcon from '@mui/icons-material/SdCardAlert';
-import SdStorageIcon from '@mui/icons-material/SdStorage';
-import { Avatar, Box, Button, Divider, List, ListItem, ListItemAvatar, ListItemText } from '@mui/material';
-
-import { useRequest } from 'alova';
-import type { FC } from 'react';
-
-import * as SystemApi from 'api/system';
-import { ButtonRow, FormLoader, SectionContent, useLayoutTitle } from 'components';
-import { useI18nContext } from 'i18n/i18n-react';
-
-function formatNumber(num: number) {
-  return new Intl.NumberFormat().format(num);
-}
-
-const ESPSystemStatus: FC = () => {
-  const { LL } = useI18nContext();
-
-  useLayoutTitle(LL.STATUS_OF('ESP32'));
-
-  const { data: data, send: loadData, error } = useRequest(SystemApi.readESPSystemStatus, { force: true });
-
-  const content = () => {
-    if (!data) {
-      return <FormLoader onRetry={loadData} errorMessage={error?.message} />;
-    }
-
-    return (
-      <>
-        <List>
-          <ListItem>
-            <ListItemAvatar>
-              <Avatar sx={{ bgcolor: '#5f9a5f', color: 'white' }}>
-                <DevicesIcon />
-              </Avatar>
-            </ListItemAvatar>
-            <ListItemText primary="SDK" secondary={data.arduino_version + ' / ESP-IDF ' + data.sdk_version} />
-          </ListItem>
-          <Divider variant="inset" component="li" />
-          <ListItem>
-            <ListItemAvatar>
-              <Avatar sx={{ bgcolor: '#5f9a5f', color: 'white' }}>
-                <DeveloperBoardIcon />
-              </Avatar>
-            </ListItemAvatar>
-            <ListItemText
-              primary="CPU"
-              secondary={
-                data.esp_platform +
-                '/' +
-                data.cpu_type +
-                ' (rev.' +
-                data.cpu_rev +
-                ', ' +
-                (data.cpu_cores == 1 ? 'single-core)' : 'dual-core)') +
-                ' @ ' +
-                data.cpu_freq_mhz +
-                ' Mhz'
-              }
-            />
-          </ListItem>
-          <Divider variant="inset" component="li" />
-          <ListItem>
-            <ListItemAvatar>
-              <Avatar sx={{ bgcolor: '#5f9a5f', color: 'white' }}>
-                <MemoryIcon />
-              </Avatar>
-            </ListItemAvatar>
-            <ListItemText
-              primary={LL.HEAP()}
-              secondary={formatNumber(data.free_heap) + ' KB / ' + formatNumber(data.max_alloc_heap) + ' KB '}
-            />
-          </ListItem>
-          {data.psram_size !== undefined && data.free_psram !== undefined && (
-            <>
-              <Divider variant="inset" component="li" />
-              <ListItem>
-                <ListItemAvatar>
-                  <Avatar sx={{ bgcolor: '#5f9a5f', color: 'white' }}>
-                    <AppsIcon />
-                  </Avatar>
-                </ListItemAvatar>
-                <ListItemText
-                  primary={LL.PSRAM()}
-                  secondary={formatNumber(data.psram_size) + ' KB / ' + formatNumber(data.free_psram) + ' KB'}
-                />
-              </ListItem>
-            </>
-          )}
-          <Divider variant="inset" component="li" />
-          <ListItem>
-            <ListItemAvatar>
-              <Avatar sx={{ bgcolor: '#5f9a5f', color: 'white' }}>
-                <SdStorageIcon />
-              </Avatar>
-            </ListItemAvatar>
-            <ListItemText
-              primary={LL.FLASH()}
-              secondary={
-                formatNumber(data.flash_chip_size) + ' KB / ' + (data.flash_chip_speed / 1000000).toFixed(0) + ' MHz'
-              }
-            />
-          </ListItem>
-          <Divider variant="inset" component="li" />
-          <ListItem>
-            <ListItemAvatar>
-              <Avatar sx={{ bgcolor: '#5f9a5f', color: 'white' }}>
-                <SdCardAlertIcon />
-              </Avatar>
-            </ListItemAvatar>
-            <ListItemText
-              primary={LL.APPSIZE()}
-              secondary={
-                data.partition + ': ' + formatNumber(data.app_used) + ' KB / ' + formatNumber(data.app_free) + ' KB'
-              }
-            />
-          </ListItem>
-          <Divider variant="inset" component="li" />
-          <ListItem>
-            <ListItemAvatar>
-              <Avatar sx={{ bgcolor: '#5f9a5f', color: 'white' }}>
-                <FolderIcon />
-              </Avatar>
-            </ListItemAvatar>
-            <ListItemText
-              primary={LL.FILESYSTEM()}
-              secondary={formatNumber(data.fs_used) + ' KB / ' + formatNumber(data.fs_free) + ' KB'}
-            />
-          </ListItem>
-          <Divider variant="inset" component="li" />
-        </List>
-        <Box display="flex" flexWrap="wrap">
-          <Box flexGrow={1} sx={{ '& button': { mt: 2 } }}>
-            <ButtonRow>
-              <Button startIcon={<RefreshIcon />} variant="outlined" color="secondary" onClick={loadData}>
-                {LL.REFRESH()}
-              </Button>
-            </ButtonRow>
-          </Box>
-        </Box>
-      </>
-    );
-  };
-
-  return <SectionContent>{content()}</SectionContent>;
-};
-
-export default ESPSystemStatus;

interface/src/framework/system/OTASettingsForm.tsx

@@ -5,7 +5,7 @@ import { useState } from 'react';
 import type { ValidateFieldsError } from 'async-validator';
 import type { FC } from 'react';
 
-import type { OTASettingsType } from 'types';
+import type { OTASettings } from 'types';
 import * as SystemApi from 'api/system';
 import {
   BlockFormControlLabel,
@@ -14,8 +14,7 @@ import {
   SectionContent,
   ValidatedPasswordField,
   ValidatedTextField,
-  BlockNavigation,
+  BlockNavigation
-  useLayoutTitle
 } from 'components';
 
 import { useI18nContext } from 'i18n/i18n-react';
@@ -24,7 +23,7 @@ import { numberValue, updateValueDirty, useRest } from 'utils';
 import { validate } from 'validators';
 import { OTA_SETTINGS_VALIDATOR } from 'validators/system';
 
-const OTASettings: FC = () => {
+const OTASettingsForm: FC = () => {
   const {
     loadData,
     saveData,
@@ -36,7 +35,7 @@ const OTASettings: FC = () => {
     setDirtyFlags,
     blocker,
     errorMessage
-  } = useRest<OTASettingsType>({
+  } = useRest<OTASettings>({
     read: SystemApi.readOTASettings,
     update: SystemApi.updateOTASettings
   });
@@ -62,8 +61,6 @@ const OTASettings: FC = () => {
       }
     };
 
-    useLayoutTitle('OTA');
-
     return (
       <>
         <BlockFormControlLabel
@@ -120,11 +117,11 @@ const OTASettings: FC = () => {
   };
 
   return (
-    <SectionContent>
+    <SectionContent title={LL.SETTINGS_OF('OTA')} titleGutter>
       {blocker ? <BlockNavigation blocker={blocker} /> : null}
       {content()}
     </SectionContent>
   );
 };
 
-export default OTASettings;
+export default OTASettingsForm;

interface/src/framework/system/System.tsx

@@ -1,42 +1,53 @@
 import { Tab } from '@mui/material';
-import { useContext, type FC } from 'react';
+import { useContext } from 'react';
 import { Navigate, Routes, Route } from 'react-router-dom';
+import OTASettingsForm from './OTASettingsForm';
 import SystemLog from './SystemLog';
-import SystemStatus from './SystemStatus';
+import SystemStatusForm from './SystemStatusForm';
+import UploadFileForm from './UploadFileForm';
+import type { FC } from 'react';
 
 import { useRouterTab, RouterTabs, useLayoutTitle, RequireAdmin } from 'components';
-
 import { AuthenticatedContext } from 'contexts/authentication';
+
 import { useI18nContext } from 'i18n/i18n-react';
-import SystemActivity from 'project/SystemActivity';
 
 const System: FC = () => {
   const { LL } = useI18nContext();
 
   useLayoutTitle(LL.SYSTEM(0));
 
-  const { routerTab } = useRouterTab();
   const { me } = useContext(AuthenticatedContext);
+  const { routerTab } = useRouterTab();
 
   return (
     <>
       <RouterTabs value={routerTab}>
-        <Tab value="status" label={LL.STATUS_OF('')} />
+        <Tab value="/system/status" label={LL.STATUS_OF(LL.SYSTEM(1))} />
-        <Tab value="activity" label={LL.ACTIVITY()} />
+        <Tab value="/system/log" label={LL.LOG_OF(LL.SYSTEM(2))} />
-        <Tab disabled={!me.admin} value="log" label={me.admin ? LL.LOG_OF('') : ''} />
+        <Tab value="/system/ota" label={LL.SETTINGS_OF('OTA')} disabled={!me.admin} />
+        <Tab value="/system/upload" label={LL.UPLOAD_DOWNLOAD()} disabled={!me.admin} />
       </RouterTabs>
       <Routes>
-        <Route path="status" element={<SystemStatus />} />
+        <Route path="status" element={<SystemStatusForm />} />
-        <Route path="activity" element={<SystemActivity />} />
+        <Route path="log" element={<SystemLog />} />
         <Route
-          path="log"
+          path="ota"
           element={
             <RequireAdmin>
-              <SystemLog />
+              <OTASettingsForm />
             </RequireAdmin>
           }
         />
-        <Route path="*" element={<Navigate replace to="status" />} />
+        <Route
+          path="upload"
+          element={
+            <RequireAdmin>
+              <UploadFileForm />
+            </RequireAdmin>
+          }
+        />
+        <Route path="*" element={<Navigate replace to="/system/status" />} />
       </Routes>
     </>
   );

interface/src/framework/system/SystemLog.tsx

@@ -11,7 +11,7 @@ import { addAccessTokenParameter } from 'api/authentication';
 import { EVENT_SOURCE_ROOT } from 'api/endpoints';
 import * as SystemApi from 'api/system';
 
-import { SectionContent, FormLoader, BlockFormControlLabel, BlockNavigation, useLayoutTitle } from 'components';
+import { SectionContent, FormLoader, BlockFormControlLabel, BlockNavigation } from 'components';
 
 import { useI18nContext } from 'i18n/i18n-react';
 import { LogLevel } from 'types';
@@ -50,8 +50,6 @@ const levelLabel = (level: LogLevel) => {
 const SystemLog: FC = () => {
   const { LL } = useI18nContext();
 
-  useLayoutTitle(LL.LOG_OF(''));
-
   const { loadData, data, updateDataValue, origData, dirtyFlags, setDirtyFlags, blocker, saveData, errorMessage } =
     useRest<LogSettings>({
       read: SystemApi.readLogSettings,
@@ -234,7 +232,7 @@ const SystemLog: FC = () => {
   };
 
   return (
-    <SectionContent id="log-window">
+    <SectionContent title={LL.LOG_OF(LL.SYSTEM(2))} titleGutter id="log-window">
       {blocker ? <BlockNavigation blocker={blocker} /> : null}
       {content()}
     </SectionContent>

interface/src/framework/system/SystemStatus.tsx

@@ -1,297 +0,0 @@
-import AccessTimeIcon from '@mui/icons-material/AccessTime';
-import BuildIcon from '@mui/icons-material/Build';
-import CancelIcon from '@mui/icons-material/Cancel';
-import CastIcon from '@mui/icons-material/Cast';
-import DeviceHubIcon from '@mui/icons-material/DeviceHub';
-import DirectionsBusIcon from '@mui/icons-material/DirectionsBus';
-import MemoryIcon from '@mui/icons-material/Memory';
-import PermScanWifiIcon from '@mui/icons-material/PermScanWifi';
-import RefreshIcon from '@mui/icons-material/Refresh';
-import SettingsInputAntennaIcon from '@mui/icons-material/SettingsInputAntenna';
-import TimerIcon from '@mui/icons-material/Timer';
-
-import {
-  Avatar,
-  Box,
-  Button,
-  Dialog,
-  DialogActions,
-  DialogContent,
-  DialogTitle,
-  Divider,
-  List,
-  ListItem,
-  ListItemAvatar,
-  ListItemText,
-  useTheme
-} from '@mui/material';
-
-import { useRequest } from 'alova';
-import { useContext, type FC, useState } from 'react';
-
-import { toast } from 'react-toastify';
-import { dialogStyle } from 'CustomTheme';
-import * as SystemApi from 'api/system';
-import { FormLoader, SectionContent, useLayoutTitle } from 'components';
-import ListMenuItem from 'components/layout/ListMenuItem';
-import { AuthenticatedContext } from 'contexts/authentication';
-import { useI18nContext } from 'i18n/i18n-react';
-import * as EMSESP from 'project/api';
-import { busConnectionStatus } from 'project/types';
-import { NTPSyncStatus } from 'types';
-
-const SystemStatus: FC = () => {
-  const { LL } = useI18nContext();
-
-  useLayoutTitle(LL.STATUS_OF(''));
-
-  const { me } = useContext(AuthenticatedContext);
-
-  const [confirmScan, setConfirmScan] = useState<boolean>(false);
-
-  const { data: data, send: loadData, error } = useRequest(SystemApi.readSystemStatus, { force: true });
-
-  const { send: scanDevices } = useRequest(EMSESP.scanDevices, {
-    immediate: false
-  });
-
-  const theme = useTheme();
-
-  const formatDurationSec = (duration_sec: number) => {
-    const days = Math.trunc((duration_sec * 1000) / 86400000);
-    const hours = Math.trunc((duration_sec * 1000) / 3600000) % 24;
-    const minutes = Math.trunc((duration_sec * 1000) / 60000) % 60;
-    const seconds = Math.trunc((duration_sec * 1000) / 1000) % 60;
-
-    let formatted = '';
-    if (days) {
-      formatted += LL.NUM_DAYS({ num: days }) + ' ';
-    }
-    if (hours) {
-      formatted += LL.NUM_HOURS({ num: hours }) + ' ';
-    }
-    if (minutes) {
-      formatted += LL.NUM_MINUTES({ num: minutes }) + ' ';
-    }
-    formatted += LL.NUM_SECONDS({ num: seconds });
-    return formatted;
-  };
-
-  function formatNumber(num: number) {
-    return new Intl.NumberFormat().format(num);
-  }
-
-  const busStatus = () => {
-    if (data) {
-      switch (data.status) {
-        case busConnectionStatus.BUS_STATUS_CONNECTED:
-          return LL.CONNECTED(0) + ' (' + formatDurationSec(data.bus_uptime) + ')';
-        case busConnectionStatus.BUS_STATUS_TX_ERRORS:
-          return LL.TX_ISSUES();
-        case busConnectionStatus.BUS_STATUS_OFFLINE:
-          return LL.DISCONNECTED();
-      }
-    }
-    return 'Unknown';
-  };
-
-  const busStatusHighlight = () => {
-    switch (data.status) {
-      case busConnectionStatus.BUS_STATUS_TX_ERRORS:
-        return theme.palette.warning.main;
-      case busConnectionStatus.BUS_STATUS_CONNECTED:
-        return theme.palette.success.main;
-      case busConnectionStatus.BUS_STATUS_OFFLINE:
-        return theme.palette.error.main;
-      default:
-        return theme.palette.warning.main;
-    }
-  };
-
-  const ntpStatus = () => {
-    switch (data.ntp_status) {
-      case NTPSyncStatus.NTP_DISABLED:
-        return LL.NOT_ENABLED();
-      case NTPSyncStatus.NTP_INACTIVE:
-        return LL.INACTIVE(0);
-      case NTPSyncStatus.NTP_ACTIVE:
-        return LL.ACTIVE();
-      default:
-        return LL.UNKNOWN();
-    }
-  };
-
-  const ntpStatusHighlight = () => {
-    switch (data.ntp_status) {
-      case NTPSyncStatus.NTP_DISABLED:
-        return theme.palette.info.main;
-      case NTPSyncStatus.NTP_INACTIVE:
-        return theme.palette.error.main;
-      case NTPSyncStatus.NTP_ACTIVE:
-        return theme.palette.success.main;
-      default:
-        return theme.palette.error.main;
-    }
-  };
-
-  const activeHighlight = (value: boolean) => (value ? theme.palette.success.main : theme.palette.info.main);
-
-  const scan = async () => {
-    await scanDevices()
-      .then(() => {
-        toast.info(LL.SCANNING() + '...');
-      })
-      .catch((err) => {
-        toast.error(err.message);
-      });
-    setConfirmScan(false);
-  };
-
-  const renderScanDialog = () => (
-    <Dialog sx={dialogStyle} open={confirmScan} onClose={() => setConfirmScan(false)}>
-      <DialogTitle>{LL.SCAN_DEVICES()}</DialogTitle>
-      <DialogContent dividers>{LL.EMS_SCAN()}</DialogContent>
-      <DialogActions>
-        <Button startIcon={<CancelIcon />} variant="outlined" onClick={() => setConfirmScan(false)} color="secondary">
-          {LL.CANCEL()}
-        </Button>
-        <Button startIcon={<PermScanWifiIcon />} variant="outlined" onClick={scan} color="primary">
-          {LL.SCAN()}
-        </Button>
-      </DialogActions>
-    </Dialog>
-  );
-
-  const content = () => {
-    if (!data) {
-      return <FormLoader onRetry={loadData} errorMessage={error?.message} />;
-    }
-
-    return (
-      <>
-        <List>
-          <ListItem>
-            <ListItemAvatar>
-              <Avatar sx={{ bgcolor: busStatusHighlight(), color: 'white' }}>
-                <DirectionsBusIcon />
-              </Avatar>
-            </ListItemAvatar>
-            <ListItemText primary={LL.EMS_BUS_STATUS()} secondary={busStatus()} />
-          </ListItem>
-          <Divider variant="inset" component="li" />
-
-          <ListMenuItem
-            disabled={!me.admin}
-            icon={TimerIcon}
-            bgcolor="#c5572c"
-            label={LL.UPTIME()}
-            text={formatDurationSec(data.uptime)}
-          />
-          <Divider variant="inset" component="li" />
-
-          <ListItem>
-            <ListItemAvatar>
-              <Avatar sx={{ bgcolor: '#5d89f7', color: 'white' }}>
-                <DeviceHubIcon />
-              </Avatar>
-            </ListItemAvatar>
-            <ListItemText
-              primary={LL.ACTIVE_DEVICES()}
-              secondary={
-                LL.NUM_DEVICES({ num: data.num_devices }) +
-                ', ' +
-                LL.NUM_TEMP_SENSORS({ num: data.num_sensors }) +
-                ', ' +
-                LL.NUM_ANALOG_SENSORS({ num: data.num_analogs })
-              }
-            />
-            {me.admin && (
-              <Button
-                startIcon={<PermScanWifiIcon />}
-                variant="outlined"
-                color="primary"
-                onClick={() => setConfirmScan(true)}
-              >
-                {LL.SCAN_DEVICES()}
-              </Button>
-            )}
-          </ListItem>
-          <Divider variant="inset" component="li" />
-
-          <ListMenuItem
-            disabled={!me.admin}
-            icon={BuildIcon}
-            bgcolor="#134ba2"
-            label={LL.EMS_ESP_VER()}
-            text={data.emsesp_version}
-            to="/settings/upload"
-          />
-          <Divider variant="inset" component="li" />
-
-          {/* TODO: translate */}
-          <ListMenuItem
-            disabled={!me.admin}
-            icon={MemoryIcon}
-            bgcolor="#68374d"
-            label="System Memory"
-            text={formatNumber(data.free_heap) + ' KB'}
-            to="/settings/espsystemstatus"
-          />
-          <Divider variant="inset" component="li" />
-
-          <ListMenuItem
-            disabled={!me.admin}
-            icon={DeviceHubIcon}
-            bgcolor={activeHighlight(data.mqtt_status)}
-            label={LL.STATUS_OF('MQTT')}
-            text={data.mqtt_status ? LL.ACTIVE() : LL.INACTIVE(0)}
-            to="/settings/mqtt/status"
-          />
-          <Divider variant="inset" component="li" />
-
-          <ListMenuItem
-            disabled={!me.admin}
-            icon={AccessTimeIcon}
-            bgcolor={ntpStatusHighlight()}
-            label={LL.STATUS_OF('NTP')}
-            text={ntpStatus()}
-            to="/settings/ntp/status"
-          />
-          <Divider variant="inset" component="li" />
-
-          <ListMenuItem
-            disabled={!me.admin}
-            icon={CastIcon}
-            bgcolor={activeHighlight(data.ota_status)}
-            label={LL.STATUS_OF('OTA')}
-            text={data.ota_status ? LL.ACTIVE() : LL.INACTIVE(0)}
-            to="/settings/ota"
-          />
-          <Divider variant="inset" component="li" />
-
-          <ListMenuItem
-            disabled={!me.admin}
-            icon={SettingsInputAntennaIcon}
-            bgcolor={activeHighlight(data.ota_status)}
-            label={LL.ACCESS_POINT(0)}
-            text={data.ap_status ? LL.ACTIVE() : LL.INACTIVE(0)}
-            to="/settings/ap/status"
-          />
-          <Divider variant="inset" component="li" />
-        </List>
-
-        {renderScanDialog()}
-
-        <Box mt={2} display="flex" flexWrap="wrap">
-          <Button startIcon={<RefreshIcon />} variant="outlined" color="secondary" onClick={loadData}>
-            {LL.REFRESH()}
-          </Button>
-        </Box>
-      </>
-    );
-  };
-
-  return <SectionContent>{content()}</SectionContent>;
-};
-
-export default SystemStatus;

interface/src/framework/system/SystemStatusForm.tsx

@@ -0,0 +1,363 @@
+import AppsIcon from '@mui/icons-material/Apps';
+import BuildIcon from '@mui/icons-material/Build';
+import CancelIcon from '@mui/icons-material/Cancel';
+import DeveloperBoardIcon from '@mui/icons-material/DeveloperBoard';
+import DevicesIcon from '@mui/icons-material/Devices';
+import FolderIcon from '@mui/icons-material/Folder';
+import MemoryIcon from '@mui/icons-material/Memory';
+import PowerSettingsNewIcon from '@mui/icons-material/PowerSettingsNew';
+import RefreshIcon from '@mui/icons-material/Refresh';
+import SdCardAlertIcon from '@mui/icons-material/SdCardAlert';
+import SdStorageIcon from '@mui/icons-material/SdStorage';
+import SettingsBackupRestoreIcon from '@mui/icons-material/SettingsBackupRestore';
+import TimerIcon from '@mui/icons-material/Timer';
+import {
+  Avatar,
+  Box,
+  Button,
+  Dialog,
+  DialogActions,
+  DialogContent,
+  DialogTitle,
+  Divider,
+  List,
+  ListItem,
+  ListItemAvatar,
+  ListItemText
+} from '@mui/material';
+
+import { useRequest } from 'alova';
+import { useContext, useState } from 'react';
+import { toast } from 'react-toastify';
+import { FeaturesContext } from '../../contexts/features';
+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';
+import { useI18nContext } from 'i18n/i18n-react';
+
+function formatNumber(num: number) {
+  return new Intl.NumberFormat().format(num);
+}
+
+const SystemStatusForm: FC = () => {
+  const { LL } = useI18nContext();
+
+  const { me } = useContext(AuthenticatedContext);
+  const [confirmRestart, setConfirmRestart] = useState<boolean>(false);
+  const [confirmFactoryReset, setConfirmFactoryReset] = useState<boolean>(false);
+  const [processing, setProcessing] = useState<boolean>(false);
+  const [restarting, setRestarting] = useState<boolean>();
+  const [versionDialogOpen, setVersionDialogOpen] = useState<boolean>(false);
+
+  const { features } = useContext(FeaturesContext);
+
+  const { send: restartCommand } = useRequest(SystemApi.restart(), {
+    immediate: false
+  });
+
+  const { send: factoryResetCommand } = useRequest(SystemApi.factoryReset(), {
+    immediate: false
+  });
+
+  const { send: partitionCommand } = useRequest(SystemApi.partition(), {
+    immediate: false
+  });
+
+  const { data: data, send: loadData, error } = useRequest(SystemApi.readSystemStatus, { force: true });
+
+  const restart = async () => {
+    setProcessing(true);
+    await restartCommand()
+      .then(() => {
+        setRestarting(true);
+      })
+      .catch((err) => {
+        toast.error(err.message);
+      })
+      .finally(() => {
+        setConfirmRestart(false);
+        setProcessing(false);
+      });
+  };
+
+  const factoryReset = async () => {
+    setProcessing(true);
+    await factoryResetCommand()
+      .then(() => {
+        setRestarting(true);
+      })
+      .catch((err) => {
+        toast.error(err.message);
+      })
+      .finally(() => {
+        setConfirmFactoryReset(false);
+        setProcessing(false);
+      });
+  };
+
+  const partition = async () => {
+    setProcessing(true);
+    await partitionCommand()
+      .then(() => {
+        setRestarting(true);
+      })
+      .catch((err) => {
+        toast.error(err.message);
+      })
+      .finally(() => {
+        setConfirmRestart(false);
+        setProcessing(false);
+      });
+  };
+
+  const renderRestartDialog = () => (
+    <Dialog sx={dialogStyle} open={confirmRestart} onClose={() => setConfirmRestart(false)}>
+      <DialogTitle>{LL.RESTART()}</DialogTitle>
+      <DialogContent dividers>{LL.RESTART_CONFIRM()}</DialogContent>
+      <DialogActions>
+        <Button
+          startIcon={<CancelIcon />}
+          variant="outlined"
+          onClick={() => setConfirmRestart(false)}
+          disabled={processing}
+          color="secondary"
+        >
+          {LL.CANCEL()}
+        </Button>
+        <Button
+          startIcon={<PowerSettingsNewIcon />}
+          variant="outlined"
+          onClick={restart}
+          disabled={processing}
+          color="primary"
+        >
+          {LL.RESTART()}
+        </Button>
+        {data?.has_loader && (
+          <Button
+            startIcon={<PowerSettingsNewIcon />}
+            variant="outlined"
+            onClick={partition}
+            disabled={processing}
+            color="primary"
+          >
+            EMS-ESP-Loader
+          </Button>
+        )}
+      </DialogActions>
+    </Dialog>
+  );
+
+  const renderFactoryResetDialog = () => (
+    <Dialog sx={dialogStyle} open={confirmFactoryReset} onClose={() => setConfirmFactoryReset(false)}>
+      <DialogTitle>{LL.FACTORY_RESET()}</DialogTitle>
+      <DialogContent dividers>{LL.SYSTEM_FACTORY_TEXT_DIALOG()}</DialogContent>
+      <DialogActions>
+        <Button
+          startIcon={<CancelIcon />}
+          variant="outlined"
+          onClick={() => setConfirmFactoryReset(false)}
+          disabled={processing}
+          color="secondary"
+        >
+          {LL.CANCEL()}
+        </Button>
+        <Button
+          startIcon={<SettingsBackupRestoreIcon />}
+          variant="outlined"
+          onClick={factoryReset}
+          disabled={processing}
+          color="error"
+        >
+          {LL.FACTORY_RESET()}
+        </Button>
+      </DialogActions>
+    </Dialog>
+  );
+
+  const content = () => {
+    if (!data) {
+      return <FormLoader onRetry={loadData} errorMessage={error?.message} />;
+    }
+
+    return (
+      <>
+        <List>
+          <ListItem>
+            <ListItemAvatar>
+              <Avatar>
+                <BuildIcon />
+              </Avatar>
+            </ListItemAvatar>
+            <ListItemText primary={LL.EMS_ESP_VER()} secondary={data.emsesp_version} />
+            <Button color="primary" onClick={() => setVersionDialogOpen(true)}>
+              {LL.VERSION_CHECK(0)}
+            </Button>
+          </ListItem>
+          <Divider variant="inset" component="li" />
+          <ListItem>
+            <ListItemAvatar>
+              <Avatar>
+                <TimerIcon />
+              </Avatar>
+            </ListItemAvatar>
+            <ListItemText primary={LL.UPTIME()} secondary={data.uptime} />
+          </ListItem>
+          <Divider variant="inset" component="li" />
+          <ListItem>
+            <ListItemAvatar>
+              <Avatar>
+                <DevicesIcon />
+              </Avatar>
+            </ListItemAvatar>
+            <ListItemText primary="SDK" secondary={data.arduino_version + ' / ESP-IDF v' + data.sdk_version} />
+          </ListItem>
+          <Divider variant="inset" component="li" />
+          <ListItem>
+            <ListItemAvatar>
+              <Avatar>
+                <DeveloperBoardIcon />
+              </Avatar>
+            </ListItemAvatar>
+            <ListItemText
+              primary="CPU"
+              secondary={
+                data.cpu_type +
+                ' (rev.' +
+                data.cpu_rev +
+                ', ' +
+                (data.cpu_cores == 1 ? 'single-core)' : 'dual-core)') +
+                ' @ ' +
+                data.cpu_freq_mhz +
+                ' Mhz'
+              }
+            />
+          </ListItem>
+          <Divider variant="inset" component="li" />
+          <ListItem>
+            <ListItemAvatar>
+              <Avatar>
+                <MemoryIcon />
+              </Avatar>
+            </ListItemAvatar>
+            <ListItemText
+              primary={LL.HEAP()}
+              secondary={formatNumber(data.free_heap) + ' KB / ' + formatNumber(data.max_alloc_heap) + ' KB '}
+            />
+          </ListItem>
+          {data.psram_size !== undefined && data.free_psram !== undefined && (
+            <>
+              <Divider variant="inset" component="li" />
+              <ListItem>
+                <ListItemAvatar>
+                  <Avatar>
+                    <AppsIcon />
+                  </Avatar>
+                </ListItemAvatar>
+                <ListItemText
+                  primary={LL.PSRAM()}
+                  secondary={formatNumber(data.psram_size) + ' KB / ' + formatNumber(data.free_psram) + ' KB'}
+                />
+              </ListItem>
+            </>
+          )}
+          <Divider variant="inset" component="li" />
+          <ListItem>
+            <ListItemAvatar>
+              <Avatar>
+                <SdStorageIcon />
+              </Avatar>
+            </ListItemAvatar>
+            <ListItemText
+              primary={LL.FLASH()}
+              secondary={
+                formatNumber(data.flash_chip_size) + ' KB / ' + (data.flash_chip_speed / 1000000).toFixed(0) + ' MHz'
+              }
+            />
+          </ListItem>
+          <Divider variant="inset" component="li" />
+          <ListItem>
+            <ListItemAvatar>
+              <Avatar>
+                <SdCardAlertIcon />
+              </Avatar>
+            </ListItemAvatar>
+            <ListItemText
+              primary={LL.APPSIZE()}
+              secondary={
+                data.partition + ': ' + formatNumber(data.app_used) + ' KB / ' + formatNumber(data.app_free) + ' KB'
+              }
+            />
+          </ListItem>
+          <Divider variant="inset" component="li" />
+          <ListItem>
+            <ListItemAvatar>
+              <Avatar>
+                <FolderIcon />
+              </Avatar>
+            </ListItemAvatar>
+            <ListItemText
+              primary={LL.FILESYSTEM()}
+              secondary={formatNumber(data.fs_used) + ' KB / ' + formatNumber(data.fs_free) + ' KB'}
+            />
+          </ListItem>
+          <Divider variant="inset" component="li" />
+        </List>
+        <Box display="flex" flexWrap="wrap">
+          <Box flexGrow={1} sx={{ '& button': { mt: 2 } }}>
+            <ButtonRow>
+              <Button startIcon={<RefreshIcon />} variant="outlined" color="secondary" onClick={loadData}>
+                {LL.REFRESH()}
+              </Button>
+            </ButtonRow>
+          </Box>
+          {me.admin && (
+            <Box flexWrap="nowrap" whiteSpace="nowrap">
+              <ButtonRow>
+                <Button
+                  startIcon={<PowerSettingsNewIcon />}
+                  variant="outlined"
+                  color="primary"
+                  onClick={() => setConfirmRestart(true)}
+                >
+                  {LL.RESTART()}
+                </Button>
+                <Button
+                  startIcon={<SettingsBackupRestoreIcon />}
+                  variant="outlined"
+                  onClick={() => setConfirmFactoryReset(true)}
+                  color="error"
+                >
+                  {LL.FACTORY_RESET()}
+                </Button>
+              </ButtonRow>
+            </Box>
+          )}
+        </Box>
+        {renderRestartDialog()}
+        {renderFactoryResetDialog()}
+      </>
+    );
+  };
+
+  return (
+    <SectionContent title={LL.STATUS_OF(LL.SYSTEM(1))} titleGutter>
+      {restarting ? <RestartMonitor /> : content()}
+      {data && (
+        <SystemStatusVersionDialog
+          open={versionDialogOpen}
+          onClose={() => setVersionDialogOpen(false)}
+          version={data.emsesp_version}
+          platform={features.platform}
+        />
+      )}
+    </SectionContent>
+  );
+};
+
+export default SystemStatusForm;

interface/src/framework/system/SystemStatusVersionDialog.tsx

@@ -0,0 +1,112 @@
+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';
+import { useI18nContext } from 'i18n/i18n-react';
+
+type SystemStatusVersionDialogProps = {
+  open: boolean;
+  onClose: () => void;
+  version: string;
+  platform: string;
+};
+
+const SystemStatusVersionDialog = ({ open, onClose, version, platform }: SystemStatusVersionDialogProps) => {
+  const { LL } = useI18nContext();
+  const { send: getLatestVersion, data: latestVersion } = useRequest(SystemApi.getStableVersion, {
+    immediate: false,
+    force: true
+  });
+  const { send: getLatestDevVersion, data: latestDevVersion } = useRequest(SystemApi.getDevVersion, {
+    immediate: false,
+    force: true
+  });
+
+  const STABLE_URL = 'https://github.com/emsesp/EMS-ESP32/releases/download/';
+  const DEV_URL = 'https://github.com/emsesp/EMS-ESP32/releases/download/latest/';
+
+  const STABLE_RELNOTES_URL = 'https://github.com/emsesp/EMS-ESP32/blob/main/CHANGELOG.md';
+  const DEV_RELNOTES_URL = 'https://github.com/emsesp/EMS-ESP32/blob/dev/CHANGELOG_LATEST.md';
+
+  const uploadURL = window.location.origin + '/system/upload';
+
+  const connected = latestVersion && latestDevVersion;
+
+  const getVersions = useCallback(async () => {
+    await getLatestVersion();
+    await getLatestDevVersion();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  useEffect(() => {
+    if (open) {
+      void getVersions();
+    }
+  }, [getVersions, open]);
+
+  const getBinURL = (v: string) => 'EMS-ESP-' + v.replaceAll('.', '_') + '-' + platform.replaceAll('-', '_') + '.bin';
+
+  return (
+    <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 + ')'} />
+        {latestVersion && (
+          <Box mt={2} mb={2}>
+            {LL.THE_LATEST()}&nbsp;<b>{LL.OFFICIAL()}</b>&nbsp;{LL.RELEASE_IS()}&nbsp;<b>{latestVersion}</b>
+            &nbsp;(
+            <Link target="_blank" href={STABLE_RELNOTES_URL} color="primary">
+              {LL.RELEASE_NOTES()}
+            </Link>
+            )&nbsp;(
+            <Link
+              target="_blank"
+              href={STABLE_URL + 'v' + latestVersion + '/' + getBinURL(latestVersion)}
+              color="primary"
+            >
+              {LL.DOWNLOAD(1)}
+            </Link>
+            )
+          </Box>
+        )}
+        {latestDevVersion && (
+          <Box mt={2} mb={2}>
+            {LL.THE_LATEST()}&nbsp;<b>{LL.DEVELOPMENT()}</b>&nbsp;{LL.RELEASE_IS()}&nbsp;
+            <b>{latestDevVersion}</b>
+            &nbsp;(
+            <Link target="_blank" href={DEV_RELNOTES_URL} color="primary">
+              {LL.RELEASE_NOTES()}
+            </Link>
+            )&nbsp;(
+            <Link target="_blank" href={DEV_URL + getBinURL(latestDevVersion)} color="primary">
+              {LL.DOWNLOAD(1)}
+            </Link>
+            )
+          </Box>
+        )}
+        {connected && (
+          <Box color="warning.main" mt={2}>
+            <Typography variant="body2">
+              {LL.USE()}&nbsp;
+              <Link href={uploadURL} color="primary">
+                {LL.UPLOAD()}
+              </Link>
+              &nbsp;{LL.SYSTEM_APPLY_FIRMWARE()}
+            </Typography>
+          </Box>
+        )}
+        {!connected && <MessageBox my={2} level="warning" message="No internet connection" />}
+      </DialogContent>
+      <DialogActions>
+        <Button variant="outlined" onClick={onClose} color="secondary">
+          {LL.CLOSE()}
+        </Button>
+      </DialogActions>
+    </Dialog>
+  );
+};
+
+export default SystemStatusVersionDialog;

interface/src/framework/system/UploadDownload.tsx

@@ -1,308 +0,0 @@
-import DownloadIcon from '@mui/icons-material/GetApp';
-import { Typography, Button, Box, Link } from '@mui/material';
-import { useRequest } from 'alova';
-import { useState, type FC } from 'react';
-import { toast } from 'react-toastify';
-import RestartMonitor from './RestartMonitor';
-
-import * as SystemApi from 'api/system';
-import { FormLoader, SectionContent, SingleUpload, useLayoutTitle } from 'components';
-
-import { useI18nContext } from 'i18n/i18n-react';
-import * as EMSESP from 'project/api';
-
-const UploadDownload: FC = () => {
-  const { LL } = useI18nContext();
-  const [restarting, setRestarting] = useState<boolean>();
-  const [md5, setMd5] = useState<string>();
-
-  const { send: getSettings, onSuccess: onSuccessGetSettings } = useRequest(EMSESP.getSettings(), {
-    immediate: false
-  });
-  const { send: getCustomizations, onSuccess: onSuccessGetCustomizations } = useRequest(EMSESP.getCustomizations(), {
-    immediate: false
-  });
-  const { send: getEntities, onSuccess: onSuccessGetEntities } = useRequest(EMSESP.getEntities(), {
-    immediate: false
-  });
-  const { send: getSchedule, onSuccess: onSuccessGetSchedule } = useRequest(EMSESP.getSchedule(), {
-    immediate: false
-  });
-  const { send: getAPI, onSuccess: onGetAPI } = useRequest((data) => EMSESP.API(data), {
-    immediate: false
-  });
-
-  const { data: data, send: loadData, error } = useRequest(SystemApi.readESPSystemStatus, { force: true });
-
-  const { data: latestVersion } = useRequest(SystemApi.getStableVersion, {
-    immediate: true,
-    force: true
-  });
-
-  const { data: latestDevVersion } = useRequest(SystemApi.getDevVersion, {
-    immediate: true,
-    force: true
-  });
-
-  const STABLE_URL = 'https://github.com/emsesp/EMS-ESP32/releases/download/';
-  const DEV_URL = 'https://github.com/emsesp/EMS-ESP32/releases/download/latest/';
-
-  const STABLE_RELNOTES_URL = 'https://github.com/emsesp/EMS-ESP32/blob/main/CHANGELOG.md';
-  const DEV_RELNOTES_URL = 'https://github.com/emsesp/EMS-ESP32/blob/dev/CHANGELOG_LATEST.md';
-
-  const getBinURL = (v: string) =>
-    'EMS-ESP-' + v.replaceAll('.', '_') + '-' + data.esp_platform.replaceAll('-', '_') + '.bin';
-
-  const {
-    loading: isUploading,
-    uploading: progress,
-    send: sendUpload,
-    onSuccess: onSuccessUpload,
-    abort: cancelUpload
-  } = useRequest(SystemApi.uploadFile, {
-    immediate: false,
-    force: true
-  });
-
-  onSuccessUpload(({ data }: any) => {
-    if (data) {
-      setMd5(data.md5);
-      toast.success(LL.UPLOAD() + ' MD5 ' + LL.SUCCESSFUL());
-    } else {
-      setRestarting(true);
-    }
-  });
-
-  const startUpload = async (files: File[]) => {
-    await sendUpload(files[0]).catch((err) => {
-      if (err.message === 'The user aborted a request') {
-        toast.warning(LL.UPLOAD() + ' ' + LL.ABORTED());
-      } else if (err.message === 'Network Error') {
-        toast.warning('Invalid file extension or incompatible bin file');
-      } else {
-        toast.error(err.message);
-      }
-    });
-  };
-
-  const saveFile = (json: any, endpoint: string) => {
-    const anchor = document.createElement('a');
-    anchor.href = URL.createObjectURL(
-      new Blob([JSON.stringify(json, null, 2)], {
-        type: 'text/plain'
-      })
-    );
-    anchor.download = 'emsesp_' + endpoint;
-    anchor.click();
-    URL.revokeObjectURL(anchor.href);
-    toast.info(LL.DOWNLOAD_SUCCESSFUL());
-  };
-
-  onSuccessGetSettings((event) => {
-    saveFile(event.data, 'settings.json');
-  });
-  onSuccessGetCustomizations((event) => {
-    saveFile(event.data, 'customizations.json');
-  });
-  onSuccessGetEntities((event) => {
-    saveFile(event.data, 'entities.json');
-  });
-  onSuccessGetSchedule((event) => {
-    saveFile(event.data, 'schedule.json');
-  });
-  onGetAPI((event) => {
-    saveFile(event.data, event.sendArgs[0].device + '_' + event.sendArgs[0].entity + '.txt');
-  });
-
-  const downloadSettings = async () => {
-    await getSettings().catch((error) => {
-      toast.error(error.message);
-    });
-  };
-
-  const downloadCustomizations = async () => {
-    await getCustomizations().catch((error) => {
-      toast.error(error.message);
-    });
-  };
-
-  const downloadEntities = async () => {
-    await getEntities().catch((error) => {
-      toast.error(error.message);
-    });
-  };
-
-  const downloadSchedule = async () => {
-    await getSchedule()
-      .catch((error) => {
-        toast.error(error.message);
-      })
-      .finally(() => {
-        toast.info(LL.DOWNLOAD_SUCCESSFUL());
-      });
-  };
-
-  const callAPI = async (device: string, entity: string) => {
-    await getAPI({ device, entity, id: 0 }).catch((error) => {
-      toast.error(error.message);
-    });
-  };
-
-  useLayoutTitle(LL.UPLOAD_DOWNLOAD());
-
-  const content = () => {
-    if (!data) {
-      return <FormLoader onRetry={loadData} errorMessage={error?.message} />;
-    }
-
-    return (
-      <>
-        <Typography sx={{ pb: 2 }} variant="h6" color="primary">
-          {LL.EMS_ESP_VER()}
-        </Typography>
-        <Box p={2} border="2px solid grey" borderRadius={2}>
-          {LL.VERSION_ON() + ' '}
-          <b>{data.emsesp_version}</b>&nbsp;({data.esp_platform})
-          {latestVersion && (
-            <Box mt={2}>
-              {LL.THE_LATEST()}&nbsp;{LL.OFFICIAL()}&nbsp;{LL.RELEASE_IS()}&nbsp;<b>{latestVersion}</b>
-              &nbsp;(
-              <Link target="_blank" href={STABLE_RELNOTES_URL} color="primary">
-                {LL.RELEASE_NOTES()}
-              </Link>
-              )&nbsp;(
-              <Link
-                target="_blank"
-                href={STABLE_URL + 'v' + latestVersion + '/' + getBinURL(latestVersion)}
-                color="primary"
-              >
-                {LL.DOWNLOAD(1)}
-              </Link>
-              )
-            </Box>
-          )}
-          {latestDevVersion && (
-            <Box mt={2}>
-              {LL.THE_LATEST()}&nbsp;{LL.DEVELOPMENT()}&nbsp;{LL.RELEASE_IS()}&nbsp;
-              <b>{latestDevVersion}</b>
-              &nbsp;(
-              <Link target="_blank" href={DEV_RELNOTES_URL} color="primary">
-                {LL.RELEASE_NOTES()}
-              </Link>
-              )&nbsp;(
-              <Link target="_blank" href={DEV_URL + getBinURL(latestDevVersion)} color="primary">
-                {LL.DOWNLOAD(1)}
-              </Link>
-              )
-            </Box>
-          )}
-        </Box>
-
-        <Typography sx={{ pt: 2, pb: 2 }} variant="h6" color="primary">
-          {LL.UPLOAD()}
-        </Typography>
-        <Box mb={2} color="warning.main">
-          <Typography variant="body2">
-            {LL.UPLOAD_TEXT()}
-            <br />
-            <br />
-            {LL.RESTART_TEXT(1)}.
-          </Typography>
-        </Box>
-        {md5 && (
-          <Box mb={2}>
-            <Typography variant="body2">{'MD5: ' + md5}</Typography>
-          </Box>
-        )}
-        <SingleUpload onDrop={startUpload} onCancel={cancelUpload} isUploading={isUploading} progress={progress} />
-        {!isUploading && (
-          <>
-            <Typography sx={{ pt: 4, pb: 2 }} variant="h6" color="primary">
-              {LL.DOWNLOAD(0)}
-            </Typography>
-            <Box color="warning.main">
-              <Typography mb={1} variant="body2">
-                {LL.HELP_INFORMATION_4()}
-              </Typography>
-              <Button
-                sx={{ ml: 2 }}
-                startIcon={<DownloadIcon />}
-                variant="outlined"
-                color="primary"
-                onClick={() => callAPI('system', 'info')}
-              >
-                {LL.SUPPORT_INFORMATION(0)}
-              </Button>
-              <Button
-                sx={{ ml: 2 }}
-                startIcon={<DownloadIcon />}
-                variant="outlined"
-                color="primary"
-                onClick={() => callAPI('system', 'allvalues')}
-              >
-                All Values
-              </Button>
-            </Box>
-
-            <Box color="warning.main">
-              <Typography mt={2} mb={1} variant="body2">
-                {LL.DOWNLOAD_SETTINGS_TEXT()}
-              </Typography>
-              <Button
-                sx={{ ml: 2 }}
-                startIcon={<DownloadIcon />}
-                variant="outlined"
-                color="primary"
-                onClick={downloadSettings}
-              >
-                {LL.SETTINGS_OF('')}
-              </Button>
-            </Box>
-
-            <Box color="warning.main">
-              <Typography mt={2} mb={1} variant="body2">
-                {LL.DOWNLOAD_CUSTOMIZATION_TEXT()}
-              </Typography>
-              <Button
-                sx={{ ml: 2 }}
-                startIcon={<DownloadIcon />}
-                variant="outlined"
-                color="primary"
-                onClick={downloadCustomizations}
-              >
-                {LL.CUSTOMIZATIONS()}
-              </Button>
-              <Button
-                sx={{ ml: 2 }}
-                startIcon={<DownloadIcon />}
-                variant="outlined"
-                color="primary"
-                onClick={downloadEntities}
-              >
-                {LL.CUSTOM_ENTITIES(0)}
-              </Button>
-              <Box color="warning.main">
-                <Typography mt={2} mb={1} variant="body2">
-                  {LL.DOWNLOAD_SCHEDULE_TEXT()}
-                </Typography>
-              </Box>
-              <Button
-                sx={{ ml: 2 }}
-                startIcon={<DownloadIcon />}
-                variant="outlined"
-                color="primary"
-                onClick={downloadSchedule}
-              >
-                {LL.SCHEDULE(0)}
-              </Button>
-            </Box>
-          </>
-        )}
-      </>
-    );
-  };
-
-  return <SectionContent>{restarting ? <RestartMonitor /> : content()}</SectionContent>;
-};
-
-export default UploadDownload;

interface/src/framework/system/UploadFileForm.tsx

@@ -0,0 +1,219 @@
+import DownloadIcon from '@mui/icons-material/GetApp';
+import { Typography, Button, Box } from '@mui/material';
+import { useRequest } from 'alova';
+import { useState, type FC } from 'react';
+import { toast } from 'react-toastify';
+import RestartMonitor from './RestartMonitor';
+
+import * as SystemApi from 'api/system';
+import { SectionContent, SingleUpload } from 'components';
+
+import { useI18nContext } from 'i18n/i18n-react';
+import * as EMSESP from 'project/api';
+
+const UploadFileForm: FC = () => {
+  const { LL } = useI18nContext();
+  const [restarting, setRestarting] = useState<boolean>();
+  const [md5, setMd5] = useState<string>();
+
+  const { send: getSettings, onSuccess: onSuccessGetSettings } = useRequest(EMSESP.getSettings(), {
+    immediate: false
+  });
+  const { send: getCustomizations, onSuccess: onSuccessgetCustomizations } = useRequest(EMSESP.getCustomizations(), {
+    immediate: false
+  });
+  const { send: getEntities, onSuccess: onSuccessGetEntities } = useRequest(EMSESP.getEntities(), {
+    immediate: false
+  });
+  const { send: getSchedule, onSuccess: onSuccessGetSchedule } = useRequest(EMSESP.getSchedule(), {
+    immediate: false
+  });
+  const { send: getSystemAPI, onSuccess: onSystemAPI } = useRequest((data) => EMSESP.APIcall('system', data), {
+    immediate: false
+  });
+
+  const {
+    loading: isUploading,
+    uploading: progress,
+    send: sendUpload,
+    onSuccess: onSuccessUpload,
+    abort: cancelUpload
+  } = useRequest(SystemApi.uploadFile, {
+    immediate: false,
+    force: true
+  });
+
+  onSuccessUpload(({ data }: any) => {
+    if (data) {
+      setMd5(data.md5);
+      toast.success(LL.UPLOAD() + ' MD5 ' + LL.SUCCESSFUL());
+    } else {
+      setRestarting(true);
+    }
+  });
+
+  const startUpload = async (files: File[]) => {
+    await sendUpload(files[0]).catch((err) => {
+      if (err.message === 'The user aborted a request') {
+        toast.warning(LL.UPLOAD() + ' ' + LL.ABORTED());
+      } else if (err.message === 'Network Error') {
+        toast.warning('Invalid file extension or incompatible bin file');
+      } else {
+        toast.error(err.message);
+      }
+    });
+  };
+
+  const saveFile = (json: any, endpoint: string) => {
+    const anchor = document.createElement('a');
+    anchor.href = URL.createObjectURL(
+      new Blob([JSON.stringify(json, null, 2)], {
+        type: 'text/plain'
+      })
+    );
+    anchor.download = 'emsesp_' + endpoint;
+    anchor.click();
+    URL.revokeObjectURL(anchor.href);
+    toast.info(LL.DOWNLOAD_SUCCESSFUL());
+  };
+
+  onSuccessGetSettings((event) => {
+    saveFile(event.data, 'settings.json');
+  });
+  onSuccessgetCustomizations((event) => {
+    saveFile(event.data, 'customizations.json');
+  });
+  onSuccessGetEntities((event) => {
+    saveFile(event.data, 'entities.json');
+  });
+  onSuccessGetSchedule((event) => {
+    saveFile(event.data, 'schedule.json');
+  });
+  onSystemAPI((event) => {
+    saveFile(event.data, event.sendArgs[0].entity + '.txt');
+  });
+
+  const downloadSettings = async () => {
+    await getSettings().catch((error) => {
+      toast.error(error.message);
+    });
+  };
+
+  const downloadCustomizations = async () => {
+    await getCustomizations().catch((error) => {
+      toast.error(error.message);
+    });
+  };
+
+  const downloadEntities = async () => {
+    await getEntities().catch((error) => {
+      toast.error(error.message);
+    });
+  };
+
+  const downloadSchedule = async () => {
+    await getSchedule()
+      .catch((error) => {
+        toast.error(error.message);
+      })
+      .finally(() => {
+        toast.info(LL.DOWNLOAD_SUCCESSFUL());
+      });
+  };
+
+  const callSystemAPI = async (entity: string) => {
+    await getSystemAPI({ entity, id: 0 }).catch((error) => {
+      toast.error(error.message);
+    });
+  };
+
+  const content = () => (
+    <>
+      <Typography sx={{ pt: 2, pb: 2 }} variant="h6" color="primary">
+        {LL.UPLOAD()}
+      </Typography>
+      <Box mb={2} color="warning.main">
+        <Typography variant="body2">
+          {LL.UPLOAD_TEXT()}.
+          <br />
+          <br />
+          {LL.RESTART_TEXT(1)}.
+        </Typography>
+      </Box>
+      {md5 && (
+        <Box mb={2}>
+          <Typography variant="body2">{'MD5: ' + md5}</Typography>
+        </Box>
+      )}
+      <SingleUpload onDrop={startUpload} onCancel={cancelUpload} isUploading={isUploading} progress={progress} />
+      {!isUploading && (
+        <>
+          <Typography sx={{ pt: 4, pb: 2 }} variant="h6" color="primary">
+            {LL.DOWNLOAD(0)}&nbsp;{LL.SUPPORT_INFORMATION(1)}
+          </Typography>
+          <Box color="warning.main">
+            <Typography mb={1} variant="body2">
+              {LL.HELP_INFORMATION_4()}
+            </Typography>
+          </Box>
+          <Button startIcon={<DownloadIcon />} variant="outlined" color="primary" onClick={() => callSystemAPI('info')}>
+            {LL.SUPPORT_INFORMATION(0)}
+          </Button>
+          <Button
+            sx={{ ml: 2 }}
+            startIcon={<DownloadIcon />}
+            variant="outlined"
+            color="primary"
+            onClick={() => callSystemAPI('allvalues')}
+          >
+            All Values
+          </Button>
+
+          <Typography sx={{ pt: 4, pb: 2 }} variant="h6" color="primary">
+            {LL.DOWNLOAD(0)}&nbsp;{LL.SETTINGS(1)}
+          </Typography>
+          <Box color="warning.main">
+            <Typography mb={1} variant="body2">
+              {LL.DOWNLOAD_SETTINGS_TEXT()}
+            </Typography>
+          </Box>
+          <Button startIcon={<DownloadIcon />} variant="outlined" color="primary" onClick={downloadSettings}>
+            {LL.SETTINGS_OF('')}
+          </Button>
+          <Box color="warning.main">
+            <Typography mt={2} mb={1} variant="body2">
+              {LL.DOWNLOAD_CUSTOMIZATION_TEXT()}
+            </Typography>
+          </Box>
+          <Button startIcon={<DownloadIcon />} variant="outlined" color="primary" onClick={downloadCustomizations}>
+            {LL.CUSTOMIZATIONS()}
+          </Button>
+          <Button
+            sx={{ ml: 2 }}
+            startIcon={<DownloadIcon />}
+            variant="outlined"
+            color="primary"
+            onClick={downloadEntities}
+          >
+            {LL.CUSTOM_ENTITIES(0)}
+          </Button>
+          <Box color="warning.main">
+            <Typography mt={2} mb={1} variant="body2">
+              {LL.DOWNLOAD_SCHEDULE_TEXT()}
+            </Typography>
+          </Box>
+          <Button startIcon={<DownloadIcon />} variant="outlined" color="primary" onClick={downloadSchedule}>
+            {LL.SCHEDULE(0)}
+          </Button>
+        </>
+      )}
+    </>
+  );
+  return (
+    <SectionContent title={LL.UPLOAD_DOWNLOAD()} titleGutter>
+      {restarting ? <RestartMonitor /> : content()}
+    </SectionContent>
+  );
+};
+
+export default UploadFileForm;

interface/src/i18n/de/index.ts

@@ -12,6 +12,7 @@ const de: Translation = {
   USERNAME: 'Nutzername',
   PASSWORD: 'Passwort',
   SU_PASSWORD: 'su Passwort',
+  DASHBOARD: 'Kontrollzentrum',
   SETTINGS_OF: '{0} Einstellungen',
   HELP_OF: '{0} Hilfe',
   LOGGED_IN: 'Eingeloggt als {name}',
@@ -36,6 +37,8 @@ const de: Translation = {
   BRAND: 'Marke',
   ENTITY_NAME: 'Entitätsname',
   VALUE: '{{Wert|wert}}',
+  DEVICE_DATA: 'Gerätedaten',
+  SENSOR_DATA: 'Sensordaten',
   DEVICES: 'Geräte',
   SENSORS: 'Sensoren',
   RUN_COMMAND: 'Befehl ausführen',
@@ -80,6 +83,7 @@ const de: Translation = {
   FAIL: 'FEHLER',
   QUALITY: 'QUALITÄT',
   SCAN_DEVICES: 'Nach neuen Geräten suchen',
+  EMS_BUS_STATUS_TITLE: 'EMS-Bus- und Aktivitätsstatus',
   SCAN: 'Suche',
   STATUS_NAMES: [
     'EMS-Telegramme empfangen (Rx)',
@@ -159,7 +163,9 @@ const de: Translation = {
   OPTIONS: 'Optionen',
   NAME: 'Name',
   CUSTOMIZATIONS_RESET: 'Möchten Sie wirklich alle Anpassungen entfernen, einschließlich der benutzerdefinierten Einstellungen der Temperatur- und Analogsensoren?',
+  DEVICE_ENTITIES: 'Geräteentitäten',
   SUPPORT_INFORMATION: 'Unterstützende Informationen',
+  CLICK_HERE: 'Hier klicken',
   HELP_INFORMATION_1: 'EMS-ESP Konfigurationsanweisungen und mehr finden Sie im Online-Wiki',
   HELP_INFORMATION_2: 'Für einen Live-Community-Chat besuchen Sie unseren Discord-Server',
   HELP_INFORMATION_3: 'Um neue Funktionen anzufragen oder Fehler zu melden, eröffnen Sie ein Issue auf Github',
@@ -175,15 +181,17 @@ const de: Translation = {
   STATUS_OF: '{0} Status',
   UPLOAD_DOWNLOAD: 'Hoch-/Herunterladen',
   VERSION_ON: 'Sie verwenden derzeit',
+  SYSTEM_APPLY_FIRMWARE: 'um die neue Firmware anzuwenden',
   CLOSE: 'Schließen',
   USE: 'Verwenden Sie',
   FACTORY_RESET: 'Werkseinstellung',
   SYSTEM_FACTORY_TEXT: 'EMS-ESP wurde auf Werkseinstellung gesetzt und startet als Zugangspunkt neu',
   SYSTEM_FACTORY_TEXT_DIALOG: 'Sind Sie sicher alle Einstellungen auf Werkseinstellung zu setzen?',
+  VERSION_CHECK: 'Versionsprüfung',
   THE_LATEST: 'Die neueste',
   OFFICIAL: 'offizielle',
   DEVELOPMENT: 'Entwicklungs',
-  RELEASE_IS: 'Release ist',
+  RELEASE_IS: 'release ist', // TODO translate
   RELEASE_NOTES: 'Versionshinweise',
   EMS_ESP_VER: 'EMS-ESP Version',
   UPTIME: 'System Betriebszeit',
@@ -220,7 +228,7 @@ const de: Translation = {
   BROKER: 'Broker',
   CLIENT: 'Client',
   BASE_TOPIC: 'Base',
-  OPTIONAL: 'Optional',
+  OPTIONAL: 'Optional', // TODO translate
   FORMATTING: 'Formattierung',
   MQTT_FORMAT: 'Topic/Payload Format',
   MQTT_NEST_1: 'Eingebettet in einem Gesamttopic',
@@ -236,7 +244,6 @@ const de: Translation = {
   MQTT_INT_THERMOSTATS: 'Thermostate',
   MQTT_INT_SOLAR: 'Solarmodule',
   MQTT_INT_MIXER: 'Mischermodule',
-  MQTT_INT_WATER: 'Warmwassermodule',
   MQTT_QUEUE: 'MQTT Queue',
   DEFAULT: 'Standard',
   MQTT_ENTITY_FORMAT: 'Entitäts-ID Format',
@@ -300,7 +307,7 @@ const de: Translation = {
   LEAVE: 'Verlassen',
   SCHEDULER: 'Planer',
   SCHEDULER_HELP_1: 'Fügen Sie eigene, geplante Befehle zur Automatisierung hinzu. Vergeben Sie einen Entitätsnamen um die Aktivierung über API/Mqtt zu steuern',
-  SCHEDULER_HELP_2: '00:00 aktiviert einmalige Ausführung am Start',
+  SCHEDULER_HELP_2: 'Use 00:00 to trigger once on start-up', // TODO translate
   SCHEDULE: 'Zeitplan',
   TIME: 'Zeit',
   TIMER: 'Timer',
@@ -309,7 +316,7 @@ const de: Translation = {
   SCHEDULE_TIMER_2: 'jede Minute',
   SCHEDULE_TIMER_3: 'jede Stunde',
   CUSTOM_ENTITIES: 'Individuelle Entitäten',
-  ENTITIES_HELP_1: 'Definition eigener EMS-Werte oder dynamischer Variablen',
+  ENTITIES_HELP_1: 'Abfrage von Werten auf dem EMS-Bus',
   ENTITIES_UPDATED: 'Entitäten gespeichert',
   WRITEABLE: 'Schreibbar',
   SHOWING: 'Anzeigen von',
@@ -322,9 +329,7 @@ const de: Translation = {
   ACTIVEHIGH: 'Aktiv Positiv',
   ACTIVELOW: 'Aktiv Negativ',
   UNCHANGED: 'Unverändert',
-  ALWAYS: 'Immer',
+  ALWAYS: 'Immer'
-  ACTIVITY: 'Activity', // TODO translate
-  CONFIGURE: 'Configure {0}' // TODO translate
 };
 
 export default de;

interface/src/i18n/en/index.ts

@@ -12,6 +12,7 @@ const en: Translation = {
   USERNAME: 'Username',
   PASSWORD: 'Password',
   SU_PASSWORD: 'su Password',
+  DASHBOARD: 'Dashboard',
   SETTINGS_OF: '{0} Settings',
   HELP_OF: '{0} Help',
   LOGGED_IN: 'Logged in as {name}',
@@ -36,6 +37,8 @@ const en: Translation = {
   BRAND: 'Brand',
   ENTITY_NAME: 'Entity Name',
   VALUE: '{{Value|value}}',
+  DEVICE_DATA: 'Device Data',
+  SENSOR_DATA: 'Sensor Data',
   DEVICES: 'Devices',
   SENSORS: 'Sensors',
   RUN_COMMAND: 'Call Command',
@@ -60,7 +63,7 @@ const en: Translation = {
   FREQ: 'Frequency',
   DUTY_CYCLE: 'Duty Cycle',
   UNIT: 'UoM',
-  STARTVALUE: 'Start Value',
+  STARTVALUE: 'Start value',
   WARN_GPIO: 'Warning: be careful when assigning a GPIO!',
   EDIT: 'Edit',
   SENSOR: 'Sensor',
@@ -80,6 +83,7 @@ const en: Translation = {
   FAIL: 'FAIL',
   QUALITY: 'QUALITY',
   SCAN_DEVICES: 'Scan for new devices',
+  EMS_BUS_STATUS_TITLE: 'EMS Bus & Activity Status',
   SCAN: 'Scan',
   STATUS_NAMES: [
     'EMS Telegrams Received (Rx)',
@@ -154,16 +158,18 @@ const en: Translation = {
   CUSTOMIZATIONS_HELP_4: 'exclude from MQTT and API',
   CUSTOMIZATIONS_HELP_5: 'hide from Dashboard',
   CUSTOMIZATIONS_HELP_6: 'remove from memory',
-  SELECT_DEVICE: 'select a device',
+  SELECT_DEVICE: 'Select a device',
   SET_ALL: 'set all',
   OPTIONS: 'Options',
   NAME: 'Name',
   CUSTOMIZATIONS_RESET: 'Are you sure you want remove all customizations including the custom settings of the Temperature and Analog sensors?',
+  DEVICE_ENTITIES: 'Device Entities',
   SUPPORT_INFORMATION: 'Support Information',
+  CLICK_HERE: 'Click Here',
   HELP_INFORMATION_1: 'Visit the online wiki to get instructions on how to configure EMS-ESP',
   HELP_INFORMATION_2: 'For live community chat join our Discord server',
   HELP_INFORMATION_3: 'To request a feature or report a bug',
-  HELP_INFORMATION_4: 'Download and attach your support information for a faster response when reporting an issue',
+  HELP_INFORMATION_4: 'Remember to download and attach your support information for a faster response when reporting an issue',
   HELP_INFORMATION_5: 'EMS-ESP is a free and open-source project. Please support its future development by giving it a star on Github!',
   UPLOAD: 'Upload',
   DOWNLOAD: '{{D|d|d}}ownload',
@@ -175,17 +181,20 @@ const en: Translation = {
   STATUS_OF: '{0} Status',
   UPLOAD_DOWNLOAD: 'Upload/Download',
   VERSION_ON: 'You are currently on version',
+  SYSTEM_APPLY_FIRMWARE: 'to apply the new firmware',
   CLOSE: 'Close',
   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 EMS-ESP to its factory defaults?',
+  VERSION_CHECK: 'Version Check',
   THE_LATEST: 'The latest',
   OFFICIAL: 'official',
   DEVELOPMENT: 'development',
   RELEASE_IS: 'release is',
   RELEASE_NOTES: 'release notes',
   EMS_ESP_VER: 'EMS-ESP Version',
+  PLATFORM: 'Device (Platform / SDK)',
   UPTIME: 'System Uptime',
   HEAP: 'Heap (Free / Max Alloc)',
   PSRAM: 'PSRAM (Size / Free)',
@@ -236,7 +245,6 @@ const en: Translation = {
   MQTT_INT_THERMOSTATS: 'Thermostats',
   MQTT_INT_SOLAR: 'Solar Modules',
   MQTT_INT_MIXER: 'Mixer Modules',
-  MQTT_INT_WATER: 'Water Modules',
   MQTT_QUEUE: 'MQTT Queue',
   DEFAULT: 'Default',
   MQTT_ENTITY_FORMAT: 'Entity ID format',
@@ -309,7 +317,7 @@ const en: Translation = {
   SCHEDULE_TIMER_2: 'every minute',
   SCHEDULE_TIMER_3: 'every hour',
   CUSTOM_ENTITIES: 'Custom Entities',
-  ENTITIES_HELP_1: 'Define custom EMS entities or dynamic user variables',
+  ENTITIES_HELP_1: 'Fetch custom entities from the EMS bus',
   ENTITIES_UPDATED: 'Entities Updated',
   WRITEABLE: 'Writeable',
   SHOWING: 'Showing',
@@ -322,9 +330,7 @@ const en: Translation = {
   ACTIVEHIGH: 'Active High',
   ACTIVELOW: 'Active Low',
   UNCHANGED: 'Unchanged',
-  ALWAYS: 'Always',
+  ALWAYS: 'Always'
-  ACTIVITY: 'Activity',
-  CONFIGURE: 'Configure {0}'
 };
 
 export default en;

interface/src/i18n/fr/index.ts

@@ -12,6 +12,7 @@ const fr: Translation = {
   USERNAME: 'Nom d\'utilisateur',
   PASSWORD: 'Mot de passe',
   SU_PASSWORD: 'Mot de passe su',
+  DASHBOARD: 'Tableau de bord',
   SETTINGS_OF: 'Paramètres {0}',
   HELP_OF: 'Aide {0}',
   LOGGED_IN: 'Connecté en tant que {name}',
@@ -36,6 +37,8 @@ const fr: Translation = {
   BRAND: 'Marque',
   ENTITY_NAME: 'Nom de l\'entité',
   VALUE: 'Valeur',
+  DEVICE_DATA: 'Données des appareils',
+  SENSOR_DATA: 'Données des capteurs',
   DEVICES: 'Appareils',
   SENSORS: 'Capteurs',
   RUN_COMMAND: 'Lancer une commande',
@@ -80,6 +83,7 @@ const fr: Translation = {
   FAIL: 'ÉCHEC',
   QUALITY: 'QUALITÉ',
   SCAN_DEVICES: 'Rechercher de nouveaux appareils',
+  EMS_BUS_STATUS_TITLE: 'Statut du bus et de l\'activité EMS',
   SCAN: 'Scan',
   STATUS_NAMES: [
     'Télégrammes EMS reçus (Rx)',
@@ -159,7 +163,9 @@ const fr: Translation = {
   OPTIONS: 'Options',
   NAME: 'Nom',
   CUSTOMIZATIONS_RESET: 'Êtes-vous sûr de vouloir supprimer toutes les personnalisations, y compris les paramètres personnalisés des capteurs de température et analogiques ?',
+  DEVICE_ENTITIES: 'Entités de l\'appareil',
   SUPPORT_INFORMATION: 'Information de support',
+  CLICK_HERE: 'Cliquez ici',
   HELP_INFORMATION_1: 'Visitez le wiki en ligne pour obtenir des instructions sur la façon de configurer EMS-ESP.',
   HELP_INFORMATION_2: 'Pour une discussion en direct avec la communauté, rejoignez notre serveur Discord',
   HELP_INFORMATION_3: 'Pour demander une fonctionnalité ou signaler un problème',
@@ -175,11 +181,13 @@ const fr: Translation = {
   STATUS_OF: 'Statut {0}',
   UPLOAD_DOWNLOAD: 'Upload/Download',
   VERSION_ON: 'You are currently on', // TODO translate
+  SYSTEM_APPLY_FIRMWARE: 'pour appliquer le nouveau firmware',
   CLOSE: 'Fermer',
   USE: 'Utiliser',
   FACTORY_RESET: 'Réinitialisation',
   SYSTEM_FACTORY_TEXT: 'L\'appareil a été réinitialisé et va maintenant redémarrer',
   SYSTEM_FACTORY_TEXT_DIALOG: 'Êtes-vous sûr de vouloir réinitialiser l\'appareil à ses paramètres d\'usine ?',
+  VERSION_CHECK: 'Vérification de la version',
   THE_LATEST: 'La dernière',
   OFFICIAL: 'officielle',
   DEVELOPMENT: 'développement',
@@ -236,7 +244,6 @@ const fr: Translation = {
   MQTT_INT_THERMOSTATS: 'Thermostats',
   MQTT_INT_SOLAR: 'Modules solaires',
   MQTT_INT_MIXER: 'Modules mélangeurs',
-  MQTT_INT_WATER: 'Modules eau',
   MQTT_QUEUE: 'Queue MQTT',
   DEFAULT: 'Défaut',
   MQTT_ENTITY_FORMAT: 'Entity ID format', // TODO translate
@@ -322,9 +329,7 @@ const fr: Translation = {
   ACTIVEHIGH: 'Active High', // TODO translate
   ACTIVELOW: 'Active Low', // TODO translate
   UNCHANGED: 'Unchanged', // TODO translate
-  ALWAYS: 'Always', // TODO translate
+  ALWAYS: 'Always' // TODO translate
-  ACTIVITY: 'Activity', // TODO translate
-  CONFIGURE: 'Configure {0}' // TODO translate
 };
 
 export default fr;

interface/src/i18n/it/index.ts

@@ -12,6 +12,7 @@ const it: Translation = {
   USERNAME: 'Nome Utente',
   PASSWORD: 'Password',
   SU_PASSWORD: 'su Password',
+  DASHBOARD: 'Pannello di Controllo',
   SETTINGS_OF: 'Impostazioni {0}',
   HELP_OF: '{0} Aiuto',
   LOGGED_IN: 'Registrato come {name}',
@@ -36,6 +37,8 @@ const it: Translation = {
   BRAND: 'Marca',
   ENTITY_NAME: 'Nome Entità',
   VALUE: '{{Valore|valore}}',
+  DEVICE_DATA: 'Device Data',
+  SENSOR_DATA: 'Sensor Data',
   DEVICES: 'Dispositivi',
   SENSORS: 'Sensori',
   RUN_COMMAND: 'Esegui',
@@ -48,6 +51,7 @@ const it: Translation = {
   REMOVE: 'Elimina',
   PROBLEM_UPDATING: 'Problema aggiornamento',
   PROBLEM_LOADING: 'Problema caricamento',
+  ACCESS_DENIED: 'Accesso Negato',
   ANALOG_SENSOR: 'Sensore Analogico',
   ANALOG_SENSORS: 'Sensori Analogici',
   SETTINGS: 'Settings',
@@ -67,6 +71,7 @@ const it: Translation = {
   TEMP_SENSOR: 'Sensore Temperatura',
   TEMP_SENSORS: 'Sensori Temperatura',
   WRITE_CMD_SENT: 'Scrittura comando inviata',
+  WRITE_CMD_FAILED: 'Scittura comando fallita',
   EMS_BUS_WARNING: 'EMS bus disconnesso. Se questo avvertimento persiste dopo alcuni secondi prego verificare impostazioni scheda',
   EMS_BUS_SCANNING: 'Scansione dispositivi EMS ...',
   CONNECTED: 'Connesso',
@@ -80,6 +85,7 @@ const it: Translation = {
   FAIL: 'FALLITO',
   QUALITY: 'QUALITÂ',
   SCAN_DEVICES: 'Scansione per nuovi dispositivi',
+  EMS_BUS_STATUS_TITLE: 'Bus EMS & Stato Attività',
   SCAN: 'Scansione',
   STATUS_NAMES: [
     'Telegrammi EMS Ricevuti (Rx)',
@@ -159,7 +165,9 @@ const it: Translation = {
   OPTIONS: 'Opzioni',
   NAME: 'Nome',
   CUSTOMIZATIONS_RESET: 'Sei sicuro di voler rimuovere tutte le personalizzazioni incluse le impostazioni personalizzate dei sensori di temperatura e analogici?',
+  DEVICE_ENTITIES: 'Entità Dispositivo',
   SUPPORT_INFORMATION: 'Informazioni di Supporto',
+  CLICK_HERE: 'Clicca qui',
   HELP_INFORMATION_1: 'Visita il wiki online per ottenere istruzioni su come configurare EMS-ESP',
   HELP_INFORMATION_2: 'Per la chat della community dal vivo unisciti al nostro server Discord',
   HELP_INFORMATION_3: 'Per richiedere una funzionalità o segnalare un errore',
@@ -175,11 +183,13 @@ const it: Translation = {
   STATUS_OF: 'Stato {0}',
   UPLOAD_DOWNLOAD: 'Caricamento/Scaricamento',
   VERSION_ON: 'Attualmente stai eseguendo la versione',
+  SYSTEM_APPLY_FIRMWARE: 'per applicare il nuovo firmware',
   CLOSE: 'Chiudere',
   USE: 'Usa',
   FACTORY_RESET: 'Impostazioni di fabbrica',
   SYSTEM_FACTORY_TEXT: 'Il dispositivo è stato ripristinato alle impostazioni di fabbrica e ora verrà riavviato',
   SYSTEM_FACTORY_TEXT_DIALOG: 'Sei sicuro di voler ripristinare il dispositivo alle impostazioni di fabbrica??',
+  VERSION_CHECK: 'Verifica Versione',
   THE_LATEST: 'Ultima',
   OFFICIAL: 'ufficiale',
   DEVELOPMENT: 'sviluppo',
@@ -236,7 +246,6 @@ const it: Translation = {
   MQTT_INT_THERMOSTATS: 'Termostati',
   MQTT_INT_SOLAR: 'Moduli solari',
   MQTT_INT_MIXER: 'Moduli Mixer',
-  MQTT_INT_WATER: 'Moduli Acqua',
   MQTT_QUEUE: 'Coda MQTT',
   DEFAULT: 'Predefinito',
   MQTT_ENTITY_FORMAT: 'Formato ID entità',
@@ -309,7 +318,7 @@ const it: Translation = {
   SCHEDULE_TIMER_2: 'Ogni minuto',
   SCHEDULE_TIMER_3: 'Ogni ora',
   CUSTOM_ENTITIES: 'Entità personalizzate',
-  ENTITIES_HELP_1: 'Recupera entità personalizzate dal BUS EMS', // TODO translate
+  ENTITIES_HELP_1: 'Recupera entità personalizzate dal BUS EMS',
   ENTITIES_UPDATED: 'Entità aggiornate',
   WRITEABLE: 'Scrivibile',
   SHOWING: 'Visualizza',
@@ -322,9 +331,7 @@ const it: Translation = {
   ACTIVEHIGH: 'Active High', // TODO translate
   ACTIVELOW: 'Active Low', // TODO translate
   UNCHANGED: 'Unchanged', // TODO translate
-  ALWAYS: 'Always', // TODO translate
+  ALWAYS: 'Always' // TODO translate
-  ACTIVITY: 'Activity', // TODO translate
-  CONFIGURE: 'Configure {0}' // TODO translate
 };
 
 export default it;

interface/src/i18n/nl/index.ts

@@ -12,6 +12,7 @@ const nl: Translation = {
   USERNAME: 'Gebruikersnaam',
   PASSWORD: 'Wachtwoord',
   SU_PASSWORD: 'su Wachtwoord',
+  DASHBOARD: 'Dashboard',
   SETTINGS_OF: '{0} Instellingen',
   HELP_OF: '{0} Help',
   LOGGED_IN: 'Ingelogd als {name}',
@@ -36,6 +37,8 @@ const nl: Translation = {
   BRAND: 'Merk',
   ENTITY_NAME: 'Entiteit',
   VALUE: '{{Waarde|waarde}}',
+  SENSOR_DATA: 'Sensor data',
+  DEVICE_DATA: 'Apparaat data',
   DEVICES: 'Apparaten',
   SENSORS: 'Sensoren',
   RUN_COMMAND: 'Call commando',
@@ -80,6 +83,7 @@ const nl: Translation = {
   FAIL: 'MISLUKT',
   QUALITY: 'QUALITEIT',
   SCAN_DEVICES: 'Scannen naar nieuwe apparaten',
+  EMS_BUS_STATUS_TITLE: 'EMS Bus & Activiteitenstatus',
   SCAN: 'Scan',
   STATUS_NAMES: [
     'EMS Telegrammen ontvangen (Rx)',
@@ -122,7 +126,7 @@ const nl: Translation = {
   BYPASS_TOKEN: 'API Access Token authenticatie uitschakelen',
   READONLY: 'Activeer read-only modus (blokkeert alle outgaande EMS Tx schrijf commandos)',
   UNDERCLOCK_CPU: 'Underclock CPU snelheid',
-  HEATINGOFF: 'Start ketel met geforceerde verwarming uit',
+  HEATINGOFF: 'Start boiler with forced heating off', // TODO translate
   ENABLE_SHOWER_TIMER: 'Activeer Douche Timer (tijdmeting)',
   ENABLE_SHOWER_ALERT: 'Activeer Douchemelding',
   TRIGGER_TIME: 'Trigger tijd',
@@ -159,7 +163,9 @@ const nl: Translation = {
   OPTIONS: 'Opties',
   NAME: 'Naam',
   CUSTOMIZATIONS_RESET: 'Weet je zeker dat je alle custom aanpassingen wilt verwijderen inclusief de custom instellingen voor analoge temperatuursensoren?',
+  DEVICE_ENTITIES: 'Apparaat Entiteiten',
   SUPPORT_INFORMATION: 'Support Informatie',
+  CLICK_HERE: 'Klik Hier',
   HELP_INFORMATION_1: 'Bezoek de online wiki om instructies te vinden om EMS-ESP te configureren',
   HELP_INFORMATION_2: 'Voor de live community ga naar de Discord server',
   HELP_INFORMATION_3: 'Om een nieuwe feature te vragen of een bug te rapporteren',
@@ -175,11 +181,13 @@ const nl: Translation = {
   STATUS_OF: '{0} Status',
   UPLOAD_DOWNLOAD: 'Upload/Download',
   VERSION_ON: 'U bevindt zich momenteel op versie',
+  SYSTEM_APPLY_FIRMWARE: 'om de nieuwe firmware te activeren',
   CLOSE: 'Sluiten',
   USE: 'Gebruik',
   FACTORY_RESET: 'Fabrieksinstellingen',
   SYSTEM_FACTORY_TEXT: 'Gateway is gereset en start nu weer op met fabrieksinstellingen',
   SYSTEM_FACTORY_TEXT_DIALOG: 'Weet je zeker dat je een reset naar fabrieksinstellingen uit wilt voeren?',
+  VERSION_CHECK: 'Versie Check',
   THE_LATEST: 'De laatste',
   OFFICIAL: 'official',
   DEVELOPMENT: 'development',
@@ -236,7 +244,6 @@ const nl: Translation = {
   MQTT_INT_THERMOSTATS: 'Thermostaten',
   MQTT_INT_SOLAR: 'Solar Modules',
   MQTT_INT_MIXER: 'Mixer Modules',
-  MQTT_INT_WATER: 'Water Modules',
   MQTT_QUEUE: 'MQTT Queue',
   DEFAULT: 'Default',
   MQTT_ENTITY_FORMAT: 'Entity ID formaat',
@@ -273,7 +280,7 @@ const nl: Translation = {
   NETWORK_SCANNER: 'Netwerk Scanner',
   NETWORK_NO_WIFI: 'Geen WiFi networken gevonden',
   NETWORK_BLANK_SSID: 'laat leeg om WiFi uit te schakelen',
-  NETWORK_BLANK_BSSID: 'laat leeg om alleen SSID te bebruiken',
+  NETWORK_BLANK_BSSID: 'leave blank to use only SSID', // TODO translate
   TX_POWER: 'Tx Vermogen',
   HOSTNAME: 'Hostname',
   NETWORK_DISABLE_SLEEP: 'WiFi Sleep Mode uitzetten',
@@ -314,17 +321,15 @@ const nl: Translation = {
   WRITEABLE: 'Beschrijfbare',
   SHOWING: 'Tonen',
   SEARCH: 'Zoek',
-  CERT: 'TLS rootcertificaat (laat leeg om TLS-insecure)',
+  CERT: 'TLS rootcertificaat (laat leeg om TLS-insecure)', // TODO translate
   ENABLE_TLS: 'Activeer TLS',
-  ON: 'Aan',
+  ON: 'On', // TODO translate
-  OFF: 'Uit',
+  OFF: 'Off', // TODO translate
-  POLARITY: 'Polariteit',
+  POLARITY: 'Polarity', // TODO translate
-  ACTIVEHIGH: 'Actiev Hoog',
+  ACTIVEHIGH: 'Active High', // TODO translate
-  ACTIVELOW: 'Actiev Laag',
+  ACTIVELOW: 'Active Low', // TODO translate
-  UNCHANGED: 'Ongewijzigd',
+  UNCHANGED: 'Unchanged', // TODO translate
-  ALWAYS: 'Altijd',
+  ALWAYS: 'Always' // TODO translate
-  ACTIVITY: 'Activiteit',
-  CONFIGURE: '{0} Configureren'
 };
 
 export default nl;

interface/src/i18n/no/index.ts

@@ -12,6 +12,7 @@ const no: Translation = {
   USERNAME: 'Brukernavn',
   PASSWORD: 'Passord',
   SU_PASSWORD: 'su Passord',
+  DASHBOARD: 'Dashboard',
   SETTINGS_OF: '{0} Innstillinger',
   HELP_OF: '{0} Hjelp',
   LOGGED_IN: 'Logget in som {name}',
@@ -36,6 +37,8 @@ const no: Translation = {
   BRAND: 'Fabrikat',
   ENTITY_NAME: 'Objektsnavn',
   VALUE: '{{Verdi|verdi}}',
+  DEVICE_DATA: 'Enheterdata',
+  SENSOR_DATA: 'Sensordata',
   DEVICES: 'Enheter',
   SENSORS: 'Sensorer',
   RUN_COMMAND: 'Kjør kommando',
@@ -80,6 +83,7 @@ const no: Translation = {
   FAIL: 'MISLYKKET',
   QUALITY: 'KVALITET',
   SCAN_DEVICES: 'Søk etter nye enheter',
+  EMS_BUS_STATUS_TITLE: 'EMS Buss & Aktivitet Status',
   SCAN: 'Søk',
   STATUS_NAMES: [
     'EMS Telegrammer Mottatt (Rx)',
@@ -159,7 +163,9 @@ const no: Translation = {
   OPTIONS: 'Alternativ',
   NAME: 'Navn',
   CUSTOMIZATIONS_RESET: 'Er du sikker på att du vil fjerne tilpassninger inkludert innstillinger for Temperatur og Analoge sensorer?',
+  DEVICE_ENTITIES: 'Enhets objekter',
   SUPPORT_INFORMATION: 'Supportinformasjon',
+  CLICK_HERE: 'Klikk her',
   HELP_INFORMATION_1: 'Besøk wiki for instruksjoner for å konfigurere EMS-ESP',
   HELP_INFORMATION_2: 'For community-support besøk vår Discord-server',
   HELP_INFORMATION_3: 'For å be om en ny funksjon eller melde feil',
@@ -175,11 +181,13 @@ const no: Translation = {
   STATUS_OF: '{0} Status',
   UPLOAD_DOWNLOAD: 'Opp/Nedlasting',
   VERSION_ON: 'You are currently on', // TODO translate
+  SYSTEM_APPLY_FIRMWARE: 'for å aktivere ny firmware',
   CLOSE: 'Steng',
   USE: 'Bruk',
   FACTORY_RESET: 'Sett tilbake til fabrikkinstilling',
   SYSTEM_FACTORY_TEXT: 'Enhet har blitt satt tilbake til fabrikkinstilling og vil restarte',
   SYSTEM_FACTORY_TEXT_DIALOG: 'Er du sikker på at du vil resette enheten til fabrikkinstillinger?',
+  VERSION_CHECK: 'Versjonsjekk',
   THE_LATEST: 'Den nyeste',
   OFFICIAL: 'official',
   DEVELOPMENT: 'development',
@@ -236,7 +244,6 @@ const no: Translation = {
   MQTT_INT_THERMOSTATS: 'Termostat',
   MQTT_INT_SOLAR: 'Solpaneler',
   MQTT_INT_MIXER: 'Blandeventil',
-  MQTT_INT_WATER: 'Water Modules', // TODO translate
   MQTT_QUEUE: 'MQTT Queue',
   DEFAULT: 'Standard',
   MQTT_ENTITY_FORMAT: 'Enhets ID format',
@@ -322,9 +329,7 @@ const no: Translation = {
   ACTIVEHIGH: 'Active High', // TODO translate
   ACTIVELOW: 'Active Low', // TODO translate
   UNCHANGED: 'Unchanged', // TODO translate
-  ALWAYS: 'Always', // TODO translate
+  ALWAYS: 'Always' // TODO translate
-  ACTIVITY: 'Activity', // TODO translate
-  CONFIGURE: 'Configure {0}' // TODO translate
 };
 
 export default no;

interface/src/i18n/pl/index.ts

@@ -12,6 +12,7 @@ const pl: BaseTranslation = {
   USERNAME: '{{Użytkownik|Nazwa użytkownika|}}',
   PASSWORD: 'Hasło',
   SU_PASSWORD: 'Hasło "su"',
+  DASHBOARD: 'Pulpit',
   SETTINGS_OF: 'Ustawienia {0}',
   HELP_OF: 'Pomoc {0}',
   LOGGED_IN: 'Zalogowano użytkownika {name}.',
@@ -36,6 +37,8 @@ const pl: BaseTranslation = {
   VERSION: 'Wersja',
   ENTITY_NAME: '{{N|n|}}azwa encji',
   VALUE: '{{W|w|}}artość',
+  DEVICE_DATA: 'Dane z urządzeń',
+  SENSOR_DATA: 'Dane z czujników',
   DEVICES: 'Urządzenia',
   SENSORS: 'Czujniki',
   RUN_COMMAND: 'Wykonaj komendę',
@@ -80,6 +83,7 @@ const pl: BaseTranslation = {
   FAIL: 'Nieudane',
   QUALITY: 'Jakość',
   SCAN_DEVICES: 'Wyszukiwanie nowych urządzeń',
+  EMS_BUS_STATUS_TITLE: 'Aktywność',
   SCAN: 'Skanuj',
   STATUS_NAMES: [
     'EMS, telegramy odebrane (Rx)',
@@ -159,7 +163,9 @@ const pl: BaseTranslation = {
   OPTIONS: 'Opcje',
   NAME: '{{Nazwa|nazwa|}}',
   CUSTOMIZATIONS_RESET:  'Na pewno chcesz usunąć wszystkie personalizacje łącznie z ustawieniami dla czujników temperatury 1-Wire® i urządzeń podłączonych do EMS-ESP?',
+  DEVICE_ENTITIES: 'Encje urządzenia',
   SUPPORT_INFORMATION: '{{I|i|}}nformacj{{e|i|}} o systemie',
+  CLICK_HERE: 'Kliknij tu',
   HELP_INFORMATION_1: 'Aby uzyskać instrukcje dotyczące konfiguracji EMS-ESP, skorzystaj z wiki w internecie',
   HELP_INFORMATION_2: 'Aby dołączyć do naszego serwera Discord i komunikować się na żywo ze społecznością',
   HELP_INFORMATION_3: 'Aby zaproponować nową funkcjonalność lub zgłosić problem',
@@ -175,11 +181,13 @@ const pl: BaseTranslation = {
   STATUS_OF: 'Status {0}',
   UPLOAD_DOWNLOAD: 'Przesyłanie plików',
   VERSION_ON: 'Aktualnie używasz',
+  SYSTEM_APPLY_FIRMWARE: '',
   CLOSE: 'Zamknij',
   USE: 'Aby zaktualizować firmware skorzystaj z funkcji',
   FACTORY_RESET: 'Ustawienia fabryczne',
   SYSTEM_FACTORY_TEXT: 'Interfejs EMS-ESP został przywrócony do ustawień fabrycznych i zostanie teraz ponownie uruchomiony.',
   SYSTEM_FACTORY_TEXT_DIALOG: 'Na pewno chcesz przywrócić ustawienia fabryczne interfejsu EMS-ESP? ',
+  VERSION_CHECK: 'Sprawd{{ź|zanie|}} wersj{{ę|i|}}',
   THE_LATEST: 'Najnowsze',
   OFFICIAL: 'oficjalne',
   DEVELOPMENT: 'testowe',
@@ -236,7 +244,6 @@ const pl: BaseTranslation = {
   MQTT_INT_THERMOSTATS: 'Termostaty',
   MQTT_INT_SOLAR: 'Panele solarne',
   MQTT_INT_MIXER: 'Mieszacze',
-  MQTT_INT_WATER: 'Woda',
   MQTT_QUEUE: 'Kolejka MQTT',
   DEFAULT: '{{Pozostałe|Domyślna|}}',
   MQTT_ENTITY_FORMAT: 'Format "Entity ID"',
@@ -322,9 +329,7 @@ const pl: BaseTranslation = {
   ACTIVEHIGH: 'Wyzwalany stanem wysokim', 
   ACTIVELOW: 'Wyzwalany stanem niskim', 
   UNCHANGED: 'Zachowaj stan', 
-  ALWAYS: 'Zawsze',
+  ALWAYS: 'Zawsze' 
-  ACTIVITY: 'Aktywność',
-  CONFIGURE: 'Konfiguracja {0}'
 };
 
 export default pl;

interface/src/i18n/sk/index.ts

@@ -12,6 +12,7 @@ const sk: Translation = {
   USERNAME: 'Užívateľské meno',
   PASSWORD: 'Heslo',
   SU_PASSWORD: 'su heslo',
+  DASHBOARD: 'Panel',
   SETTINGS_OF: '{0} Nastavenia',
   HELP_OF: '{0} Pomoc',
   LOGGED_IN: 'Prihlásený ako {name}',
@@ -35,7 +36,9 @@ const sk: Translation = {
   VERSION: 'Verzia',
   BRAND: 'Značka',
   ENTITY_NAME: 'Názov entity',
-  VALUE: '{{Hodnota|hodnota}}',
+  VALUE: '{{Value|value}}',
+  DEVICE_DATA: 'Dáta zariadenia',
+  SENSOR_DATA: 'Dáta snímača',
   DEVICES: 'Zariadenia',
   SENSORS: 'Snímače',
   RUN_COMMAND: 'Volať príkaz',
@@ -77,33 +80,34 @@ const sk: Translation = {
   ACTIVE_DEVICES: 'Aktívne zariadenia a snímače',
   EMS_DEVICE: 'EMS zariadenie',
   SUCCESS: 'ÚSPEŠNÉ',
-  FAIL: 'ZLÝHANIE',
+  FAIL: 'ZLYHANIE',
   QUALITY: 'KVALITA',
   SCAN_DEVICES: 'Scan pre nové zariadenia',
+  EMS_BUS_STATUS_TITLE: 'EMS zbernica & stav aktivity',
   SCAN: 'Scan',
   STATUS_NAMES: [
     'EMS Telegramy prijaté (Rx)',
     'EMS Čítania (Tx)',
     'EMS Zápisy (Tx)',
-    'Čítanie snímačov teploty',
+    'Čítanie snímača teploty',
-    'Čítanie analógových snímačov',
+    'Analógové snímanie',
     'MQTT Publikovanie',
-    'Externé API volania',
+    'API volania',
     'Syslog správy'
   ],
-  NUM_DEVICES: '{num} Zariaden{{í|ie|ia|ia|í|í}}',
+  NUM_DEVICES: '{num} Zariadenia{{s}}',
-  NUM_TEMP_SENSORS: '{num} Teplotn{{ých|ý|é|é|ých|ých}} sníma{{čov|č|če|če|čov|čov}}',
+  NUM_TEMP_SENSORS: '{num} Teplotné snímače{{s}}',
-  NUM_ANALOG_SENSORS: '{num} Analogov{{ých|ý|é|é|ých|ých}} sníma{{čov|č|če|če|čov|čov}}',
+  NUM_ANALOG_SENSORS: '{num} Analógové snímače{{s}}',
-  NUM_DAYS: '{num} d{{ní|eň|ní|ní|ní|ní}}',
+  NUM_DAYS: '{num} dní{{s}}',
-  NUM_SECONDS: '{num} sek{{únd|unda|undy|undy|únd|únd}}',
+  NUM_SECONDS: '{num} sekúnd{{s}}',
-  NUM_HOURS: '{num} hod{{ín|ina|iny|iny|ín|ín}}',
+  NUM_HOURS: '{num} hodín{{s}}',
-  NUM_MINUTES: '{num} minú{{t|ta|ty|ty|t|t}}',
+  NUM_MINUTES: '{num} minút{{s}}',
   APPLICATION_SETTINGS: 'Nastavenia aplikácie',
   CUSTOMIZATIONS: 'Prispôsobenia',
   APPLICATION_RESTARTING: 'EMS-ESP sa reštartuje',
-  INTERFACE_BOARD_PROFILE: 'Profil dosky rozhrania',
+  INTERFACE_BOARD_PROFILE: 'Profil boardu rozhrania',
-  BOARD_PROFILE_TEXT: 'Vyberte vopred nakonfigurovaný profil dosky rozhrania zo zoznamu nižšie, alebo vyberte možnosť Vlastné a nakonfigurujte svoje vlastné hardvérové nastavenia',
+  BOARD_PROFILE_TEXT: 'Vyberte vopred nakonfigurovaný profil dosky rozhrania zo zoznamu nižšie alebo vyberte možnosť Vlastné a nakonfigurujte svoje vlastné hardvérové nastavenia',
-  BOARD_PROFILE: 'Profil dosky',
+  BOARD_PROFILE: 'Board profil',
   CUSTOM: 'Vlastné',
   GPIO_OF: '{0} GPIO',
   BUTTON: 'Tlačidlo',
@@ -118,12 +122,11 @@ const sk: Translation = {
   HIDE_LED: 'Skryť LED',
   ENABLE_TELNET: 'Povoliť Telnet konzolu',
   ENABLE_ANALOG: 'Povoliť analógové snímače',
-  CONVERT_FAHRENHEIT: 'Previesť hodnoty teploty na °F',
+  CONVERT_FAHRENHEIT: 'Previesť hodnoty teploty na fahrenheity',
   BYPASS_TOKEN: 'Vynechajte autorizáciu prístupového tokenu pri volaniach API',
   READONLY: 'Povoliť režim len na čítanie (blokuje všetky odchádzajúce príkazy EMS Tx Write)',
   UNDERCLOCK_CPU: 'Podtaktovanie rýchlosti procesora',
-  HEATINGOFF: 'Spustiť kotol s vynúteným vykurovaním',
+  HEATINGOFF: 'Spustite kotol s núteným vykurovaním',
-
   ENABLE_SHOWER_TIMER: 'Povoliť časovač sprchovania',
   ENABLE_SHOWER_ALERT: 'Povoliť upozornenie na sprchu',
   TRIGGER_TIME: 'Čas spustenia',
@@ -133,7 +136,7 @@ const sk: Translation = {
   BOOLEAN_FORMAT_API: 'Boolean formát API/MQTT',
   ENUM_FORMAT: 'Enum formát API/MQTT',
   INDEX: 'Index',
-  ENABLE_PARASITE: 'Povoliť parazité napájanie DS18B20',
+  ENABLE_PARASITE: 'Povolenie parazitného napájania',
   LOGGING: 'Logovanie',
   LOG_HEX: 'Záznam telegramov EMS v hexadecimálnej sústave',
   ENABLE_SYSLOG: 'Povoliť Syslog',
@@ -160,7 +163,9 @@ const sk: Translation = {
   OPTIONS: 'Možnosti',
   NAME: 'Názov',
   CUSTOMIZATIONS_RESET: 'Naozaj chcete odstrániť všetky prispôsobenia vrátane vlastných nastavení snímačov teploty a analógových snímačov?',
-  SUPPORT_INFORMATION: 'Informácie pre podporu',
+  DEVICE_ENTITIES: 'Entity zariadenia',
+  SUPPORT_INFORMATION: 'Informácie o podpore',
+  CLICK_HERE: 'Kliknite tu',
   HELP_INFORMATION_1: 'Navštívte online wiki, kde nájdete pokyny na konfiguráciu EMS-ESP',
   HELP_INFORMATION_2: 'Pre živý komunitný chat sa pripojte na náš Discord server',
   HELP_INFORMATION_3: 'Ak chcete požiadať o funkciu alebo nahlásiť chybu',
@@ -175,25 +180,27 @@ const sk: Translation = {
   LOG_OF: '{0} Log',
   STATUS_OF: '{0} Stav',
   UPLOAD_DOWNLOAD: 'Nahrať/Stiahnuť',
-  VERSION_ON: 'Momentálne nainštalovaná verzia: ',
+  VERSION_ON: 'Momentálne ste vo verzii',
+  SYSTEM_APPLY_FIRMWARE: 'na použitie nového firmvéru',
   CLOSE: 'Zatvoriť',
   USE: 'Použiť',
   FACTORY_RESET: 'Továrenské nastavenia',
   SYSTEM_FACTORY_TEXT: 'Zariadenie bolo obnovené z výroby a teraz sa reštartuje',
   SYSTEM_FACTORY_TEXT_DIALOG: 'Naozaj chcete resetovať EMS-ESP na predvolené výrobné nastavenia?',
+  VERSION_CHECK: 'Kontrola verzie',
   THE_LATEST: 'Posledná',
   OFFICIAL: 'officiálna',
   DEVELOPMENT: 'vývojárska',
-  RELEASE_IS: 'verzia je',
+  RELEASE_IS: 'vydanie je',
-  RELEASE_NOTES: 'poznámky k verzii',
+  RELEASE_NOTES: 'poznámky k vydaniu',
   EMS_ESP_VER: 'EMS-ESP verzia',
   UPTIME: 'Beh systému',
   HEAP: 'Zásobník (voľné / max pridelenie)',
   PSRAM: 'PSRAM (Veľkosť / Voľné)',
   FLASH: 'Flash chip (Veľkosť / Rýchlosť)',
-  APPSIZE: 'Applikácia (Oddiel: Použité / Voľné)',
+  APPSIZE: 'Applikácia (Priečka: Použité / Voľné)',
   FILESYSTEM: 'Súborový systém (Použité / Voľné)',
-  BUFFER_SIZE: 'Buffer-max.veľkosť',
+  BUFFER_SIZE: 'Maximálna veľkosť vyrovnávacej pamäte',
   COMPACT: 'Kompaktné',
   ENABLE_OTA: 'Povoliť OTA aktualizácie',
   DOWNLOAD_CUSTOMIZATION_TEXT: 'Stiahnutie prispôsobení entity',
@@ -201,7 +208,7 @@ const sk: Translation = {
   DOWNLOAD_SETTINGS_TEXT: 'Stiahnite si nastavenia aplikácie. Pri zdieľaní nastavení buďte opatrní, pretože tento súbor obsahuje heslá a iné citlivé systémové informácie.',
   UPLOAD_TEXT: 'Najskôr nahrajte nový súbor firmvéru (.bin), nastavenia alebo prispôsobenia (.json), pre voliteľné overenie nahrajte súbor (.md5)',
   UPLOADING: 'Nahrávanie',
-  UPLOAD_DROP_TEXT: 'Potiahnúť a pripnúť súbor alebo kliknúť sem',
+  UPLOAD_DROP_TEXT: 'Zahodiť súbor alebo kliknúť sem',
   ERROR: 'Neočakávaná chyba, prosím skúste to znova',
   TIME_SET: 'Nastavený čas',
   MANAGE_USERS: 'Správa používateľov',
@@ -237,7 +244,6 @@ const sk: Translation = {
   MQTT_INT_THERMOSTATS: 'Termostaty',
   MQTT_INT_SOLAR: 'Solárne moduly',
   MQTT_INT_MIXER: 'Zmiešavacie moduley',
-  MQTT_INT_WATER: 'Voda moduley',
   MQTT_QUEUE: 'Fronta MQTT',
   DEFAULT: 'Predvolené',
   MQTT_ENTITY_FORMAT: 'ID formát entity',
@@ -259,7 +265,7 @@ const sk: Translation = {
   ACCESS_POINT: 'Prístupový bod',
   AP_PROVIDE: 'Povoliť prístupový bod',
   AP_PROVIDE_TEXT_1: 'vždy',
-  AP_PROVIDE_TEXT_2: 'keď je WiFi odpojená',
+  AP_PROVIDE_TEXT_2: 'keď WiFi je odpojená',
   AP_PROVIDE_TEXT_3: 'nikdy',
   AP_PREFERRED_CHANNEL: 'Preferovaný kanál',
   AP_HIDE_SSID: 'Skryť SSID',
@@ -287,11 +293,11 @@ const sk: Translation = {
   NETWORK_GATEWAY: 'Brána',
   NETWORK_SUBNET: 'Maska podsiete',
   NETWORK_DNS: 'DNS servery',
-  ADDRESS_OF: '{0} adresa',
+  ADDRESS_OF: '{0} adries',
   ADMIN: 'Admin',
   GUEST: 'Hosť',
   NEW: 'Nová',
-  NEW_NAME_OF: 'Nový názov {0}',
+  NEW_NAME_OF: 'Nových {0} názvov',
   ENTITY: 'entita',
   MIN: 'min',
   MAX: 'max',
@@ -302,7 +308,7 @@ const sk: Translation = {
   SCHEDULER: 'Plánovač',
   SCHEDULER_HELP_1: 'Automatizujte príkazy pridaním naplánovaných udalostí nižšie. Nastavte jedinečné meno na aktiváciu/deaktiváciu cez API/MQTT.',
   SCHEDULER_HELP_2: 'Použite 00:00 na jednorazové spustenie pri štarte',
-  SCHEDULE: 'Plánovač',
+  SCHEDULE: 'Plánovať',
   TIME: 'Čas',
   TIMER: 'Časovač',
   SCHEDULE_UPDATED: 'Plánovanie aktualizované',
@@ -323,9 +329,7 @@ const sk: Translation = {
   ACTIVEHIGH: 'Aktívny Vysoký',
   ACTIVELOW: 'Aktívny Nízky',
   UNCHANGED: 'Nezmenené',
-  ALWAYS: 'Vždy',
+  ALWAYS: 'Vždy'
-  ACTIVITY: 'Aktivita', 
-  CONFIGURE: 'Konfiguracia {0}'
 };
 
 export default sk;

interface/src/i18n/sv/index.ts

@@ -12,6 +12,7 @@ const sv: Translation = {
   USERNAME: 'Användarnamn',
   PASSWORD: 'Lösenord',
   SU_PASSWORD: 'su Lösenord',
+  DASHBOARD: 'Kontrollpanel',
   SETTINGS_OF: '{0} Inställningar',
   HELP_OF: '{0} Hjälp',
   LOGGED_IN: 'Inloggad som {name}',
@@ -36,6 +37,8 @@ const sv: Translation = {
   BRAND: 'Fabrikat',
   ENTITY_NAME: 'Entitetsnamn',
   VALUE: '{{Värde|värde}}',
+  DEVICE_DATA: 'Enhets data',
+  SENSOR_DATA: 'Sensor data',
   DEVICES: 'Enheter',
   SENSORS: 'Sensorer',
   RUN_COMMAND: 'Kör Kommando',
@@ -80,6 +83,7 @@ const sv: Translation = {
   FAIL: 'Misslyckades',
   QUALITY: 'Kvalitet',
   SCAN_DEVICES: 'Sök efter nya enheter',
+  EMS_BUS_STATUS_TITLE: 'EMS-buss & aktivitetsstatus',
   SCAN: 'Sök',
   STATUS_NAMES: [
     'EMS-telegram (Rx)',
@@ -159,7 +163,9 @@ const sv: Translation = {
   OPTIONS: 'Alternativ',
   NAME: 'Namn',
   CUSTOMIZATIONS_RESET: 'Är du säker på att du vill ta bort alla anpassningar inklusive inställningar för Temperatur och Analoga sensorer?',
+  DEVICE_ENTITIES: 'Enhets-entiteter',
   SUPPORT_INFORMATION: 'Supportinformation',
+  CLICK_HERE: 'Klicka Här',
   HELP_INFORMATION_1: 'Besök Wikin för instruktioner för hur du kan konfigurera EMS-ESP',
   HELP_INFORMATION_2: 'För community-support besök vår Discord-server',
   HELP_INFORMATION_3: 'Önska en ny funktion eller rapportera en bugg',
@@ -175,11 +181,13 @@ const sv: Translation = {
   STATUS_OF: '{0} Status',
   UPLOAD_DOWNLOAD: 'Upp/Nedladdning',
   VERSION_ON: 'You are currently on', // TODO translate
+  SYSTEM_APPLY_FIRMWARE: 'för att aktivera ny firmware',
   CLOSE: 'Stäng',
   USE: 'Använd',
   FACTORY_RESET: 'Fabriksåterställning',
   SYSTEM_FACTORY_TEXT: 'Enheten har blivit fabriksåterställd och startar nu om',
   SYSTEM_FACTORY_TEXT_DIALOG: 'Är du säker att du vill fabriksåterställa enheten?',
+  VERSION_CHECK: 'Senaste versioner',
   THE_LATEST: 'Den senaste',
   OFFICIAL: 'officiell',
   DEVELOPMENT: 'utveckling',
@@ -236,7 +244,6 @@ const sv: Translation = {
   MQTT_INT_THERMOSTATS: 'Termostater',
   MQTT_INT_SOLAR: 'Solpaneler',
   MQTT_INT_MIXER: 'Blandningsventiler',
-  MQTT_INT_WATER: 'Water Modules', // TODO translate
   MQTT_QUEUE: 'MQTT-kö',
   DEFAULT: 'Standard',
   MQTT_ENTITY_FORMAT: 'Entitets-ID format',
@@ -322,9 +329,7 @@ const sv: Translation = {
   ACTIVEHIGH: 'Active High', // TODO translate
   ACTIVELOW: 'Active Low', // TODO translate
   UNCHANGED: 'Unchanged', // TODO translate
-  ALWAYS: 'Always', // TODO translate
+  ALWAYS: 'Always' // TODO translate
-  ACTIVITY: 'Activity', // TODO translate
-  CONFIGURE: 'Configure {0}' // TODO translate
 };
 
 export default sv;

interface/src/i18n/tr/index.ts

@@ -12,6 +12,7 @@ const tr: Translation = {
   USERNAME: 'Kullanıcı Adı',
   PASSWORD: 'Şifre',
   SU_PASSWORD: 'SK Şifresi',
+  DASHBOARD: 'Gösterge Paneli',
   SETTINGS_OF: '{0} Ayarlar',
   HELP_OF: '{0} Yardım',
   LOGGED_IN: '{name} olarak giriş yapıldı',
@@ -36,6 +37,8 @@ const tr: Translation = {
   BRAND: 'Marka',
   ENTITY_NAME: 'Valık Adı',
   VALUE: '{{Değer|değer}}',
+  DEVICE_DATA: 'Cihaz Bilgisi',
+  SENSOR_DATA: 'Sensör Bilgisi',
   DEVICES: 'Cihazlar',
   SENSORS: 'Sensörler',
   RUN_COMMAND: 'Çalıştırma Komutu',
@@ -80,6 +83,7 @@ const tr: Translation = {
   FAIL: 'HATA',
   QUALITY: 'KALİTE',
   SCAN_DEVICES: 'Yeni cihaz taraması',
+  EMS_BUS_STATUS_TITLE: 'EMS Hattı ve Aktivite Durumu',
   SCAN: 'Tara',
   STATUS_NAMES: [
     'EMS Telegramlar Alındı (Rx)',
@@ -159,7 +163,9 @@ const tr: Translation = {
   OPTIONS: 'Seçenekler',
   NAME: 'İsim',
   CUSTOMIZATIONS_RESET: 'Sıcaklık ve Analog Sensörlerin özelleştirilmiş seçenekleri dahil bütün özelleştirmeleri kaldırmak istediğinizden emin misiniz?',
+  DEVICE_ENTITIES: 'Cihaz Varlıkları',
   SUPPORT_INFORMATION: 'Destek Bilgileri',
+  CLICK_HERE: 'Buraya Tıklayın',
   HELP_INFORMATION_1: 'EMS-ESPnin nasıl ayarlanacağı ile ilgili bilgileri edinmek için çevrimiçi WIKI sayfasını ziyaret edin',
   HELP_INFORMATION_2: 'Canlı topluluk sohbeti için Discord sunucumuza katılın',
   HELP_INFORMATION_3: 'Yeni bir özellik talep etmek yada hata bildirmek için',
@@ -175,11 +181,13 @@ const tr: Translation = {
   STATUS_OF: '{0} Durumu',
   UPLOAD_DOWNLOAD: 'Yükleme/İndirme',
   VERSION_ON: 'You are currently on', // TODO translate
+  SYSTEM_APPLY_FIRMWARE: 'yeni bellenimi uygulamak için',
   CLOSE: 'Kapat',
   USE: 'KUllan',
   FACTORY_RESET: 'Fabrika ayarına dönme',
   SYSTEM_FACTORY_TEXT: 'Cihaz fabrika ayarlarına döndü ve şimdi yendiden başlatılacak',
   SYSTEM_FACTORY_TEXT_DIALOG: 'Cihazı fabrika ayarlarına döndürmek istediğinize emin misiniz?',
+  VERSION_CHECK: 'Sürüm Kontrolü',
   THE_LATEST: 'En son',
   OFFICIAL: 'resmi',
   DEVELOPMENT: 'geliştirme',
@@ -236,7 +244,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_WATER: 'Water Modules', // TODO translate
   MQTT_QUEUE: 'MQTT Sırası',
   DEFAULT: 'Varsayılan',
   MQTT_ENTITY_FORMAT: 'Varlık Kimlik biçimi',
@@ -322,9 +329,7 @@ const tr: Translation = {
   ACTIVEHIGH: 'Active High', // TODO translate
   ACTIVELOW: 'Active Low', // TODO translate
   UNCHANGED: 'Unchanged', // TODO translate
-  ALWAYS: 'Always', // TODO translate
+  ALWAYS: 'Always' // TODO translate
-  ACTIVITY: 'Activity', // TODO translate
-  CONFIGURE: 'Configure {0}' // TODO translate
 };
 
 export default tr;

interface/src/project/CustomEntitiesDialog.tsx

@@ -1,284 +0,0 @@
-import AddIcon from '@mui/icons-material/Add';
-import CancelIcon from '@mui/icons-material/Cancel';
-import DoneIcon from '@mui/icons-material/Done';
-import RemoveIcon from '@mui/icons-material/RemoveCircleOutline';
-import {
-  Box,
-  Button,
-  Checkbox,
-  Dialog,
-  DialogActions,
-  DialogContent,
-  DialogTitle,
-  Grid,
-  InputAdornment,
-  MenuItem,
-  TextField
-} from '@mui/material';
-import { useEffect, useState } from 'react';
-
-import { DeviceValueUOM_s, DeviceValueType } from './types';
-import type { EntityItem } from './types';
-import type Schema from 'async-validator';
-import type { ValidateFieldsError } from 'async-validator';
-
-import { dialogStyle } from 'CustomTheme';
-import { BlockFormControlLabel, ValidatedTextField } from 'components';
-
-import { useI18nContext } from 'i18n/i18n-react';
-
-import { numberValue, updateValue } from 'utils';
-import { validate } from 'validators';
-
-type CustomEntitiesDialogProps = {
-  open: boolean;
-  creating: boolean;
-  onClose: () => void;
-  onSave: (ei: EntityItem) => void;
-  selectedItem: EntityItem;
-  validator: Schema;
-};
-
-const CustomEntitiesDialog = ({
-  open,
-  creating,
-  onClose,
-  onSave,
-  selectedItem,
-  validator
-}: CustomEntitiesDialogProps) => {
-  const { LL } = useI18nContext();
-  const [editItem, setEditItem] = useState<EntityItem>(selectedItem);
-  const [fieldErrors, setFieldErrors] = useState<ValidateFieldsError>();
-  const updateFormValue = updateValue(setEditItem);
-
-  useEffect(() => {
-    if (open) {
-      setFieldErrors(undefined);
-      setEditItem(selectedItem);
-      // convert to hex strings straight away
-      setEditItem({
-        ...selectedItem,
-        device_id: selectedItem.device_id.toString(16).toUpperCase(),
-        type_id: selectedItem.type_id.toString(16).toUpperCase()
-      });
-    }
-  }, [open, selectedItem]);
-
-  const close = () => {
-    onClose();
-  };
-
-  const save = async () => {
-    try {
-      setFieldErrors(undefined);
-      await validate(validator, editItem);
-      if (typeof editItem.device_id === 'string') {
-        editItem.device_id = parseInt(editItem.device_id, 16);
-      }
-      if (typeof editItem.type_id === 'string') {
-        editItem.type_id = parseInt(editItem.type_id, 16);
-      }
-      onSave(editItem);
-    } catch (errors: any) {
-      setFieldErrors(errors);
-    }
-  };
-
-  const remove = () => {
-    editItem.deleted = true;
-    onSave(editItem);
-  };
-
-  return (
-    <Dialog sx={dialogStyle} open={open} onClose={close}>
-      <DialogTitle>
-        {creating ? LL.ADD(1) + ' ' + LL.NEW(1) : LL.EDIT()}&nbsp;{LL.ENTITY()}
-      </DialogTitle>
-      <DialogContent dividers>
-        <Box display="flex" flexWrap="wrap" mb={1}>
-          <Box flexWrap="nowrap" whiteSpace="nowrap" />
-        </Box>
-        <Grid container spacing={2}>
-          <Grid item xs={4}>
-            <ValidatedTextField
-              fieldErrors={fieldErrors}
-              name="name"
-              label={LL.NAME(0)}
-              value={editItem.name}
-              margin="normal"
-              fullWidth
-              onChange={updateFormValue}
-            />
-          </Grid>
-          <Grid item xs={4}>
-            <TextField
-              name="ram"
-              label={LL.VALUE(1) + ' ' + LL.TYPE(1)}
-              value={editItem.ram}
-              variant="outlined"
-              onChange={updateFormValue}
-              margin="normal"
-              fullWidth
-              select
-            >
-              <MenuItem value={0}>EMS-{LL.VALUE(1)}</MenuItem>
-              <MenuItem value={1}>RAM-{LL.VALUE(1)}</MenuItem>
-            </TextField>
-          </Grid>
-          {editItem.ram === 1 && (
-            <Grid item xs={4}>
-              <TextField
-                name="value"
-                label={LL.DEFAULT(0) + ' ' + LL.VALUE(1)}
-                value={editItem.value}
-                variant="outlined"
-                onChange={updateFormValue}
-                fullWidth
-                margin="normal"
-              />
-            </Grid>
-          )}
-          {editItem.ram === 0 && (
-            <>
-              <Grid item xs={4} mt={3}>
-                <BlockFormControlLabel
-                  control={<Checkbox checked={editItem.writeable} onChange={updateFormValue} name="writeable" />}
-                  label={LL.WRITEABLE()}
-                />
-              </Grid>
-              <Grid item xs={4}>
-                <ValidatedTextField
-                  fieldErrors={fieldErrors}
-                  name="device_id"
-                  label={LL.ID_OF(LL.DEVICE())}
-                  margin="normal"
-                  type="string"
-                  fullWidth
-                  value={editItem.device_id as string}
-                  onChange={updateFormValue}
-                  inputProps={{ style: { textTransform: 'uppercase' } }}
-                  InputProps={{ startAdornment: <InputAdornment position="start">0x</InputAdornment> }}
-                />
-              </Grid>
-              <Grid item xs={4}>
-                <ValidatedTextField
-                  fieldErrors={fieldErrors}
-                  name="type_id"
-                  label={LL.ID_OF(LL.TYPE(1))}
-                  margin="normal"
-                  fullWidth
-                  value={editItem.type_id}
-                  onChange={updateFormValue}
-                  inputProps={{ style: { textTransform: 'uppercase' } }}
-                  InputProps={{ startAdornment: <InputAdornment position="start">0x</InputAdornment> }}
-                />
-              </Grid>
-              <Grid item xs={4}>
-                <ValidatedTextField
-                  fieldErrors={fieldErrors}
-                  name="offset"
-                  label={LL.OFFSET()}
-                  margin="normal"
-                  fullWidth
-                  type="number"
-                  value={editItem.offset}
-                  onChange={updateFormValue}
-                />
-              </Grid>
-              <Grid item xs={4}>
-                <TextField
-                  name="value_type"
-                  label={LL.VALUE(1) + ' ' + LL.TYPE(1)}
-                  value={editItem.value_type}
-                  variant="outlined"
-                  onChange={updateFormValue}
-                  margin="normal"
-                  fullWidth
-                  select
-                >
-                  <MenuItem value={DeviceValueType.BOOL}>BOOL</MenuItem>
-                  <MenuItem value={DeviceValueType.INT}>INT</MenuItem>
-                  <MenuItem value={DeviceValueType.UINT}>UINT</MenuItem>
-                  <MenuItem value={DeviceValueType.SHORT}>SHORT</MenuItem>
-                  <MenuItem value={DeviceValueType.USHORT}>USHORT</MenuItem>
-                  <MenuItem value={DeviceValueType.ULONG}>ULONG</MenuItem>
-                  <MenuItem value={DeviceValueType.TIME}>TIME</MenuItem>
-                  <MenuItem value={DeviceValueType.STRING}>RAW</MenuItem>
-                </TextField>
-              </Grid>
-
-              {editItem.value_type !== DeviceValueType.BOOL && editItem.value_type !== DeviceValueType.STRING && (
-                <>
-                  <Grid item xs={4}>
-                    <TextField
-                      name="factor"
-                      label={LL.FACTOR()}
-                      value={numberValue(editItem.factor)}
-                      variant="outlined"
-                      onChange={updateFormValue}
-                      fullWidth
-                      margin="normal"
-                      type="number"
-                      inputProps={{ step: '0.001' }}
-                    />
-                  </Grid>
-                  <Grid item xs={4}>
-                    <TextField
-                      name="uom"
-                      label={LL.UNIT()}
-                      value={editItem.uom}
-                      margin="normal"
-                      fullWidth
-                      onChange={updateFormValue}
-                      select
-                    >
-                      {DeviceValueUOM_s.map((val, i) => (
-                        <MenuItem key={i} value={i}>
-                          {val}
-                        </MenuItem>
-                      ))}
-                    </TextField>
-                  </Grid>
-                </>
-              )}
-              {editItem.value_type === DeviceValueType.STRING && editItem.device_id !== '0' && (
-                <Grid item xs={4}>
-                  <TextField
-                    name="factor"
-                    label="Bytes"
-                    value={editItem.factor}
-                    variant="outlined"
-                    onChange={updateFormValue}
-                    fullWidth
-                    margin="normal"
-                    type="number"
-                    inputProps={{ min: '1', max: '27', step: '1' }}
-                  />
-                </Grid>
-              )}
-            </>
-          )}
-        </Grid>
-      </DialogContent>
-
-      <DialogActions>
-        {!creating && (
-          <Box flexGrow={1}>
-            <Button startIcon={<RemoveIcon />} variant="outlined" color="warning" onClick={remove}>
-              {LL.REMOVE()}
-            </Button>
-          </Box>
-        )}
-        <Button startIcon={<CancelIcon />} variant="outlined" onClick={close} color="secondary">
-          {LL.CANCEL()}
-        </Button>
-        <Button startIcon={creating ? <AddIcon /> : <DoneIcon />} variant="outlined" onClick={save} color="primary">
-          {creating ? LL.ADD(0) : LL.UPDATE()}
-        </Button>
-      </DialogActions>
-    </Dialog>
-  );
-};
-
-export default CustomEntitiesDialog;

interface/src/project/Dashboard.tsx

@@ -0,0 +1,37 @@
+import { Tab } from '@mui/material';
+import { Navigate, Route, Routes } from 'react-router-dom';
+
+import DashboardDevices from './DashboardDevices';
+import DashboardSensors from './DashboardSensors';
+import DashboardStatus from './DashboardStatus';
+
+import type { FC } from 'react';
+
+import { RouterTabs, useRouterTab, useLayoutTitle } from 'components';
+
+import { useI18nContext } from 'i18n/i18n-react';
+
+const Dashboard: FC = () => {
+  const { routerTab } = useRouterTab();
+
+  const { LL } = useI18nContext();
+  useLayoutTitle(LL.DASHBOARD());
+
+  return (
+    <>
+      <RouterTabs value={routerTab}>
+        <Tab value="/dashboard/devices" label={LL.DEVICES()} />
+        <Tab value="/dashboard/sensors" label={LL.SENSORS()} />
+        <Tab value="/dashboard/status" label="Status" />
+      </RouterTabs>
+      <Routes>
+        <Route path="devices" element={<DashboardDevices />} />
+        <Route path="sensors" element={<DashboardSensors />} />
+        <Route path="status" element={<DashboardStatus />} />
+        <Route path="*" element={<Navigate replace to="/dashboard/devices" />} />
+      </Routes>
+    </>
+  );
+};
+
+export default Dashboard;

interface/src/project/DashboardDevices.tsx

@@ -33,13 +33,13 @@ import { useSort, SortToggleType } from '@table-library/react-table-library/sort
 import { Table, Header, HeaderRow, HeaderCell, Body, Row, Cell } from '@table-library/react-table-library/table';
 import { useTheme } from '@table-library/react-table-library/theme';
 import { useRequest } from 'alova';
-import { useState, useEffect, useCallback, useLayoutEffect, useContext } from 'react';
+import { useState, useContext, useEffect, useCallback, useLayoutEffect } from 'react';
 
 import { IconContext } from 'react-icons';
 import { useNavigate } from 'react-router-dom';
 import { toast } from 'react-toastify';
+import DashboardDevicesDialog from './DashboardDevicesDialog';
 import DeviceIcon from './DeviceIcon';
-import DashboardDevicesDialog from './DevicesDialog';
 
 import * as EMSESP from './api';
 import { formatValue } from './deviceValue';
@@ -49,15 +49,14 @@ import { deviceValueItemValidation } from './validators';
 import type { Device, DeviceValue } from './types';
 import type { FC } from 'react';
 import { dialogStyle } from 'CustomTheme';
-import { ButtonRow, SectionContent, MessageBox, useLayoutTitle } from 'components';
+import { ButtonRow, SectionContent, MessageBox } from 'components';
-
 import { AuthenticatedContext } from 'contexts/authentication';
+
 import { useI18nContext } from 'i18n/i18n-react';
 
-const Devices: FC = () => {
+const DashboardDevices: FC = () => {
-  const { LL } = useI18nContext();
   const { me } = useContext(AuthenticatedContext);
-
+  const { LL } = useI18nContext();
   const [size, setSize] = useState([0, 0]);
   const [selectedDeviceValue, setSelectedDeviceValue] = useState<DeviceValue>();
   const [onlyFav, setOnlyFav] = useState(false);
@@ -67,8 +66,6 @@ const Devices: FC = () => {
 
   const navigate = useNavigate();
 
-  useLayoutTitle(LL.DEVICES());
-
   const { data: coreData, send: readCoreData } = useRequest(() => EMSESP.readCoreData(), {
     initialData: {
       connected: true,
@@ -97,14 +94,8 @@ const Devices: FC = () => {
   }, []);
 
   const leftOffset = () => {
-    const devicesWindow = document.getElementById('devices-window');
+    const left = document.getElementById('devices-window')?.getBoundingClientRect().left;
-    if (!devicesWindow) {
+    const right = document.getElementById('devices-window')?.getBoundingClientRect().right;
-      return 0;
-    }
-
-    const clientRect = devicesWindow.getBoundingClientRect();
-    const left = clientRect.left;
-    const right = clientRect.right;
 
     if (!left || !right) {
       return 0;
@@ -284,9 +275,9 @@ const Devices: FC = () => {
 
   const customize = () => {
     if (selectedDevice == 99) {
-      navigate('/customentities');
+      navigate('/settings/customentities');
     } else {
-      navigate('/customizations', { state: selectedDevice });
+      navigate('/settings/customization', { state: selectedDevice });
     }
   };
 
@@ -423,8 +414,11 @@ const Devices: FC = () => {
   };
 
   const renderCoreData = () => (
-    <IconContext.Provider value={{ color: 'lightblue', size: '18', style: { verticalAlign: 'middle' } }}>
+    <IconContext.Provider value={{ color: 'lightblue', size: '24', style: { verticalAlign: 'middle' } }}>
       {!coreData.connected && <MessageBox my={2} level="error" message={LL.EMS_BUS_WARNING()} />}
+      {coreData.connected && coreData.devices.length === 0 && (
+        <MessageBox my={2} level="warning" message={LL.EMS_BUS_SCANNING()} />
+      )}
 
       {coreData.connected && (
         <Table data={{ nodes: coreData.devices }} select={device_select} theme={device_theme} layout={{ custom: true }}>
@@ -523,11 +517,9 @@ const Devices: FC = () => {
               <IconButton onClick={() => setShowDeviceInfo(true)}>
                 <InfoOutlinedIcon color="primary" sx={{ fontSize: 18, verticalAlign: 'middle' }} />
               </IconButton>
-              {me.admin && (
               <IconButton onClick={customize}>
-                  <FormatListNumberedIcon sx={{ fontSize: 18, verticalAlign: 'middle' }} />
+                <FormatListNumberedIcon color="primary" sx={{ fontSize: 18, verticalAlign: 'middle' }} />
               </IconButton>
-              )}
               <IconButton onClick={handleDownloadCsv}>
                 <DownloadIcon color="primary" sx={{ fontSize: 18, verticalAlign: 'middle' }} />
               </IconButton>
@@ -589,7 +581,7 @@ const Devices: FC = () => {
                     <Cell>{renderNameCell(dv)}</Cell>
                     <Cell>{formatValue(LL, dv.v, dv.u)}</Cell>
                     <Cell stiff>
-                      {me.admin && dv.c && !hasMask(dv.id, DeviceEntityMask.DV_READONLY) && (
+                      {dv.c && me.admin && !hasMask(dv.id, DeviceEntityMask.DV_READONLY) && (
                         <IconButton size="small" onClick={() => showDeviceValue(dv)}>
                           {dv.v === '' && dv.c ? (
                             <PlayArrowIcon color="primary" sx={{ fontSize: 16 }} />
@@ -610,7 +602,7 @@ const Devices: FC = () => {
   };
 
   return (
-    <SectionContent id="devices-window">
+    <SectionContent title={LL.DEVICE_DATA()} titleGutter id="devices-window">
       {renderCoreData()}
       {renderDeviceData()}
       {renderDeviceDetails()}
@@ -621,13 +613,15 @@ const Devices: FC = () => {
           onSave={deviceValueDialogSave}
           selectedItem={selectedDeviceValue}
           writeable={
-            selectedDeviceValue.c !== undefined && !hasMask(selectedDeviceValue.id, DeviceEntityMask.DV_READONLY)
+            me.admin &&
+            selectedDeviceValue.c !== undefined &&
+            !hasMask(selectedDeviceValue.id, DeviceEntityMask.DV_READONLY)
           }
           validator={deviceValueItemValidation(selectedDeviceValue)}
           progress={submitting}
         />
       )}
-      <ButtonRow mt={1}>
+      <ButtonRow>
         <Button startIcon={<RefreshIcon />} variant="outlined" color="secondary" onClick={refreshData}>
           {LL.REFRESH()}
         </Button>
@@ -636,4 +630,4 @@ const Devices: FC = () => {
   );
 };
 
-export default Devices;
+export default DashboardDevices;

interface/src/project/DashboardDevicesDialog.tsx

@@ -26,7 +26,7 @@ import type { ValidateFieldsError } from 'async-validator';
 import { dialogStyle } from 'CustomTheme';
 import { ValidatedTextField } from 'components';
 import { useI18nContext } from 'i18n/i18n-react';
-import { updateValue, numberValue } from 'utils';
+import { updateValue } from 'utils';
 
 import { validate } from 'validators';
 
@@ -40,7 +40,7 @@ type DashboardDevicesDialogProps = {
   progress: boolean;
 };
 
-const DevicesDialog = ({
+const DashboardDevicesDialog = ({
   open,
   onClose,
   onSave,
@@ -103,7 +103,7 @@ const DevicesDialog = ({
   return (
     <Dialog sx={dialogStyle} open={open} onClose={close}>
       <DialogTitle>
-        {selectedItem.v === '' && selectedItem.c ? LL.RUN_COMMAND() : writeable ? LL.CHANGE_VALUE() : LL.VALUE(1)}
+        {selectedItem.v === '' && selectedItem.c ? LL.RUN_COMMAND() : writeable ? LL.CHANGE_VALUE() : LL.VALUE(0)}
       </DialogTitle>
       <DialogContent dividers>
         <Box color="warning.main" p={0} pl={0} pr={0} mt={0} mb={2}>
@@ -133,7 +133,7 @@ const DevicesDialog = ({
                 fieldErrors={fieldErrors}
                 name="v"
                 label={LL.VALUE(1)}
-                value={numberValue(Math.round(editItem.v * 10) / 10)}
+                value={Math.round(editItem.v * 10) / 10}
                 autoFocus
                 disabled={!writeable}
                 type="number"
@@ -204,4 +204,4 @@ const DevicesDialog = ({
   );
 };
 
-export default DevicesDialog;
+export default DashboardDevicesDialog;

interface/src/project/DashboardSensors.tsx

@@ -8,27 +8,26 @@ import { useSort, SortToggleType } from '@table-library/react-table-library/sort
 import { Table, Header, HeaderRow, HeaderCell, Body, Row, Cell } from '@table-library/react-table-library/table';
 import { useTheme } from '@table-library/react-table-library/theme';
 import { useRequest } from 'alova';
-import { useState, useEffect, useContext } from 'react';
+import { useState, useContext, useEffect } from 'react';
 
 import { toast } from 'react-toastify';
 
-import DashboardSensorsAnalogDialog from './SensorsAnalogDialog';
+import DashboardSensorsAnalogDialog from './DashboardSensorsAnalogDialog';
-import DashboardSensorsTemperatureDialog from './SensorsTemperatureDialog';
+import DashboardSensorsTemperatureDialog from './DashboardSensorsTemperatureDialog';
 import * as EMSESP from './api';
 
 import { DeviceValueUOM, DeviceValueUOM_s, AnalogTypeNames, AnalogType } from './types';
 import { temperatureSensorItemValidation, analogSensorItemValidation } from './validators';
 import type { TemperatureSensor, AnalogSensor } from './types';
 import type { FC } from 'react';
-import { ButtonRow, SectionContent, useLayoutTitle } from 'components';
+import { ButtonRow, SectionContent } from 'components';
 
 import { AuthenticatedContext } from 'contexts/authentication';
 import { useI18nContext } from 'i18n/i18n-react';
 
-const Sensors: FC = () => {
+const DashboardSensors: FC = () => {
   const { LL } = useI18nContext();
   const { me } = useContext(AuthenticatedContext);
-
   const [selectedTemperatureSensor, setSelectedTemperatureSensor] = useState<TemperatureSensor>();
   const [selectedAnalogSensor, setSelectedAnalogSensor] = useState<AnalogSensor>();
   const [temperatureDialogOpen, setTemperatureDialogOpen] = useState<boolean>(false);
@@ -52,6 +51,8 @@ const Sensors: FC = () => {
     immediate: false
   });
 
+  const isAdmin = me.admin;
+
   const common_theme = useTheme({
     BaseRow: `
       font-size: 14px;
@@ -169,8 +170,6 @@ const Sensors: FC = () => {
     };
   });
 
-  useLayoutTitle(LL.SENSORS());
-
   const formatDurationMin = (duration_min: number) => {
     const days = Math.trunc((duration_min * 60000) / 86400000);
     const hours = Math.trunc((duration_min * 60000) / 3600000) % 24;
@@ -221,7 +220,7 @@ const Sensors: FC = () => {
   }
 
   const updateTemperatureSensor = (ts: TemperatureSensor) => {
-    if (me.admin) {
+    if (isAdmin) {
       setSelectedTemperatureSensor(ts);
       setTemperatureDialogOpen(true);
     }
@@ -247,7 +246,7 @@ const Sensors: FC = () => {
   };
 
   const updateAnalogSensor = (as: AnalogSensor) => {
-    if (me.admin) {
+    if (isAdmin) {
       setCreating(false);
       setSelectedAnalogSensor(as);
       setAnalogDialogOpen(true);
@@ -263,7 +262,7 @@ const Sensors: FC = () => {
     setSelectedAnalogSensor({
       id: Math.floor(Math.random() * (Math.floor(200) - 100) + 100),
       n: '',
-      g: 21, // default GPIO 21 which is safe for all platforms
+      g: 40,
       u: 0,
       v: 0,
       o: 0,
@@ -407,8 +406,10 @@ const Sensors: FC = () => {
   );
 
   return (
-    <SectionContent>
+    <SectionContent title={LL.SENSOR_DATA()} titleGutter>
-      <Typography sx={{ pb: 1 }} variant="h6" color="secondary">
+      {sensorData.ts.length > 0 && (
+        <>
+          <Typography sx={{ pt: 2, pb: 1 }} variant="h6" color="secondary">
             {LL.TEMP_SENSORS()}
           </Typography>
           <RenderTemperatureSensors />
@@ -421,6 +422,9 @@ const Sensors: FC = () => {
               validator={temperatureSensorItemValidation()}
             />
           )}
+        </>
+      )}
+
       {sensorData?.analog_enabled === true && (
         <>
           <Typography sx={{ pt: 4, pb: 1 }} variant="h6" color="secondary">
@@ -439,14 +443,15 @@ const Sensors: FC = () => {
           )}
         </>
       )}
+
       <ButtonRow>
-        <Box mt={1} display="flex" flexWrap="wrap">
+        <Box mt={2} display="flex" flexWrap="wrap">
           <Box flexGrow={1}>
             <Button startIcon={<RefreshIcon />} variant="outlined" color="secondary" onClick={fetchSensorData}>
               {LL.REFRESH()}
             </Button>
           </Box>
-          {sensorData?.analog_enabled === true && me.admin && (
+          {sensorData?.analog_enabled === true && (
             <Button
               variant="outlined"
               color="primary"
@@ -462,4 +467,4 @@ const Sensors: FC = () => {
   );
 };
 
-export default Sensors;
+export default DashboardSensors;

interface/src/project/DashboardSensorsAnalogDialog.tsx

@@ -38,7 +38,7 @@ type DashboardSensorsAnalogDialogProps = {
   validator: Schema;
 };
 
-const SensorsAnalogDialog = ({
+const DashboardSensorsAnalogDialog = ({
   open,
   onClose,
   onSave,
@@ -182,7 +182,7 @@ const SensorsAnalogDialog = ({
             <Grid item xs={4}>
               <TextField
                 name="o"
-                label={LL.VALUE(1)}
+                label={LL.VALUE(0)}
                 value={numberValue(editItem.o)}
                 fullWidth
                 type="number"
@@ -197,7 +197,7 @@ const SensorsAnalogDialog = ({
               <Grid item xs={4}>
                 <TextField
                   name="o"
-                  label={LL.VALUE(1)}
+                  label={LL.VALUE(0)}
                   value={numberValue(editItem.o)}
                   fullWidth
                   select
@@ -296,4 +296,4 @@ const SensorsAnalogDialog = ({
   );
 };
 
-export default SensorsAnalogDialog;
+export default DashboardSensorsAnalogDialog;

interface/src/project/DashboardSensorsTemperatureDialog.tsx

@@ -26,7 +26,7 @@ import { numberValue, updateValue } from 'utils';
 
 import { validate } from 'validators';
 
-type SensorsTemperatureDialogProps = {
+type DashboardSensorsTemperatureDialogProps = {
   open: boolean;
   onClose: () => void;
   onSave: (ts: TemperatureSensor) => void;
@@ -34,13 +34,13 @@ type SensorsTemperatureDialogProps = {
   validator: Schema;
 };
 
-const SensorsTemperatureDialog = ({
+const DashboardSensorsTemperatureDialog = ({
   open,
   onClose,
   onSave,
   selectedItem,
   validator
-}: SensorsTemperatureDialogProps) => {
+}: DashboardSensorsTemperatureDialogProps) => {
   const { LL } = useI18nContext();
   const [fieldErrors, setFieldErrors] = useState<ValidateFieldsError>();
   const [editItem, setEditItem] = useState<TemperatureSensor>(selectedItem);
@@ -119,4 +119,4 @@ const SensorsTemperatureDialog = ({
   );
 };
 
-export default SensorsTemperatureDialog;
+export default DashboardSensorsTemperatureDialog;

interface/src/project/DashboardStatus.tsx

@@ -0,0 +1,282 @@
+import CancelIcon from '@mui/icons-material/Cancel';
+import DeviceHubIcon from '@mui/icons-material/DeviceHub';
+import DirectionsBusIcon from '@mui/icons-material/DirectionsBus';
+import PermScanWifiIcon from '@mui/icons-material/PermScanWifi';
+import RefreshIcon from '@mui/icons-material/Refresh';
+import {
+  Avatar,
+  Box,
+  Button,
+  Dialog,
+  DialogActions,
+  DialogContent,
+  DialogTitle,
+  List,
+  ListItem,
+  ListItemAvatar,
+  ListItemText,
+  useTheme
+} from '@mui/material';
+import { Body, Cell, Header, HeaderCell, HeaderRow, Row, Table } from '@table-library/react-table-library/table';
+import { useTheme as tableTheme } from '@table-library/react-table-library/theme';
+import { useRequest } from 'alova';
+import { useContext, useEffect, useState } from 'react';
+import { toast } from 'react-toastify';
+
+import * as EMSESP from './api';
+import { busConnectionStatus } from './types';
+import type { Stat, Status } from './types';
+import type { Theme } from '@mui/material';
+
+import type { Translation } from 'i18n/i18n-types';
+import type { FC } from 'react';
+import { dialogStyle } from 'CustomTheme';
+import { ButtonRow, FormLoader, SectionContent } from 'components';
+import { AuthenticatedContext } from 'contexts/authentication';
+import { useI18nContext } from 'i18n/i18n-react';
+
+export const isConnected = ({ status }: Status) => status !== busConnectionStatus.BUS_STATUS_OFFLINE;
+
+const busStatusHighlight = ({ status }: Status, theme: Theme) => {
+  switch (status) {
+    case busConnectionStatus.BUS_STATUS_TX_ERRORS:
+      return theme.palette.warning.main;
+    case busConnectionStatus.BUS_STATUS_CONNECTED:
+      return theme.palette.success.main;
+    case busConnectionStatus.BUS_STATUS_OFFLINE:
+      return theme.palette.error.main;
+    default:
+      return theme.palette.warning.main;
+  }
+};
+
+const showQuality = (stat: Stat) => {
+  if (stat.q === 0 || stat.s + stat.f === 0) {
+    return;
+  }
+  if (stat.q === 100) {
+    return <div style={{ color: '#00FF7F' }}>{stat.q}%</div>;
+  }
+  if (stat.q >= 95) {
+    return <div style={{ color: 'orange' }}>{stat.q}%</div>;
+  } else {
+    return <div style={{ color: 'red' }}>{stat.q}%</div>;
+  }
+};
+
+const DashboardStatus: FC = () => {
+  const { data: data, send: loadData, error } = useRequest(EMSESP.readStatus);
+
+  const { LL } = useI18nContext();
+
+  const theme = useTheme();
+  const [confirmScan, setConfirmScan] = useState<boolean>(false);
+
+  const { me } = useContext(AuthenticatedContext);
+
+  const { send: scanDevices } = useRequest(EMSESP.scanDevices, {
+    immediate: false
+  });
+
+  const stats_theme = tableTheme({
+    Table: `
+      --data-table-library_grid-template-columns: repeat(1, minmax(0, 1fr)) 90px 90px 80px;
+    `,
+    BaseRow: `
+      font-size: 14px;
+    `,
+    HeaderRow: `
+      text-transform: uppercase;
+      background-color: black;
+      color: #90CAF9;
+
+      .th {
+        height: 36px;
+        border-bottom: 1px solid #565656;
+      }
+    `,
+    Row: `
+      .td {
+        padding: 8px;
+        border-top: 1px solid #565656;
+        border-bottom: 1px solid #565656;
+      }
+
+      &:nth-of-type(odd) .td {
+        background-color: #303030;
+      }
+      &:nth-of-type(even) .td {
+        background-color: #1e1e1e;
+      }
+    `,
+    BaseCell: `
+      &:not(:first-of-type) {
+        text-align: center;
+      }
+    `
+  });
+
+  useEffect(() => {
+    const timer = setInterval(() => loadData(), 30000);
+    return () => {
+      clearInterval(timer);
+    };
+  });
+
+  const showName = (id: any) => {
+    const name: keyof Translation['STATUS_NAMES'] = id;
+    return LL.STATUS_NAMES[name]();
+  };
+
+  const formatDurationSec = (duration_sec: number) => {
+    const days = Math.trunc((duration_sec * 1000) / 86400000);
+    const hours = Math.trunc((duration_sec * 1000) / 3600000) % 24;
+    const minutes = Math.trunc((duration_sec * 1000) / 60000) % 60;
+    const seconds = Math.trunc((duration_sec * 1000) / 1000) % 60;
+
+    let formatted = '';
+    if (days) {
+      formatted += LL.NUM_DAYS({ num: days }) + ' ';
+    }
+    if (hours) {
+      formatted += LL.NUM_HOURS({ num: hours }) + ' ';
+    }
+    if (minutes) {
+      formatted += LL.NUM_MINUTES({ num: minutes }) + ' ';
+    }
+    formatted += LL.NUM_SECONDS({ num: seconds });
+    return formatted;
+  };
+
+  const busStatus = () => {
+    if (data) {
+      switch (data.status) {
+        case busConnectionStatus.BUS_STATUS_CONNECTED:
+          return LL.CONNECTED(0) + ' (' + formatDurationSec(data.uptime) + ')';
+        case busConnectionStatus.BUS_STATUS_TX_ERRORS:
+          return LL.TX_ISSUES();
+        case busConnectionStatus.BUS_STATUS_OFFLINE:
+          return LL.DISCONNECTED();
+      }
+    }
+    return 'Unknown';
+  };
+
+  const scan = async () => {
+    await scanDevices()
+      .then(() => {
+        toast.info(LL.SCANNING() + '...');
+      })
+      .catch((err) => {
+        toast.error(err.message);
+      });
+    setConfirmScan(false);
+  };
+
+  const renderScanDialog = () => (
+    <Dialog sx={dialogStyle} open={confirmScan} onClose={() => setConfirmScan(false)}>
+      <DialogTitle>{LL.SCAN_DEVICES()}</DialogTitle>
+      <DialogContent dividers>{LL.EMS_SCAN()}</DialogContent>
+      <DialogActions>
+        <Button startIcon={<CancelIcon />} variant="outlined" onClick={() => setConfirmScan(false)} color="secondary">
+          {LL.CANCEL()}
+        </Button>
+        <Button startIcon={<PermScanWifiIcon />} variant="outlined" onClick={scan} color="primary">
+          {LL.SCAN()}
+        </Button>
+      </DialogActions>
+    </Dialog>
+  );
+
+  const content = () => {
+    if (!data) {
+      return <FormLoader onRetry={loadData} errorMessage={error?.message} />;
+    }
+
+    return (
+      <>
+        <List>
+          <ListItem>
+            <ListItemAvatar>
+              <Avatar sx={{ bgcolor: busStatusHighlight(data, theme) }}>
+                <DirectionsBusIcon />
+              </Avatar>
+            </ListItemAvatar>
+            <ListItemText primary={LL.EMS_BUS_STATUS()} secondary={busStatus()} />
+          </ListItem>
+          <ListItem>
+            <ListItemAvatar>
+              <Avatar>
+                <DeviceHubIcon />
+              </Avatar>
+            </ListItemAvatar>
+            <ListItemText
+              primary={LL.ACTIVE_DEVICES()}
+              secondary={
+                LL.NUM_DEVICES({ num: data.num_devices }) +
+                ', ' +
+                LL.NUM_TEMP_SENSORS({ num: data.num_sensors }) +
+                ', ' +
+                LL.NUM_ANALOG_SENSORS({ num: data.num_analogs })
+              }
+            />
+          </ListItem>
+          <Box m={3} />
+          <Table data={{ nodes: data.stats }} theme={stats_theme} layout={{ custom: true }}>
+            {(tableList: any) => (
+              <>
+                <Header>
+                  <HeaderRow>
+                    <HeaderCell resize />
+                    <HeaderCell stiff>{LL.SUCCESS()}</HeaderCell>
+                    <HeaderCell stiff>{LL.FAIL()}</HeaderCell>
+                    <HeaderCell stiff>{LL.QUALITY()}</HeaderCell>
+                  </HeaderRow>
+                </Header>
+                <Body>
+                  {tableList.map((stat: Stat) => (
+                    <Row key={stat.id} item={stat}>
+                      <Cell>{showName(stat.id)}</Cell>
+                      <Cell stiff>{Intl.NumberFormat().format(stat.s)}</Cell>
+                      <Cell stiff>{Intl.NumberFormat().format(stat.f)}</Cell>
+                      <Cell stiff>{showQuality(stat)}</Cell>
+                    </Row>
+                  ))}
+                </Body>
+              </>
+            )}
+          </Table>
+        </List>
+        {renderScanDialog()}
+        <Box display="flex" flexWrap="wrap">
+          <Box flexGrow={1} sx={{ '& button': { mt: 2 } }}>
+            <Button startIcon={<RefreshIcon />} variant="outlined" color="secondary" onClick={loadData}>
+              {LL.REFRESH()}
+            </Button>
+          </Box>
+          <Box flexWrap="nowrap" whiteSpace="nowrap">
+            <ButtonRow>
+              <Button
+                startIcon={<PermScanWifiIcon />}
+                variant="outlined"
+                color="primary"
+                disabled={!me.admin}
+                onClick={() => setConfirmScan(true)}
+              >
+                {LL.SCAN_DEVICES()}
+              </Button>
+            </ButtonRow>
+          </Box>
+        </Box>
+      </>
+    );
+  };
+
+  return (
+    <SectionContent title={LL.EMS_BUS_STATUS_TITLE()} titleGutter>
+      {content()}
+    </SectionContent>
+  );
+};
+
+export default DashboardStatus;

interface/src/project/DeviceIcon.tsx

@@ -1,13 +1,12 @@
-import PlaylistAddIcon from '@mui/icons-material/PlaylistAdd';
 import { AiOutlineControl, AiOutlineGateway, AiOutlineAlert } from 'react-icons/ai';
 import { CgSmartHomeBoiler } from 'react-icons/cg';
+
 import { FaSolarPanel } from 'react-icons/fa';
-import { GiHeatHaze, GiTap } from 'react-icons/gi';
+import { GiHeatHaze } from 'react-icons/gi';
-import { MdThermostatAuto, MdOutlineSensors, MdOutlineDevices, MdOutlinePool } from 'react-icons/md';
+import { MdThermostatAuto, MdOutlineSensors, MdOutlineExtension, MdOutlineDevices } from 'react-icons/md';
 import { TiFlowSwitch } from 'react-icons/ti';
 import { VscVmConnect } from 'react-icons/vsc';
 import { DeviceType } from './types';
-
 import type { FC } from 'react';
 
 interface DeviceIconProps {
@@ -41,12 +40,8 @@ const DeviceIcon: FC<DeviceIconProps> = ({ type_id }) => {
       return <AiOutlineAlert />;
     case DeviceType.EXTENSION:
       return <MdOutlineDevices />;
-    case DeviceType.WATER:
-      return <GiTap />;
-    case DeviceType.POOL:
-      return <MdOutlinePool />;
     case DeviceType.CUSTOM:
-      return <PlaylistAddIcon sx={{ color: 'lightblue', fontSize: 22, verticalAlign: 'middle' }} />;
+      return <MdOutlineExtension />;
     default:
       return null;
   }

interface/src/project/Help.tsx

@@ -1,19 +1,9 @@
 import CommentIcon from '@mui/icons-material/CommentTwoTone';
+import EastIcon from '@mui/icons-material/East';
 import DownloadIcon from '@mui/icons-material/GetApp';
 import GitHubIcon from '@mui/icons-material/GitHub';
 import MenuBookIcon from '@mui/icons-material/MenuBookTwoTone';
-import {
+import { Box, List, ListItem, ListItemAvatar, ListItemText, Link, Typography, Button } from '@mui/material';
-  Box,
-  List,
-  ListItem,
-  ListItemAvatar,
-  ListItemText,
-  Link,
-  Typography,
-  Button,
-  ListItemButton,
-  Avatar
-} from '@mui/material';
 import { useRequest } from 'alova';
 import { toast } from 'react-toastify';
 import type { FC } from 'react';
@@ -25,7 +15,7 @@ const Help: FC = () => {
   const { LL } = useI18nContext();
   useLayoutTitle(LL.HELP_OF(''));
 
-  const { send: getAPI, onSuccess: onGetAPI } = useRequest((data) => EMSESP.API(data), {
+  const { send: getSystemAPI, onSuccess: onGetAPI } = useRequest((data) => EMSESP.APIcall('system', data), {
     immediate: false
   });
 
@@ -36,80 +26,83 @@ const Help: FC = () => {
         type: 'text/plain'
       })
     );
-    anchor.download = 'emsesp_' + event.sendArgs[0].device + '_' + event.sendArgs[0].entity + '.txt';
+    anchor.download = 'emsesp_' + event.sendArgs[0].entity + '.txt';
     anchor.click();
     URL.revokeObjectURL(anchor.href);
     toast.info(LL.DOWNLOAD_SUCCESSFUL());
   });
 
-  const callAPI = async (device: string, entity: string) => {
+  const callSystemAPI = async (entity: string) => {
-    await getAPI({ device, entity, id: 0 }).catch((error) => {
+    await getSystemAPI({ entity, id: 0 }).catch((error) => {
       toast.error(error.message);
     });
   };
 
   return (
-    <SectionContent>
+    <SectionContent title={LL.SUPPORT_INFORMATION(0)} titleGutter>
-      <List sx={{ borderRadius: 3, border: '2px solid grey' }}>
+      <List>
         <ListItem>
-          <ListItemButton component="a" href="https://emsesp.github.io/docs">
           <ListItemAvatar>
-              <Avatar sx={{ bgcolor: '#72caf9' }}>
+            <MenuBookIcon style={{ fontSize: 24, color: 'lightblue', verticalAlign: 'middle' }} />
-                <MenuBookIcon />
-              </Avatar>
           </ListItemAvatar>
-            <ListItemText primary={LL.HELP_INFORMATION_1()} />
+          <ListItemText>
-          </ListItemButton>
+            {LL.HELP_INFORMATION_1()}&nbsp;
+            <EastIcon style={{ fontSize: 24, color: 'lightblue', verticalAlign: 'middle' }} />
+            &nbsp;
+            <Link target="_blank" href="https://emsesp.github.io/docs" color="primary">
+              {LL.CLICK_HERE()}
+            </Link>
+          </ListItemText>
         </ListItem>
 
         <ListItem>
-          <ListItemButton component="a" href="https://discord.gg/3J3GgnzpyT">
           <ListItemAvatar>
-              <Avatar sx={{ bgcolor: '#72caf9' }}>
+            <CommentIcon style={{ fontSize: 24, color: 'lightblue', verticalAlign: 'middle' }} />
-                <CommentIcon />
-              </Avatar>
           </ListItemAvatar>
-            <ListItemText primary={LL.HELP_INFORMATION_2()} />
+          <ListItemText>
-          </ListItemButton>
+            {LL.HELP_INFORMATION_2()}&nbsp;
+            <EastIcon style={{ fontSize: 24, color: 'lightblue', verticalAlign: 'middle' }} />
+            &nbsp;
+            <Link target="_blank" href="https://discord.gg/3J3GgnzpyT" color="primary">
+              {LL.CLICK_HERE()}
+            </Link>
+          </ListItemText>
         </ListItem>
 
         <ListItem>
-          <ListItemButton component="a" href="https://github.com/emsesp/EMS-ESP32/issues/new/choose">
           <ListItemAvatar>
-              <Avatar sx={{ bgcolor: '#72caf9' }}>
+            <GitHubIcon style={{ fontSize: 24, color: 'lightblue', verticalAlign: 'middle' }} />
-                <GitHubIcon />
-              </Avatar>
           </ListItemAvatar>
-            <ListItemText primary={LL.HELP_INFORMATION_3()} />
+          <ListItemText>
-          </ListItemButton>
+            {LL.HELP_INFORMATION_3()}&nbsp;
+            <EastIcon style={{ fontSize: 24, color: 'lightblue', verticalAlign: 'middle' }} />
+            <Link target="_blank" href="https://github.com/emsesp/EMS-ESP32/issues/new/choose" color="primary">
+              {LL.CLICK_HERE()}
+            </Link>
+            <br />
+          </ListItemText>
         </ListItem>
       </List>
 
-      <Box p={2} color="warning.main">
+      <Box color="warning.main">
         <Typography mb={1} variant="body2">
           {LL.HELP_INFORMATION_4()}
         </Typography>
-        <Button
+      </Box>
-          startIcon={<DownloadIcon />}
+      <Button startIcon={<DownloadIcon />} variant="outlined" color="primary" onClick={() => callSystemAPI('info')}>
-          variant="outlined"
-          color="primary"
-          onClick={() => callAPI('system', 'info')}
-        >
         {LL.SUPPORT_INFORMATION(0)}
       </Button>
-      </Box>
-
       <Button
         sx={{ ml: 2 }}
         startIcon={<DownloadIcon />}
         variant="outlined"
         color="primary"
-        onClick={() => callAPI('system', 'allvalues')}
+        onClick={() => callSystemAPI('allvalues')}
       >
         All Values
       </Button>
 
-      <Box border={1} p={1} mt={4}>
+      <Box border={1} p={1} mt={4} color="orange">
         <Typography align="center" variant="subtitle1" color="orange">
           <b>{LL.HELP_INFORMATION_5()}</b>
         </Typography>

interface/src/project/Settings.tsx

@@ -0,0 +1,37 @@
+import { Tab } from '@mui/material';
+import { Navigate, Route, Routes } from 'react-router-dom';
+
+import SettingsApplication from './SettingsApplication';
+import SettingsCustomization from './SettingsCustomization';
+import SettingsEntities from './SettingsEntities';
+import SettingsScheduler from './SettingsScheduler';
+import type { FC } from 'react';
+import { RouterTabs, useRouterTab, useLayoutTitle } from 'components';
+import { useI18nContext } from 'i18n/i18n-react';
+
+const Settings: FC = () => {
+  const { LL } = useI18nContext();
+  const { routerTab } = useRouterTab();
+
+  useLayoutTitle(LL.SETTINGS_OF(''));
+
+  return (
+    <>
+      <RouterTabs value={routerTab}>
+        <Tab value="/settings/application" label={LL.APPLICATION_SETTINGS()} />
+        <Tab value="/settings/customization" label={LL.CUSTOMIZATIONS()} />
+        <Tab value="/settings/scheduler" label={LL.SCHEDULER()} />
+        <Tab value="/settings/customentities" label={LL.CUSTOM_ENTITIES(0)} />
+      </RouterTabs>
+      <Routes>
+        <Route path="application" element={<SettingsApplication />} />
+        <Route path="customization" element={<SettingsCustomization />} />
+        <Route path="scheduler" element={<SettingsScheduler />} />
+        <Route path="customentities" element={<SettingsEntities />} />
+        <Route path="*" element={<Navigate replace to="/settings/application" />} />
+      </Routes>
+    </>
+  );
+};
+
+export default Settings;

interface/src/project/SettingsApplication.tsx

@@ -20,8 +20,7 @@ import {
   ValidatedTextField,
   ButtonRow,
   MessageBox,
-  BlockNavigation,
+  BlockNavigation
-  useLayoutTitle
 } from 'components';
 
 import RestartMonitor from 'framework/system/RestartMonitor';
@@ -37,7 +36,7 @@ export function boardProfileSelectItems() {
   ));
 }
 
-const ApplicationSettings: FC = () => {
+const SettingsApplication: FC = () => {
   const {
     loadData,
     saveData,
@@ -98,8 +97,6 @@ const ApplicationSettings: FC = () => {
     });
   };
 
-  useLayoutTitle(LL.APPLICATION_SETTINGS());
-
   const content = () => {
     if (!data) {
       return <FormLoader onRetry={loadData} errorMessage={errorMessage} />;
@@ -139,7 +136,7 @@ const ApplicationSettings: FC = () => {
 
     return (
       <>
-        <Typography sx={{ pb: 1 }} variant="h6" color="primary">
+        <Typography sx={{ pt: 2 }} variant="h6" color="primary">
           {LL.INTERFACE_BOARD_PROFILE()}
         </Typography>
         <Box color="warning.main">
@@ -683,11 +680,11 @@ const ApplicationSettings: FC = () => {
   };
 
   return (
-    <SectionContent>
+    <SectionContent title={LL.APPLICATION_SETTINGS()} titleGutter>
       {blocker ? <BlockNavigation blocker={blocker} /> : null}
       {restarting ? <RestartMonitor /> : content()}
     </SectionContent>
   );
 };
 
-export default ApplicationSettings;
+export default SettingsApplication;

interface/src/project/SettingsCustomization.tsx

@@ -26,9 +26,9 @@ import { useState, useEffect, useCallback } from 'react';
 import { useBlocker, useLocation } from 'react-router-dom';
 import { toast } from 'react-toastify';
 
-import SettingsCustomizationDialog from './CustomizationDialog';
 import EntityMaskToggle from './EntityMaskToggle';
 import OptionIcon from './OptionIcon';
+import SettingsCustomizationDialog from './SettingsCustomizationDialog';
 
 import * as EMSESP from './api';
 
@@ -37,14 +37,14 @@ import type { DeviceShort, DeviceEntity } from './types';
 import type { FC } from 'react';
 import { dialogStyle } from 'CustomTheme';
 import * as SystemApi from 'api/system';
-import { ButtonRow, SectionContent, MessageBox, BlockNavigation, useLayoutTitle } from 'components';
+import { ButtonRow, SectionContent, MessageBox, BlockNavigation } from 'components';
 
 import RestartMonitor from 'framework/system/RestartMonitor';
 import { useI18nContext } from 'i18n/i18n-react';
 
 export const APIURL = window.location.origin + '/api/';
 
-const Customization: FC = () => {
+const SettingsCustomization: FC = () => {
   const { LL } = useI18nContext();
   const [numChanges, setNumChanges] = useState<number>(0);
   const blocker = useBlocker(numChanges !== 0);
@@ -58,8 +58,6 @@ const Customization: FC = () => {
   const [selectedDeviceEntity, setSelectedDeviceEntity] = useState<DeviceEntity>();
   const [dialogOpen, setDialogOpen] = useState<boolean>(false);
 
-  useLayoutTitle(LL.CUSTOMIZATIONS());
-
   // fetch devices first
   const { data: devices } = useRequest(EMSESP.readDevices);
 
@@ -510,6 +508,9 @@ const Customization: FC = () => {
 
   const renderContent = () => (
     <>
+      <Typography sx={{ pt: 2, pb: 2 }} variant="h6" color="primary">
+        {LL.DEVICE_ENTITIES()}
+      </Typography>
       {devices && renderDeviceList()}
       {deviceEntities && renderDeviceData()}
       {restartNeeded && (
@@ -543,7 +544,7 @@ const Customization: FC = () => {
               </ButtonRow>
             )}
           </Box>
-          <ButtonRow mt={1}>
+          <ButtonRow>
             <Button
               startIcon={<SettingsBackupRestoreIcon />}
               variant="outlined"
@@ -560,7 +561,7 @@ const Customization: FC = () => {
   );
 
   return (
-    <SectionContent>
+    <SectionContent title={LL.CUSTOMIZATIONS()} titleGutter>
       {blocker ? <BlockNavigation blocker={blocker} /> : null}
       {restarting ? <RestartMonitor /> : renderContent()}
       {selectedDeviceEntity && (
@@ -575,4 +576,4 @@ const Customization: FC = () => {
   );
 };
 
-export default Customization;
+export default SettingsCustomization;

interface/src/project/SettingsCustomizationDialog.tsx

@@ -31,7 +31,7 @@ type SettingsCustomizationDialogProps = {
   selectedItem: DeviceEntity;
 };
 
-const CustomizationDialog = ({ open, onClose, onSave, selectedItem }: SettingsCustomizationDialogProps) => {
+const SettingsCustomizationDialog = ({ open, onClose, onSave, selectedItem }: SettingsCustomizationDialogProps) => {
   const { LL } = useI18nContext();
   const [editItem, setEditItem] = useState<DeviceEntity>(selectedItem);
   const [error, setError] = useState<boolean>(false);
@@ -152,4 +152,4 @@ const CustomizationDialog = ({ open, onClose, onSave, selectedItem }: SettingsCu
   );
 };
 
-export default CustomizationDialog;
+export default SettingsCustomizationDialog;

interface/src/project/SettingsEntities.tsx

@@ -1,7 +1,5 @@
 import AddIcon from '@mui/icons-material/Add';
 import CancelIcon from '@mui/icons-material/Cancel';
-import EditOutlinedIcon from '@mui/icons-material/EditOutlined';
-import RefreshIcon from '@mui/icons-material/Refresh';
 import WarningIcon from '@mui/icons-material/Warning';
 import { Button, Typography, Box } from '@mui/material';
 import { Table, Header, HeaderRow, HeaderCell, Body, Row, Cell } from '@table-library/react-table-library/table';
@@ -13,17 +11,17 @@ import { useBlocker } from 'react-router-dom';
 
 import { toast } from 'react-toastify';
 
-import SettingsCustomEntitiesDialog from './CustomEntitiesDialog';
+import SettingsEntitiesDialog from './SettingsEntitiesDialog';
 import * as EMSESP from './api';
 import { DeviceValueTypeNames, DeviceValueUOM_s } from './types';
 import { entityItemValidation } from './validators';
 import type { EntityItem } from './types';
 import type { FC } from 'react';
-import { ButtonRow, FormLoader, SectionContent, BlockNavigation, useLayoutTitle } from 'components';
+import { ButtonRow, FormLoader, SectionContent, BlockNavigation } from 'components';
 
 import { useI18nContext } from 'i18n/i18n-react';
 
-const CustomEntities: FC = () => {
+const SettingsEntities: FC = () => {
   const { LL } = useI18nContext();
   const [numChanges, setNumChanges] = useState<number>(0);
   const blocker = useBlocker(numChanges !== 0);
@@ -31,8 +29,6 @@ const CustomEntities: FC = () => {
   const [creating, setCreating] = useState<boolean>(false);
   const [dialogOpen, setDialogOpen] = useState<boolean>(false);
 
-  useLayoutTitle(LL.CUSTOM_ENTITIES(0));
-
   const {
     data: entities,
     send: fetchEntities,
@@ -47,7 +43,6 @@ const CustomEntities: FC = () => {
   function hasEntityChanged(ei: EntityItem) {
     return (
       ei.id !== ei.o_id ||
-      ei.ram !== ei.o_ram ||
       (ei?.name || '') !== (ei?.o_name || '') ||
       ei.device_id !== ei.o_device_id ||
       ei.type_id !== ei.o_type_id ||
@@ -56,8 +51,7 @@ const CustomEntities: FC = () => {
       ei.factor !== ei.o_factor ||
       ei.value_type !== ei.o_value_type ||
       ei.writeable !== ei.o_writeable ||
-      ei.deleted !== ei.o_deleted ||
+      ei.deleted !== ei.o_deleted
-      (ei.value || '') !== (ei.o_value || '')
     );
   }
 
@@ -124,7 +118,6 @@ const CustomEntities: FC = () => {
         .filter((ei) => !ei.deleted)
         .map((condensed_ei) => ({
           id: condensed_ei.id,
-          ram: condensed_ei.ram,
           name: condensed_ei.name,
           device_id: condensed_ei.device_id,
           type_id: condensed_ei.type_id,
@@ -132,8 +125,7 @@ const CustomEntities: FC = () => {
           factor: condensed_ei.factor,
           uom: condensed_ei.uom,
           writeable: condensed_ei.writeable,
-          value_type: condensed_ei.value_type,
+          value_type: condensed_ei.value_type
-          value: condensed_ei.value
         }))
     })
       .then(() => {
@@ -181,16 +173,14 @@ const CustomEntities: FC = () => {
     setSelectedEntityItem({
       id: Math.floor(Math.random() * (Math.floor(200) - 100) + 100),
       name: '',
-      ram: 0,
+      device_id: '',
-      device_id: '0',
+      type_id: '',
-      type_id: '0',
       offset: 0,
       factor: 1,
       uom: 0,
       value_type: 0,
       writeable: false,
-      deleted: false,
+      deleted: false
-      value: ''
     });
     setDialogOpen(true);
   };
@@ -222,21 +212,18 @@ const CustomEntities: FC = () => {
                 <HeaderCell stiff>{LL.ID_OF(LL.DEVICE())}</HeaderCell>
                 <HeaderCell stiff>{LL.ID_OF(LL.TYPE(1))}</HeaderCell>
                 <HeaderCell stiff>{LL.OFFSET()}</HeaderCell>
-                <HeaderCell stiff>{LL.TYPE(1)}</HeaderCell>
+                <HeaderCell stiff>{LL.VALUE(1) + ' ' + LL.TYPE(1)}</HeaderCell>
                 <HeaderCell stiff>{LL.VALUE(1)}</HeaderCell>
               </HeaderRow>
             </Header>
             <Body>
               {tableList.map((ei: EntityItem) => (
                 <Row key={ei.name} item={ei} onClick={() => editEntityItem(ei)}>
-                  <Cell>
+                  <Cell>{ei.name}</Cell>
-                    {ei.name}&nbsp;
+                  <Cell>{showHex(ei.device_id as number, 2)}</Cell>
-                    {ei.writeable && <EditOutlinedIcon color="primary" sx={{ fontSize: 12 }} />}
+                  <Cell>{showHex(ei.type_id as number, 3)}</Cell>
-                  </Cell>
+                  <Cell>{ei.offset}</Cell>
-                  <Cell>{ei.ram === 1 ? '' : showHex(ei.device_id as number, 2)}</Cell>
+                  <Cell>{DeviceValueTypeNames[ei.value_type]}</Cell>
-                  <Cell>{ei.ram === 1 ? '' : showHex(ei.type_id as number, 3)}</Cell>
-                  <Cell>{ei.ram === 1 ? '' : ei.offset}</Cell>
-                  <Cell>{ei.ram === 1 ? 'RAM' : DeviceValueTypeNames[ei.value_type]}</Cell>
                   <Cell>{formatValue(ei.value, ei.uom)}</Cell>
                 </Row>
               ))}
@@ -248,7 +235,7 @@ const CustomEntities: FC = () => {
   };
 
   return (
-    <SectionContent>
+    <SectionContent title={LL.CUSTOM_ENTITIES(0)} titleGutter>
       {blocker ? <BlockNavigation blocker={blocker} /> : null}
       <Box mb={2} color="warning.main">
         <Typography variant="body2">{LL.ENTITIES_HELP_1()}</Typography>
@@ -257,7 +244,7 @@ const CustomEntities: FC = () => {
       {renderEntity()}
 
       {selectedEntityItem && (
-        <SettingsCustomEntitiesDialog
+        <SettingsEntitiesDialog
           open={dialogOpen}
           creating={creating}
           onClose={onDialogClose}
@@ -267,7 +254,7 @@ const CustomEntities: FC = () => {
         />
       )}
 
-      <Box mt={1} display="flex" flexWrap="wrap">
+      <Box display="flex" flexWrap="wrap">
         <Box flexGrow={1}>
           {numChanges > 0 && (
             <ButtonRow>
@@ -287,10 +274,7 @@ const CustomEntities: FC = () => {
         </Box>
         <Box flexWrap="nowrap" whiteSpace="nowrap">
           <ButtonRow>
-            <Button startIcon={<RefreshIcon />} variant="outlined" color="secondary" onClick={fetchEntities}>
+            <Button startIcon={<AddIcon />} variant="outlined" color="secondary" onClick={addEntityItem}>
-              {LL.REFRESH()}
-            </Button>
-            <Button startIcon={<AddIcon />} variant="outlined" color="primary" onClick={addEntityItem}>
               {LL.ADD(0)}
             </Button>
           </ButtonRow>
@@ -300,4 +284,4 @@ const CustomEntities: FC = () => {
   );
 };
 
-export default CustomEntities;
+export default SettingsEntities;

interface/src/project/SettingsEntitiesDialog.tsx

@@ -0,0 +1,252 @@
+import AddIcon from '@mui/icons-material/Add';
+import CancelIcon from '@mui/icons-material/Cancel';
+import DoneIcon from '@mui/icons-material/Done';
+import RemoveIcon from '@mui/icons-material/RemoveCircleOutline';
+import {
+  Box,
+  Button,
+  Checkbox,
+  Dialog,
+  DialogActions,
+  DialogContent,
+  DialogTitle,
+  Grid,
+  InputAdornment,
+  MenuItem,
+  TextField
+} from '@mui/material';
+import { useEffect, useState } from 'react';
+
+import { DeviceValueUOM_s, DeviceValueType } from './types';
+import type { EntityItem } from './types';
+import type Schema from 'async-validator';
+import type { ValidateFieldsError } from 'async-validator';
+
+import { dialogStyle } from 'CustomTheme';
+import { BlockFormControlLabel, ValidatedTextField } from 'components';
+
+import { useI18nContext } from 'i18n/i18n-react';
+
+import { updateValue } from 'utils';
+import { validate } from 'validators';
+
+type SettingsEntitiesDialogProps = {
+  open: boolean;
+  creating: boolean;
+  onClose: () => void;
+  onSave: (ei: EntityItem) => void;
+  selectedItem: EntityItem;
+  validator: Schema;
+};
+
+const SettingsEntitiesDialog = ({
+  open,
+  creating,
+  onClose,
+  onSave,
+  selectedItem,
+  validator
+}: SettingsEntitiesDialogProps) => {
+  const { LL } = useI18nContext();
+  const [editItem, setEditItem] = useState<EntityItem>(selectedItem);
+  const [fieldErrors, setFieldErrors] = useState<ValidateFieldsError>();
+  const updateFormValue = updateValue(setEditItem);
+
+  useEffect(() => {
+    if (open) {
+      setFieldErrors(undefined);
+      setEditItem(selectedItem);
+      // convert to hex strings straight away
+      setEditItem({
+        ...selectedItem,
+        device_id: selectedItem.device_id.toString(16).toUpperCase(),
+        type_id: selectedItem.type_id.toString(16).toUpperCase()
+      });
+    }
+  }, [open, selectedItem]);
+
+  const close = () => {
+    onClose();
+  };
+
+  const save = async () => {
+    try {
+      setFieldErrors(undefined);
+      await validate(validator, editItem);
+      if (typeof editItem.device_id === 'string') {
+        editItem.device_id = parseInt(editItem.device_id, 16);
+      }
+      if (typeof editItem.type_id === 'string') {
+        editItem.type_id = parseInt(editItem.type_id, 16);
+      }
+      onSave(editItem);
+    } catch (errors: any) {
+      setFieldErrors(errors);
+    }
+  };
+
+  const remove = () => {
+    editItem.deleted = true;
+    onSave(editItem);
+  };
+
+  return (
+    <Dialog sx={dialogStyle} open={open} onClose={close}>
+      <DialogTitle>
+        {creating ? LL.ADD(1) + ' ' + LL.NEW(1) : LL.EDIT()}&nbsp;{LL.ENTITY()}
+      </DialogTitle>
+      <DialogContent dividers>
+        <Box display="flex" flexWrap="wrap" mb={1}>
+          <Box flexWrap="nowrap" whiteSpace="nowrap" />
+        </Box>
+        <Grid container spacing={2}>
+          <Grid item xs={8}>
+            <ValidatedTextField
+              fieldErrors={fieldErrors}
+              name="name"
+              label={LL.NAME(0)}
+              value={editItem.name}
+              margin="normal"
+              fullWidth
+              onChange={updateFormValue}
+            />
+          </Grid>
+          <Grid item xs={4} mt={3}>
+            <BlockFormControlLabel
+              control={<Checkbox checked={editItem.writeable} onChange={updateFormValue} name="writeable" />}
+              label={LL.WRITEABLE()}
+            />
+          </Grid>
+          <Grid item xs={4}>
+            <ValidatedTextField
+              fieldErrors={fieldErrors}
+              name="device_id"
+              label={LL.ID_OF(LL.DEVICE())}
+              margin="normal"
+              type="string"
+              fullWidth
+              value={editItem.device_id as string}
+              onChange={updateFormValue}
+              inputProps={{ style: { textTransform: 'uppercase' } }}
+              InputProps={{ startAdornment: <InputAdornment position="start">0x</InputAdornment> }}
+            />
+          </Grid>
+          <Grid item xs={4}>
+            <ValidatedTextField
+              fieldErrors={fieldErrors}
+              name="type_id"
+              label={LL.ID_OF(LL.TYPE(1))}
+              margin="normal"
+              fullWidth
+              value={editItem.type_id}
+              onChange={updateFormValue}
+              inputProps={{ style: { textTransform: 'uppercase' } }}
+              InputProps={{ startAdornment: <InputAdornment position="start">0x</InputAdornment> }}
+            />
+          </Grid>
+          <Grid item xs={4}>
+            <ValidatedTextField
+              fieldErrors={fieldErrors}
+              name="offset"
+              label={LL.OFFSET()}
+              margin="normal"
+              fullWidth
+              type="number"
+              value={editItem.offset}
+              onChange={updateFormValue}
+            />
+          </Grid>
+          <Grid item xs={4}>
+            <TextField
+              name="value_type"
+              label={LL.VALUE(1) + ' ' + LL.TYPE(1)}
+              value={editItem.value_type}
+              variant="outlined"
+              onChange={updateFormValue}
+              margin="normal"
+              fullWidth
+              select
+            >
+              <MenuItem value={DeviceValueType.BOOL}>BOOL</MenuItem>
+              <MenuItem value={DeviceValueType.INT}>INT</MenuItem>
+              <MenuItem value={DeviceValueType.UINT}>UINT</MenuItem>
+              <MenuItem value={DeviceValueType.SHORT}>SHORT</MenuItem>
+              <MenuItem value={DeviceValueType.USHORT}>USHORT</MenuItem>
+              <MenuItem value={DeviceValueType.ULONG}>ULONG</MenuItem>
+              <MenuItem value={DeviceValueType.TIME}>TIME</MenuItem>
+              <MenuItem value={DeviceValueType.STRING}>RAW</MenuItem>
+            </TextField>
+          </Grid>
+
+          {editItem.value_type !== DeviceValueType.BOOL && editItem.value_type !== DeviceValueType.STRING && (
+            <>
+              <Grid item xs={4}>
+                <TextField
+                  name="factor"
+                  label={LL.FACTOR()}
+                  value={editItem.factor}
+                  variant="outlined"
+                  onChange={updateFormValue}
+                  fullWidth
+                  margin="normal"
+                  type="number"
+                  inputProps={{ step: '0.001' }}
+                />
+              </Grid>
+              <Grid item xs={4}>
+                <TextField
+                  name="uom"
+                  label={LL.UNIT()}
+                  value={editItem.uom}
+                  margin="normal"
+                  fullWidth
+                  onChange={updateFormValue}
+                  select
+                >
+                  {DeviceValueUOM_s.map((val, i) => (
+                    <MenuItem key={i} value={i}>
+                      {val}
+                    </MenuItem>
+                  ))}
+                </TextField>
+              </Grid>
+            </>
+          )}
+          {editItem.value_type === DeviceValueType.STRING && (
+            <Grid item xs={4}>
+              <TextField
+                name="factor"
+                label="Bytes"
+                value={editItem.factor}
+                variant="outlined"
+                onChange={updateFormValue}
+                fullWidth
+                margin="normal"
+                type="number"
+                inputProps={{ min: '1', max: '27', step: '1' }}
+              />
+            </Grid>
+          )}
+        </Grid>
+      </DialogContent>
+
+      <DialogActions>
+        {!creating && (
+          <Box flexGrow={1}>
+            <Button startIcon={<RemoveIcon />} variant="outlined" color="warning" onClick={remove}>
+              {LL.REMOVE()}
+            </Button>
+          </Box>
+        )}
+        <Button startIcon={<CancelIcon />} variant="outlined" onClick={close} color="secondary">
+          {LL.CANCEL()}
+        </Button>
+        <Button startIcon={creating ? <AddIcon /> : <DoneIcon />} variant="outlined" onClick={save} color="primary">
+          {creating ? LL.ADD(0) : LL.UPDATE()}
+        </Button>
+      </DialogActions>
+    </Dialog>
+  );
+};
+
+export default SettingsEntitiesDialog;

interface/src/project/SettingsScheduler.tsx

@@ -11,18 +11,18 @@ import { updateState, useRequest } from 'alova';
 import { useState, useEffect, useCallback } from 'react';
 import { useBlocker } from 'react-router-dom';
 import { toast } from 'react-toastify';
-import SettingsSchedulerDialog from './SchedulerDialog';
+import SettingsSchedulerDialog from './SettingsSchedulerDialog';
 import * as EMSESP from './api';
 import { ScheduleFlag } from './types';
 import { schedulerItemValidation } from './validators';
 import type { ScheduleItem } from './types';
 import type { FC } from 'react';
 
-import { ButtonRow, FormLoader, SectionContent, BlockNavigation, useLayoutTitle } from 'components';
+import { ButtonRow, FormLoader, SectionContent, BlockNavigation } from 'components';
 
 import { useI18nContext } from 'i18n/i18n-react';
 
-const Scheduler: FC = () => {
+const SettingsScheduler: FC = () => {
   const { LL, locale } = useI18nContext();
   const [numChanges, setNumChanges] = useState<number>(0);
   const blocker = useBlocker(numChanges !== 0);
@@ -194,8 +194,6 @@ const Scheduler: FC = () => {
       </>
     );
 
-    useLayoutTitle(LL.SCHEDULER());
-
     return (
       <Table
         data={{ nodes: schedule.filter((si) => !si.deleted).sort((a, b) => a.time.localeCompare(b.time)) }}
@@ -251,7 +249,7 @@ const Scheduler: FC = () => {
   };
 
   return (
-    <SectionContent>
+    <SectionContent title={LL.SCHEDULER()} titleGutter>
       {blocker ? <BlockNavigation blocker={blocker} /> : null}
       <Box mb={2} color="warning.main">
         <Typography variant="body2">{LL.SCHEDULER_HELP_1()}</Typography>
@@ -270,7 +268,7 @@ const Scheduler: FC = () => {
         />
       )}
 
-      <Box mt={1} display="flex" flexWrap="wrap">
+      <Box display="flex" flexWrap="wrap">
         <Box flexGrow={1}>
           {numChanges !== 0 && (
             <ButtonRow>
@@ -300,4 +298,4 @@ const Scheduler: FC = () => {
   );
 };
 
-export default Scheduler;
+export default SettingsScheduler;

interface/src/project/SettingsSchedulerDialog.tsx

@@ -32,7 +32,7 @@ import { useI18nContext } from 'i18n/i18n-react';
 import { updateValue } from 'utils';
 import { validate } from 'validators';
 
-type SchedulerDialogProps = {
+type SettingsSchedulerDialogProps = {
   open: boolean;
   creating: boolean;
   onClose: () => void;
@@ -42,7 +42,15 @@ type SchedulerDialogProps = {
   dow: string[];
 };
 
-const SchedulerDialog = ({ open, creating, onClose, onSave, selectedItem, validator, dow }: SchedulerDialogProps) => {
+const SettingsSchedulerDialog = ({
+  open,
+  creating,
+  onClose,
+  onSave,
+  selectedItem,
+  validator,
+  dow
+}: SettingsSchedulerDialogProps) => {
   const { LL } = useI18nContext();
   const [editItem, setEditItem] = useState<ScheduleItem>(selectedItem);
   const [fieldErrors, setFieldErrors] = useState<ValidateFieldsError>();
@@ -202,7 +210,7 @@ const SchedulerDialog = ({ open, creating, onClose, onSave, selectedItem, valida
         />
         <TextField
           name="value"
-          label={LL.VALUE(1)}
+          label={LL.VALUE(0)}
           multiline
           margin="normal"
           fullWidth
@@ -238,4 +246,4 @@ const SchedulerDialog = ({ open, creating, onClose, onSave, selectedItem, valida
   );
 };
 
-export default SchedulerDialog;
+export default SettingsSchedulerDialog;

interface/src/project/SystemActivity.tsx

@@ -1,130 +0,0 @@
-import RefreshIcon from '@mui/icons-material/Refresh';
-import { Button } from '@mui/material';
-import { Body, Cell, Header, HeaderCell, HeaderRow, Row, Table } from '@table-library/react-table-library/table';
-import { useTheme as tableTheme } from '@table-library/react-table-library/theme';
-import { useRequest } from 'alova';
-import { useEffect } from 'react';
-
-import * as EMSESP from './api';
-import type { Stat } from './types';
-
-import type { Translation } from 'i18n/i18n-types';
-import type { FC } from 'react';
-import { ButtonRow, FormLoader, SectionContent, useLayoutTitle } from 'components';
-import { useI18nContext } from 'i18n/i18n-react';
-
-const SystemActivity: FC = () => {
-  const { data: data, send: loadData, error } = useRequest(EMSESP.readActivity);
-
-  const { LL } = useI18nContext();
-
-  useLayoutTitle(LL.ACTIVITY());
-
-  const stats_theme = tableTheme({
-    Table: `
-      --data-table-library_grid-template-columns: repeat(1, minmax(0, 1fr)) 90px 90px 80px;
-    `,
-    BaseRow: `
-      font-size: 14px;
-    `,
-    HeaderRow: `
-      text-transform: uppercase;
-      background-color: black;
-      color: #90CAF9;
-
-      .th {
-        height: 36px;
-        border-bottom: 1px solid #565656;
-      }
-    `,
-    Row: `
-      .td {
-        padding: 8px;
-        border-top: 1px solid #565656;
-        border-bottom: 1px solid #565656;
-      }
-
-      &:nth-of-type(odd) .td {
-        background-color: #303030;
-      }
-      &:nth-of-type(even) .td {
-        background-color: #1e1e1e;
-      }
-    `,
-    BaseCell: `
-      &:not(:first-of-type) {
-        text-align: center;
-      }
-    `
-  });
-
-  useEffect(() => {
-    const timer = setInterval(() => loadData(), 30000);
-    return () => {
-      clearInterval(timer);
-    };
-  });
-
-  const showName = (id: any) => {
-    const name: keyof Translation['STATUS_NAMES'] = id;
-    return LL.STATUS_NAMES[name]();
-  };
-
-  const showQuality = (stat: Stat) => {
-    if (stat.q === 0 || stat.s + stat.f === 0) {
-      return;
-    }
-    if (stat.q === 100) {
-      return <div style={{ color: '#00FF7F' }}>{stat.q}%</div>;
-    }
-    if (stat.q >= 95) {
-      return <div style={{ color: 'orange' }}>{stat.q}%</div>;
-    } else {
-      return <div style={{ color: 'red' }}>{stat.q}%</div>;
-    }
-  };
-
-  const content = () => {
-    if (!data) {
-      return <FormLoader onRetry={loadData} errorMessage={error?.message} />;
-    }
-
-    return (
-      <>
-        <Table data={{ nodes: data.stats }} theme={stats_theme} layout={{ custom: true }}>
-          {(tableList: any) => (
-            <>
-              <Header>
-                <HeaderRow>
-                  <HeaderCell resize />
-                  <HeaderCell stiff>{LL.SUCCESS()}</HeaderCell>
-                  <HeaderCell stiff>{LL.FAIL()}</HeaderCell>
-                  <HeaderCell stiff>{LL.QUALITY()}</HeaderCell>
-                </HeaderRow>
-              </Header>
-              <Body>
-                {tableList.map((stat: Stat) => (
-                  <Row key={stat.id} item={stat}>
-                    <Cell>{showName(stat.id)}</Cell>
-                    <Cell stiff>{Intl.NumberFormat().format(stat.s)}</Cell>
-                    <Cell stiff>{Intl.NumberFormat().format(stat.f)}</Cell>
-                    <Cell stiff>{showQuality(stat)}</Cell>
-                  </Row>
-                ))}
-              </Body>
-            </>
-          )}
-        </Table>
-        <ButtonRow mt={1}>
-          <Button startIcon={<RefreshIcon />} variant="outlined" color="secondary" onClick={loadData}>
-            {LL.REFRESH()}
-          </Button>
-        </ButtonRow>
-      </>
-    );
-  };
-
-  return <SectionContent>{content()}</SectionContent>;
-};
-
-export default SystemActivity;

interface/src/project/api.ts

@@ -1,7 +1,7 @@
 import type {
-  APIcall,
+  APIdata,
   Settings,
-  Activity,
+  Status,
   CoreData,
   Devices,
   DeviceEntity,
@@ -20,12 +20,12 @@ export const readCoreData = () => alovaInstance.Get<CoreData>(`/rest/coreData`);
 export const readDeviceData = (id: number) =>
   alovaInstance.Get<DeviceData>('/rest/deviceData', {
     // alovaInstance.Get<DeviceData>(`/rest/deviceData/${id}`, {
-    params: { id }, // TODO replace later with id
+    params: { id }, // TODO replace params later
     responseType: 'arraybuffer' // uses msgpack
   });
 export const writeDeviceValue = (data: any) => alovaInstance.Post('/rest/writeDeviceValue', data);
 
-// Application Settings
+// SettingsApplication
 export const readSettings = () => alovaInstance.Get<Settings>('/rest/settings');
 export const writeSettings = (data: any) => alovaInstance.Post('/rest/settings', data);
 export const getBoardProfile = (boardProfile: string) =>
@@ -33,19 +33,18 @@ export const getBoardProfile = (boardProfile: string) =>
     params: { boardProfile }
   });
 
-// Sensors
+// DashboardSensors
 export const readSensorData = () => alovaInstance.Get<SensorData>('/rest/sensorData');
 export const writeTemperatureSensor = (ts: WriteTemperatureSensor) =>
   alovaInstance.Post('/rest/writeTemperatureSensor', ts);
 export const writeAnalogSensor = (as: WriteAnalogSensor) => alovaInstance.Post('/rest/writeAnalogSensor', as);
 
-// Activity
+// DashboardStatus
-export const readActivity = () => alovaInstance.Get<Activity>('/rest/activity');
+export const readStatus = () => alovaInstance.Get<Status>('/rest/status');
-
 export const scanDevices = () => alovaInstance.Post('/rest/scanDevices');
 
-// API, used in HelpInformation
+// HelpInformation
-export const API = (apiCall: APIcall) => alovaInstance.Post('/api', apiCall);
+export const APIcall = (device: string, apiData: APIdata) => alovaInstance.Post(`/api/${device}`, apiData);
 
 // UploadFileForm
 export const getSettings = () => alovaInstance.Get('/rest/getSettings');
@@ -57,7 +56,7 @@ export const getSchedule = () => alovaInstance.Get('/rest/getSchedule');
 export const readDeviceEntities = (id: number) =>
   // alovaInstance.Get<DeviceEntity[]>(`/rest/deviceEntities/${id}`, {
   alovaInstance.Get<DeviceEntity[]>(`/rest/deviceEntities`, {
-    params: { id }, // TODO replace later with id
+    params: { id }, // TODO replace params later
     responseType: 'arraybuffer',
     transformData(data: any) {
       return data.map((de: DeviceEntity) => ({ ...de, o_m: de.m, o_cn: de.cn, o_mi: de.mi, o_ma: de.ma }));
@@ -89,7 +88,7 @@ export const writeSchedule = (data: any) => alovaInstance.Post('/rest/schedule',
 
 // SettingsEntities
 export const readCustomEntities = () =>
-  alovaInstance.Get<EntityItem[]>('/rest/customEntities', {
+  alovaInstance.Get<EntityItem[]>('/rest/customentities', {
     name: 'entities',
     transformData(data: any) {
       return data.entities.map((ei: EntityItem) => ({
@@ -107,4 +106,4 @@ export const readCustomEntities = () =>
       }));
     }
   });
-export const writeCustomEntities = (data: any) => alovaInstance.Post('/rest/customEntities', data);
+export const writeCustomEntities = (data: any) => alovaInstance.Post('/rest/customentities', data);