Merge branch 'origin/dev'

v3.4.4 Fix for new installations with filesystem not initializing

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,50 +1,35 @@
 ---
-name: Problem Report
-about: Create a Report to help us improve
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
 ---
 
-<!-- Thanks for reporting a problem for this project. READ THIS FIRST:
+*Before creating a new issue please check that you have:*
 
-Please DO NOT OPEN AN ISSUE if your EMS-ESP version is not the latest from the dev branch, please update your device before submitting your issue. Your problem might already be solved. The latest precompiled binaries of EMS-ESP can be downloaded from https://github.com/emsesp/EMS-ESP32/releases/tag/latest
+* *searched the existing [issues](https://github.com/emsesp/EMS-ESP32/issues) (both open and closed)*
+* *searched the [documentation help section](https://emsesp.github.io/docs)*
 
-Please take a few minutes to complete the requested information below.
+*Completing this template will help developers and contributors to address the issue. Try to be as specific and extensive as possible. If the information provided is not enough the issue will likely be closed.*
 
--->
+*You can now remove this line and the above ones. Text in italic is meant to be replaced by your own words. If any of the sections below are not relevant to the issue (for instance, the screenshots) then you can delete them.*
 
-### PROBLEM DESCRIPTION
+**Bug description**
+*A clear and concise description of what the bug is. Mention which EMS-ESP version you're using.*
 
-_A clear and concise description of what the problem is._
+**Steps to reproduce**
+*Steps to reproduce the behavior.*
 
-### REQUESTED INFORMATION
+**Expected behavior**
+*A clear and concise description of what you expected to happen.*
 
-_Make sure your have performed every step and checked the applicable boxes before submitting your issue. Thank you!_
+**Screenshots**
+*If applicable, add screenshots to help explain your problem.*
 
-- [ ] Searched the problem in [issues](https://github.com/emsesp/EMS-ESP32/issues)
-- [ ] Searched the problem in [discussions](https://github.com/emsesp/EMS-ESP32/discussions)
-- [ ] Searched the problem in the [docs](https://emsesp.github.io/docs/Troubleshooting/)
-- [ ] Searched the problem in the [chat](https://discord.gg/3J3GgnzpyT)
-- [ ] Provide the output of http://ems-esp.local/api/system :
+**Device information**
+*Copy-paste here the information as it is outputted by the device. You can get this information by from http://ems-esp.local/api/system*
 
-```lua
-  System information output here:
-
-
-```
-
-### TO REPRODUCE
-
-_Steps to reproduce the behavior:_
-
-### EXPECTED BEHAVIOUR
-
-_A clear and concise description of what you expected to happen._
-
-### SCREENSHOTS
-
-_If applicable, add screenshots to help explain your problem._
-
-### ADDITIONAL CONTEXT
-
-_Add any other context about the problem here._
-
-**(Please, remember to close the issue when the problem has been addressed)**
+**Additional context**
+*Add any other context about the problem here.*

.github/ISSUE_TEMPLATE/config.yml

@@ -1,11 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: EMS-ESP Docs
-    url: https://emsesp.github.io/docs/
-    about: All the information related to EMS-ESP.
-  - name: EMS-ESP Discussions and Support
-    url: https://github.com/emsesp/EMS-ESP32/discussions
-    about: EMS-ESP usage Questions, Feature Requests and Projects.
-  - name: EMS-ESP Users Chat
-    url: https://discord.gg/3J3GgnzpyT
-    about: Chat for feedback, questions and troubleshooting.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,26 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+*Before creating a new feature request please check that you have searched the existing [issues](https://github.com/emsesp/EMS-ESP32/issues) (both open and closed)*
+
+*Completing this template will help developers and contributors evaluating the feature. If the information provided is not enough the issue will likely be closed.*
+
+*You can now remove this line and the above ones. Text in italic is meant to be replaced by your own words. If any of the sections below are not relevant to the request then you can delete them.*
+
+**Is your feature request related to a problem? Please describe.**
+*A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]*
+
+**Describe the solution you'd like**
+*A clear and concise description of what you want to happen.*
+
+**Describe alternatives you've considered**
+*A clear and concise description of any alternative solutions or features you've considered.*
+
+**Additional context**
+*Add any other context or screenshots about the feature request here.*

.github/ISSUE_TEMPLATE/questions---troubleshooting.md

@@ -0,0 +1,29 @@
+---
+name: Questions & Troubleshooting
+about: Anything not a bug or feature request
+title: ''
+labels: question
+assignees: ''
+
+---
+
+*Before creating a new issue please check that you have:*
+
+* *searched the existing [issues](https://github.com/emsesp/EMS-ESP32/issues) (both open and closed)*
+* *searched the [documentation help section](https://emsesp.github.io/docs)*
+
+*Completing this template will help developers and contributors help you. Try to be as specific and extensive as possible. If the information provided is not enough the issue will likely be closed.*
+
+*You can now remove this line and the above ones. Text in italic is meant to be replaced by your own words. If any of the sections below are not relevant to the issue (for instance, the screenshots) then you can delete them.*
+
+**Question**
+*A clear and concise description of what the problem/doubt is.*
+
+**Screenshots**
+*If applicable, add screenshots to help explain your problem.*
+
+**Device information**
+*Copy-paste here the information as it is outputted by the device. You can get this information from http://ems-esp.local/api/system*
+
+**Additional context**
+*Add any other context about the problem here.*

.github/workflows/github-releases-to-discord.yml

@@ -1,23 +0,0 @@
-name: 'github-releases-to-discord'
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  github-releases-to-discord:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Github Releases To Discord
-        uses: SethCohen/github-releases-to-discord@v1.13.1
-        with:
-          webhook_url: ${{ secrets.WEBHOOK_URL }}
-          color: '2105893'
-          username: 'Release Changelog'
-          avatar_url: 'https://cdn.discordapp.com/icons/816637840644505620/0b14718532d855c452903851b4f0c9a2.png'
-          content: '||@everyone||'
-          footer_title: 'Changelog'
-          footer_icon_url: 'https://cdn.discordapp.com/icons/816637840644505620/0b14718532d855c452903851b4f0c9a2.png'
-          footer_timestamp: true

.github/workflows/pre_release.yml

@@ -1,24 +1,24 @@
-name: 'pre-release'
+name: "pre-release"
 
 on:
   workflow_dispatch:
   push:
     branches:
-      - 'dev'
+      - "dev"
 
 jobs:
   pre-release:
-    name: 'Automatic pre-release build'
+
+    name: "Automatic pre-release build"
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+    
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+      - uses: actions/setup-node@v3
         with:
-          python-version: '3.11'
-      - uses: actions/setup-node@v4
-        with:
-          node-version: '20'
+          node-version: '16'
 
       - name: Get EMS-ESP source code and version
         id: build_info
@@ -34,32 +34,24 @@ jobs:
       - name: Build WebUI
         run: |
           cd interface
-          yarn install
-          yarn typesafe-i18n --no-watch
+          npm ci
+          npx typesafe-i18n --no-watch
           sed -i "s/= 'pl'/= 'en'/" ./src/i18n/i18n-util.ts
-          yarn build
-          yarn webUI
+          npm run build
 
       - name: Build firmware
         run: |
           platformio run -e ci
 
-      - name: Build S3 firmware
-        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'
+        id: "automatic_releases"
+        uses: "marvinpinto/action-automatic-releases@latest"
         with:
-          repo_token: '${{ secrets.GITHUB_TOKEN }}'
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
           title: Development Build v${{steps.build_info.outputs.VERSION}}
-          automatic_release_tag: 'latest'
+          automatic_release_tag: "latest"
           prerelease: true
           files: |
             CHANGELOG_LATEST.md
             ./build/firmware/*.*
+            

.github/workflows/sonar_check.yml

@@ -7,24 +7,51 @@ on:
     types: [opened, synchronize, reopened]
 jobs:
   build:
-    name: Build and analyze
+    name: Build
     runs-on: ubuntu-latest
-    # if: github.repository_owner == 'emsesp'
+    if: github.repository_owner == 'emsesp'
     # if: github.repository == 'emsesp/EMS-ESP32'
     env:
-      BUILD_WRAPPER_OUT_DIR: bw-output
+      # https://binaries.sonarsource.com/?prefix=Distribution/sonar-scanner-cli/
+      SONAR_SCANNER_VERSION: 4.7.0.2747                                
+      SONAR_SERVER_URL: "https://sonarcloud.io"
+      BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
         with:
           fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Install sonar-scanner and build-wrapper
-        uses: SonarSource/sonarcloud-github-c-cpp@v2
+      - name: Set up JDK 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - name: Cache SonarCloud packages
+        uses: actions/cache@v1
+        with:
+          path: ~/.sonar/cache
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
+      - name: Download and set up sonar-scanner
+        env:
+          SONAR_SCANNER_DOWNLOAD_URL: https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${{ env.SONAR_SCANNER_VERSION }}-linux.zip
+        run: |
+          mkdir -p $HOME/.sonar
+          curl -sSLo $HOME/.sonar/sonar-scanner.zip ${{ env.SONAR_SCANNER_DOWNLOAD_URL }} 
+          unzip -o $HOME/.sonar/sonar-scanner.zip -d $HOME/.sonar/
+          echo "$HOME/.sonar/sonar-scanner-${{ env.SONAR_SCANNER_VERSION }}-linux/bin" >> $GITHUB_PATH
+      - name: Download and set up build-wrapper
+        env:
+          BUILD_WRAPPER_DOWNLOAD_URL: ${{ env.SONAR_SERVER_URL }}/static/cpp/build-wrapper-linux-x86.zip
+        run: |
+          curl -sSLo $HOME/.sonar/build-wrapper-linux-x86.zip ${{ env.BUILD_WRAPPER_DOWNLOAD_URL }}
+          unzip -o $HOME/.sonar/build-wrapper-linux-x86.zip -d $HOME/.sonar/
+          echo "$HOME/.sonar/build-wrapper-linux-x86" >> $GITHUB_PATH
       - name: Run build-wrapper
         run: |
-          build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} make all
+          make clean
+          build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} make clean all
       - name: Run sonar-scanner
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: |
-          sonar-scanner --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}"
+          sonar-scanner

.github/workflows/tagged_release.yml

@@ -1,23 +1,23 @@
-name: 'tagged-release'
+name: "tagged-release"
 
 on:
   push:
     tags:
-      - 'v*'
+      - "v*"
 
 jobs:
   tagged-release:
-    name: 'Tagged Release'
+
+    name: "Tagged Release"
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+      - uses: actions/setup-node@v2
         with:
-          python-version: '3.11'
-      - uses: actions/setup-node@v4
-        with:
-          node-version: '20'
+          node-version: '16'
 
       - name: Install PlatformIO
         run: |
@@ -29,24 +29,19 @@ jobs:
       - name: Build WebUI
         run: |
           cd interface
-          yarn install
-          yarn typesafe-i18n --no-watch
+          npm ci
+          npx typesafe-i18n --no-watch
           sed -i "s/= 'pl'/= 'en'/" ./src/i18n/i18n-util.ts
-          yarn build
-          yarn webUI
+          npm run build
 
       - name: Build firmware
         run: |
           platformio run -e ci
 
-      - name: Build S3 firmware
-        run: |
-          platformio run -e ci_s3
-
       - name: Release
-        uses: 'marvinpinto/action-automatic-releases@latest'
+        uses: "marvinpinto/action-automatic-releases@latest"
         with:
-          repo_token: '${{ secrets.GITHUB_TOKEN }}'
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
           prerelease: false
           files: |
             CHANGELOG.md

.github/workflows/test_release.yml

@@ -1,61 +0,0 @@
-name: 'test-release'
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - 'dev2'
-
-jobs:
-  pre-release:
-    name: 'Automatic test-release build'
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.11'
-      - uses: actions/setup-node@v4
-        with:
-          node-version: '20'
-
-      - name: Get EMS-ESP source code and version
-        id: build_info
-        run: |
-          version=`grep -E '^#define EMSESP_APP_VERSION' ./src/version.h | awk -F'"' '{print $2}'`
-          echo "VERSION=$version" >> $GITHUB_OUTPUT
-
-      - name: Install PlatformIO
-        run: |
-          python -m pip install --upgrade pip
-          pip install -U platformio
-
-      - name: Build WebUI
-        run: |
-          cd interface
-          yarn install
-          yarn typesafe-i18n --no-watch
-          sed -i "s/= 'pl'/= 'en'/" ./src/i18n/i18n-util.ts
-          yarn build
-          yarn webUI
-
-      - name: Build firmware
-        run: |
-          platformio run -e ci
-
-      - name: Build S3 firmware
-        run: |
-          platformio run -e ci_s3
-
-      - name: Create a GH Release
-        id: 'automatic_releases'
-        uses: 'marvinpinto/action-automatic-releases@latest'
-        with:
-          repo_token: '${{ secrets.GITHUB_TOKEN }}'
-          title: Test Build v${{steps.build_info.outputs.VERSION}}
-          automatic_release_tag: 'test'
-          prerelease: true
-          files: |
-            CHANGELOG_LATEST.md
-            ./build/firmware/*.*

.gitignore

@@ -1,50 +1,34 @@
 # vscode
-.vscode/c_cpp_properties.json
-.vscode/extensions.json
-.vscode/launch.json
-#.vscode/settings.json
+.vscode
+.directory
+workspace.code-workspace
 
-# c++ compiling
+# build
+build/
 .clang_complete
 .gcc-flags.json
 cppcheck.out.xml
+debug.log
 
 # platformio
 .pio
 pio_local.ini
-*_old
 
 # OS specific
 .DS_Store
 *Thumbs.db
 
-# web specfic
-build/
-dist/
+# project specfic
+/scripts/stackdmp.txt
+emsesp
 /data/www
 /lib/framework/WWWData.h
 /interface/build
 node_modules
 /interface/.eslintcache
-stats.html
-*.sln
-*.sw?
-.pnp.*
-.yarn/*
-!.yarn/patches
-!.yarn/plugins
-!.yarn/releases
-!.yarn/sdks
-!.yarn/versions
-yarn.lock
-analyse.html
-interface/vite.config.ts.timestamp*
-
-# scripts
 test.sh
-scripts/run.sh
 scripts/__pycache__
-scripts/stackdmp.txt
+.temp
 
 # i18n generated files
 interface/src/i18n/i18n-react.tsx
@@ -56,8 +40,8 @@ interface/src/i18n/i18n-util.async.ts
 # sonar
 .scannerwork/
 sonar/
-bw-output/
-
-# testing
-emsesp
+build_wrapper_output_directory/
 
+# other build files
+dump_entities.csv
+dump_entities.xls*

.vscode/extensions.json

@@ -1,10 +0,0 @@
-{
-    // See http://go.microsoft.com/fwlink/?LinkId=827846
-    // for the documentation about the extensions.json format
-    "recommendations": [
-        "platformio.platformio-ide"
-    ],
-    "unwantedRecommendations": [
-        "ms-vscode.cpptools-extension-pack"
-    ]
-}

.vscode/settings.json

@@ -1,91 +0,0 @@
-{
-    "search.exclude": {
-      "**/.yarn": true,
-      "**/.pnp.*": true
-    },
-    "editor.codeActionsOnSave": {
-      "source.fixAll": "explicit"
-    },
-    "eslint.nodePath": "interface/.yarn/sdks",
-    "eslint.workingDirectories": ["interface"],
-    "prettier.prettierPath": "",
-    "typescript.enablePromptUseWorkspaceTsdk": true,
-    "files.associations": {
-      "*.tsx": "typescriptreact",
-      "*.tcc": "cpp",
-      "optional": "cpp",
-      "istream": "cpp",
-      "ostream": "cpp",
-      "ratio": "cpp",
-      "system_error": "cpp",
-      "array": "cpp",
-      "functional": "cpp",
-      "regex": "cpp",
-      "tuple": "cpp",
-      "type_traits": "cpp",
-      "utility": "cpp",
-      "string": "cpp",
-      "string_view": "cpp",
-      "atomic": "cpp",
-      "bitset": "cpp",
-      "cctype": "cpp",
-      "chrono": "cpp",
-      "clocale": "cpp",
-      "cmath": "cpp",
-      "condition_variable": "cpp",
-      "cstdarg": "cpp",
-      "cstddef": "cpp",
-      "cstdint": "cpp",
-      "cstdio": "cpp",
-      "cstdlib": "cpp",
-      "cstring": "cpp",
-      "ctime": "cpp",
-      "cwchar": "cpp",
-      "cwctype": "cpp",
-      "deque": "cpp",
-      "list": "cpp",
-      "unordered_map": "cpp",
-      "unordered_set": "cpp",
-      "vector": "cpp",
-      "exception": "cpp",
-      "algorithm": "cpp",
-      "iterator": "cpp",
-      "map": "cpp",
-      "memory": "cpp",
-      "memory_resource": "cpp",
-      "numeric": "cpp",
-      "random": "cpp",
-      "set": "cpp",
-      "fstream": "cpp",
-      "initializer_list": "cpp",
-      "iomanip": "cpp",
-      "iosfwd": "cpp",
-      "iostream": "cpp",
-      "limits": "cpp",
-      "mutex": "cpp",
-      "new": "cpp",
-      "sstream": "cpp",
-      "stdexcept": "cpp",
-      "streambuf": "cpp",
-      "thread": "cpp",
-      "cinttypes": "cpp",
-      "typeinfo": "cpp"
-    },
-    "todo-tree.filtering.excludeGlobs": [
-      "**/vendor/**",
-      "**/node_modules/**",
-      "**/dist/**",
-      "**/bower_components/**",
-      "**/build/**",
-      "**/.vscode/**",
-      "**/.github/**",
-      "**/_output/**",
-      "**/*.min.*",
-      "**/*.map",
-      "**/ArduinoJson/**"
-    ],
-    "cSpell.enableFiletypes": [
-      "!cpp",
-      "!typescript"
-    ]
-  }

CHANGELOG.md

@@ -5,212 +5,12 @@ 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**
-
-Writeable Text entities have moved from type `sensor` to `text` in Home Assistant to make them also editable within an HA dashboard. Examples are `datetime`, `holidays`, `switchtime`, `vacations`, `maintenancedate`... You will need to manually remove any old discovery topics from your MQTT broker using an application like MQTT Explorer.
-
-## Added
-
-- humidity for ventilation devices
-- telegrams for RC100H, hc2, etc. (seen on discord, not tested)
-- names for BC400, GB192i.2, read temperatures for low loss header and heatblock [#1317](https://github.com/emsesp/EMS-ESP32/discussions/1317)
-- option for `forceheatingoff` [#1262](https://github.com/emsesp/EMS-ESP32/issues/1262)
-- remote thermostat emulation RC100H for RC3xx [#1278](https://github.com/emsesp/EMS-ESP32/discussions/1278)
-- shower_data MQTT payload contains the timestamp [#1329](https://github.com/emsesp/EMS-ESP32/issues/1329)
-- HA discovery for writeable text entities [#1337](https://github.com/emsesp/EMS-ESP32/pull/1377)
-- autodetect board_profile, store in nvs, add telnet command option, add E32V2
-- heat pump high res energy counters [#1348, #1349. #1350](https://github.com/emsesp/EMS-ESP32/issues/1348)
-- optional bssid in network settings
-- extension module EM100 [#1315](https://github.com/emsesp/EMS-ESP32/discussions/1315)
-- digital_out with new options for polarity and startup state
-- added 'system allvalues' command that dumps all the EMS device values, plus sensors and any custom entities
-
-## Fixed
-
-- remove command `remoteseltemp`, thermostat accept it only from remote thermostat
-- shower_data MQTT payload contains the timestamp [#1329](https://github.com/emsesp/EMS-ESP32/issues/1329)
-- fixed helper text in Web Device Entity dialog box for numerical ranges
-- MQTT base with paths not working in HA [#1393](https://github.com/emsesp/EMS-ESP32/issues/1393)
-- set/read thermostat mode for RC100-RC300, [#1440](https://github.com/emsesp/EMS-ESP32/issues/1440) [#1442](https://github.com/emsesp/EMS-ESP32/issues/1442)
-- some setting commands for ems-boiler have used wrong ems+ telegram in 3.6.3
-
-## Changed
-
-- update to platform 6.4.0, arduino 2.0.14 / idf 4.4.6
-- small changes for arduino 3.0.0 / idf 5.1 compatibility (not backward compatible to platform 6.3.2 and before)
-- AP start after 10 sec, stay until station/eth connected
-- tested wifi-all-channel-scan (3.6.3-dev4 a-e), removed again because of connect issues
-- mqtt disconnect stops queue
-
-## [3.6.2] October 1 2023
-
-## **IMPORTANT! BREAKING CHANGES**
-
-## Added
-
-- Power entities
-- Optional input of BSSID for AP connection
-- Return empty json if no entries in scheduler/custom/analogsensor/temperaturesensor
-
-## Fixed
-
-- Wifi full scan to get strongest AP
-- Add missing dhw tags
-- Sending a dash/- to the Reset command doesn't return an error [#1308](https://github.com/emsesp/EMS-ESP32/discussions/1308)
-
-## Changed
-
-- MQTT queue max 300 messages, check heap and maxAlloc
-- API call commands are logged as WARN in the log
-- Reset Command renamed to 'reset' in lowercase in EN
-
-## [3.6.1] September 9 2023
-
-## **IMPORTANT! BREAKING CHANGES**
-
-- `shower_data` MQTT topic shows duration is seconds (was previously a full english sentence)
-
-## Added
-
-- Show WiFi rssi in Network Status Page, show quality as color
-
-## Fixed
-
-- Issue in espMqttClient causing a memory leak when MQTT broker is disconnected due to network unavailability [#1264](https://github.com/emsesp/EMS-ESP32/issues/1264)
-- Using MQTT enum values correctly formatted in MQTT Discovery [#1280](https://github.com/emsesp/EMS-ESP32/issues/1280)
-
-## Changed
-
-- MQTT free mem check set to 60 kb
-- Small cosmetic changes to Searching in Customization web page
-- Updated to espressif32@6.4.0
-
-# [3.6.0] August 13 2023
-
-## **IMPORTANT! BREAKING CHANGES**
-
-There are breaking changes between 3.5.x and earlier versions of 3.6.0. Please read carefully before applying the update.
-
-- The sensors have been renamed. `dallassensor` is now `temperaturesensor` in the MQTT topic and named `ts` in the Customizations file. Likewise `analogs` is now `analogsensor` in MQTT and called `as` in the Customizations file. If you have previous customizations you will need to manually update by downloading, changing the JSON file and uploading. It's also recommended cleaning up any old MQTT topics from your broker using an application like MQTTExplorer.
-
-## Added
-
-- Workaround for better Domoticz MQTT integration? [#904](https://github.com/emsesp/EMS-ESP32/issues/904)
-- Show MAC address without connecting to network enhancement [#933](https://github.com/emsesp/EMS-ESP32/issues/933)
-- Warn user in WebUI of unsaved changes [#911](https://github.com/emsesp/EMS-ESP32/issues/911)
-- Detect old Tado thermostat, device-id 0x19, no entities
-- Some more HM200 entities [#500](https://github.com/emsesp/EMS-ESP32/issues/500)
-- Added Scheduler [#701](https://github.com/emsesp/EMS-ESP32/issues/701)
-- Added Custom Entities read/write from EMS bus
-- Build S3 binary with github actions
-- Greenstar HIU [#1158](https://github.com/emsesp/EMS-ESP32/issues/1158)
-- AM200 code 10 [#1161](https://github.com/emsesp/EMS-ESP32/issues/1161)
-- Ventilation device (Logavent HRV176) [#1172](https://github.com/emsesp/EMS-ESP32/issues/1172)
-- Turn ETH off on wifi connect [#1167](https://github.com/emsesp/EMS-ESP32/issues/1167)
-- Support for multiple EMS-ESPs with HA [#1196](https://github.com/emsesp/EMS-ESP32/issues/1196)
-- Italian translation [#1199](https://github.com/emsesp/EMS-ESP32/issues/1199)
-- Turkish language support [#1076](https://github.com/emsesp/EMS-ESP32/issues/1076)
-- Buderus GB182 - HC1 mode change not work bug [#1193](https://github.com/emsesp/EMS-ESP32/issues/1193)
-- Minimal flow temperature enhancement [#1192](https://github.com/emsesp/EMS-ESP32/issues/1192)
-- Roomtemperature Switching Difference enhancement [#1191](https://github.com/emsesp/EMS-ESP32/issues/1191)
-- Dew Point Temperature Difference enhancement [#1190](https://github.com/emsesp/EMS-ESP32/issues/1190)
-- Control of heating circuit mode enhancement [#1187](https://github.com/emsesp/EMS-ESP32/issues/1187)
-- Warn user in WebUI of unsaved changes enhancement [#911](https://github.com/emsesp/EMS-ESP32/issues/911)
-- Create safebuild app to fit into factory partition to give ESP32 more flash memory enhancement [#608](https://github.com/emsesp/EMS-ESP32/issues/608)
-- Support ESP32 S2, C3 mini and S3 [#605](https://github.com/emsesp/EMS-ESP32/issues/605)
-- Support Buderus AM200 [#1161](https://github.com/emsesp/EMS-ESP32/issues/1161)
-- Custom telegram handler [#1155](https://github.com/emsesp/EMS-ESP32/issues/1155)
-- Added support for TLS in MQTT (ESP32-S3 only) [#1178](https://github.com/emsesp/EMS-ESP32/issues/1178)
-- Boardprofile BBQKees Gateway S3
-- Custom entity type RAW [#1212](https://github.com/emsesp/EMS-ESP32/discussions/1212)
-- API command response [#1212](https://github.com/emsesp/EMS-ESP32/discussions/1212)
-
-## Fixed
-
-- HA-discovery for analog sensor commands [#1035](https://github.com/emsesp/EMS-ESP32/issues/1035)
-- Enum order of RC3x nofrost mode
-- Heartbeat interval
-- Exhaust temperature always zero on GB125/MC110/RC310 bug [#1147](https://github.com/emsesp/EMS-ESP32/issues/1147)
-- thermostat modetype is not changing when mode changes (e.g. to night) bugSomething isn't working [#1098](https://github.com/emsesp/EMS-ESP32/issues/1098)
-- NTP: cant apply changed timezone [#1182](https://github.com/emsesp/EMS-ESP32/issues/1182)
-- Missing Status of VS1 for Buderus SM200 enhancement [#1034](https://github.com/emsesp/EMS-ESP32/issues/1034)
-- Allowed gpios for S3
-
-## Changed
-
-- Optional upgrade to platform-espressif32 6.3.0 (after 5.3.0) [#862](https://github.com/emsesp/EMS-ESP32/issues/862)
-- Use byte 3 for detection RC30 active heatingcircuit [#786](https://github.com/emsesp/EMS-ESP32/issues/786)
-- Write repeated selflowtemp if tx-queue is empty without verify [#954](https://github.com/emsesp/EMS-ESP32/issues/954)
-- HA discovery recreate after disconnect by device [#1067](https://github.com/emsesp/EMS-ESP32/issues/1067)
-- File upload: check flash size (overflow) instead of filesize
-- Improved HA Discovery so previous configs no longer need to be removed when starting [#1077](https://github.com/emsesp/EMS-ESP32/pull/1077) (thanks @pswid)
-- Enlarge UART-Stack to 2,5k
-- Retry timeout for Mqtt-QOS1/2 10seconds
-- Optimize WebUI rendering when using Dialog Boxes [#1116](https://github.com/emsesp/EMS-ESP32/issues/1116)
-- Optimize Web libraries to reduce bundle size (3.6.x) [#1112](https://github.com/emsesp/EMS-ESP32/issues/1112)
-- Use [espMqttClient](https://github.com/bertmelis/espMqttClient) with integrated queue [#1178](https://github.com/emsesp/EMS-ESP32/issues/1178)
-- Move Sensors from Web dashboard to it's own tab enhancement [#1170](https://github.com/emsesp/EMS-ESP32/issues/1170)
-- Optimize WebUI dashboard data [#1169](https://github.com/emsesp/EMS-ESP32/issues/1169)
-- Replace React core library with Preact to save on memory footprint
-- Response to `system/send` raw reads gives combined data for telegrams with more parts
-
-# [3.5.0] February 6 2023
+# [3.5.0]
 
 ## **IMPORTANT! BREAKING CHANGES**
 
 - When upgrading to v3.5 for the first time from v3.4 on a BBQKees Gateway board you will need to use the [EMS-EPS Flasher](https://github.com/emsesp/EMS-ESP-Flasher/releases) to correctly re-partition the flash. Make sure you backup the settings and customizations from the WebUI (System->Upload/Download) and restore after the upgrade.
+- Support for multiple EMS-ESPs [#759] has been added as an optional setting for MQTT. When enabled, which is now the default, all MQTT Discovery Entity IDs will include the MQTT base name and the shortname of the EMS-ESP device entity. For example what was previously `sensor.boiler_actual_boiler_temperature` will now become `sensor.ems_esp_boiler_boiltemp`. If you still want to use the old format and retain the history and script compatibility in Home Assistant then set this back to the old format.
 
 ## Added
 
@@ -267,7 +67,19 @@ There are breaking changes between 3.5.x and earlier versions of 3.6.0. Please r
 - HA duration class for time entities [[#822](https://github.com/emsesp/EMS-ESP32/issues/822)
 - AM200 alternative heatsource as class heatsource [[#857](https://github.com/emsesp/EMS-ESP32/issues/857)
 
-# [3.4.2] September 18 2022
+# [3.4.4]
+
+## Fixed
+
+- Fix for new installations with filesystem not initializing
+
+# [3.4.3]
+
+## Fixed
+
+- Fix for new installations with filesystem not initializing
+
+# [3.4.2]
 
 ## Added
 
@@ -286,7 +98,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
 
@@ -303,17 +115,13 @@ There are breaking changes between 3.5.x and earlier versions of 3.6.0. Please r
 
 ## Changed
 
-- Controller data in web-ui only for IVT [#522](https://github.com/emsesp/EMS-ESP32/issues/522)
-- Rename hidden `climate` to a more explaining name [#523](https://github.com/emsesp/EMS-ESP32/issues/523)
-- Minor changes to the Customizations web page [#527](https://github.com/emsesp/EMS-ESP32/pull/527)
-
 # [3.4.0] May 23 2022
 
 ## Added
 
 - WebUI optimizations, updated look&feel and better performance [#124](https://github.com/emsesp/EMS-ESP32/issues/124)
 - Auto refresh of WebUI after successful firmware upload [#178](https://github.com/emsesp/EMS-ESP32/issues/178)
-- New Customization Service in WebUI. First feature is the ability to enable/disabled Entities (device values) from EMS devices [#206](https://github.com/emsesp/EMS-ESP32/issues/206)
+- New Customization Service in WebUI. First feature is the ability to enable/disabled Enitites (device values) from EMS devices [#206](https://github.com/emsesp/EMS-ESP32/issues/206)
 - Option to disable Telnet Console [#209](https://github.com/emsesp/EMS-ESP32/issues/209)
 - Added Hide SSID, Max Clients and Preferred Channel to Access Point
 - Merged in MichaelDvP's changes like Fahrenheit conversion, publish single (for IOBroker) and a few other critical optimizations
@@ -413,7 +221,7 @@ There are breaking changes between 3.5.x and earlier versions of 3.6.0. Please r
 - Added pool data to telegrams 0x494 & 0x495 [#102](https://github.com/emsesp/EMS-ESP32/issues/102)
 - Add RC300 second summermode telegram [#108](https://github.com/emsesp/EMS-ESP32/issues/108)
 - Add support for the RC25 thermostat [#106](https://github.com/emsesp/EMS-ESP32/issues/106)
-- Add new command 'entities' for a device, e.g. <http://ems-esp/api/boiler/entities> to show the shortname, description and HA Entity name (if HA enabled) [#116](https://github.com/emsesp/EMS-ESP32/issues/116)
+- Add new command 'entities' for a device, e.g. http://ems-esp/api/boiler/entities to show the shortname, description and HA Entity name (if HA enabled) [#116](https://github.com/emsesp/EMS-ESP32/issues/116)
 - Support for Junkers program and remote (fb10/fb110) temperature
 - Home Assistant `state_class` attribute for Wh, kWh, W and KW [#129](https://github.com/emsesp/EMS-ESP32/issues/129)
 - Add current room influence for RC300 [#136](https://github.com/emsesp/EMS-ESP32/issues/136)
@@ -635,4 +443,4 @@ There are breaking changes between 3.5.x and earlier versions of 3.6.0. Please r
 - some names of mqtt-tags like in v2.2.1
 - new ESP32 partition side to allow for smoother OTA and fallback
 - Network Gateway IP is optional (#682)emsesp/EMS-ESP
-- moved to a new GitHub repo <https://github.com/emsesp/EMS-ESP32>
+- moved to a new GitHub repo https://github.com/emsesp/EMS-ESP32

CHANGELOG_LATEST.md

@@ -1,23 +0,0 @@
-# Changelog
-
-## [3.7.0]
-
-## **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 second dhw circuit [#1634](https://github.com/emsesp/EMS-ESP32/issues/1634)
-- 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 dhw stop temperatures [#1624](https://github.com/emsesp/EMS-ESP32/issues/1624)
-
-## Fixed
-
-## Changed
-
-- use flag for BC400 compatible thermostats, manage different mode settings
-- 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

@@ -17,8 +17,8 @@ MAKEFLAGS+="j "
 #TARGET    := $(notdir $(CURDIR))
 TARGET    := emsesp
 BUILD     := build
-SOURCES   := src src/* lib_standalone lib/uuid-common/src lib/uuid-console/src lib/uuid-log/src src/devices lib/ArduinoJson/src lib/PButton lib/semver lib/espMqttClient/src lib/espMqttClient/src/*
-INCLUDES  := src lib_standalone lib/espMqttClient/src lib/espMqttClient/src/Transport lib/ArduinoJson/src lib/uuid-common/src lib/uuid-console/src lib/uuid-log/src lib/uuid-telnet/src lib/uuid-syslog/src lib/semver lib/* src/devices
+SOURCES   := src src/* lib_standalone lib/uuid-common/src lib/uuid-console/src lib/uuid-log/src src/devices lib/ArduinoJson/src lib/PButton lib/semver
+INCLUDES  := src lib_standalone lib/ArduinoJson/src lib/uuid-common/src lib/uuid-console/src lib/uuid-log/src lib/uuid-telnet/src lib/uuid-syslog/src lib/semver lib/* src/devices
 LIBRARIES := 
 
 CPPCHECK = cppcheck
@@ -28,21 +28,19 @@ CHECKFLAGS = -q --force --std=c++11
 #----------------------------------------------------------------------
 # Languages Standard
 #----------------------------------------------------------------------
-C_STANDARD   := -std=c17
+# C_STANDARD   := -std=c17
 # CXX_STANDARD := -std=c++17
-CXX_STANDARD := -std=gnu++11
-
-# C_STANDARD   := -std=c11
-# CXX_STANDARD := -std=c++11
+C_STANDARD   := -std=c11
+CXX_STANDARD := -std=c++11
 
 #----------------------------------------------------------------------
 # Defined Symbols
 #----------------------------------------------------------------------
 DEFINES += -DARDUINOJSON_ENABLE_STD_STRING=1 -DARDUINOJSON_ENABLE_PROGMEM=1 -DARDUINOJSON_ENABLE_ARDUINO_STRING -DARDUINOJSON_USE_DOUBLE=0 
-DEFINES += -DEMSESP_DEBUG -DEMSESP_STANDALONE -DEMSESP_TEST -D__linux__ -DEMC_RX_BUFFER_SIZE=1500
+DEFINES += -DEMSESP_DEBUG -DEMSESP_STANDALONE -DEMSESP_USE_SERIAL
 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.5.0b11\" -DEMSESP_DEFAULT_BOARD_PROFILE=\"S32\"
 
 #----------------------------------------------------------------------
 # Sources & Files
@@ -81,7 +79,9 @@ CPPFLAGS  += -g3
 CPPFLAGS  += -Os
 
 CFLAGS    += $(CPPFLAGS)
-CFLAGS    += -Wall -Wextra -Werror -Wswitch-enum -Wno-unused-parameter -Wno-inconsistent-missing-override -Wno-missing-braces -Wno-unused-lambda-capture -Wno-sign-compare
+CFLAGS    += -Wall
+CFLAGS    += -Wextra
+CFLAGS    += -Wno-unused-parameter
 
 CXXFLAGS  += $(CFLAGS) -MMD
 

README.md

@@ -21,7 +21,7 @@
 - Native support for Home Assistant, Domoticz and openHAB via [MQTT Discovery](https://www.home-assistant.io/docs/mqtt/discovery/)
 - Can run standalone as an independent WiFi Access Point or join an existing WiFi network
 - Easy first-time configuration via a web Captive Portal
-- Support for more than [110+ EMS devices](https://emsesp.github.io/docs/All-Devices/) (boilers, thermostats, solar modules, mixer modules, heat pumps, gateways, switches, heat sources)
+- Support for more than [110 EMS devices](https://emsesp.github.io/docs/#/Supported-EMS-Devices) (boilers, thermostats, solar modules, mixer modules, heat pumps, gateways, switches, heat sources)
 
 ## **Documentation**
 
@@ -46,7 +46,7 @@ EMS-ESP is a project owned and maintained by [proddy](https://github.com/proddy)
 - [esp8266-react](https://github.com/rjwats/esp8266-react) by @rjwats for the framework that provides the core of the Web UI
 - [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
+- [AsyncMqttClient](https://github.com/marvinroger/async-mqtt-client) for the MQTT client, with custom modifications from @bertmelis and @proddy
 - ESPAsyncWebServer and AsyncTCP for the Web server and TCP backends, with custom modifications for performance
 
 ## **License**

RELEASENOTES.md

@@ -0,0 +1,5 @@
+# ![logo](https://github.com/emsesp/EMS-ESP32/blob/main/media/EMS-ESP_logo_dark.png)
+
+# Firmware Installation
+
+Follow the instructions in the [documentation](https://emsesp.github.io/docs) on how to install the firmware binaries in the Assets below.

RELEASENOTES_DEV.md

@@ -0,0 +1,7 @@
+# ![logo](https://github.com/emsesp/EMS-ESP32/blob/main/media/EMS-ESP_logo_dark.png)
+
+This is a snapshot of the current "beta" development code and firmware binaries for the ESP32. It has all the latest features and fixes but please be aware that this is still experimental firmware used for testing and thus may contain the odd bug. Use at your own risk and remember to report an issue if you find something unusual.
+
+# Firmware Installation
+
+Follow the instructions in the [documentation](https://emsesp.github.io/docs) on how to install the firmware binaries in the Assets below.

esp32_asym_partition_4M.csv

@@ -1,6 +0,0 @@
-# Name,   Type, SubType, Offset,   Size,    Flags
-nvs,      data, nvs,     0x9000,   0x5000,
-otadata,  data, ota,     ,         0x2000,
-app0,     app,  ota_0,   ,         0x2A0000,
-app1,     app,  ota_1,   ,         0x140000,
-spiffs,   data, spiffs,  ,         64K,

esp32_partition_16M.csv

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

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/.env

@@ -0,0 +1,8 @@
+# This enables lint extensions
+EXTEND_ESLINT=true
+
+# This is the name of your project. It appears on the sign-in page and in the menu bar.
+REACT_APP_PROJECT_NAME=EMS-ESP
+
+# This is the url path your project will be exposed under.
+REACT_APP_PROJECT_PATH=ems-esp

interface/.env.development

@@ -1,2 +0,0 @@
-VITE_ALOVA_TIPS=0
-REACT_APP_ALOVA_TIPS=0

interface/.env.hosted

@@ -0,0 +1,3 @@
+GENERATE_SOURCEMAP=false
+
+REACT_APP_HOSTED=true

interface/.env.production

@@ -0,0 +1 @@
+GENERATE_SOURCEMAP=false

interface/.eslintignore

@@ -1,12 +0,0 @@
-node_modules/
-build/
-dist/
-.yarn/
-
-.prettierrc
-.eslintrc*
-env.d.ts
-progmem-generator.js
-unpack.ts
-vite.config.ts
-package.json

interface/.eslintrc.json

@@ -1,108 +0,0 @@
-{
-  "env": {
-    "browser": true,
-    "es6": true
-  },
-  "extends": [
-    "eslint:recommended",
-    // "airbnb/hooks",
-    // "airbnb-typescript",
-    "plugin:react/recommended",
-    "plugin:react/jsx-runtime",
-    "plugin:@typescript-eslint/recommended",
-    "plugin:@typescript-eslint/recommended-requiring-type-checking",
-    "plugin:prettier/recommended",
-    "plugin:import/recommended"
-  ],
-  "parser": "@typescript-eslint/parser",
-  "parserOptions": {
-    "ecmaFeatures": {
-      "jsx": true
-    },
-    "ecmaVersion": "latest",
-    "sourceType": "module",
-    "tsconfigRootDir": ".",
-    "project": ["tsconfig.json"]
-  },
-  "plugins": ["react", "@typescript-eslint", "autofix", "react-hooks"],
-  "settings": {
-    "import/resolver": {
-      "typescript": {
-        "project": "./tsconfig.json"
-      }
-    },
-    "react": {
-      "version": "18.x"
-    }
-  },
-  "rules": {
-    "object-shorthand": "error",
-    "no-console": "warn",
-    "@typescript-eslint/consistent-type-definitions": ["off", "type"],
-    "@typescript-eslint/explicit-function-return-type": "off",
-    "@typescript-eslint/no-unsafe-call": "off",
-    "@typescript-eslint/no-unsafe-enum-comparison": "off",
-    "@typescript-eslint/no-unsafe-assignment": "off",
-    "@typescript-eslint/no-unsafe-return": "off",
-    "@typescript-eslint/no-unsafe-member-access": "off",
-    "@typescript-eslint/naming-convention": "off",
-    "@typescript-eslint/no-explicit-any": "off",
-    "@typescript-eslint/no-unsafe-argument": "off",
-    "@typescript-eslint/restrict-plus-operands": "off",
-    "@typescript-eslint/no-unused-expressions": "off",
-    "@typescript-eslint/no-implied-eval": "off",
-    "@typescript-eslint/no-misused-promises": "off",
-    "arrow-body-style": ["error", "as-needed"],
-    "react-hooks/exhaustive-deps": "warn",
-    "@typescript-eslint/consistent-type-imports": [
-      "error",
-      {
-        "prefer": "type-imports"
-      }
-    ],
-    "import/order": [
-      "warn",
-      {
-        "groups": ["builtin", "external", "parent", "sibling", "index", "object", "type"],
-        "pathGroups": [
-          {
-            "pattern": "@/**/**",
-            "group": "parent",
-            "position": "before"
-          }
-        ],
-        "alphabetize": { "order": "asc" }
-      }
-    ],
-    // "autofix/no-unused-vars": [
-    //   "error",
-    //   {
-    //     "argsIgnorePattern": "^_",
-    //     "ignoreRestSiblings": true,
-    //     "destructuredArrayIgnorePattern": "^_"
-    //   }
-    // ],
-    "react/self-closing-comp": [
-      "error",
-      {
-        "component": true,
-        "html": true
-      }
-    ],
-    "@typescript-eslint/ban-types": [
-      "error",
-      {
-        "extendDefaults": true,
-        "types": {
-          "{}": false
-        }
-      }
-    ],
-    "prettier/prettier": [
-      "error",
-      {
-        "endOfLine": "auto"
-      }
-    ]
-  }
-}

interface/.gitignore

@@ -1,7 +0,0 @@
-.pnp.*
-.yarn/*
-!.yarn/patches
-!.yarn/plugins
-!.yarn/releases
-!.yarn/sdks
-!.yarn/versions

interface/.prettierignore

@@ -1,6 +0,0 @@
-node_modules/
-build/
-dist/
-.prettierrc
-.yarn/
-.typesafe-i18n.json

interface/.prettierrc

@@ -1,8 +1,6 @@
 {
-  "trailingComma": "none",
-  "tabWidth": 2,
-  "semi": true,
   "singleQuote": true,
-  "printWidth": 120,
-  "bracketSpacing": true
+  "semi": true,
+  "trailingComma": "none",
+  "printWidth": 120
 }

interface/.typesafe-i18n.json

@@ -1,5 +1,5 @@
 {
-   "adapter": "react",
-   "baseLocale": "pl",
-   "$schema": "https://unpkg.com/typesafe-i18n@5.26.2/schema/typesafe-i18n.json"
+  "adapter": "react",
+  "baseLocale": "pl",
+  "$schema": "https://unpkg.com/typesafe-i18n@5.24.0/schema/typesafe-i18n.json"
 }

interface/.yarnrc.yml

@@ -1,7 +0,0 @@
-compressionLevel: mixed
-
-enableGlobalCache: false
-
-nodeLinker: node-modules
-
-yarnPath: .yarn/releases/yarn-4.1.1.cjs

interface/config-overrides.js

@@ -0,0 +1,30 @@
+const { WebpackManifestPlugin } = require('webpack-manifest-plugin');
+const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+const ProgmemGenerator = require('./progmem-generator.js');
+const TerserPlugin = require('terser-webpack-plugin');
+
+module.exports = function override(config, env) {
+  const hosted = process.env.REACT_APP_HOSTED;
+
+  if (env === 'production' && !hosted) {
+    // rename the ouput file, we need it's path to be short, for embedded FS
+    config.output.filename = 'js/[id].[chunkhash:4].js';
+    config.output.chunkFilename = 'js/[id].[chunkhash:4].js';
+
+    // take out the manifest plugin
+    config.plugins = config.plugins.filter((plugin) => !(plugin instanceof WebpackManifestPlugin));
+
+    // shorten css filenames
+    const miniCssExtractPlugin = config.plugins.find((plugin) => plugin instanceof MiniCssExtractPlugin);
+    miniCssExtractPlugin.options.filename = 'css/[id].[contenthash:4].css';
+    miniCssExtractPlugin.options.chunkFilename = 'css/[id].[contenthash:4].c.css';
+
+    // don't emit license file
+    const terserPlugin = config.optimization.minimizer.find((plugin) => plugin instanceof TerserPlugin);
+    terserPlugin.options.extractComments = false;
+
+    // build progmem data files
+    config.plugins.push(new ProgmemGenerator({ outputPath: '../lib/framework/WWWData.h', bytesPerLine: 20 }));
+  }
+  return config;
+};

interface/index.html

@@ -1,14 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width" />
-    <link rel="stylesheet" href="/css/roboto.css" />
-    <link rel="manifest" href="/app/manifest.json" />
-    <title>EMS-ESP</title>
-  </head>
-  <body>
-    <div id="root"></div>
-    <script type="module" src="/src/index.tsx"></script>
-  </body>
-</html>

interface/package.json

@@ -1,78 +1,104 @@
 {
   "name": "EMS-ESP",
-  "version": "3.7",
-  "description": "build EMS-ESP WebUI",
-  "homepage": "https://emsesp.github.io/docs",
-  "author": "proddy",
-  "license": "MIT",
+  "version": "3.5.0",
   "private": true,
-  "type": "module",
-  "scripts": {
-    "build": "vite build",
-    "preview": "vite preview",
-    "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"
-  },
+  "proxy": "http://localhost:3080",
   "dependencies": {
-    "@alova/adapter-xhr": "^1.0.3",
-    "@babel/core": "^7.24.3",
-    "@emotion/react": "^11.11.4",
-    "@emotion/styled": "^11.11.0",
-    "@mui/icons-material": "^5.15.14",
-    "@mui/material": "^5.15.14",
-    "@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/react": "^18.2.72",
-    "@types/react-dom": "^18.2.22",
+    "@emotion/react": "^11.10.5",
+    "@emotion/styled": "^11.10.5",
+    "@msgpack/msgpack": "^2.8.0",
+    "@mui/icons-material": "^5.11.0",
+    "@mui/material": "^5.11.7",
+    "@table-library/react-table-library": "4.0.24",
+    "@types/lodash": "^4.14.191",
+    "@types/node": "^18.11.19",
+    "@types/react": "^18.0.27",
+    "@types/react-dom": "^18.0.10",
     "@types/react-router-dom": "^5.3.3",
-    "alova": "^2.18.0",
     "async-validator": "^4.2.5",
-    "history": "^5.3.0",
-    "jwt-decode": "^4.0.0",
-    "lodash-es": "^4.17.21",
-    "mime-types": "^2.1.35",
-    "react": "latest",
-    "react-dom": "latest",
+    "axios": "^1.3.2",
+    "jwt-decode": "^3.1.2",
+    "lodash": "^4.17.21",
+    "notistack": "^2.0.8",
+    "react": "^18.2.0",
+    "react-app-rewired": "^2.2.1",
+    "react-dom": "^18.2.0",
     "react-dropzone": "^14.2.3",
-    "react-icons": "^5.0.1",
-    "react-router-dom": "^6.22.3",
-    "react-toastify": "^10.0.5",
+    "react-icons": "^4.7.1",
+    "react-router-dom": "^6.8.1",
+    "react-scripts": "5.0.1",
     "sockette": "^2.0.6",
-    "typesafe-i18n": "^5.26.2",
-    "typescript": "^5.4.3"
+    "typesafe-i18n": "^5.24.0",
+    "typescript": "^4.9.5"
+  },
+  "scripts": {
+    "start": "react-app-rewired start",
+    "build": "react-app-rewired build",
+    "test": "react-app-rewired test",
+    "eject": "react-scripts eject",
+    "format": "prettier --write '**/*.{ts,tsx,js,css,json,md}'",
+    "build-hosted": "env-cmd -f .env.hosted npm run build",
+    "build-localhost": "PUBLIC_URL=/ react-app-rewired build",
+    "mock-api": "nodemon --watch ../mock-api ../mock-api/server.js",
+    "standalone": "npm-run-all -p start typesafe-i18n mock-api",
+    "lint": "eslint . --ext .ts,.tsx",
+    "typesafe-i18n": "typesafe-i18n"
+  },
+  "eslintConfig": {
+    "extends": [
+      "react-app",
+      "react-app/jest"
+    ],
+    "rules": {
+      "eol-last": 1,
+      "react/jsx-closing-bracket-location": 1,
+      "react/jsx-closing-tag-location": 1,
+      "react/jsx-wrap-multilines": 1,
+      "react/jsx-curly-newline": 1,
+      "no-multiple-empty-lines": [
+        1,
+        {
+          "max": 1
+        }
+      ],
+      "no-trailing-spaces": 1,
+      "semi": 1,
+      "no-extra-semi": 1,
+      "react/jsx-max-props-per-line": [
+        1,
+        {
+          "when": "multiline"
+        }
+      ],
+      "react/jsx-first-prop-new-line": [
+        1,
+        "multiline"
+      ],
+      "@typescript-eslint/no-shadow": 1,
+      "max-len": [
+        1,
+        {
+          "code": 220
+        }
+      ],
+      "arrow-parens": 1
+    }
+  },
+  "browserslist": {
+    "production": [
+      ">0.2%",
+      "not dead",
+      "not op_mini all"
+    ],
+    "development": [
+      "last 1 chrome version",
+      "last 1 firefox version",
+      "last 1 safari version"
+    ]
   },
   "devDependencies": {
-    "@preact/compat": "^17.1.2",
-    "@preact/preset-vite": "^2.8.2",
-    "@typescript-eslint/eslint-plugin": "^7.4.0",
-    "@typescript-eslint/parser": "^7.4.0",
-    "concurrently": "^8.2.2",
-    "eslint": "^8.57.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-hooks": "^4.6.0",
-    "preact": "^10.20.1",
-    "prettier": "^3.2.5",
-    "rollup-plugin-visualizer": "^5.12.0",
-    "terser": "^5.29.2",
-    "vite": "^5.2.6",
-    "vite-plugin-imagemin": "^0.6.1",
-    "vite-tsconfig-paths": "^4.3.2"
-  },
-  "packageManager": "yarn@4.1.1"
+    "nodemon": "^2.0.20",
+    "npm-run-all": "^4.1.5",
+    "http-proxy-middleware": "^2.0.6"
+  }
 }

interface/progmem-generator.js

@@ -1,32 +1,9 @@
-import { readdirSync, existsSync, unlinkSync, readFileSync, createWriteStream } from 'fs';
-import { resolve, relative, sep } from 'path';
-import zlib from 'zlib';
-import mime from 'mime-types';
-import crypto from 'crypto';
+const { resolve, relative, sep } = require('path');
+const { readdirSync, existsSync, unlinkSync, readFileSync, createWriteStream } = require('fs');
+var zlib = require('zlib');
+var mime = require('mime-types');
 
 const ARDUINO_INCLUDES = '#include <Arduino.h>\n\n';
-const INDENT = '  ';
-const outputPath = '../lib/framework/WWWData.h';
-const sourcePath = './dist';
-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;
-// Total size is ${totalSize} bytes
-
-class WWWData {
-${indent}public:
-${indent.repeat(2)}static void registerRoutes(RouteRegistrationHandler handler) {
-${fileInfo
-  .map(
-    (file) =>
-      `${indent.repeat(3)}handler("${file.uri}", "${file.mimeType}", ${file.variable}, ${file.size}, "${file.hash}");`
-  )
-  .join('\n')}
-${indent.repeat(2)}}
-};
-`;
 
 function getFilesSync(dir, files = []) {
   readdirSync(dir, { withFileTypes: true }).forEach((entry) => {
@@ -40,6 +17,10 @@ function getFilesSync(dir, files = []) {
   return files;
 }
 
+function coherseToBuffer(input) {
+  return Buffer.isBuffer(input) ? input : Buffer.from(input);
+}
+
 function cleanAndOpen(path) {
   if (existsSync(path)) {
     unlinkSync(path);
@@ -47,68 +28,94 @@ function cleanAndOpen(path) {
   return createWriteStream(path, { flags: 'w+' });
 }
 
-const writeFile = (relativeFilePath, buffer) => {
-  const variable = 'ESP_REACT_DATA_' + fileInfo.length;
-  const mimeType = mime.lookup(relativeFilePath);
-  var size = 0;
-  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');
-      writeStream.write(indent);
-    }
-    writeStream.write('0x' + ('00' + b.toString(16).toUpperCase()).slice(-2) + ',');
-    size++;
-  });
-
-  if (size % bytesPerLine) {
-    writeStream.write('\n');
+class ProgmemGenerator {
+  constructor(options = {}) {
+    const { outputPath, bytesPerLine = 20, indent = '  ', includes = ARDUINO_INCLUDES } = options;
+    this.options = { outputPath, bytesPerLine, indent, includes };
   }
 
-  writeStream.write('};\n\n');
+  apply(compiler) {
+    compiler.hooks.emit.tapAsync({ name: 'ProgmemGenerator' }, (compilation, callback) => {
+      const { outputPath, bytesPerLine, indent, includes } = this.options;
+      const fileInfo = [];
+      const writeStream = cleanAndOpen(resolve(compilation.options.context, outputPath));
+      try {
+        const writeIncludes = () => {
+          writeStream.write(includes);
+        };
 
-  fileInfo.push({
-    uri: '/' + relativeFilePath.replace(sep, '/'),
-    mimeType,
-    variable,
-    size,
-    hash
-  });
+        const writeFile = (relativeFilePath, buffer) => {
+          const variable = 'ESP_REACT_DATA_' + fileInfo.length;
+          const mimeType = mime.lookup(relativeFilePath);
+          var size = 0;
+          writeStream.write('const uint8_t ' + variable + '[] PROGMEM = {');
+          const zipBuffer = zlib.gzipSync(buffer);
+          zipBuffer.forEach((b) => {
+            if (!(size % bytesPerLine)) {
+              writeStream.write('\n');
+              writeStream.write(indent);
+            }
+            writeStream.write('0x' + ('00' + b.toString(16).toUpperCase()).substr(-2) + ',');
+            size++;
+          });
+          if (size % bytesPerLine) {
+            writeStream.write('\n');
+          }
+          writeStream.write('};\n\n');
+          fileInfo.push({
+            uri: '/' + relativeFilePath.replace(sep, '/'),
+            mimeType,
+            variable,
+            size
+          });
+        };
 
-  // console.log(relativeFilePath + ' (size ' + size + ' bytes)');
-  totalSize += size;
+        const writeFiles = () => {
+          // process static files
+          const buildPath = compilation.options.output.path;
+          for (const filePath of getFilesSync(buildPath)) {
+            const readStream = readFileSync(filePath);
+            const relativeFilePath = relative(buildPath, filePath);
+            writeFile(relativeFilePath, readStream);
+          }
+          // process assets
+          const { assets } = compilation;
+          Object.keys(assets).forEach((relativeFilePath) => {
+            writeFile(relativeFilePath, coherseToBuffer(assets[relativeFilePath].source()));
+          });
+        };
+
+        const generateWWWClass = () => {
+          // eslint-disable-next-line max-len
+          return `typedef std::function<void(const String& uri, const String& contentType, const uint8_t * content, size_t len)> RouteRegistrationHandler;
+
+class WWWData {
+${indent}public:
+${indent.repeat(2)}static void registerRoutes(RouteRegistrationHandler handler) {
+${fileInfo
+  .map((file) => `${indent.repeat(3)}handler("${file.uri}", "${file.mimeType}", ${file.variable}, ${file.size});`)
+  .join('\n')}
+${indent.repeat(2)}}
 };
+`;
+        };
 
-// start
-console.log('Generating ' + outputPath + ' from ' + sourcePath);
-const includes = ARDUINO_INCLUDES;
-const indent = INDENT;
-const fileInfo = [];
-const writeStream = cleanAndOpen(resolve(outputPath));
+        const writeWWWClass = () => {
+          writeStream.write(generateWWWClass());
+        };
 
-// includes
-writeStream.write(includes);
+        writeIncludes();
+        writeFiles();
+        writeWWWClass();
 
-// process static files
-const buildPath = resolve(sourcePath);
-for (const filePath of getFilesSync(buildPath)) {
-  const readStream = readFileSync(filePath);
-  const relativeFilePath = relative(buildPath, filePath);
-  writeFile(relativeFilePath, readStream);
+        writeStream.on('finish', () => {
+          callback();
+        });
+      } finally {
+        writeStream.end();
+      }
+    });
+  }
 }
 
-// add class
-writeStream.write(generateWWWClass());
-
-// end
-writeStream.end();
-
-console.log('Total size: ' + totalSize / 1000 + ' KB');
+module.exports = ProgmemGenerator;

interface/public/css/roboto.css

@@ -1,18 +1,26 @@
 /* 
-* Uses font-size 400 (normal) only and Latin (plus extra unicode chars) to keep flash memory to a minimum
-* View fonts on https://fonts.google.com/
-* Download woff2 using e.g. https://fonts.googleapis.com/css2?family=Lato or https://fonts.googleapis.com/css2?family=Roboto
+* Just supporting latin due to size constrains on the esp chip 
+*
+* The framework only makes use of 400 (regular) + 500 (medium) weight fonts.
+*
+* If using light or strong typography variants you will need to add additional fonts.
 */
 @font-face {
   font-family: 'Roboto';
   font-style: normal;
   font-weight: 400;
-  /* src: url(https://fonts.gstatic.com/s/roboto/v30/KFOmCnqEu92Fr1Mu4mxK.woff2) format('woff2'); */
-  src:
-    local('Roboto'),
-    local('Roboto-Regular'),
-    url(../fonts/re.woff2) format('woff2');
-  unicode-range: U+0000-00FF, U+0104-0107, U+0118-0119, U+011E-011F, U+0130-0131, U+0141-0144, U+0152-0153, U+015A-015B,
-    U+015E-015F, U+0179-017C, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193,
-    U+2212, U+2215, U+FEFF, U+FFFD;
+  src: local('Roboto'), local('Roboto-Regular'), url(../fonts/re.woff2) format('woff2');
+  unicode-range: U+0000-00FF, U+0104-0107, U+0118-0119, U+0131, U+0141-0144, U+0152-0153, U+015A-015B, U+0179-017C,
+    U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF,
+    U+FFFD;
+}
+
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 500;
+  src: local('Roboto Medium'), local('Roboto-Medium'), url(../fonts/md.woff2) format('woff2');
+  unicode-range: U+0000-00FF, U+0104-0107, U+0118-0119, U+0131, U+0141-0144, U+0152-0153, U+015A-015B, U+0179-017C,
+    U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF,
+    U+FFFD;
 }

interface/public/index.html

@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, user-scalable=0, maximum-scale=1, minimum-scale=1"
+    />
+    <link rel="stylesheet" href="%PUBLIC_URL%/css/roboto.css" />
+    <link rel="manifest" href="%PUBLIC_URL%/app/manifest.json" />
+    <title>EMS-ESP</title>
+  </head>
+  <body>
+    <noscript> You need to enable JavaScript to run this app. </noscript>
+    <div id="root"></div>
+  </body>
+</html>

interface/src/App.tsx

@@ -1,48 +1,61 @@
-import { useEffect, useState } from 'react';
-import { ToastContainer, Slide } from 'react-toastify';
+import { FC, createRef, createContext, useContext, useEffect, useState, RefObject } from 'react';
+import { SnackbarProvider } from 'notistack';
 
-import 'react-toastify/dist/ReactToastify.min.css';
+import { IconButton } from '@mui/material';
+import CloseIcon from '@mui/icons-material/Close';
+
+import { FeaturesLoader } from './contexts/features';
+
+import CustomTheme from './CustomTheme';
+import AppRouting from './AppRouting';
 
 import { localStorageDetector } from 'typesafe-i18n/detectors';
-import type { FC } from 'react';
-import AppRouting from 'AppRouting';
-import CustomTheme from 'CustomTheme';
-
-import TypesafeI18n from 'i18n/i18n-react';
-import { detectLocale } from 'i18n/i18n-util';
-import { loadLocaleAsync } from 'i18n/i18n-util.async';
+import TypesafeI18n from './i18n/i18n-react';
+import { detectLocale } from './i18n/i18n-util';
+import { loadLocaleAsync } from './i18n/i18n-util.async';
 
 const detectedLocale = detectLocale(localStorageDetector);
 
 const App: FC = () => {
+  const notistackRef: RefObject<any> = createRef();
+
+  const onClickDismiss = (key: string | number | undefined) => () => {
+    notistackRef.current.closeSnackbar(key);
+  };
+
+  const ColorModeContext = createContext({ toggleColorMode: () => {} });
+
+  const colorMode = useContext(ColorModeContext);
+
   const [wasLoaded, setWasLoaded] = useState(false);
 
   useEffect(() => {
-    void loadLocaleAsync(detectedLocale).then(() => setWasLoaded(true));
+    loadLocaleAsync(detectedLocale).then(() => setWasLoaded(true));
   }, []);
 
   if (!wasLoaded) return null;
 
   return (
-    <TypesafeI18n locale={detectedLocale}>
-      <CustomTheme>
-        <AppRouting />
-        <ToastContainer
-          position="bottom-right"
-          autoClose={3000}
-          hideProgressBar={false}
-          newestOnTop={false}
-          closeOnClick={true}
-          rtl={false}
-          pauseOnFocusLoss={false}
-          draggable={false}
-          pauseOnHover={false}
-          transition={Slide}
-          closeButton={false}
-          theme="light"
-        />
-      </CustomTheme>
-    </TypesafeI18n>
+    <ColorModeContext.Provider value={colorMode}>
+      <TypesafeI18n locale={detectedLocale}>
+        <CustomTheme>
+          <SnackbarProvider
+            maxSnack={3}
+            anchorOrigin={{ vertical: 'bottom', horizontal: 'left' }}
+            ref={notistackRef}
+            action={(key) => (
+              <IconButton onClick={onClickDismiss(key)} size="small">
+                <CloseIcon />
+              </IconButton>
+            )}
+          >
+            <FeaturesLoader>
+              <AppRouting />
+            </FeaturesLoader>
+          </SnackbarProvider>
+        </CustomTheme>
+      </TypesafeI18n>
+    </ColorModeContext.Provider>
   );
 };
 

interface/src/AppRouting.tsx

@@ -1,28 +1,29 @@
-import { useContext, useEffect } from 'react';
+import { FC, useContext, useEffect } from 'react';
+import { Navigate, Routes, Route, useLocation } from 'react-router-dom';
+import { useSnackbar, VariantType } from 'notistack';
 
-import { Route, Routes, Navigate, useLocation } from 'react-router-dom';
+import { useI18nContext } from './i18n/i18n-react';
 
-import { toast } from 'react-toastify';
-import type { FC } from 'react';
+import { Authentication, AuthenticationContext } from './contexts/authentication';
+import { FeaturesContext } from './contexts/features';
+import { RequireAuthenticated, RequireUnauthenticated } from './components';
 
-import AuthenticatedRouting from 'AuthenticatedRouting';
-import SignIn from 'SignIn';
-import { RequireAuthenticated, RequireUnauthenticated } from 'components';
-
-import { Authentication, AuthenticationContext } from 'contexts/authentication';
-import { useI18nContext } from 'i18n/i18n-react';
+import SignIn from './SignIn';
+import AuthenticatedRouting from './AuthenticatedRouting';
 
 interface SecurityRedirectProps {
   message: string;
+  variant?: VariantType;
   signOut?: boolean;
 }
 
-const RootRedirect: FC<SecurityRedirectProps> = ({ message, signOut }) => {
+const RootRedirect: FC<SecurityRedirectProps> = ({ message, variant, signOut }) => {
   const authenticationContext = useContext(AuthenticationContext);
+  const { enqueueSnackbar } = useSnackbar();
   useEffect(() => {
     signOut && authenticationContext.signOut(false);
-    toast.success(message);
-  }, [message, signOut, authenticationContext]);
+    enqueueSnackbar(message, { variant });
+  }, [message, variant, signOut, authenticationContext, enqueueSnackbar]);
   return <Navigate to="/" />;
 };
 
@@ -41,6 +42,7 @@ export const RemoveTrailingSlashes = () => {
 };
 
 const AppRouting: FC = () => {
+  const { features } = useContext(FeaturesContext);
   const { LL } = useI18nContext();
 
   return (
@@ -48,15 +50,17 @@ const AppRouting: FC = () => {
       <RemoveTrailingSlashes />
       <Routes>
         <Route path="/unauthorized" element={<RootRedirect message={LL.PLEASE_SIGNIN()} signOut />} />
-        <Route path="/fileUpdated" element={<RootRedirect message={LL.UPLOAD_SUCCESSFUL()} />} />
-        <Route
-          path="/"
-          element={
-            <RequireUnauthenticated>
-              <SignIn />
-            </RequireUnauthenticated>
-          }
-        />
+        <Route path="/fileUpdated" element={<RootRedirect message={LL.UPLOAD_SUCCESSFUL()} variant="success" />} />
+        {features.security && (
+          <Route
+            path="/"
+            element={
+              <RequireUnauthenticated>
+                <SignIn />
+              </RequireUnauthenticated>
+            }
+          />
+        )}
         <Route
           path="/*"
           element={

interface/src/AuthenticatedRouting.tsx

@@ -1,52 +1,63 @@
-import { useContext, type FC } from 'react';
-import { Navigate, Routes, Route } from 'react-router-dom';
-import Help from './project/Help';
-import { Layout } from 'components';
-import { AuthenticatedContext } from 'contexts/authentication';
-import Settings from 'framework/Settings';
-import AccessPoint from 'framework/ap/AccessPoint';
-import Mqtt from 'framework/mqtt/Mqtt';
-import Network from 'framework/network/Network';
-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';
+import { FC, useCallback, useContext, useEffect } from 'react';
+import { Navigate, Routes, Route, useNavigate, useLocation } from 'react-router-dom';
+import { AxiosError } from 'axios';
+
+import { FeaturesContext } from './contexts/features';
+import * as AuthenticationApi from './api/authentication';
+import { PROJECT_PATH } from './api/env';
+import { AXIOS } from './api/endpoints';
+import { Layout, RequireAdmin } from './components';
+
+import ProjectRouting from './project/ProjectRouting';
+
+import NetworkConnection from './framework/network/NetworkConnection';
+import AccessPoint from './framework/ap/AccessPoint';
+import NetworkTime from './framework/ntp/NetworkTime';
+import Mqtt from './framework/mqtt/Mqtt';
+import System from './framework/system/System';
+import Security from './framework/security/Security';
 
 const AuthenticatedRouting: FC = () => {
-  const { me } = useContext(AuthenticatedContext);
+  const { features } = useContext(FeaturesContext);
+  const location = useLocation();
+  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]);
+
   return (
     <Layout>
       <Routes>
-        <Route path="/devices/*" element={<Devices />} />
-        <Route path="/sensors/*" element={<Sensors />} />
-        <Route path="/system/*" element={<System />} />
-        <Route path="/help/*" element={<Help />} />
-        <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 />} />
-          </>
+        {features.project && <Route path={`/${PROJECT_PATH}/*`} element={<ProjectRouting />} />}
+        <Route path="/network/*" element={<NetworkConnection />} />
+        <Route path="/ap/*" element={<AccessPoint />} />
+        {features.ntp && <Route path="/ntp/*" element={<NetworkTime />} />}
+        {features.mqtt && <Route path="/mqtt/*" element={<Mqtt />} />}
+        {features.security && (
+          <Route
+            path="/security/*"
+            element={
+              <RequireAdmin>
+                <Security />
+              </RequireAdmin>
+            }
+          />
         )}
+        <Route path="/system/*" element={<System />} />
+        <Route path="/*" element={<Navigate to={AuthenticationApi.getDefaultRoute(features)} />} />
       </Routes>
     </Layout>
   );

interface/src/CustomTheme.tsx

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

interface/src/SignIn.tsx

@@ -1,38 +1,34 @@
+import { FC, useContext, useState } from 'react';
+import { ValidateFieldsError } from 'async-validator';
+import { useSnackbar } from 'notistack';
+
+import { Box, Fab, Paper, Typography, Button } from '@mui/material';
 import ForwardIcon from '@mui/icons-material/Forward';
-import { Box, Paper, Typography, MenuItem, TextField, Button } from '@mui/material';
-import { useRequest } from 'alova';
-import { useContext, useState } from 'react';
-import { toast } from 'react-toastify';
-import type { ValidateFieldsError } from 'async-validator';
 
-import type { Locales } from 'i18n/i18n-types';
-import type { ChangeEventHandler, FC } from 'react';
-import type { SignInRequest } from 'types';
-import * as AuthenticationApi from 'api/authentication';
-import { PROJECT_NAME } from 'api/env';
+import * as AuthenticationApi from './api/authentication';
+import { PROJECT_NAME } from './api/env';
+import { AuthenticationContext } from './contexts/authentication';
 
-import { ValidatedPasswordField, ValidatedTextField } from 'components';
-import { AuthenticationContext } from 'contexts/authentication';
+import { extractErrorMessage, onEnterCallback, updateValue } from './utils';
+import { SignInRequest } from './types';
+import { ValidatedTextField } from './components';
+import { SIGN_IN_REQUEST_VALIDATOR, validate } from './validators';
 
-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';
-import { onEnterCallback, updateValue } from 'utils';
-import { SIGN_IN_REQUEST_VALIDATOR, validate } from 'validators';
+import { I18nContext } from './i18n/i18n-react';
+import type { Locales } from './i18n/i18n-types';
+import { loadLocaleAsync } from './i18n/i18n-util.async';
+
+import { ReactComponent as NLflag } from './i18n/NL.svg';
+import { ReactComponent as DEflag } from './i18n/DE.svg';
+import { ReactComponent as GBflag } from './i18n/GB.svg';
+import { ReactComponent as SVflag } from './i18n/SV.svg';
+import { ReactComponent as PLflag } from './i18n/PL.svg';
+import { ReactComponent as NOflag } from './i18n/NO.svg';
+import { ReactComponent as FRflag } from './i18n/FR.svg';
 
 const SignIn: FC = () => {
   const authenticationContext = useContext(AuthenticationContext);
-
-  const { LL, setLocale, locale } = useContext(I18nContext);
+  const { enqueueSnackbar } = useSnackbar();
 
   const [signInRequest, setSignInRequest] = useState<SignInRequest>({
     username: '',
@@ -41,29 +37,8 @@ const SignIn: FC = () => {
   const [processing, setProcessing] = useState<boolean>(false);
   const [fieldErrors, setFieldErrors] = useState<ValidateFieldsError>();
 
-  const { send: callSignIn, onSuccess } = useRequest((request: SignInRequest) => AuthenticationApi.signIn(request), {
-    immediate: false
-  });
-
-  onSuccess((response) => {
-    if (response.data) {
-      authenticationContext.signIn(response.data.access_token);
-    }
-  });
-
   const updateLoginRequestValue = updateValue(setSignInRequest);
 
-  const signIn = async () => {
-    await callSignIn(signInRequest).catch((event) => {
-      if (event.message === 'Unauthorized') {
-        toast.warning(LL.INVALID_LOGIN());
-      } else {
-        toast.error(LL.ERROR() + ' ' + event.message);
-      }
-      setProcessing(false);
-    });
-  };
-
   const validateAndSignIn = async () => {
     setProcessing(true);
     SIGN_IN_REQUEST_VALIDATOR.messages({
@@ -71,17 +46,34 @@ const SignIn: FC = () => {
     });
     try {
       await validate(SIGN_IN_REQUEST_VALIDATOR, signInRequest);
-      await signIn();
+      signIn();
     } catch (errors: any) {
       setFieldErrors(errors);
       setProcessing(false);
     }
   };
 
+  const signIn = async () => {
+    try {
+      const { data: loginResponse } = await AuthenticationApi.signIn(signInRequest);
+      authenticationContext.signIn(loginResponse.access_token);
+    } catch (error) {
+      if (error.response) {
+        if (error.response?.status === 401) {
+          enqueueSnackbar(LL.INVALID_LOGIN(), { variant: 'warning' });
+        }
+      } else {
+        enqueueSnackbar(extractErrorMessage(error, LL.ERROR()), { variant: 'error' });
+      }
+      setProcessing(false);
+    }
+  };
+
   const submitOnEnter = onEnterCallback(signIn);
 
-  const onLocaleSelected: ChangeEventHandler<HTMLInputElement> = async ({ target }) => {
-    const loc = target.value as Locales;
+  const { LL, setLocale, locale } = useContext(I18nContext);
+
+  const selectLocale = async (loc: Locales) => {
     localStorage.setItem('lang', loc);
     await loadLocaleAsync(loc);
     setLocale(loc);
@@ -101,91 +93,81 @@ const SignIn: FC = () => {
         sx={(theme) => ({
           textAlign: 'center',
           padding: theme.spacing(2),
-          paddingTop: '172px',
+          paddingTop: '200px',
           backgroundImage: 'url("/app/icon.png")',
           backgroundRepeat: 'no-repeat',
           backgroundPosition: '50% ' + theme.spacing(2),
+          backgroundSize: 'auto 150px',
           width: '100%'
         })}
       >
         <Typography variant="h4">{PROJECT_NAME}</Typography>
-
-        <TextField name="locale" 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' }} />
+        <Box
+          sx={{
+            '& button, & a, & .MuiCard-root': {
+              mt: 0.5,
+              mx: 0.5
+            }
+          }}
+        >
+          <Button size="small" variant={locale === 'en' ? 'contained' : 'outlined'} onClick={() => selectLocale('en')}>
+            <GBflag style={{ width: 24 }} />
             &nbsp;EN
-          </MenuItem>
-          <MenuItem key="fr" value="fr">
-            <img src={FRflag} style={{ width: 16, verticalAlign: 'middle' }} />
+          </Button>
+          <Button size="small" variant={locale === 'de' ? 'contained' : 'outlined'} onClick={() => selectLocale('de')}>
+            <DEflag style={{ width: 24 }} />
+            &nbsp;DE
+          </Button>
+          <Button size="small" variant={locale === 'fr' ? 'contained' : 'outlined'} onClick={() => selectLocale('fr')}>
+            <FRflag style={{ width: 24 }} />
             &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' }} />
+          </Button>
+          <Button size="small" variant={locale === 'nl' ? 'contained' : 'outlined'} onClick={() => selectLocale('nl')}>
+            <NLflag style={{ width: 24 }} />
             &nbsp;NL
-          </MenuItem>
-          <MenuItem key="no" value="no">
-            <img src={NOflag} style={{ width: 16, verticalAlign: 'middle' }} />
+          </Button>
+          <Button size="small" variant={locale === 'no' ? 'contained' : 'outlined'} onClick={() => selectLocale('no')}>
+            <NOflag style={{ width: 24 }} />
             &nbsp;NO
-          </MenuItem>
-          <MenuItem key="pl" value="pl">
-            <img src={PLflag} style={{ width: 16, verticalAlign: 'middle' }} />
+          </Button>
+          <Button size="small" variant={locale === 'pl' ? 'contained' : 'outlined'} onClick={() => selectLocale('pl')}>
+            <PLflag style={{ width: 24 }} />
             &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' }} />
+          </Button>
+          <Button size="small" variant={locale === 'sv' ? 'contained' : 'outlined'} onClick={() => selectLocale('sv')}>
+            <SVflag style={{ width: 24 }} />
             &nbsp;SV
-          </MenuItem>
-          <MenuItem key="tr" value="tr">
-            <img src={TRflag} style={{ width: 16, verticalAlign: 'middle' }} />
-            &nbsp;TR
-          </MenuItem>
-        </TextField>
-
-        <Box display="flex" flexDirection="column" alignItems="center">
-          <ValidatedTextField
-            fieldErrors={fieldErrors}
-            disabled={processing}
-            sx={{
-              width: 240
-            }}
-            name="username"
-            label={LL.USERNAME(0)}
-            value={signInRequest.username}
-            onChange={updateLoginRequestValue}
-            margin="normal"
-            variant="outlined"
-          />
-          <ValidatedPasswordField
-            fieldErrors={fieldErrors}
-            disabled={processing}
-            sx={{
-              width: 240
-            }}
-            name="password"
-            label={LL.PASSWORD()}
-            value={signInRequest.password}
-            onChange={updateLoginRequestValue}
-            onKeyDown={submitOnEnter}
-            variant="outlined"
-          />
+          </Button>
         </Box>
 
-        <Button variant="contained" color="primary" sx={{ mt: 2 }} onClick={validateAndSignIn} disabled={processing}>
+        <ValidatedTextField
+          fieldErrors={fieldErrors}
+          disabled={processing}
+          name="username"
+          label={LL.USERNAME(0)}
+          value={signInRequest.username}
+          onChange={updateLoginRequestValue}
+          margin="normal"
+          variant="outlined"
+          fullWidth
+        />
+        <ValidatedTextField
+          fieldErrors={fieldErrors}
+          disabled={processing}
+          type="password"
+          name="password"
+          label={LL.PASSWORD()}
+          value={signInRequest.password}
+          onChange={updateLoginRequestValue}
+          onKeyDown={submitOnEnter}
+          margin="normal"
+          variant="outlined"
+          fullWidth
+        />
+        <Fab variant="extended" color="primary" sx={{ mt: 2 }} onClick={validateAndSignIn} disabled={processing}>
           <ForwardIcon sx={{ mr: 1 }} />
           {LL.SIGN_IN()}
-        </Button>
+        </Fab>
       </Paper>
     </Box>
   );

interface/src/api/ap.ts

@@ -1,7 +1,16 @@
-import { alovaInstance } from './endpoints';
+import { AxiosPromise } from 'axios';
 
-import type { APSettings, APStatus } from 'types';
+import { APSettings, APStatus } from '../types';
+import { AXIOS } from './endpoints';
 
-export const readAPStatus = () => alovaInstance.Get<APStatus>('/rest/apStatus');
-export const readAPSettings = () => alovaInstance.Get<APSettings>('/rest/apSettings');
-export const updateAPSettings = (data: APSettings) => alovaInstance.Post<APSettings>('/rest/apSettings', data);
+export function readAPStatus(): AxiosPromise<APStatus> {
+  return AXIOS.get('/apStatus');
+}
+
+export function readAPSettings(): AxiosPromise<APSettings> {
+  return AXIOS.get('/apSettings');
+}
+
+export function updateAPSettings(apSettings: APSettings): AxiosPromise<APSettings> {
+  return AXIOS.post('/apSettings', apSettings);
+}

interface/src/api/authentication.ts

@@ -1,16 +1,29 @@
-import { jwtDecode } from 'jwt-decode';
-import { ACCESS_TOKEN, alovaInstance } from './endpoints';
-import type * as H from 'history';
-import type { Path } from 'react-router-dom';
+import { AxiosPromise } from 'axios';
+import * as H from 'history';
+import jwtDecode from 'jwt-decode';
+import { Path } from 'react-router-dom';
 
-import type { Me, SignInRequest, SignInResponse } from 'types';
+import { Features, Me, SignInRequest, SignInResponse } from '../types';
+
+import { ACCESS_TOKEN, AXIOS } from './endpoints';
+import { PROJECT_PATH } from './env';
 
 export const SIGN_IN_PATHNAME = 'loginPathname';
 export const SIGN_IN_SEARCH = 'loginSearch';
 
-export const verifyAuthorization = () => alovaInstance.Get('/rest/verifyAuthorization');
-export const signIn = (request: SignInRequest) => alovaInstance.Post<SignInResponse>('/rest/signIn', request);
+export const getDefaultRoute = (features: Features) => (features.project ? `/${PROJECT_PATH}` : '/wifi');
 
+export function verifyAuthorization(): AxiosPromise<void> {
+  return AXIOS.get('/verifyAuthorization');
+}
+
+export function signIn(request: SignInRequest): AxiosPromise<SignInResponse> {
+  return AXIOS.post('/signIn', request);
+}
+
+/**
+ * Fallback to sessionStorage if localStorage is absent. WebView may not have local storage enabled.
+ */
 export function getStorage() {
   return localStorage || sessionStorage;
 }
@@ -27,18 +40,18 @@ export function clearLoginRedirect() {
   getStorage().removeItem(SIGN_IN_SEARCH);
 }
 
-export function fetchLoginRedirect(): Partial<Path> {
+export function fetchLoginRedirect(features: Features): Partial<Path> {
   const signInPathname = getStorage().getItem(SIGN_IN_PATHNAME);
   const signInSearch = getStorage().getItem(SIGN_IN_SEARCH);
   clearLoginRedirect();
   return {
-    pathname: signInPathname || `/devices`,
+    pathname: signInPathname || getDefaultRoute(features),
     search: (signInPathname && signInSearch) || undefined
   };
 }
 
 export const clearAccessToken = () => localStorage.removeItem(ACCESS_TOKEN);
-export const decodeMeJWT = (accessToken: string): Me => jwtDecode(accessToken);
+export const decodeMeJWT = (accessToken: string): Me => jwtDecode(accessToken) as Me;
 
 export function addAccessTokenParameter(url: string) {
   const accessToken = getStorage().getItem(ACCESS_TOKEN);

interface/src/api/endpoints.ts

@@ -1,60 +1,105 @@
-import { xhrRequestAdapter } from '@alova/adapter-xhr';
-import { createAlova } from 'alova';
-import ReactHook from 'alova/react';
-import { unpack } from '../api/unpack';
+import axios, { AxiosPromise, CancelToken, AxiosProgressEvent } from 'axios';
 
+import { decode } from '@msgpack/msgpack';
+
+export const WS_BASE_URL = '/ws/';
+export const API_BASE_URL = '/rest/';
+export const ES_BASE_URL = '/es/';
+export const EMSESP_API_BASE_URL = '/api/';
 export const ACCESS_TOKEN = 'access_token';
+export const WEB_SOCKET_ROOT = calculateWebSocketRoot(WS_BASE_URL);
+export const EVENT_SOURCE_ROOT = calculateEventSourceRoot(ES_BASE_URL);
 
-const host = window.location.host;
-export const WEB_SOCKET_ROOT = 'ws://' + host + '/ws/';
-export const EVENT_SOURCE_ROOT = 'http://' + host + '/es/';
-
-export const alovaInstance = createAlova({
-  statesHook: ReactHook,
-  timeout: 3000, // 3 seconds but throwing a timeout error
-  localCache: null,
-  // localCache: {
-  //   GET: {
-  //     mode: 'placeholder', // see https://alova.js.org/learning/response-cache/#cache-replaceholder-mode
-  //     expire: 2000
-  //   }
-  // },
-  requestAdapter: xhrRequestAdapter(),
-  beforeRequest(method) {
-    if (localStorage.getItem(ACCESS_TOKEN)) {
-      method.config.headers.Authorization = 'Bearer ' + localStorage.getItem(ACCESS_TOKEN);
-    }
+export const AXIOS = axios.create({
+  baseURL: API_BASE_URL,
+  headers: {
+    'Content-Type': 'application/json'
   },
-
-  responded: {
-    onSuccess: async (response) => {
-      // if (response.status === 202) {
-      //   throw new Error('Wait'); // wifi scan in progress
-      // } else
-      if (response.status === 205) {
-        throw new Error('Reboot required');
-      } else if (response.status === 400) {
-        throw new Error('Request Failed');
-      } else if (response.status >= 400) {
-        throw new Error(response.statusText);
+  transformRequest: [
+    (data, headers) => {
+      if (headers) {
+        if (localStorage.getItem(ACCESS_TOKEN)) {
+          headers.Authorization = 'Bearer ' + localStorage.getItem(ACCESS_TOKEN);
+        }
+        if (headers['Content-Type'] !== 'application/json') {
+          return data;
+        }
       }
-      const data = await response.data;
-      if (response.data instanceof ArrayBuffer) {
-        return unpack(data);
-      }
-      return data;
+      return JSON.stringify(data);
     }
-
-    // Interceptor for request failure. This interceptor will be entered when the request is wrong.
-    // http errors like 401 (unauthorized) are handled either in the methods or AuthenticatedRouting()
-    // onError: (error, method) => {
-    //   alert(error.message);
-    // }
-  }
+  ]
 });
 
-export const alovaInstanceGH = createAlova({
-  baseURL: 'https://api.github.com/repos/emsesp/EMS-ESP32/releases',
-  statesHook: ReactHook,
-  requestAdapter: xhrRequestAdapter()
+export const AXIOS_API = axios.create({
+  baseURL: EMSESP_API_BASE_URL,
+  headers: {
+    'Content-Type': 'application/json'
+  },
+  transformRequest: [
+    (data, headers) => {
+      if (headers) {
+        if (localStorage.getItem(ACCESS_TOKEN)) {
+          headers.Authorization = 'Bearer ' + localStorage.getItem(ACCESS_TOKEN);
+        }
+        if (headers['Content-Type'] !== 'application/json') {
+          return data;
+        }
+      }
+      return JSON.stringify(data);
+    }
+  ]
 });
+
+export const AXIOS_BIN = axios.create({
+  baseURL: API_BASE_URL,
+  headers: {
+    'Content-Type': 'application/json'
+  },
+  responseType: 'arraybuffer',
+  transformRequest: [
+    (data, headers) => {
+      if (headers) {
+        if (localStorage.getItem(ACCESS_TOKEN)) {
+          headers.Authorization = 'Bearer ' + localStorage.getItem(ACCESS_TOKEN);
+        }
+        if (headers['Content-Type'] !== 'application/json') {
+          return data;
+        }
+      }
+      return JSON.stringify(data);
+    }
+  ],
+  transformResponse: [
+    (data) => {
+      return decode(data);
+    }
+  ]
+});
+
+function calculateWebSocketRoot(webSocketPath: string) {
+  const location = window.location;
+  const webProtocol = location.protocol === 'https:' ? 'wss:' : 'ws:';
+  return webProtocol + '//' + location.host + webSocketPath;
+}
+
+function calculateEventSourceRoot(endpointPath: string) {
+  const location = window.location;
+  return location.protocol + '//' + location.host + endpointPath;
+}
+
+export interface FileUploadConfig {
+  cancelToken?: CancelToken;
+  onUploadProgress?: (progressEvent: AxiosProgressEvent) => void;
+}
+
+export const startUploadFile = (url: string, file: File, config?: FileUploadConfig): AxiosPromise<void> => {
+  const formData = new FormData();
+  formData.append('file', file);
+
+  return AXIOS.post(url, formData, {
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    },
+    ...(config || {})
+  });
+};

interface/src/api/env.ts

@@ -1 +1,2 @@
-export const PROJECT_NAME = 'EMS-ESP';
+export const PROJECT_NAME = process.env.REACT_APP_PROJECT_NAME || 'EMS-ESP';
+export const PROJECT_PATH = process.env.REACT_APP_PROJECT_PATH || 'project';

interface/src/api/features.ts

@@ -0,0 +1,9 @@
+import { AxiosPromise } from 'axios';
+
+import { Features } from '../types';
+
+import { AXIOS } from './endpoints';
+
+export function readFeatures(): AxiosPromise<Features> {
+  return AXIOS.get('/features');
+}

interface/src/api/mqtt.ts

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

interface/src/api/network.ts

@@ -1,15 +1,25 @@
-import { alovaInstance } from './endpoints';
+import { AxiosPromise } from 'axios';
 
-import type { WiFiNetworkList, NetworkSettings, NetworkStatus } from 'types';
+import { WiFiNetworkList, NetworkSettings, NetworkStatus } from '../types';
 
-export const readNetworkStatus = () => alovaInstance.Get<NetworkStatus>('/rest/networkStatus');
-export const scanNetworks = () => alovaInstance.Get('/rest/scanNetworks');
-export const listNetworks = () =>
-  alovaInstance.Get<WiFiNetworkList>('/rest/listNetworks', {
-    name: 'listNetworks',
-    timeout: 20000 // timeout 20 seconds
-  });
-export const readNetworkSettings = () =>
-  alovaInstance.Get<NetworkSettings>('/rest/networkSettings', { name: 'networkSettings' });
-export const updateNetworkSettings = (wifiSettings: NetworkSettings) =>
-  alovaInstance.Post<NetworkSettings>('/rest/networkSettings', wifiSettings);
+import { AXIOS } from './endpoints';
+
+export function readNetworkStatus(): AxiosPromise<NetworkStatus> {
+  return AXIOS.get('/networkStatus');
+}
+
+export function scanNetworks(): AxiosPromise<void> {
+  return AXIOS.get('/scanNetworks');
+}
+
+export function listNetworks(): AxiosPromise<WiFiNetworkList> {
+  return AXIOS.get('/listNetworks');
+}
+
+export function readNetworkSettings(): AxiosPromise<NetworkSettings> {
+  return AXIOS.get('/networkSettings');
+}
+
+export function updateNetworkSettings(wifiSettings: NetworkSettings): AxiosPromise<NetworkSettings> {
+  return AXIOS.post('/networkSettings', wifiSettings);
+}

interface/src/api/ntp.ts

@@ -1,11 +1,20 @@
-import { alovaInstance } from './endpoints';
-import type { NTPSettings, NTPStatus, Time } from 'types';
+import { AxiosPromise } from 'axios';
+import { NTPSettings, NTPStatus, Time } from '../types';
 
-export const readNTPStatus = () => alovaInstance.Get<NTPStatus>('/rest/ntpStatus');
-export const readNTPSettings = () =>
-  alovaInstance.Get<NTPSettings>('/rest/ntpSettings', {
-    name: 'ntpSettings'
-  });
-export const updateNTPSettings = (data: NTPSettings) => alovaInstance.Post<NTPSettings>('/rest/ntpSettings', data);
+import { AXIOS } from './endpoints';
 
-export const updateTime = (data: Time) => alovaInstance.Post<Time>('/rest/time', data);
+export function readNTPStatus(): AxiosPromise<NTPStatus> {
+  return AXIOS.get('/ntpStatus');
+}
+
+export function readNTPSettings(): AxiosPromise<NTPSettings> {
+  return AXIOS.get('/ntpSettings');
+}
+
+export function updateNTPSettings(ntpSettings: NTPSettings): AxiosPromise<NTPSettings> {
+  return AXIOS.post('/ntpSettings', ntpSettings);
+}
+
+export function updateTime(time: Time): AxiosPromise<Time> {
+  return AXIOS.post('/time', time);
+}

interface/src/api/security.ts

@@ -1,13 +1,17 @@
-import { alovaInstance } from './endpoints';
+import { AxiosPromise } from 'axios';
 
-import type { SecuritySettings, Token } from 'types';
+import { SecuritySettings, Token } from '../types';
 
-export const readSecuritySettings = () => alovaInstance.Get<SecuritySettings>('/rest/securitySettings');
+import { AXIOS } from './endpoints';
 
-export const updateSecuritySettings = (securitySettings: SecuritySettings) =>
-  alovaInstance.Post('/rest/securitySettings', securitySettings);
+export function readSecuritySettings(): AxiosPromise<SecuritySettings> {
+  return AXIOS.get('/securitySettings');
+}
 
-export const generateToken = (username?: string) =>
-  alovaInstance.Get<Token>('/rest/generateToken', {
-    params: { username }
-  });
+export function updateSecuritySettings(securitySettings: SecuritySettings): AxiosPromise<SecuritySettings> {
+  return AXIOS.post('/securitySettings', securitySettings);
+}
+
+export function generateToken(username?: string): AxiosPromise<Token> {
+  return AXIOS.get('/generateToken', { params: { username } });
+}

interface/src/api/system.ts

@@ -1,45 +1,44 @@
-import { alovaInstance, alovaInstanceGH } from './endpoints';
-import type { OTASettings, SystemStatus, LogSettings, ESPSystemStatus } from 'types';
+import { AxiosPromise } from 'axios';
 
-// ESPSystemStatus - also used to ping in Restart monitor for pinging
-export const readESPSystemStatus = () => alovaInstance.Get<ESPSystemStatus>('/rest/ESPSystemStatus');
+import { OTASettings, SystemStatus, LogSettings, LogEntries } from '../types';
 
-// SystemStatus
-export const readSystemStatus = () => alovaInstance.Get<SystemStatus>('/rest/systemStatus');
+import { AXIOS, AXIOS_BIN, FileUploadConfig, startUploadFile } from './endpoints';
 
-// commands
-export const restart = () => alovaInstance.Post('/rest/restart');
-export const partition = () => alovaInstance.Post('/rest/partition');
-export const factoryReset = () => alovaInstance.Post('/rest/factoryReset');
+export function readSystemStatus(timeout?: number): AxiosPromise<SystemStatus> {
+  return AXIOS.get('/systemStatus', { timeout });
+}
 
-// OTA
-export const readOTASettings = () => alovaInstance.Get<OTASettings>(`/rest/otaSettings`);
-export const updateOTASettings = (data: any) => alovaInstance.Post('/rest/otaSettings', data);
+export function restart(): AxiosPromise<void> {
+  return AXIOS.post('/restart');
+}
 
-// SystemLog
-export const readLogSettings = () => alovaInstance.Get<LogSettings>(`/rest/logSettings`);
-export const updateLogSettings = (data: any) => alovaInstance.Post('/rest/logSettings', data);
-export const fetchLog = () => alovaInstance.Post('/rest/fetchLog');
+export function partition(): AxiosPromise<void> {
+  return AXIOS.post('/partition');
+}
 
-// Get versions from github
-export const getStableVersion = () =>
-  alovaInstanceGH.Get('latest', {
-    transformData(response: any) {
-      return response.data.name.substring(1);
-    }
-  });
-export const getDevVersion = () =>
-  alovaInstanceGH.Get('tags/latest', {
-    transformData(response: any) {
-      return response.data.name.split(/\s+/).splice(-1)[0].substring(1);
-    }
-  });
+export function factoryReset(): AxiosPromise<void> {
+  return AXIOS.post('/factoryReset');
+}
 
-export const uploadFile = (file: File) => {
-  const formData = new FormData();
-  formData.append('file', file);
-  return alovaInstance.Post('/rest/uploadFile', formData, {
-    timeout: 60000, // override timeout for uploading firmware - 1 minute
-    enableUpload: true
-  });
-};
+export function readOTASettings(): AxiosPromise<OTASettings> {
+  return AXIOS.get('/otaSettings');
+}
+
+export function updateOTASettings(otaSettings: OTASettings): AxiosPromise<OTASettings> {
+  return AXIOS.post('/otaSettings', otaSettings);
+}
+
+export const uploadFile = (file: File, config?: FileUploadConfig): AxiosPromise<void> =>
+  startUploadFile('/uploadFile', file, config);
+
+export function readLogSettings(): AxiosPromise<LogSettings> {
+  return AXIOS.get('/logSettings');
+}
+
+export function updateLogSettings(logSettings: LogSettings): AxiosPromise<LogSettings> {
+  return AXIOS.post('/logSettings', logSettings);
+}
+
+export function readLogEntries(): AxiosPromise<LogEntries> {
+  return AXIOS_BIN.get('/fetchLog');
+}

interface/src/components/ButtonRow.tsx

@@ -1,25 +1,26 @@
-import { Box } from '@mui/material';
-import type { BoxProps } from '@mui/material';
-import type { FC } from 'react';
+import { FC } from 'react';
+import { Box, BoxProps } from '@mui/material';
 
-const ButtonRow: FC<BoxProps> = ({ children, ...rest }) => (
-  <Box
-    sx={{
-      '& button, & a, & .MuiCard-root': {
-        mt: 2,
-        mx: 0.6,
-        '&:last-child': {
-          mr: 0
-        },
-        '&:first-of-type': {
-          ml: 0
+const ButtonRow: FC<BoxProps> = ({ children, ...rest }) => {
+  return (
+    <Box
+      sx={{
+        '& button, & a, & .MuiCard-root': {
+          mt: 2,
+          mx: 0.6,
+          '&:last-child': {
+            mr: 0
+          },
+          '&:first-of-type': {
+            ml: 0
+          }
         }
-      }
-    }}
-    {...rest}
-  >
-    {children}
-  </Box>
-);
+      }}
+      {...rest}
+    >
+      {children}
+    </Box>
+  );
+};
 
 export default ButtonRow;

interface/src/components/MessageBox.tsx

@@ -1,10 +1,11 @@
+import { FC } from 'react';
+
+import { Box, BoxProps, SvgIconProps, Theme, Typography, useTheme } from '@mui/material';
+
 import CheckCircleOutlineOutlinedIcon from '@mui/icons-material/CheckCircleOutlineOutlined';
-import ErrorIcon from '@mui/icons-material/Error';
 import InfoOutlinedIcon from '@mui/icons-material/InfoOutlined';
 import ReportProblemOutlinedIcon from '@mui/icons-material/ReportProblemOutlined';
-import { Box, Typography, useTheme } from '@mui/material';
-import type { BoxProps, SvgIconProps, Theme } from '@mui/material';
-import type { FC } from 'react';
+import ErrorIcon from '@mui/icons-material/Error';
 
 type MessageBoxLevel = 'warning' | 'success' | 'info' | 'error';
 

interface/src/components/SectionContent.tsx

@@ -1,10 +1,12 @@
-import { Paper, Divider } from '@mui/material';
-import type { FC } from 'react';
+import { FC } from 'react';
 
-import type { RequiredChildrenProps } from 'utils';
+import { Paper, Divider } from '@mui/material';
+
+import { RequiredChildrenProps } from '../utils';
 
 interface SectionContentProps extends RequiredChildrenProps {
-  title?: string;
+  title: string;
+  titleGutter?: boolean;
   id?: string;
 }
 
@@ -12,9 +14,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>
-      )}
+      <Divider sx={{ pb: 2, borderColor: 'primary.main', fontSize: 20, color: 'primary.main' }}>{title}</Divider>
       {children}
     </Paper>
   );

interface/src/components/index.ts

@@ -6,4 +6,3 @@ export * from './upload';
 export { default as SectionContent } from './SectionContent';
 export { default as ButtonRow } from './ButtonRow';
 export { default as MessageBox } from './MessageBox';
-export { default as BlockNavigation } from './routing/BlockNavigation';

interface/src/components/inputs/BlockFormControlLabel.tsx

@@ -1,6 +1,5 @@
-import { FormControlLabel } from '@mui/material';
-import type { FormControlLabelProps } from '@mui/material';
-import type { FC } from 'react';
+import { FC } from 'react';
+import { FormControlLabel, FormControlLabelProps } from '@mui/material';
 
 const BlockFormControlLabel: FC<FormControlLabelProps> = (props) => (
   <div>

interface/src/components/inputs/ValidatedPasswordField.tsx

@@ -1,11 +1,10 @@
+import { FC, useState } from 'react';
+
+import { IconButton, InputAdornment } from '@mui/material';
 import VisibilityIcon from '@mui/icons-material/Visibility';
 import VisibilityOffIcon from '@mui/icons-material/VisibilityOff';
-import { IconButton, InputAdornment } from '@mui/material';
-import { useState } from 'react';
 
-import ValidatedTextField from './ValidatedTextField';
-import type { ValidatedTextFieldProps } from './ValidatedTextField';
-import type { FC } from 'react';
+import ValidatedTextField, { ValidatedTextFieldProps } from './ValidatedTextField';
 
 type ValidatedPasswordFieldProps = Omit<ValidatedTextFieldProps, 'type'>;
 
@@ -20,7 +19,11 @@ const ValidatedPasswordField: FC<ValidatedPasswordFieldProps> = ({ InputProps, .
         ...InputProps,
         endAdornment: (
           <InputAdornment position="end">
-            <IconButton onClick={() => setShowPassword(!showPassword)} edge="end">
+            <IconButton
+              aria-label="toggle password visibility"
+              onClick={() => setShowPassword(!showPassword)}
+              edge="end"
+            >
               {showPassword ? <VisibilityIcon /> : <VisibilityOffIcon />}
             </IconButton>
           </InputAdornment>

interface/src/components/inputs/ValidatedTextField.tsx

@@ -1,7 +1,7 @@
-import { FormHelperText, TextField } from '@mui/material';
-import type { TextFieldProps } from '@mui/material';
-import type { ValidateFieldsError } from 'async-validator';
-import type { FC } from 'react';
+import { FC } from 'react';
+import { ValidateFieldsError } from 'async-validator';
+
+import { FormHelperText, TextField, TextFieldProps } from '@mui/material';
 
 interface ValidatedFieldProps {
   fieldErrors?: ValidateFieldsError;

interface/src/components/layout/Layout.tsx

@@ -1,15 +1,16 @@
-import { Box, Toolbar } from '@mui/material';
-import { useState, useEffect } from 'react';
+import { FC, useState, useEffect } from 'react';
 import { useLocation } from 'react-router-dom';
-import LayoutAppBar from './LayoutAppBar';
+
+import { Box, Toolbar } from '@mui/material';
+
+import { PROJECT_NAME } from '../../api/env';
+import { RequiredChildrenProps } from '../../utils';
+
 import LayoutDrawer from './LayoutDrawer';
+import LayoutAppBar from './LayoutAppBar';
 import { LayoutContext } from './context';
-import type { FC } from 'react';
 
-import type { RequiredChildrenProps } from 'utils';
-import { PROJECT_NAME } from 'api/env';
-
-export const DRAWER_WIDTH = 210;
+export const DRAWER_WIDTH = 240;
 
 const Layout: FC<RequiredChildrenProps> = ({ children }) => {
   const [mobileOpen, setMobileOpen] = useState(false);

interface/src/components/layout/LayoutAppBar.tsx

@@ -1,33 +1,50 @@
-import MenuIcon from '@mui/icons-material/Menu';
-import { AppBar, IconButton, Toolbar, Typography } from '@mui/material';
-import type { FC } from 'react';
+import { FC, useContext } from 'react';
 
-export const DRAWER_WIDTH = 210;
+import { AppBar, Box, IconButton, Toolbar, Typography } from '@mui/material';
+import MenuIcon from '@mui/icons-material/Menu';
+
+import LayoutAuthMenu from './LayoutAuthMenu';
+
+import { FeaturesContext } from '../../contexts/features';
+
+export const DRAWER_WIDTH = 240;
 
 interface LayoutAppBarProps {
   title: string;
   onToggleDrawer: () => void;
 }
 
-const LayoutAppBar: FC<LayoutAppBarProps> = ({ title, onToggleDrawer }) => (
-  <AppBar
-    position="fixed"
-    sx={{
-      width: { md: `calc(100% - ${DRAWER_WIDTH}px)` },
-      ml: { md: `${DRAWER_WIDTH}px` },
-      boxShadow: 'none',
-      backgroundColor: '#2e586a'
-    }}
-  >
-    <Toolbar>
-      <IconButton color="inherit" edge="start" onClick={onToggleDrawer} sx={{ mr: 2, display: { md: 'none' } }}>
-        <MenuIcon />
-      </IconButton>
-      <Typography variant="h6" noWrap component="div">
-        {title}
-      </Typography>
-    </Toolbar>
-  </AppBar>
-);
+const LayoutAppBar: FC<LayoutAppBarProps> = ({ title, onToggleDrawer }) => {
+  const { features } = useContext(FeaturesContext);
+
+  return (
+    <AppBar
+      position="fixed"
+      sx={{
+        width: { md: `calc(100% - ${DRAWER_WIDTH}px)` },
+        ml: { md: `${DRAWER_WIDTH}px` },
+        boxShadow: 'none',
+        backgroundColor: '#2e586a'
+      }}
+    >
+      <Toolbar>
+        <IconButton
+          color="inherit"
+          aria-label="open drawer"
+          edge="start"
+          onClick={onToggleDrawer}
+          sx={{ mr: 2, display: { md: 'none' } }}
+        >
+          <MenuIcon />
+        </IconButton>
+        <Typography variant="h6" noWrap component="div">
+          {title}
+        </Typography>
+        <Box flexGrow={1} />
+        {features.security && <LayoutAuthMenu />}
+      </Toolbar>
+    </AppBar>
+  );
+};
 
 export default LayoutAppBar;

interface/src/components/layout/LayoutAuthMenu.tsx

@@ -0,0 +1,154 @@
+import { FC, useState, useContext, ChangeEventHandler } from 'react';
+
+import {
+  Box,
+  Button,
+  Divider,
+  IconButton,
+  Popover,
+  Typography,
+  Avatar,
+  styled,
+  TypographyProps,
+  MenuItem,
+  TextField
+} from '@mui/material';
+
+import PersonIcon from '@mui/icons-material/Person';
+import AccountCircleIcon from '@mui/icons-material/AccountCircle';
+
+import { AuthenticatedContext } from '../../contexts/authentication';
+
+import { I18nContext } from '../../i18n/i18n-react';
+import type { Locales } from '../../i18n/i18n-types';
+import { loadLocaleAsync } from '../../i18n/i18n-util.async';
+
+import { ReactComponent as NLflag } from '../../i18n/NL.svg';
+import { ReactComponent as DEflag } from '../../i18n/DE.svg';
+import { ReactComponent as GBflag } from '../../i18n/GB.svg';
+import { ReactComponent as SVflag } from '../../i18n/SV.svg';
+import { ReactComponent as PLflag } from '../../i18n/PL.svg';
+import { ReactComponent as NOflag } from '../../i18n/NO.svg';
+import { ReactComponent as FRflag } from '../../i18n/FR.svg';
+
+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="en" value="en">
+          <GBflag style={{ width: 16, verticalAlign: 'middle' }} />
+          &nbsp;EN
+        </MenuItem>
+        <Divider />
+        <MenuItem key="de" value="de">
+          <DEflag style={{ width: 16, verticalAlign: 'middle' }} />
+          &nbsp;DE
+        </MenuItem>
+        <MenuItem key="fr" value="fr">
+          <FRflag style={{ width: 16, verticalAlign: 'middle' }} />
+          &nbsp;FR
+        </MenuItem>
+        <MenuItem key="nl" value="nl">
+          <NLflag style={{ width: 16, verticalAlign: 'middle' }} />
+          &nbsp;NL
+        </MenuItem>
+        <MenuItem key="no" value="no">
+          <NOflag style={{ width: 16, verticalAlign: 'middle' }} />
+          &nbsp;NO
+        </MenuItem>
+        <MenuItem key="pl" value="pl">
+          <PLflag style={{ width: 16, verticalAlign: 'middle' }} />
+          &nbsp;PL
+        </MenuItem>
+        <MenuItem key="sv" value="sv">
+          <SVflag style={{ width: 16, verticalAlign: 'middle' }} />
+          &nbsp;SV
+        </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,11 +1,11 @@
+import { FC } from 'react';
+
 import { Box, Divider, Drawer, Toolbar, Typography, styled } from '@mui/material';
-import { DRAWER_WIDTH } from './Layout';
+
+import { PROJECT_NAME } from '../../api/env';
 
 import LayoutMenu from './LayoutMenu';
-
-import type { FC } from 'react';
-
-import { PROJECT_NAME } from 'api/env';
+import { DRAWER_WIDTH } from './Layout';
 
 const LayoutDrawerLogo = styled('img')(({ theme }) => ({
   [theme.breakpoints.down('sm')]: {
@@ -13,7 +13,7 @@ const LayoutDrawerLogo = styled('img')(({ theme }) => ({
     marginRight: theme.spacing(2)
   },
   [theme.breakpoints.up('sm')]: {
-    height: 38,
+    height: 36,
     marginRight: theme.spacing(2)
   }
 }));
@@ -29,7 +29,9 @@ const LayoutDrawer: FC<LayoutDrawerProps> = ({ mobileOpen, onClose }) => {
       <Toolbar disableGutters>
         <Box display="flex" alignItems="center" px={2}>
           <LayoutDrawerLogo src="/app/icon.png" alt={PROJECT_NAME} />
-          <Typography variant="h6">{PROJECT_NAME}</Typography>
+          <Typography variant="h6" color="textPrimary">
+            {PROJECT_NAME}
+          </Typography>
         </Box>
         <Divider absolute />
       </Toolbar>

interface/src/components/layout/LayoutMenu.tsx

@@ -1,254 +1,48 @@
-import AccountCircleIcon from '@mui/icons-material/AccountCircle';
-import AssessmentIcon from '@mui/icons-material/Assessment';
-import CategoryIcon from '@mui/icons-material/Category';
-import ConstructionIcon from '@mui/icons-material/Construction';
-import KeyboardArrowDown from '@mui/icons-material/KeyboardArrowDown';
-import LiveHelpIcon from '@mui/icons-material/LiveHelp';
-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 { FC, useContext } from 'react';
+
+import { Divider, List } from '@mui/material';
+
+import SettingsInputAntennaIcon from '@mui/icons-material/SettingsInputAntenna';
+import AccessTimeIcon from '@mui/icons-material/AccessTime';
+import DeviceHubIcon from '@mui/icons-material/DeviceHub';
 import SettingsIcon from '@mui/icons-material/Settings';
+import LockIcon from '@mui/icons-material/Lock';
+import SettingsEthernetIcon from '@mui/icons-material/SettingsEthernet';
 
-import {
-  Divider,
-  List,
-  Box,
-  Button,
-  Popover,
-  Avatar,
-  MenuItem,
-  TextField,
-  ListItem,
-  ListItemButton,
-  ListItemIcon,
-  ListItemText
-} from '@mui/material';
+import { FeaturesContext } from '../../contexts/features';
+import ProjectMenu from '../../project/ProjectMenu';
 
-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 LayoutMenuItem from './LayoutMenuItem';
+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';
+import { useI18nContext } from '../../i18n/i18n-react';
 
 const LayoutMenu: FC = () => {
-  const { me, signOut } = useContext(AuthenticatedContext);
-  const { locale, LL, setLocale } = useContext(I18nContext);
-
-  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);
-  };
+  const { features } = useContext(FeaturesContext);
+  const authenticatedContext = useContext(AuthenticatedContext);
+  const { LL } = useI18nContext();
 
   return (
     <>
-      <List component="nav">
-        <LayoutMenuItem icon={CategoryIcon} label={LL.DEVICES()} to={`/devices`} />
-        <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}
-                label={LL.CUSTOMIZATIONS()}
-                disabled={!me.admin}
-                to={`/customizations`}
-              />
-              <LayoutMenuItem icon={MoreTimeIcon} label={LL.SCHEDULER()} disabled={!me.admin} to={`/scheduler`} />
-              <LayoutMenuItem
-                icon={PlaylistAddIcon}
-                label={LL.CUSTOM_ENTITIES(0)}
-                disabled={!me.admin}
-                to={`/customentities`}
-              />
-            </>
-          )}
-        </Box>
+      {features.project && (
+        <List disablePadding component="nav">
+          <ProjectMenu />
+          <Divider />
+        </List>
+      )}
+      <List disablePadding component="nav">
+        <LayoutMenuItem icon={SettingsEthernetIcon} label={LL.NETWORK(0)} to="/network" />
+        <LayoutMenuItem icon={SettingsInputAntennaIcon} label={LL.ACCESS_POINT(0)} to="/ap" />
+        {features.ntp && <LayoutMenuItem icon={AccessTimeIcon} label="NTP" to="/ntp" />}
+        {features.mqtt && <LayoutMenuItem icon={DeviceHubIcon} label="MQTT" to="/mqtt" />}
+        <LayoutMenuItem
+          icon={LockIcon}
+          label={LL.SECURITY(0)}
+          to="/security"
+          disabled={!authenticatedContext.me.admin}
+        />
+        <LayoutMenuItem icon={SettingsIcon} label={LL.SYSTEM(0)} to="/system" />
       </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>
-
-      <Popover
-        id={id}
-        sx={{ mt: 1 }}
-        open={open}
-        anchorEl={anchorEl}
-        onClose={handleClose}
-        anchorOrigin={{
-          vertical: 'bottom',
-          horizontal: 'center'
-        }}
-        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>
-          </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,9 +1,11 @@
-import { ListItemButton, ListItemIcon, ListItemText } from '@mui/material';
+import { FC } from 'react';
 import { Link, useLocation } from 'react-router-dom';
-import type { SvgIconProps } from '@mui/material';
-import type { FC } from 'react';
 
-import { routeMatches } from 'utils';
+import { ListItem, ListItemButton, ListItemIcon, ListItemText, SvgIconProps } from '@mui/material';
+
+import { grey } from '@mui/material/colors';
+
+import { routeMatches } from '../../utils';
 
 interface LayoutMenuItemProps {
   icon: React.ComponentType<SvgIconProps>;
@@ -15,15 +17,15 @@ interface LayoutMenuItemProps {
 const LayoutMenuItem: FC<LayoutMenuItemProps> = ({ icon: Icon, label, to, disabled }) => {
   const { pathname } = useLocation();
 
-  const selected = routeMatches(to, pathname);
-
   return (
-    <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 disablePadding selected={routeMatches(to, pathname)}>
+      <ListItemButton component={Link} to={to} disabled={disabled}>
+        <ListItemIcon sx={{ color: grey[500] }}>
+          <Icon />
+        </ListItemIcon>
+        <ListItemText>{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/loading/ApplicationError.tsx

@@ -1,6 +1,7 @@
-import WarningIcon from '@mui/icons-material/Warning';
+import { FC } from 'react';
+
 import { Box, Paper, Typography } from '@mui/material';
-import type { FC } from 'react';
+import WarningIcon from '@mui/icons-material/Warning';
 
 interface ApplicationErrorProps {
   message?: string;

interface/src/components/loading/FormLoader.tsx

@@ -1,10 +1,11 @@
-import RefreshIcon from '@mui/icons-material/Refresh';
+import { FC } from 'react';
+
 import { Box, Button, CircularProgress, Typography } from '@mui/material';
-import type { FC } from 'react';
+import RefreshIcon from '@mui/icons-material/Refresh';
 
-import { MessageBox } from 'components';
+import { MessageBox } from '..';
 
-import { useI18nContext } from 'i18n/i18n-react';
+import { useI18nContext } from '../../i18n/i18n-react';
 
 interface FormLoaderProps {
   message?: string;

interface/src/components/loading/LoadingSpinner.tsx

@@ -1,8 +1,8 @@
-import { CircularProgress, Box, Typography } from '@mui/material';
-import type { Theme } from '@mui/material';
-import type { FC } from 'react';
+import { FC } from 'react';
 
-import { useI18nContext } from 'i18n/i18n-react';
+import { CircularProgress, Box, Typography, Theme } from '@mui/material';
+
+import { useI18nContext } from '../../i18n/i18n-react';
 
 interface LoadingSpinnerProps {
   height?: number | string;

interface/src/components/routing/BlockNavigation.tsx

@@ -1,32 +0,0 @@
-import { Button, Dialog, DialogActions, DialogContent, DialogTitle } from '@mui/material';
-import type { FC } from 'react';
-
-import type { unstable_Blocker as Blocker } from 'react-router-dom';
-
-import { dialogStyle } from 'CustomTheme';
-import { useI18nContext } from 'i18n/i18n-react';
-
-interface BlockNavigationProps {
-  blocker: Blocker;
-}
-
-const BlockNavigation: FC<BlockNavigationProps> = ({ blocker }) => {
-  const { LL } = useI18nContext();
-
-  return (
-    <Dialog sx={dialogStyle} open={blocker.state === 'blocked'}>
-      <DialogTitle>{LL.BLOCK_NAVIGATE_1()}</DialogTitle>
-      <DialogContent dividers>{LL.BLOCK_NAVIGATE_2()}</DialogContent>
-      <DialogActions>
-        <Button variant="outlined" onClick={() => blocker.reset?.()} color="secondary">
-          {LL.STAY()}
-        </Button>
-        <Button variant="contained" onClick={() => blocker.proceed?.()} color="primary">
-          {LL.LEAVE()}
-        </Button>
-      </DialogActions>
-    </Dialog>
-  );
-};
-
-export default BlockNavigation;

interface/src/components/routing/RequireAdmin.tsx

@@ -1,9 +1,8 @@
-import { useContext } from 'react';
+import { FC, useContext } from 'react';
 import { Navigate } from 'react-router-dom';
-import type { FC } from 'react';
 
-import type { RequiredChildrenProps } from 'utils';
-import { AuthenticatedContext } from 'contexts/authentication';
+import { AuthenticatedContext } from '../../contexts/authentication';
+import { RequiredChildrenProps } from '../../utils';
 
 const RequireAdmin: FC<RequiredChildrenProps> = ({ children }) => {
   const authenticatedContext = useContext(AuthenticatedContext);

interface/src/components/routing/RequireAuthenticated.tsx

@@ -1,12 +1,14 @@
-import { useContext, useEffect } from 'react';
+import { FC, useContext, useEffect } from 'react';
 import { Navigate, useLocation } from 'react-router-dom';
 
-import type { AuthenticatedContextValue } from 'contexts/authentication/context';
-import type { FC } from 'react';
+import {
+  AuthenticatedContext,
+  AuthenticatedContextValue,
+  AuthenticationContext
+} from '../../contexts/authentication/context';
+import { storeLoginRedirect } from '../../api/authentication';
 
-import type { RequiredChildrenProps } from 'utils';
-import { storeLoginRedirect } from 'api/authentication';
-import { AuthenticatedContext, AuthenticationContext } from 'contexts/authentication/context';
+import { RequiredChildrenProps } from '../../utils';
 
 const RequireAuthenticated: FC<RequiredChildrenProps> = ({ children }) => {
   const authenticationContext = useContext(AuthenticationContext);

interface/src/components/routing/RequireUnauthenticated.tsx

@@ -1,15 +1,16 @@
-import { useContext } from 'react';
+import { FC, useContext } from 'react';
 import { Navigate } from 'react-router-dom';
-import type { FC } from 'react';
 
-import type { RequiredChildrenProps } from 'utils';
-import * as AuthenticationApi from 'api/authentication';
-import { AuthenticationContext } from 'contexts/authentication';
+import * as AuthenticationApi from '../../api/authentication';
+import { AuthenticationContext } from '../../contexts/authentication';
+import { RequiredChildrenProps } from '../../utils';
+import { FeaturesContext } from '../../contexts/features';
 
 const RequireUnauthenticated: FC<RequiredChildrenProps> = ({ children }) => {
+  const { features } = useContext(FeaturesContext);
   const authenticationContext = useContext(AuthenticationContext);
 
-  return authenticationContext.me ? <Navigate to={AuthenticationApi.fetchLoginRedirect()} /> : <>{children}</>;
+  return authenticationContext.me ? <Navigate to={AuthenticationApi.fetchLoginRedirect(features)} /> : <>{children}</>;
 };
 
 export default RequireUnauthenticated;

interface/src/components/routing/RouterTabs.tsx

@@ -1,8 +1,9 @@
-import { Tabs, useMediaQuery, useTheme } from '@mui/material';
+import React, { FC } from 'react';
 import { useNavigate } from 'react-router-dom';
-import type { FC } from 'react';
 
-import type { RequiredChildrenProps } from 'utils';
+import { Tabs, useMediaQuery, useTheme } from '@mui/material';
+
+import { RequiredChildrenProps } from '../../utils';
 
 interface RouterTabsProps extends RequiredChildrenProps {
   value: string | false;
@@ -14,7 +15,7 @@ const RouterTabs: FC<RouterTabsProps> = ({ value, children }) => {
   const theme = useTheme();
   const smallDown = useMediaQuery(theme.breakpoints.down('sm'));
 
-  const handleTabChange = (_event: any, path: string) => {
+  const handleTabChange = (event: React.ChangeEvent<{}>, path: string) => {
     navigate(path);
   };
 

interface/src/components/routing/useRouterTab.ts

@@ -1,8 +1,9 @@
 import { useMatch, useResolvedPath } from 'react-router-dom';
 
 export const useRouterTab = () => {
-  const routerTabPathMatch = useMatch(useResolvedPath(':tab').pathname);
-  const routerTab = routerTabPathMatch?.params?.tab || 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

@@ -1,14 +1,14 @@
-import CancelIcon from '@mui/icons-material/Cancel';
-import CloudUploadIcon from '@mui/icons-material/CloudUpload';
-import { Box, Button, LinearProgress, Typography, useTheme } from '@mui/material';
-import { Fragment } from 'react';
-import { useDropzone } from 'react-dropzone';
-import type { Theme } from '@mui/material';
-import type { Progress } from 'alova';
-import type { FC } from 'react';
-import type { DropzoneState } from 'react-dropzone';
+import { FC, Fragment } from 'react';
+import { useDropzone, DropzoneState } from 'react-dropzone';
 
-import { useI18nContext } from 'i18n/i18n-react';
+import { AxiosProgressEvent } from 'axios';
+
+import { Box, Button, LinearProgress, Theme, Typography, useTheme } from '@mui/material';
+
+import CloudUploadIcon from '@mui/icons-material/CloudUpload';
+import CancelIcon from '@mui/icons-material/Cancel';
+
+import { useI18nContext } from '../../i18n/i18n-react';
 
 const getBorderColor = (theme: Theme, props: DropzoneState) => {
   if (props.isDragAccept) {
@@ -26,13 +26,11 @@ const getBorderColor = (theme: Theme, props: DropzoneState) => {
 export interface SingleUploadProps {
   onDrop: (acceptedFiles: File[]) => void;
   onCancel: () => void;
-  isUploading: boolean;
-  progress: Progress;
+  uploading: boolean;
+  progress?: AxiosProgressEvent;
 }
 
-const SingleUpload: FC<SingleUploadProps> = ({ onDrop, onCancel, isUploading, progress }) => {
-  const uploading = isUploading && progress.total > 0;
-
+const SingleUpload: FC<SingleUploadProps> = ({ onDrop, onCancel, uploading, progress }) => {
   const dropzoneState = useDropzone({
     onDrop,
     accept: {
@@ -40,21 +38,20 @@ const SingleUpload: FC<SingleUploadProps> = ({ onDrop, onCancel, isUploading, pr
       'application/json': ['.json'],
       'text/plain': ['.md5']
     },
-    disabled: isUploading,
+    disabled: uploading,
     multiple: false
   });
-
   const { getRootProps, getInputProps } = dropzoneState;
   const theme = useTheme();
+
   const { LL } = useI18nContext();
 
   const progressText = () => {
     if (uploading) {
-      if (progress.total && progress.loaded) {
-        return progress.loaded <= progress.total
-          ? LL.UPLOADING() + ': ' + Math.round((progress.loaded * 100) / progress.total) + '%'
-          : LL.UPLOADING() + ': ' + Math.round((progress.total * 100) / progress.loaded) + '%';
+      if (progress?.total) {
+        return LL.UPLOADING() + ': ' + Math.round((progress.loaded * 100) / progress.total) + '%';
       }
+      return LL.UPLOADING() + `\u2026`;
     }
     return LL.UPLOAD_DROP_TEXT();
   };
@@ -63,7 +60,7 @@ const SingleUpload: FC<SingleUploadProps> = ({ onDrop, onCancel, isUploading, pr
     <Box
       {...getRootProps({
         sx: {
-          py: 4,
+          py: 8,
           px: 2,
           borderWidth: 2,
           borderRadius: 2,
@@ -84,14 +81,8 @@ const SingleUpload: FC<SingleUploadProps> = ({ onDrop, onCancel, isUploading, pr
           <Fragment>
             <Box width="100%" p={2}>
               <LinearProgress
-                variant="determinate"
-                value={
-                  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)
-                }
+                variant={!progress || progress.total ? 'determinate' : 'indeterminate'}
+                value={!progress ? 0 : progress.total ? Math.round((progress.loaded * 100) / progress.total) : 0}
               />
             </Box>
             <Button startIcon={<CancelIcon />} variant="outlined" color="secondary" onClick={onCancel}>

interface/src/components/upload/index.ts

@@ -1 +1,2 @@
 export { default as SingleUpload } from './SingleUpload';
+export { default as useFileUpload } from './useFileUpload';

interface/src/components/upload/useFileUpload.ts

@@ -0,0 +1,70 @@
+import { useCallback, useEffect, useState } from 'react';
+import axios, { AxiosPromise, CancelTokenSource, AxiosProgressEvent } from 'axios';
+import { useSnackbar } from 'notistack';
+
+import { extractErrorMessage } from '../../utils';
+import { FileUploadConfig } from '../../api/endpoints';
+
+import { useI18nContext } from '../../i18n/i18n-react';
+
+interface MediaUploadOptions {
+  upload: (file: File, config?: FileUploadConfig) => AxiosPromise<void>;
+}
+
+const useFileUpload = ({ upload }: MediaUploadOptions) => {
+  const { LL } = useI18nContext();
+
+  const { enqueueSnackbar } = useSnackbar();
+  const [uploading, setUploading] = useState<boolean>(false);
+  const [md5, setMd5] = useState<string>('');
+  const [uploadProgress, setUploadProgress] = useState<AxiosProgressEvent>();
+  const [uploadCancelToken, setUploadCancelToken] = useState<CancelTokenSource>();
+
+  const resetUploadingStates = () => {
+    setUploading(false);
+    setUploadProgress(undefined);
+    setUploadCancelToken(undefined);
+    setMd5('');
+  };
+
+  const cancelUpload = useCallback(() => {
+    uploadCancelToken?.cancel();
+    resetUploadingStates();
+  }, [uploadCancelToken]);
+
+  useEffect(() => {
+    return () => {
+      uploadCancelToken?.cancel();
+    };
+  }, [uploadCancelToken]);
+
+  const uploadFile = async (images: File[]) => {
+    try {
+      const cancelToken = axios.CancelToken.source();
+      setUploadCancelToken(cancelToken);
+      setUploading(true);
+      const response = await upload(images[0], {
+        onUploadProgress: setUploadProgress,
+        cancelToken: cancelToken.token
+      });
+      resetUploadingStates();
+      if (response.status === 200) {
+        enqueueSnackbar(LL.UPLOAD() + ' ' + LL.SUCCESSFUL(), { variant: 'success' });
+      } else if (response.status === 201) {
+        setMd5(String(response.data));
+        enqueueSnackbar(LL.UPLOAD() + ' MD5 ' + LL.SUCCESSFUL(), { variant: 'success' });
+      }
+    } catch (error) {
+      if (axios.isCancel(error)) {
+        enqueueSnackbar(LL.UPLOAD() + ' ' + LL.ABORTED(), { variant: 'warning' });
+      } else {
+        resetUploadingStates();
+        enqueueSnackbar(extractErrorMessage(error, LL.UPLOAD() + ' ' + LL.FAILED()), { variant: 'error' });
+      }
+    }
+  };
+
+  return [uploadFile, cancelUpload, uploading, uploadProgress, md5] as const;
+};
+
+export default useFileUpload;

interface/src/contexts/authentication/Authentication.tsx

@@ -1,69 +1,71 @@
-import { useRequest } from 'alova';
-import { useCallback, useEffect, useState } from 'react';
-import { redirect } from 'react-router-dom';
-import { toast } from 'react-toastify';
-import { AuthenticationContext } from './context';
-import type { FC } from 'react';
+import { FC, useCallback, useContext, useEffect, useState } from 'react';
+import { useSnackbar } from 'notistack';
+import { useNavigate } from 'react-router-dom';
 
-import type { Me } from 'types';
-import type { RequiredChildrenProps } from 'utils';
-import * as AuthenticationApi from 'api/authentication';
-import { ACCESS_TOKEN } from 'api/endpoints';
-import { LoadingSpinner } from 'components';
-import { useI18nContext } from 'i18n/i18n-react';
+import { useI18nContext } from '../../i18n/i18n-react';
+
+import * as AuthenticationApi from '../../api/authentication';
+import { ACCESS_TOKEN } from '../../api/endpoints';
+import { RequiredChildrenProps } from '../../utils';
+import { LoadingSpinner } from '../../components';
+import { Me } from '../../types';
+import { FeaturesContext } from '../features';
+import { AuthenticationContext } from './context';
 
 const Authentication: FC<RequiredChildrenProps> = ({ children }) => {
+  const { features } = useContext(FeaturesContext);
   const { LL } = useI18nContext();
 
+  const navigate = useNavigate();
+  const { enqueueSnackbar } = useSnackbar();
+
   const [initialized, setInitialized] = useState<boolean>(false);
   const [me, setMe] = useState<Me>();
 
-  const { send: verifyAuthorization } = useRequest(AuthenticationApi.verifyAuthorization(), {
-    immediate: false
-  });
-
   const signIn = (accessToken: string) => {
     try {
       AuthenticationApi.getStorage().setItem(ACCESS_TOKEN, accessToken);
       const decodedMe = AuthenticationApi.decodeMeJWT(accessToken);
       setMe(decodedMe);
-      toast.success(LL.LOGGED_IN({ name: decodedMe.username }));
+      enqueueSnackbar(LL.LOGGED_IN({ name: decodedMe.username }), { variant: 'success' });
     } catch (error) {
       setMe(undefined);
       throw new Error('Failed to parse JWT');
     }
   };
 
-  const signOut = (doRedirect: boolean) => {
+  const signOut = (redirect: boolean) => {
     AuthenticationApi.clearAccessToken();
     setMe(undefined);
-    if (doRedirect) {
-      // navigate('/');
-      redirect('/');
+    if (redirect) {
+      navigate('/');
     }
   };
 
   const refresh = useCallback(async () => {
+    if (!features.security) {
+      setMe({ admin: true, username: 'admin' });
+      setInitialized(true);
+      return;
+    }
     const accessToken = AuthenticationApi.getStorage().getItem(ACCESS_TOKEN);
     if (accessToken) {
-      await verifyAuthorization()
-        .then(() => {
-          setMe(AuthenticationApi.decodeMeJWT(accessToken));
-          setInitialized(true);
-        })
-        .catch(() => {
-          setMe(undefined);
-          setInitialized(true);
-        });
+      try {
+        await AuthenticationApi.verifyAuthorization();
+        setMe(AuthenticationApi.decodeMeJWT(accessToken));
+        setInitialized(true);
+      } catch (error) {
+        setMe(undefined);
+        setInitialized(true);
+      }
     } else {
       setMe(undefined);
       setInitialized(true);
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+  }, [features]);
 
   useEffect(() => {
-    void refresh();
+    refresh();
   }, [refresh]);
 
   if (initialized) {

interface/src/contexts/authentication/context.ts

@@ -1,5 +1,5 @@
 import { createContext } from 'react';
-import type { Me } from 'types';
+import { Me } from '../../types';
 
 export interface AuthenticationContextValue {
   refresh: () => Promise<void>;

interface/src/contexts/features/FeaturesLoader.tsx

@@ -0,0 +1,47 @@
+import { FC, useCallback, useEffect, useState } from 'react';
+
+import * as FeaturesApi from '../../api/features';
+
+import { extractErrorMessage, RequiredChildrenProps } from '../../utils';
+import { Features } from '../../types';
+import { ApplicationError, LoadingSpinner } from '../../components';
+
+import { FeaturesContext } from '.';
+
+const FeaturesLoader: FC<RequiredChildrenProps> = (props) => {
+  const [errorMessage, setErrorMessage] = useState<string>();
+  const [features, setFeatures] = useState<Features>();
+
+  const loadFeatures = useCallback(async () => {
+    try {
+      const response = await FeaturesApi.readFeatures();
+      setFeatures(response.data);
+    } catch (error) {
+      setErrorMessage(extractErrorMessage(error, 'Failed to fetch application details.'));
+    }
+  }, []);
+
+  useEffect(() => {
+    loadFeatures();
+  }, [loadFeatures]);
+
+  if (features) {
+    return (
+      <FeaturesContext.Provider
+        value={{
+          features
+        }}
+      >
+        {props.children}
+      </FeaturesContext.Provider>
+    );
+  }
+
+  if (errorMessage) {
+    return <ApplicationError message={errorMessage} />;
+  }
+
+  return <LoadingSpinner height="100vh" />;
+};
+
+export default FeaturesLoader;

interface/src/contexts/features/context.ts

@@ -0,0 +1,10 @@
+import { createContext } from 'react';
+
+import { 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

@@ -1,45 +1,32 @@
-import CancelIcon from '@mui/icons-material/Cancel';
-import WarningIcon from '@mui/icons-material/Warning';
-import { Button, Checkbox, MenuItem } from '@mui/material';
-import { range } from 'lodash-es';
-import { useState } from 'react';
-import type { ValidateFieldsError } from 'async-validator';
-import type { FC } from 'react';
+import { FC, useState } from 'react';
+import { ValidateFieldsError } from 'async-validator';
+import { range } from 'lodash';
 
-import type { APSettingsType } from 'types';
-import * as APApi from 'api/ap';
+import { Button, Checkbox, MenuItem } from '@mui/material';
+import SaveIcon from '@mui/icons-material/Save';
+
+import { createAPSettingsValidator, validate } from '../../validators';
 import {
   BlockFormControlLabel,
   ButtonRow,
   FormLoader,
   SectionContent,
   ValidatedPasswordField,
-  ValidatedTextField,
-  BlockNavigation
-} from 'components';
+  ValidatedTextField
+} from '../../components';
 
-import { useI18nContext } from 'i18n/i18n-react';
-import { APProvisionMode } from 'types';
-import { numberValue, updateValueDirty, useRest } from 'utils';
+import { APProvisionMode, APSettings } from '../../types';
+import { numberValue, updateValue, useRest } from '../../utils';
+import * as APApi from '../../api/ap';
 
-import { createAPSettingsValidator, validate } from 'validators';
+import { useI18nContext } from '../../i18n/i18n-react';
 
-export const isAPEnabled = ({ provision_mode }: APSettingsType) =>
-  provision_mode === APProvisionMode.AP_MODE_ALWAYS || provision_mode === APProvisionMode.AP_MODE_DISCONNECTED;
+export const isAPEnabled = ({ provision_mode }: APSettings) => {
+  return provision_mode === APProvisionMode.AP_MODE_ALWAYS || provision_mode === APProvisionMode.AP_MODE_DISCONNECTED;
+};
 
-const APSettings: FC = () => {
-  const {
-    loadData,
-    saving,
-    data,
-    updateDataValue,
-    origData,
-    dirtyFlags,
-    setDirtyFlags,
-    blocker,
-    saveData,
-    errorMessage
-  } = useRest<APSettingsType>({
+const APSettingsForm: FC = () => {
+  const { loadData, saving, data, setData, saveData, errorMessage } = useRest<APSettings>({
     read: APApi.readAPSettings,
     update: APApi.updateAPSettings
   });
@@ -48,7 +35,7 @@ const APSettings: FC = () => {
 
   const [fieldErrors, setFieldErrors] = useState<ValidateFieldsError>();
 
-  const updateFormValue = updateValueDirty(origData, dirtyFlags, setDirtyFlags, updateDataValue);
+  const updateFormValue = updateValue(setData);
 
   const content = () => {
     if (!data) {
@@ -59,7 +46,7 @@ const APSettings: FC = () => {
       try {
         setFieldErrors(undefined);
         await validate(createAPSettingsValidator(data), data);
-        await saveData();
+        saveData();
       } catch (errors: any) {
         setFieldErrors(errors);
       }
@@ -176,40 +163,27 @@ const APSettings: FC = () => {
             />
           </>
         )}
-        {dirtyFlags && dirtyFlags.length !== 0 && (
-          <ButtonRow>
-            <Button
-              startIcon={<CancelIcon />}
-              disabled={saving}
-              variant="outlined"
-              color="primary"
-              type="submit"
-              onClick={loadData}
-            >
-              {LL.CANCEL()}
-            </Button>
-            <Button
-              startIcon={<WarningIcon color="warning" />}
-              disabled={saving}
-              variant="contained"
-              color="info"
-              type="submit"
-              onClick={validateAndSubmit}
-            >
-              {LL.APPLY_CHANGES(dirtyFlags.length)}
-            </Button>
-          </ButtonRow>
-        )}
+        <ButtonRow>
+          <Button
+            startIcon={<SaveIcon />}
+            disabled={saving}
+            variant="outlined"
+            color="primary"
+            type="submit"
+            onClick={validateAndSubmit}
+          >
+            {LL.SAVE()}
+          </Button>
+        </ButtonRow>
       </>
     );
   };
 
   return (
-    <SectionContent>
-      {blocker ? <BlockNavigation blocker={blocker} /> : null}
+    <SectionContent title={LL.SETTINGS_OF(LL.ACCESS_POINT(1))} titleGutter>
       {content()}
     </SectionContent>
   );
 };
 
-export default APSettings;
+export default APSettingsForm;

interface/src/framework/ap/APStatusForm.tsx

@@ -1,20 +1,19 @@
-import ComputerIcon from '@mui/icons-material/Computer';
-import DeviceHubIcon from '@mui/icons-material/DeviceHub';
-import RefreshIcon from '@mui/icons-material/Refresh';
+import { FC } from 'react';
+
+import { Avatar, Button, Divider, List, ListItem, ListItemAvatar, ListItemText, Theme, useTheme } from '@mui/material';
 import SettingsInputAntennaIcon from '@mui/icons-material/SettingsInputAntenna';
-import { Avatar, Button, Divider, List, ListItem, ListItemAvatar, ListItemText, useTheme } from '@mui/material';
-import { useRequest } from 'alova';
-import type { Theme } from '@mui/material';
-import type { FC } from 'react';
+import DeviceHubIcon from '@mui/icons-material/DeviceHub';
+import ComputerIcon from '@mui/icons-material/Computer';
+import RefreshIcon from '@mui/icons-material/Refresh';
 
-import type { APStatusType } from 'types';
-import * as APApi from 'api/ap';
-import { ButtonRow, FormLoader, SectionContent } from 'components';
+import * as APApi from '../../api/ap';
+import { APNetworkStatus, APStatus } from '../../types';
+import { ButtonRow, FormLoader, SectionContent } from '../../components';
+import { useRest } from '../../utils';
 
-import { useI18nContext } from 'i18n/i18n-react';
-import { APNetworkStatus } from 'types';
+import { useI18nContext } from '../../i18n/i18n-react';
 
-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 +26,14 @@ export const apStatusHighlight = ({ status }: APStatusType, theme: Theme) => {
   }
 };
 
-const APStatus: FC = () => {
-  const { data: data, send: loadData, error } = useRequest(APApi.readAPStatus);
+const APStatusForm: FC = () => {
+  const { loadData, data, errorMessage } = useRest<APStatus>({ read: APApi.readAPStatus });
 
   const { LL } = useI18nContext();
 
   const theme = useTheme();
 
-  const apStatus = ({ status }: APStatusType) => {
+  const apStatus = ({ status }: APStatus) => {
     switch (status) {
       case APNetworkStatus.ACTIVE:
         return LL.ACTIVE();
@@ -49,7 +48,7 @@ const APStatus: FC = () => {
 
   const content = () => {
     if (!data) {
-      return <FormLoader onRetry={loadData} errorMessage={error?.message} />;
+      return <FormLoader onRetry={loadData} errorMessage={errorMessage} />;
     }
 
     return (
@@ -99,7 +98,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,30 +1,41 @@
-import { Tab } from '@mui/material';
+import { FC, useContext } from 'react';
 import { Navigate, Routes, Route } from 'react-router-dom';
 
-import APSettings from './APSettings';
-import APStatus from './APStatus';
-import type { FC } from 'react';
-import { RouterTabs, useLayoutTitle, useRouterTab } from 'components';
+import { Tab } from '@mui/material';
 
-import { useI18nContext } from 'i18n/i18n-react';
+import { AuthenticatedContext } from '../../contexts/authentication';
+import APStatusForm from './APStatusForm';
+import APSettingsForm from './APSettingsForm';
+import { RequireAdmin, RouterTabs, useLayoutTitle, useRouterTab } from '../../components';
+
+import { useI18nContext } from '../../i18n/i18n-react';
 
 const AccessPoint: FC = () => {
   const { LL } = useI18nContext();
 
   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="status" label={LL.STATUS_OF(LL.ACCESS_POINT(1))} />
+        <Tab value="settings" label={LL.SETTINGS_OF(LL.ACCESS_POINT(1))} disabled={!authenticatedContext.me.admin} />
       </RouterTabs>
       <Routes>
-        <Route path="status" element={<APStatus />} />
-        <Route path="settings" element={<APSettings />} />
-        <Route path="*" element={<Navigate replace to="settings" />} />
+        <Route path="status" element={<APStatusForm />} />
+        <Route
+          path="settings"
+          element={
+            <RequireAdmin>
+              <APSettingsForm />
+            </RequireAdmin>
+          }
+        />
+        <Route path="/*" element={<Navigate replace to="status" />} />
       </Routes>
     </>
   );

interface/src/framework/mqtt/Mqtt.tsx

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

interface/src/framework/mqtt/MqttSettingsForm.tsx

@@ -1,39 +1,26 @@
-import CancelIcon from '@mui/icons-material/Cancel';
-import WarningIcon from '@mui/icons-material/Warning';
-import { Button, Checkbox, MenuItem, Grid, Typography, InputAdornment, TextField } from '@mui/material';
-import { useState } from 'react';
-import type { ValidateFieldsError } from 'async-validator';
-import type { FC } from 'react';
+import { FC, useState } from 'react';
+import { ValidateFieldsError } from 'async-validator';
 
-import type { MqttSettingsType } from 'types';
-import * as MqttApi from 'api/mqtt';
+import { Button, Checkbox, MenuItem, Grid, Typography, InputAdornment } from '@mui/material';
+import SaveIcon from '@mui/icons-material/Save';
+
+import { createMqttSettingsValidator, validate } from '../../validators';
 import {
   BlockFormControlLabel,
   ButtonRow,
   FormLoader,
   SectionContent,
   ValidatedPasswordField,
-  ValidatedTextField,
-  BlockNavigation
-} from 'components';
-import { useI18nContext } from 'i18n/i18n-react';
-import { numberValue, updateValueDirty, useRest } from 'utils';
+  ValidatedTextField
+} from '../../components';
+import { MqttSettings } from '../../types';
+import { numberValue, updateValue, useRest } from '../../utils';
+import * as MqttApi from '../../api/mqtt';
 
-import { createMqttSettingsValidator, validate } from 'validators';
+import { useI18nContext } from '../../i18n/i18n-react';
 
-const MqttSettings: FC = () => {
-  const {
-    loadData,
-    saving,
-    data,
-    updateDataValue,
-    origData,
-    dirtyFlags,
-    setDirtyFlags,
-    blocker,
-    saveData,
-    errorMessage
-  } = useRest<MqttSettingsType>({
+const MqttSettingsForm: FC = () => {
+  const { loadData, saving, data, setData, saveData, errorMessage } = useRest<MqttSettings>({
     read: MqttApi.readMqttSettings,
     update: MqttApi.updateMqttSettings
   });
@@ -42,7 +29,7 @@ const MqttSettings: FC = () => {
 
   const [fieldErrors, setFieldErrors] = useState<ValidateFieldsError>();
 
-  const updateFormValue = updateValueDirty(origData, dirtyFlags, setDirtyFlags, updateDataValue);
+  const updateFormValue = updateValue(setData);
 
   const content = () => {
     if (!data) {
@@ -53,7 +40,7 @@ const MqttSettings: FC = () => {
       try {
         setFieldErrors(undefined);
         await validate(createMqttSettingsValidator(data), data);
-        await saveData();
+        saveData();
       } catch (errors: any) {
         setFieldErrors(errors);
       }
@@ -66,20 +53,19 @@ const MqttSettings: FC = () => {
           label={LL.ENABLE_MQTT()}
         />
         <Grid container spacing={1} direction="row" justifyContent="flex-start" alignItems="flex-start">
-          <Grid item xs={12} sm={6}>
+          <Grid item xs={6}>
             <ValidatedTextField
               fieldErrors={fieldErrors}
               name="host"
               label={LL.ADDRESS_OF(LL.BROKER())}
               fullWidth
-              multiline
               variant="outlined"
               value={data.host}
               onChange={updateFormValue}
               margin="normal"
             />
           </Grid>
-          <Grid item xs={12} sm={6}>
+          <Grid item xs={6}>
             <ValidatedTextField
               fieldErrors={fieldErrors}
               name="port"
@@ -92,7 +78,9 @@ const MqttSettings: FC = () => {
               margin="normal"
             />
           </Grid>
-          <Grid item xs={12} sm={6}>
+        </Grid>
+        <Grid container spacing={1} direction="row" justifyContent="flex-start" alignItems="flex-start">
+          <Grid item xs={6}>
             <ValidatedTextField
               fieldErrors={fieldErrors}
               name="base"
@@ -104,8 +92,8 @@ const MqttSettings: FC = () => {
               margin="normal"
             />
           </Grid>
-          <Grid item xs={12} sm={6}>
-            <TextField
+          <Grid item xs={6}>
+            <ValidatedTextField
               name="client_id"
               label={LL.ID_OF(LL.CLIENT()) + ' (' + LL.OPTIONAL() + ')'}
               fullWidth
@@ -115,8 +103,10 @@ const MqttSettings: FC = () => {
               margin="normal"
             />
           </Grid>
-          <Grid item xs={12} sm={6}>
-            <TextField
+        </Grid>
+        <Grid container spacing={1} direction="row" justifyContent="flex-start" alignItems="flex-start">
+          <Grid item xs={6}>
+            <ValidatedTextField
               name="username"
               label={LL.USERNAME(0)}
               fullWidth
@@ -126,7 +116,7 @@ const MqttSettings: FC = () => {
               margin="normal"
             />
           </Grid>
-          <Grid item xs={12} sm={6}>
+          <Grid item xs={6}>
             <ValidatedPasswordField
               name="password"
               label={LL.PASSWORD()}
@@ -137,7 +127,9 @@ const MqttSettings: FC = () => {
               margin="normal"
             />
           </Grid>
-          <Grid item xs={12} sm={6}>
+        </Grid>
+        <Grid container spacing={1} direction="row" justifyContent="flex-start" alignItems="flex-start">
+          <Grid item xs={6}>
             <ValidatedTextField
               fieldErrors={fieldErrors}
               name="keep_alive"
@@ -153,8 +145,8 @@ const MqttSettings: FC = () => {
               margin="normal"
             />
           </Grid>
-          <Grid item xs={12} sm={6}>
-            <TextField
+          <Grid item xs={6}>
+            <ValidatedTextField
               name="mqtt_qos"
               label="QoS"
               value={data.mqtt_qos}
@@ -167,27 +159,9 @@ const MqttSettings: FC = () => {
               <MenuItem value={0}>0</MenuItem>
               <MenuItem value={1}>1</MenuItem>
               <MenuItem value={2}>2</MenuItem>
-            </TextField>
+            </ValidatedTextField>
           </Grid>
         </Grid>
-        {data.enableTLS !== undefined && (
-          <BlockFormControlLabel
-            control={<Checkbox name="enableTLS" checked={data.enableTLS} onChange={updateFormValue} />}
-            label={LL.ENABLE_TLS()}
-          />
-        )}
-        {data.enableTLS === true && (
-          <ValidatedPasswordField
-            name="rootCA"
-            label={LL.CERT()}
-            fullWidth
-            variant="outlined"
-            value={data.rootCA}
-            onChange={updateFormValue}
-            margin="normal"
-          />
-        )}
-
         <BlockFormControlLabel
           control={<Checkbox name="clean_session" checked={data.clean_session} onChange={updateFormValue} />}
           label={LL.MQTT_CLEAN_SESSION()}
@@ -200,7 +174,7 @@ const MqttSettings: FC = () => {
         <Typography sx={{ pt: 2 }} variant="h6" color="primary">
           {LL.FORMATTING()}
         </Typography>
-        <TextField
+        <ValidatedTextField
           name="nested_format"
           label={LL.MQTT_FORMAT()}
           value={data.nested_format}
@@ -212,20 +186,13 @@ const MqttSettings: FC = () => {
         >
           <MenuItem value={1}>{LL.MQTT_NEST_1()}</MenuItem>
           <MenuItem value={2}>{LL.MQTT_NEST_2()}</MenuItem>
-        </TextField>
+        </ValidatedTextField>
         <BlockFormControlLabel
           control={<Checkbox name="send_response" checked={data.send_response} onChange={updateFormValue} />}
           label={LL.MQTT_RESPONSE()}
         />
         {!data.ha_enabled && (
-          <Grid
-            container
-            rowSpacing={-1}
-            spacing={1}
-            direction="row"
-            justifyContent="flex-start"
-            alignItems="flex-start"
-          >
+          <Grid container spacing={1} direction="row" justifyContent="flex-start" alignItems="flex-start">
             <Grid item>
               <BlockFormControlLabel
                 control={<Checkbox name="publish_single" checked={data.publish_single} onChange={updateFormValue} />}
@@ -248,63 +215,43 @@ const MqttSettings: FC = () => {
           <Grid container spacing={1} direction="row" justifyContent="flex-start" alignItems="flex-start">
             <Grid item>
               <BlockFormControlLabel
+                sx={{ pb: 1 }}
                 control={<Checkbox name="ha_enabled" checked={data.ha_enabled} onChange={updateFormValue} />}
                 label={LL.MQTT_PUBLISH_TEXT_3()}
               />
             </Grid>
             {data.ha_enabled && (
-              <Grid
-                container
-                sx={{ pl: 1 }}
-                spacing={1}
-                direction="row"
-                justifyContent="flex-start"
-                alignItems="flex-start"
-              >
-                <Grid item xs={12} sm={6} md={4}>
-                  <TextField
-                    name="discovery_type"
-                    label={LL.MQTT_PUBLISH_TEXT_5()}
-                    value={data.discovery_type}
-                    fullWidth
-                    variant="outlined"
-                    onChange={updateFormValue}
-                    margin="normal"
-                    select
-                  >
-                    <MenuItem value={0}>Home Assistant</MenuItem>
-                    <MenuItem value={1}>Domoticz</MenuItem>
-                    <MenuItem value={2}>Domoticz (latest)</MenuItem>
-                  </TextField>
+              <>
+                <Grid container spacing={1} direction="row" justifyContent="flex-start" alignItems="flex-start">
+                  <Grid item>
+                    <ValidatedTextField
+                      name="discovery_prefix"
+                      label={LL.MQTT_PUBLISH_TEXT_4()}
+                      fullWidth
+                      variant="outlined"
+                      value={data.discovery_prefix}
+                      onChange={updateFormValue}
+                      margin="normal"
+                    />
+                  </Grid>
+                  <Grid item>
+                    <ValidatedTextField
+                      name="entity_format"
+                      label={LL.MQTT_ENTITY_FORMAT()}
+                      value={data.entity_format}
+                      fullWidth
+                      variant="outlined"
+                      onChange={updateFormValue}
+                      margin="normal"
+                      select
+                    >
+                      <MenuItem value={0}>{LL.MQTT_ENTITY_FORMAT_0()}</MenuItem>
+                      <MenuItem value={1}>{LL.MQTT_ENTITY_FORMAT_1()}</MenuItem>
+                      <MenuItem value={2}>{LL.MQTT_ENTITY_FORMAT_2()}</MenuItem>
+                    </ValidatedTextField>
+                  </Grid>
                 </Grid>
-                <Grid item xs={12} sm={6} md={4}>
-                  <TextField
-                    name="discovery_prefix"
-                    label={LL.MQTT_PUBLISH_TEXT_4()}
-                    fullWidth
-                    variant="outlined"
-                    value={data.discovery_prefix}
-                    onChange={updateFormValue}
-                    margin="normal"
-                  />
-                </Grid>
-                <Grid item xs={12} sm={6} md={4}>
-                  <TextField
-                    name="entity_format"
-                    label={LL.MQTT_ENTITY_FORMAT()}
-                    value={data.entity_format}
-                    fullWidth
-                    variant="outlined"
-                    onChange={updateFormValue}
-                    margin="normal"
-                    select
-                  >
-                    <MenuItem value={0}>{LL.MQTT_ENTITY_FORMAT_0()}</MenuItem>
-                    <MenuItem value={1}>{LL.MQTT_ENTITY_FORMAT_1()}</MenuItem>
-                    <MenuItem value={2}>{LL.MQTT_ENTITY_FORMAT_2()}</MenuItem>
-                  </TextField>
-                </Grid>
-              </Grid>
+              </>
             )}
           </Grid>
         )}
@@ -312,11 +259,11 @@ const MqttSettings: FC = () => {
           {LL.MQTT_PUBLISH_INTERVALS()}&nbsp;(0=auto)
         </Typography>
         <Grid container spacing={1} direction="row" justifyContent="flex-start" alignItems="flex-start">
-          <Grid item xs={12} sm={6} md={4}>
+          <Grid item xs={6} sm={4}>
             <ValidatedTextField
               fieldErrors={fieldErrors}
               name="publish_time_heartbeat"
-              label="Heartbeat"
+              label={LL.MQTT_INT_HEARTBEAT()}
               InputProps={{
                 endAdornment: <InputAdornment position="end">{LL.SECONDS()}</InputAdornment>
               }}
@@ -328,8 +275,9 @@ const MqttSettings: FC = () => {
               margin="normal"
             />
           </Grid>
-          <Grid item xs={12} sm={6} md={4}>
-            <TextField
+          <Grid item xs={6} sm={4}>
+            <ValidatedTextField
+              fieldErrors={fieldErrors}
               name="publish_time_boiler"
               label={LL.MQTT_INT_BOILER()}
               InputProps={{
@@ -343,8 +291,9 @@ const MqttSettings: FC = () => {
               margin="normal"
             />
           </Grid>
-          <Grid item xs={12} sm={6} md={4}>
-            <TextField
+          <Grid item xs={6} sm={4}>
+            <ValidatedTextField
+              fieldErrors={fieldErrors}
               name="publish_time_thermostat"
               label={LL.MQTT_INT_THERMOSTATS()}
               InputProps={{
@@ -358,8 +307,9 @@ const MqttSettings: FC = () => {
               margin="normal"
             />
           </Grid>
-          <Grid item xs={12} sm={6} md={4}>
-            <TextField
+          <Grid item xs={6} sm={4}>
+            <ValidatedTextField
+              fieldErrors={fieldErrors}
               name="publish_time_solar"
               label={LL.MQTT_INT_SOLAR()}
               InputProps={{
@@ -373,8 +323,9 @@ const MqttSettings: FC = () => {
               margin="normal"
             />
           </Grid>
-          <Grid item xs={12} sm={6} md={4}>
-            <TextField
+          <Grid item xs={6} sm={4}>
+            <ValidatedTextField
+              fieldErrors={fieldErrors}
               name="publish_time_mixer"
               label={LL.MQTT_INT_MIXER()}
               InputProps={{
@@ -388,23 +339,9 @@ 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
+          <Grid item xs={6} sm={4}>
+            <ValidatedTextField
+              fieldErrors={fieldErrors}
               name="publish_time_sensor"
               label={LL.TEMP_SENSORS()}
               InputProps={{
@@ -418,8 +355,9 @@ const MqttSettings: FC = () => {
               margin="normal"
             />
           </Grid>
-          <Grid item xs={12} sm={6} md={4}>
-            <TextField
+          <Grid item xs={6} sm={4}>
+            <ValidatedTextField
+              fieldErrors={fieldErrors}
               name="publish_time_other"
               InputProps={{
                 endAdornment: <InputAdornment position="end">{LL.SECONDS()}</InputAdornment>
@@ -434,41 +372,27 @@ const MqttSettings: FC = () => {
             />
           </Grid>
         </Grid>
-
-        {dirtyFlags && dirtyFlags.length !== 0 && (
-          <ButtonRow>
-            <Button
-              startIcon={<CancelIcon />}
-              disabled={saving}
-              variant="outlined"
-              color="primary"
-              type="submit"
-              onClick={loadData}
-            >
-              {LL.CANCEL()}
-            </Button>
-            <Button
-              startIcon={<WarningIcon color="warning" />}
-              disabled={saving}
-              variant="contained"
-              color="info"
-              type="submit"
-              onClick={validateAndSubmit}
-            >
-              {LL.APPLY_CHANGES(dirtyFlags.length)}
-            </Button>
-          </ButtonRow>
-        )}
+        <ButtonRow>
+          <Button
+            startIcon={<SaveIcon />}
+            disabled={saving}
+            variant="outlined"
+            color="primary"
+            type="submit"
+            onClick={validateAndSubmit}
+          >
+            {LL.SAVE()}
+          </Button>
+        </ButtonRow>
       </>
     );
   };
 
   return (
-    <SectionContent>
-      {blocker ? <BlockNavigation blocker={blocker} /> : null}
+    <SectionContent title={LL.SETTINGS_OF('MQTT')} titleGutter>
       {content()}
     </SectionContent>
   );
 };
 
-export default MqttSettings;
+export default MqttSettingsForm;

interface/src/framework/mqtt/MqttStatusForm.tsx

@@ -1,20 +1,20 @@
-import AutoAwesomeMotionIcon from '@mui/icons-material/AutoAwesomeMotion';
+import { FC } from 'react';
+import { Avatar, Button, Divider, List, ListItem, ListItemAvatar, ListItemText, Theme, useTheme } from '@mui/material';
+
 import DeviceHubIcon from '@mui/icons-material/DeviceHub';
 import RefreshIcon from '@mui/icons-material/Refresh';
 import ReportIcon from '@mui/icons-material/Report';
 import SpeakerNotesOffIcon from '@mui/icons-material/SpeakerNotesOff';
-import { Avatar, Button, Divider, List, ListItem, ListItemAvatar, ListItemText, useTheme } from '@mui/material';
-import { useRequest } from 'alova';
-import type { Theme } from '@mui/material';
-import type { FC } from 'react';
+import AutoAwesomeMotionIcon from '@mui/icons-material/AutoAwesomeMotion';
 
-import type { MqttStatusType } from 'types';
-import * as MqttApi from 'api/mqtt';
-import { ButtonRow, FormLoader, SectionContent } from 'components';
-import { useI18nContext } from 'i18n/i18n-react';
-import { MqttDisconnectReason } from 'types';
+import { ButtonRow, FormLoader, SectionContent } from '../../components';
+import { MqttStatus, MqttDisconnectReason } from '../../types';
+import * as MqttApi from '../../api/mqtt';
+import { useRest } from '../../utils';
 
-export const mqttStatusHighlight = ({ enabled, connected }: MqttStatusType, theme: Theme) => {
+import { useI18nContext } from '../../i18n/i18n-react';
+
+export const mqttStatusHighlight = ({ enabled, connected }: MqttStatus, theme: Theme) => {
   if (!enabled) {
     return theme.palette.info.main;
   }
@@ -24,27 +24,28 @@ 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 { data: data, send: loadData, error } = useRequest(MqttApi.readMqttStatus);
+const MqttStatusForm: FC = () => {
+  const { loadData, data, errorMessage } = useRest<MqttStatus>({ read: 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 +55,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';
@@ -68,8 +69,10 @@ const MqttStatus: FC = () => {
         return 'Malformed credentials';
       case MqttDisconnectReason.MQTT_NOT_AUTHORIZED:
         return 'Not authorized';
+      case MqttDisconnectReason.ESP8266_NOT_ENOUGH_SPACE:
+        return 'Device out of memory';
       case MqttDisconnectReason.TLS_BAD_FINGERPRINT:
-        return 'TLS fingerprint invalid';
+        return 'Server fingerprint invalid';
       default:
         return 'Unknown';
     }
@@ -77,51 +80,53 @@ const MqttStatus: FC = () => {
 
   const content = () => {
     if (!data) {
-      return <FormLoader onRetry={loadData} errorMessage={error?.message} />;
+      return <FormLoader onRetry={loadData} errorMessage={errorMessage} />;
     }
 
-    const renderConnectionStatus = () => (
-      <>
-        {!data.connected && (
-          <>
-            <ListItem>
-              <ListItemAvatar>
-                <Avatar>
-                  <ReportIcon />
-                </Avatar>
-              </ListItemAvatar>
-              <ListItemText primary={LL.DISCONNECT_REASON()} secondary={disconnectReason(data)} />
-            </ListItem>
-            <Divider variant="inset" component="li" />
-          </>
-        )}
-        <ListItem>
-          <ListItemAvatar>
-            <Avatar>#</Avatar>
-          </ListItemAvatar>
-          <ListItemText primary={LL.ID_OF(LL.CLIENT())} secondary={data.client_id} />
-        </ListItem>
-        <Divider variant="inset" component="li" />
-        <ListItem>
-          <ListItemAvatar>
-            <Avatar sx={{ bgcolor: mqttQueueHighlight(data, theme) }}>
-              <AutoAwesomeMotionIcon />
-            </Avatar>
-          </ListItemAvatar>
-          <ListItemText primary={LL.MQTT_QUEUE()} secondary={data.mqtt_queued} />
-        </ListItem>
-        <Divider variant="inset" component="li" />
-        <ListItem>
-          <ListItemAvatar>
-            <Avatar sx={{ bgcolor: mqttPublishHighlight(data, theme) }}>
-              <SpeakerNotesOffIcon />
-            </Avatar>
-          </ListItemAvatar>
-          <ListItemText primary={LL.ERRORS_OF('MQTT')} secondary={data.mqtt_fails} />
-        </ListItem>
-        <Divider variant="inset" component="li" />
-      </>
-    );
+    const renderConnectionStatus = () => {
+      return (
+        <>
+          {!data.connected && (
+            <>
+              <ListItem>
+                <ListItemAvatar>
+                  <Avatar>
+                    <ReportIcon />
+                  </Avatar>
+                </ListItemAvatar>
+                <ListItemText primary={LL.DISCONNECT_REASON()} secondary={disconnectReason(data)} />
+              </ListItem>
+              <Divider variant="inset" component="li" />
+            </>
+          )}
+          <ListItem>
+            <ListItemAvatar>
+              <Avatar>#</Avatar>
+            </ListItemAvatar>
+            <ListItemText primary={LL.ID_OF(LL.CLIENT())} secondary={data.client_id} />
+          </ListItem>
+          <Divider variant="inset" component="li" />
+          <ListItem>
+            <ListItemAvatar>
+              <Avatar sx={{ bgcolor: mqttQueueHighlight(data, theme) }}>
+                <AutoAwesomeMotionIcon />
+              </Avatar>
+            </ListItemAvatar>
+            <ListItemText primary={LL.MQTT_QUEUE()} secondary={data.mqtt_queued} />
+          </ListItem>
+          <Divider variant="inset" component="li" />
+          <ListItem>
+            <ListItemAvatar>
+              <Avatar sx={{ bgcolor: mqttPublishHighlight(data, theme) }}>
+                <SpeakerNotesOffIcon />
+              </Avatar>
+            </ListItemAvatar>
+            <ListItemText primary={LL.ERRORS_OF('MQTT')} secondary={data.mqtt_fails} />
+          </ListItem>
+          <Divider variant="inset" component="li" />
+        </>
+      );
+    };
 
     return (
       <>
@@ -146,7 +151,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;