merge #2108

2025-12-06 07:49:52 +03:00 · 2025-01-04 13:41:39 +01:00
parent 4138598db2
commit eb87651c47
166 changed files with 2099 additions and 10446 deletions
--- a/interface/package.json
+++ b/interface/package.json
@@ -24,8 +24,8 @@
    "@alova/adapter-xhr": "2.1.0",
    "@emotion/react": "^11.14.0",
    "@emotion/styled": "^11.14.0",
-    "@mui/icons-material": "^6.3.0",
-    "@mui/material": "^6.3.0",
+    "@mui/icons-material": "^6.2.1",
+    "@mui/material": "^6.2.1",
    "@table-library/react-table-library": "4.1.7",
    "alova": "3.2.7",
    "async-validator": "^4.2.5",
@@ -44,10 +44,10 @@
    "@babel/core": "^7.26.0",
    "@eslint/js": "^9.17.0",
    "@preact/compat": "^18.3.1",
-    "@preact/preset-vite": "^2.9.3",
-    "@trivago/prettier-plugin-sort-imports": "^5.2.0",
+    "@preact/preset-vite": "^2.9.4",
+    "@trivago/prettier-plugin-sort-imports": "^5.2.1",
    "@types/formidable": "^3",
-    "@types/node": "^22.10.2",
+    "@types/node": "^22.10.5",
    "@types/react": "^19.0.2",
    "@types/react-dom": "^19.0.2",
    "concurrently": "^9.1.2",
@@ -58,7 +58,7 @@
    "rollup-plugin-visualizer": "^5.13.1",
    "terser": "^5.37.0",
    "typescript-eslint": "8.19.0",
-    "vite": "^6.0.6",
+    "vite": "^6.0.7",
    "vite-plugin-imagemin": "^0.6.1",
    "vite-tsconfig-paths": "^5.1.4"
  },
--- a/interface/progmem-generator.js
+++ b/interface/progmem-generator.js
@@ -12,7 +12,7 @@ import zlib from 'zlib';

 const ARDUINO_INCLUDES = '#include <Arduino.h>\n\n';
 const INDENT = '  ';
-const outputPath = '../lib/framework/WWWData.h';
+const outputPath = '../src/ESP32React/WWWData.h';
 const sourcePath = './dist';
 const bytesPerLine = 20;
 var totalSize = 0;
--- a/interface/src/app/main/Dashboard.tsx
+++ b/interface/src/app/main/Dashboard.tsx
@@ -3,6 +3,7 @@ import { IconContext } from 'react-icons/lib';
 import { toast } from 'react-toastify';

 import ChevronRightIcon from '@mui/icons-material/ChevronRight';
+import ConstructionIcon from '@mui/icons-material/Construction';
 import EditIcon from '@mui/icons-material/Edit';
 import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
 import UnfoldLessIcon from '@mui/icons-material/UnfoldLess';
@@ -235,7 +236,10 @@ const Dashboard = () => {
          <Grid container spacing={0} justifyContent="flex-start">
            <Grid size={11}>
              <Typography mb={2} variant="body1" color="warning">
-                {LL.DASHBOARD_1()}.
+                {LL.DASHBOARD_1()}&nbsp;
+                <ConstructionIcon
+                  sx={{ color: '#9e9e9e', fontSize: 20, verticalAlign: 'middle' }}
+                />
              </Typography>
            </Grid>

--- a/interface/src/components/layout/LayoutMenu.tsx
+++ b/interface/src/components/layout/LayoutMenu.tsx
@@ -73,11 +73,6 @@ const LayoutMenu = () => {
          >
            <ListItemText
              primary={LL.MODULES()}
-              primaryTypographyProps={{
-                fontWeight: '600',
-                mb: '2px',
-                color: 'lightblue'
-              }}
              // secondary={
              //   LL.CUSTOMIZATIONS() +
              //   ', ' +
@@ -92,6 +87,13 @@ const LayoutMenu = () => {
              //   color: menuOpen ? 'rgba(0,0,0,0)' : 'rgba(255,255,255,0.5)'
              // }}
              sx={{ my: 0 }}
+              slotProps={{
+                primary: {
+                  fontWeight: '600',
+                  mb: '2px',
+                  color: 'lightblue'
+                }
+              }}
            />
            <KeyboardArrowDown
              sx={{
@@ -132,7 +134,6 @@ const LayoutMenu = () => {
          )}
        </Box>
      </List>
-
      <List style={{ marginTop: `auto` }}>
        <LayoutMenuItem
          icon={AssessmentIcon}
@@ -158,7 +159,6 @@ const LayoutMenu = () => {
          </ListItemButton>
        </ListItem>
      </List>
-
      <Popover
        id={id}
        open={open}
--- a/interface/src/i18n/nl/index.ts
+++ b/interface/src/i18n/nl/index.ts
@@ -347,4 +347,4 @@ const nl: Translation = {
  UPGRADE: 'Upgraden'
 };

-export default nl;
+export default nl;
--- a/interface/yarn.lock
+++ b/interface/yarn.lock
@@ -782,38 +782,38 @@ __metadata:
  languageName: node
  linkType: hard

-"@mui/core-downloads-tracker@npm:^6.3.0":
-  version: 6.3.0
-  resolution: "@mui/core-downloads-tracker@npm:6.3.0"
-  checksum: 10c0/56a421866c727a7c785247212a5f04cb5dd8a2b46b2badce5065ea8d6eb04e5ac8b4f981d4c33beebd866d803ea87328a79ec9baeba32611275f9805ceb0a074
+"@mui/core-downloads-tracker@npm:^6.3.1":
+  version: 6.3.1
+  resolution: "@mui/core-downloads-tracker@npm:6.3.1"
+  checksum: 10c0/a996ad8db6bd8c981c4e2e2d243526c838dd29f0bbe7dc5ab6933be357e41f748781d322b1decf79ae1c9abba24190162559d84deedcb7c8824a68754dddf216
  languageName: node
  linkType: hard

-"@mui/icons-material@npm:^6.3.0":
-  version: 6.3.0
-  resolution: "@mui/icons-material@npm:6.3.0"
+"@mui/icons-material@npm:^6.3.1":
+  version: 6.3.1
+  resolution: "@mui/icons-material@npm:6.3.1"
  dependencies:
    "@babel/runtime": "npm:^7.26.0"
  peerDependencies:
-    "@mui/material": ^6.3.0
+    "@mui/material": ^6.3.1
    "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
    react: ^17.0.0 || ^18.0.0 || ^19.0.0
  peerDependenciesMeta:
    "@types/react":
      optional: true
-  checksum: 10c0/42fd80f5a95a7736f567bf9181c4986c78f7dd3d129610a822070f0d3dd2cc86c6dfd6444468bfd9e3a616890e5c9f4722f84218eb1d020bb75f2fab15d2526f
+  checksum: 10c0/edaf71b7368c14cfbfed6f475ef96187871a010e972b9e7608d23cadae5ce52a3a6888b32453721dc1d86e2e7ad9c61aadde83ba5cd94363782bf83803d1ab36
  languageName: node
  linkType: hard

-"@mui/material@npm:^6.3.0":
-  version: 6.3.0
-  resolution: "@mui/material@npm:6.3.0"
+"@mui/material@npm:^6.3.1":
+  version: 6.3.1
+  resolution: "@mui/material@npm:6.3.1"
  dependencies:
    "@babel/runtime": "npm:^7.26.0"
-    "@mui/core-downloads-tracker": "npm:^6.3.0"
-    "@mui/system": "npm:^6.3.0"
-    "@mui/types": "npm:^7.2.20"
-    "@mui/utils": "npm:^6.3.0"
+    "@mui/core-downloads-tracker": "npm:^6.3.1"
+    "@mui/system": "npm:^6.3.1"
+    "@mui/types": "npm:^7.2.21"
+    "@mui/utils": "npm:^6.3.1"
    "@popperjs/core": "npm:^2.11.8"
    "@types/react-transition-group": "npm:^4.4.12"
    clsx: "npm:^2.1.1"
@@ -824,7 +824,7 @@ __metadata:
  peerDependencies:
    "@emotion/react": ^11.5.0
    "@emotion/styled": ^11.3.0
-    "@mui/material-pigment-css": ^6.3.0
+    "@mui/material-pigment-css": ^6.3.1
    "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
    react: ^17.0.0 || ^18.0.0 || ^19.0.0
    react-dom: ^17.0.0 || ^18.0.0 || ^19.0.0
@@ -837,16 +837,16 @@ __metadata:
      optional: true
    "@types/react":
      optional: true
-  checksum: 10c0/9a21ea88e79e19105916db8df1e2da95f5216dd57678000992d2bdfaa611772acd28c085fd058b474cfc846363b2165a9e587f9100bfd142edefffa4762323f8
+  checksum: 10c0/7fb91acd9bc021dde78e70d495a2abd69d0e2df35e526e0730e060c3177bb10cc3058ee27c72b5ec9bc7622d9c2ef99831b89f511f6700bc3717f979e2cb0152
  languageName: node
  linkType: hard

-"@mui/private-theming@npm:^6.3.0":
-  version: 6.3.0
-  resolution: "@mui/private-theming@npm:6.3.0"
+"@mui/private-theming@npm:^6.3.1":
+  version: 6.3.1
+  resolution: "@mui/private-theming@npm:6.3.1"
  dependencies:
    "@babel/runtime": "npm:^7.26.0"
-    "@mui/utils": "npm:^6.3.0"
+    "@mui/utils": "npm:^6.3.1"
    prop-types: "npm:^15.8.1"
  peerDependencies:
    "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
@@ -854,13 +854,13 @@ __metadata:
  peerDependenciesMeta:
    "@types/react":
      optional: true
-  checksum: 10c0/57d0b429914b6095b3605e99ea2c23b8ad834220426bed6938ef60b2f8eaaa2fbf800ffdfcf6e59b88e74900adb60a9c1f5ea25338b2254e1530e0bf7ee04f1f
+  checksum: 10c0/aafaca0d7e5fd4d83c2cade28b7de554c0d848595f8f23f26c8f7daf3fc664053c9c81342d44d24e0a04a4813b58d6f0c1d135ae2775380acda91468a21f9684
  languageName: node
  linkType: hard

-"@mui/styled-engine@npm:^6.3.0":
-  version: 6.3.0
-  resolution: "@mui/styled-engine@npm:6.3.0"
+"@mui/styled-engine@npm:^6.3.1":
+  version: 6.3.1
+  resolution: "@mui/styled-engine@npm:6.3.1"
  dependencies:
    "@babel/runtime": "npm:^7.26.0"
    "@emotion/cache": "npm:^11.13.5"
@@ -877,19 +877,19 @@ __metadata:
      optional: true
    "@emotion/styled":
      optional: true
-  checksum: 10c0/840053c3dedcd2299e713839e2fae3fad5faa943c491bf54e513ae0c68d3dec7acef8e234e1632b89de4bcb2bdf9fe08553faf89f85ae2cd8588ca197d0ecd55
+  checksum: 10c0/81bbf8f2016b1c7debbbaab1a44ebaf8e494e8c9d32d2201b28f8c653a082177f6570fef779bf835bad1a9120af219a64b1d7a9a8a569c9c07045f00affe6b87
  languageName: node
  linkType: hard

-"@mui/system@npm:^6.3.0":
-  version: 6.3.0
-  resolution: "@mui/system@npm:6.3.0"
+"@mui/system@npm:^6.3.1":
+  version: 6.3.1
+  resolution: "@mui/system@npm:6.3.1"
  dependencies:
    "@babel/runtime": "npm:^7.26.0"
-    "@mui/private-theming": "npm:^6.3.0"
-    "@mui/styled-engine": "npm:^6.3.0"
-    "@mui/types": "npm:^7.2.20"
-    "@mui/utils": "npm:^6.3.0"
+    "@mui/private-theming": "npm:^6.3.1"
+    "@mui/styled-engine": "npm:^6.3.1"
+    "@mui/types": "npm:^7.2.21"
+    "@mui/utils": "npm:^6.3.1"
    clsx: "npm:^2.1.1"
    csstype: "npm:^3.1.3"
    prop-types: "npm:^15.8.1"
@@ -905,28 +905,28 @@ __metadata:
      optional: true
    "@types/react":
      optional: true
-  checksum: 10c0/ee50e38919b3f86fbd6978d06959189a5903223156c1355bc0ff251d553f2eda8ffafe2fa006da2e00e12947f6c8efd7f796bbb6cc5c472106400c2ed8e6dd1e
+  checksum: 10c0/49613b001f7e60c7ed70f3e2ee3ffc4f3a2719509e4f9ec18faf73a354597b8d894d0ee8861bf3a5b5db763efca36bcfb75989505c88e009c1627b114bac88ef
  languageName: node
  linkType: hard

-"@mui/types@npm:^7.2.20":
-  version: 7.2.20
-  resolution: "@mui/types@npm:7.2.20"
+"@mui/types@npm:^7.2.21":
+  version: 7.2.21
+  resolution: "@mui/types@npm:7.2.21"
  peerDependencies:
    "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
  peerDependenciesMeta:
    "@types/react":
      optional: true
-  checksum: 10c0/257285386903fe0705ac6d53d0ece700323b7bc9be5239ab448b2c6523965b3cadbb636f2aec8ff60354180f53daf78df687d6828a75ad220b0f71fb5a117b5e
+  checksum: 10c0/c0038ae402a3cfb2805a19167362fb5ac2ca1403f0ef3dad688d1e2276afe757b69d5fb1e3af4cd0e985b9221d287fd863c5b00f29fd07a276c7de9e3423a0f3
  languageName: node
  linkType: hard

-"@mui/utils@npm:^6.3.0":
-  version: 6.3.0
-  resolution: "@mui/utils@npm:6.3.0"
+"@mui/utils@npm:^6.3.1":
+  version: 6.3.1
+  resolution: "@mui/utils@npm:6.3.1"
  dependencies:
    "@babel/runtime": "npm:^7.26.0"
-    "@mui/types": "npm:^7.2.20"
+    "@mui/types": "npm:^7.2.21"
    "@types/prop-types": "npm:^15.7.14"
    clsx: "npm:^2.1.1"
    prop-types: "npm:^15.8.1"
@@ -937,7 +937,7 @@ __metadata:
  peerDependenciesMeta:
    "@types/react":
      optional: true
-  checksum: 10c0/7059664a5471d93f3593f83816c5c3cc81e7d0879842edf2a302db324c430d349bd88dd93bffad8f8349271b45e27f18f31e0341e13408ccc65b1af247b33efd
+  checksum: 10c0/b111bca7ad065b1028714d55a8df90267c47a72ffb2bfad7a1709cef0d5d9036b463855d431b3606967c9351c7ee23f1dee02457b2f3ed02513744f0173eb00c
  languageName: node
  linkType: hard

@@ -1013,9 +1013,9 @@ __metadata:
  languageName: node
  linkType: hard

-"@preact/preset-vite@npm:^2.9.3":
-  version: 2.9.3
-  resolution: "@preact/preset-vite@npm:2.9.3"
+"@preact/preset-vite@npm:^2.9.4":
+  version: 2.9.4
+  resolution: "@preact/preset-vite@npm:2.9.4"
  dependencies:
    "@babel/code-frame": "npm:^7.22.13"
    "@babel/plugin-transform-react-jsx": "npm:^7.22.15"
@@ -1032,7 +1032,7 @@ __metadata:
  peerDependencies:
    "@babel/core": 7.x
    vite: 2.x || 3.x || 4.x || 5.x || 6.x
-  checksum: 10c0/61f7a9869dd7a5eb145851622cb219bf7dfffea770641a85d4e5560a9e263af4f07cbea3795d44abec7efaaa789b33f7dd20f6f99e14ce9a3a202dd584013efe
+  checksum: 10c0/a42aab866ef1ea4d2dac82be3a5b5c207c5e030d429cc5dbe88a259da0a52a1fd8f21f77d1ce2bef82a803b854f7653a579aed0aa7eca371108e5308ba43bc2f
  languageName: node
  linkType: hard

@@ -1240,9 +1240,9 @@ __metadata:
  languageName: node
  linkType: hard

-"@trivago/prettier-plugin-sort-imports@npm:^5.2.0":
-  version: 5.2.0
-  resolution: "@trivago/prettier-plugin-sort-imports@npm:5.2.0"
+"@trivago/prettier-plugin-sort-imports@npm:^5.2.1":
+  version: 5.2.1
+  resolution: "@trivago/prettier-plugin-sort-imports@npm:5.2.1"
  dependencies:
    "@babel/generator": "npm:^7.26.2"
    "@babel/parser": "npm:^7.26.2"
@@ -1254,7 +1254,7 @@ __metadata:
    "@vue/compiler-sfc": 3.x
    prettier: 2.x - 3.x
    prettier-plugin-svelte: 3.x
-    svelte: 4.x
+    svelte: 4.x || 5.x
  peerDependenciesMeta:
    "@vue/compiler-sfc":
      optional: true
@@ -1262,7 +1262,7 @@ __metadata:
      optional: true
    svelte:
      optional: true
-  checksum: 10c0/73ebdea1f5cef609e1bf7ed7a276916770de210d29e512dfcdac68fafd05cc155f5aec5962bcce65952d24e43aeee81bc58caf37c8d298e7d7f23d4851534405
+  checksum: 10c0/fd782f84d44c61159dce099775a86ebb5082b5e5eea205ec71d6fede3cf079aafb8f9a9979d5742ff0126598a37098cf679d5bad268320907513f2984df3d501
  languageName: node
  linkType: hard

@@ -1402,12 +1402,21 @@ __metadata:
  languageName: node
  linkType: hard

-"@types/node@npm:*, @types/node@npm:^22.10.2":
-  version: 22.10.2
-  resolution: "@types/node@npm:22.10.2"
+"@types/node@npm:*":
+  version: 22.10.3
+  resolution: "@types/node@npm:22.10.3"
  dependencies:
    undici-types: "npm:~6.20.0"
-  checksum: 10c0/2c7b71a040f1ef5320938eca8ebc946e6905caa9bbf3d5665d9b3774a8d15ea9fab1582b849a6d28c7fc80756a62c5666bc66b69f42f4d5dafd1ccb193cdb4ac
+  checksum: 10c0/0471a73c8672c803b1f2b912c2c466d00a217186933e8ff38ec7779b4a3f88a0eea3b513a59f2abf9de17cc8bbca688a3c6643c6513ac8dd1c3e45d25fab93b1
+  languageName: node
+  linkType: hard
+
+"@types/node@npm:^22.10.5":
+  version: 22.10.5
+  resolution: "@types/node@npm:22.10.5"
+  dependencies:
+    undici-types: "npm:~6.20.0"
+  checksum: 10c0/6a0e7d1fe6a86ef6ee19c3c6af4c15542e61aea2f4cee655b6252efb356795f1f228bc8299921e82924e80ff8eca29b74d9dd0dd5cc1a90983f892f740b480df
  languageName: node
  linkType: hard

@@ -1591,14 +1600,14 @@ __metadata:
    "@emotion/react": "npm:^11.14.0"
    "@emotion/styled": "npm:^11.14.0"
    "@eslint/js": "npm:^9.17.0"
-    "@mui/icons-material": "npm:^6.3.0"
-    "@mui/material": "npm:^6.3.0"
+    "@mui/icons-material": "npm:^6.3.1"
+    "@mui/material": "npm:^6.3.1"
    "@preact/compat": "npm:^18.3.1"
-    "@preact/preset-vite": "npm:^2.9.3"
+    "@preact/preset-vite": "npm:^2.9.4"
    "@table-library/react-table-library": "npm:4.1.7"
-    "@trivago/prettier-plugin-sort-imports": "npm:^5.2.0"
+    "@trivago/prettier-plugin-sort-imports": "npm:^5.2.1"
    "@types/formidable": "npm:^3"
-    "@types/node": "npm:^22.10.2"
+    "@types/node": "npm:^22.10.5"
    "@types/react": "npm:^19.0.2"
    "@types/react-dom": "npm:^19.0.2"
    alova: "npm:3.2.7"
@@ -1621,7 +1630,7 @@ __metadata:
    typesafe-i18n: "npm:^5.26.2"
    typescript: "npm:^5.7.2"
    typescript-eslint: "npm:8.19.0"
-    vite: "npm:^6.0.6"
+    vite: "npm:^6.0.7"
    vite-plugin-imagemin: "npm:^0.6.1"
    vite-tsconfig-paths: "npm:^5.1.4"
  languageName: unknown
@@ -6839,9 +6848,9 @@ __metadata:
  languageName: node
  linkType: hard

-"vite@npm:^6.0.6":
-  version: 6.0.6
-  resolution: "vite@npm:6.0.6"
+"vite@npm:^6.0.7":
+  version: 6.0.7
+  resolution: "vite@npm:6.0.7"
  dependencies:
    esbuild: "npm:^0.24.2"
    fsevents: "npm:~2.3.3"
@@ -6887,7 +6896,7 @@ __metadata:
      optional: true
  bin:
    vite: bin/vite.js
-  checksum: 10c0/144c3f80a7920a4b2fa14f00f99b58ece246455ca9313561a67a227b45dadac3343e406d3c1dbfafa79992ac88f54cb2b040b229997e432daf47594fe8cacec2
+  checksum: 10c0/ae81047b4290a7206b9394a39a782d509e9610462e7946422ba22d5bc615b5a322c07e33d7bf9dd0b3312ec3f5c63353b725913d1519324bfdf539b4f1e03f52
  languageName: node
  linkType: hard