andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-13 03:09:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev

Browse Source
This commit is contained in:
MichaelDvP
2025-11-30 21:25:07 +01:00
parent 1472e53410 15e05c4abc
commit 882e3bc1cd
23 changed files with 370 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
interface/package.json
View File

@@ -23,14 +23,14 @@
"standalone-devcontainer": "concurrently -c \"auto\" \"typesafe-i18n\" \"pnpm:mock-rest\" \"vite --host\""
},
"dependencies": {
"@alova/adapter-xhr": "2.2.1",
"@alova/adapter-xhr": "2.3.0",
"@emotion/react": "^11.14.0",
"@emotion/styled": "^11.14.1",
"@mui/icons-material": "^7.3.5",
"@mui/material": "^7.3.5",
"@preact/compat": "^18.3.1",
"@table-library/react-table-library": "4.1.15",
"alova": "3.3.4",
"alova": "3.4.0",
"async-validator": "^4.2.5",
"etag": "^1.8.1",
"formidable": "^3.5.4",
@@ -59,7 +59,7 @@
"concurrently": "^9.2.1",
"eslint": "^9.39.1",
"eslint-config-prettier": "^10.1.8",
"prettier": "^3.6.2",
"prettier": "^3.7.3",
"rollup-plugin-visualizer": "^6.0.5",
"terser": "^5.44.1",
"typescript-eslint": "^8.48.0",
@@ -67,5 +67,5 @@
"vite-plugin-imagemin": "^0.6.1",
"vite-tsconfig-paths": "^5.1.4"
},
"packageManager": "pnpm@10.23.0+sha512.21c4e5698002ade97e4efe8b8b4a89a8de3c85a37919f957e7a0f30f38fbc5bbdd05980ffe29179b2fb6e6e691242e098d945d1601772cad0fef5fb6411e2a4b"
"packageManager": "pnpm@10.24.0+sha512.01ff8ae71b4419903b65c60fb2dc9d34cf8bb6e06d03bde112ef38f7a34d6904c424ba66bea5cdcf12890230bf39f9580473140ed9c946fef328b6e5238a345a"
}

70
interface/pnpm-lock.yaml generated
View File

@@ -9,8 +9,8 @@ importers:
.:
dependencies:
'@alova/adapter-xhr':
specifier: 2.2.1
version: 2.2.1(alova@3.3.4)
specifier: 2.3.0
version: 2.3.0(alova@3.4.0)
'@emotion/react':
specifier: ^11.14.0
version: 11.14.0(@types/react@19.2.7)(react@19.2.0)
@@ -30,8 +30,8 @@ importers:
specifier: 4.1.15
version: 4.1.15(@emotion/react@11.14.0(@types/react@19.2.7)(react@19.2.0))(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
alova:
specifier: 3.3.4
version: 3.3.4
specifier: 3.4.0
version: 3.4.0
async-validator:
specifier: ^4.2.5
version: 4.2.5
@@ -86,7 +86,7 @@ importers:
version: 2.10.2(@babel/core@7.28.5)(preact@10.27.2)(vite@7.2.4(@types/node@24.10.1)(terser@5.44.1))
'@trivago/prettier-plugin-sort-imports':
specifier: ^6.0.0
version: 6.0.0(prettier@3.6.2)
version: 6.0.0(prettier@3.7.3)
'@types/node':
specifier: ^24.10.1
version: 24.10.1
@@ -109,8 +109,8 @@ importers:
specifier: ^10.1.8
version: 10.1.8(eslint@9.39.1)
prettier:
specifier: ^3.6.2
version: 3.6.2
specifier: ^3.7.3
version: 3.7.3
rollup-plugin-visualizer:
specifier: ^6.0.5
version: 6.0.5(rollup@4.53.3)
@@ -132,8 +132,8 @@ importers:
packages:
'@alova/adapter-xhr@2.2.1':
resolution: {integrity: sha512-0aPVdFmmMn4Z4KvG+DOyWhzQKaBGCe8yPQ4mJz1hQNPzbrIfqq+0flVF6ArFL4EtPbOJVnKropJNE691sjtq5A==}
'@alova/adapter-xhr@2.3.0':
resolution: {integrity: sha512-IegkchjfXFxXgn6JUZuVEHFQn+jojzrnNdzrGhX5ecEOIC8M/CQvLQzXjLeT6PbGiwnXwvZWL2ya4eqQz51+uQ==}
peerDependencies:
alova: ^3.0.20
@@ -475,8 +475,8 @@ packages:
resolution: {integrity: sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
'@eslint/eslintrc@3.3.1':
resolution: {integrity: sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==}
'@eslint/eslintrc@3.3.3':
resolution: {integrity: sha512-Kr+LPIUVKz2qkx1HAMH8q1q6azbqBAsXJUxBl/ODDuVPX45Z9DfwB8tPjTi6nNZ8BuM3nbJxC5zCAg5elnBUTQ==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
'@eslint/js@9.39.1':
@@ -960,8 +960,8 @@ packages:
ajv@6.12.6:
resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
alova@3.3.4:
resolution: {integrity: sha512-UKKqXdvf8aQ4C7m3brO77YWe5CDz8N59PdAUz7M8gowKUUXTutbk0Vk5DRBrCe0hMUyyNMUhdCZ38llGxCViyQ==}
alova@3.4.0:
resolution: {integrity: sha512-/vSvVbA45CHg34Y5erx+wVxy1B/n4UoGX7dKqSpLVz9cDSDSOhqCnRD/dV+AErjMmQeVpJrjmDT7SCkhQbnUeQ==}
engines: {node: '>= 18.0.0'}
ansi-regex@2.1.1:
@@ -1027,8 +1027,8 @@ packages:
base64-js@1.5.1:
resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
baseline-browser-mapping@2.8.31:
resolution: {integrity: sha512-a28v2eWrrRWPpJSzxc+mKwm0ZtVx/G8SepdQZDArnXYU/XS+IF6mp8aB/4E+hH1tyGCoDo3KlUCdlSxGDsRkAw==}
baseline-browser-mapping@2.8.32:
resolution: {integrity: sha512-OPz5aBThlyLFgxyhdwf/s2+8ab3OvT7AdTNvKHBwpXomIYeXqpUUuT8LrdtxZSsWJ4R4CU1un4XGh5Ez3nlTpw==}
hasBin: true
bin-build@3.0.0:
@@ -1185,8 +1185,8 @@ packages:
convert-source-map@2.0.0:
resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==}
cookie@1.1.0:
resolution: {integrity: sha512-vXiThu1/rlos7EGu8TuNZQEg2e9TvhH9dmS4T4ZVzB7Ao1agEZ6EG3sn5n+hZRYUgduISd1HpngFzAZiDGm5vQ==}
cookie@1.1.1:
resolution: {integrity: sha512-ei8Aos7ja0weRpFzJnEA9UHJ/7XQmqglbRwnf2ATjcB9Wq874VKH9kfjjirM6UhU2/E5fFYadylyhFldcqSidQ==}
engines: {node: '>=18'}
core-util-is@1.0.3:
@@ -1337,8 +1337,8 @@ packages:
duplexer3@0.1.5:
resolution: {integrity: sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==}
electron-to-chromium@1.5.260:
resolution: {integrity: sha512-ov8rBoOBhVawpzdre+Cmz4FB+y66Eqrk6Gwqd8NGxuhv99GQ8XqMAr351KEkOt7gukXWDg6gJWEMKgL2RLMPtA==}
electron-to-chromium@1.5.262:
resolution: {integrity: sha512-NlAsMteRHek05jRUxUR0a5jpjYq9ykk6+kO0yRaMi5moe7u0fVIOeQ3Y30A8dIiWFBNUoQGi1ljb1i5VtS9WQQ==}
emoji-regex@8.0.0:
resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
@@ -2478,8 +2478,8 @@ packages:
resolution: {integrity: sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==}
engines: {node: '>=4'}
prettier@3.6.2:
resolution: {integrity: sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==}
prettier@3.7.3:
resolution: {integrity: sha512-QgODejq9K3OzoBbuyobZlUhznP5SKwPqp+6Q6xw6o8gnhr4O85L2U915iM2IDcfF2NPXVaM9zlo9tdwipnYwzg==}
engines: {node: '>=14'}
hasBin: true
@@ -3098,10 +3098,10 @@ packages:
snapshots:
'@alova/adapter-xhr@2.2.1(alova@3.3.4)':
'@alova/adapter-xhr@2.3.0(alova@3.4.0)':
dependencies:
'@alova/shared': 1.3.1
alova: 3.3.4
alova: 3.4.0
'@alova/shared@1.3.1': {}
@@ -3423,7 +3423,7 @@ snapshots:
dependencies:
'@types/json-schema': 7.0.15
'@eslint/eslintrc@3.3.1':
'@eslint/eslintrc@3.3.3':
dependencies:
ajv: 6.12.6
debug: 4.4.3
@@ -3716,7 +3716,7 @@ snapshots:
react-virtualized-auto-sizer: 1.0.26(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
react-window: 1.8.11(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
'@trivago/prettier-plugin-sort-imports@6.0.0(prettier@3.6.2)':
'@trivago/prettier-plugin-sort-imports@6.0.0(prettier@3.7.3)':
dependencies:
'@babel/generator': 7.28.5
'@babel/parser': 7.28.5
@@ -3726,7 +3726,7 @@ snapshots:
lodash-es: 4.17.21
minimatch: 9.0.5
parse-imports-exports: 0.2.4
prettier: 3.6.2
prettier: 3.7.3
transitivePeerDependencies:
- supports-color
@@ -3911,7 +3911,7 @@ snapshots:
json-schema-traverse: 0.4.1
uri-js: 4.4.1
alova@3.3.4:
alova@3.4.0:
dependencies:
'@alova/shared': 1.3.1
rate-limiter-flexible: 5.0.5
@@ -3962,7 +3962,7 @@ snapshots:
base64-js@1.5.1: {}
baseline-browser-mapping@2.8.31: {}
baseline-browser-mapping@2.8.32: {}
bin-build@3.0.0:
dependencies:
@@ -4019,9 +4019,9 @@ snapshots:
browserslist@4.28.0:
dependencies:
baseline-browser-mapping: 2.8.31
baseline-browser-mapping: 2.8.32
caniuse-lite: 1.0.30001757
electron-to-chromium: 1.5.260
electron-to-chromium: 1.5.262
node-releases: 2.0.27
update-browserslist-db: 1.1.4(browserslist@4.28.0)
@@ -4151,7 +4151,7 @@ snapshots:
convert-source-map@2.0.0: {}
cookie@1.1.0: {}
cookie@1.1.1: {}
core-util-is@1.0.3: {}
@@ -4366,7 +4366,7 @@ snapshots:
duplexer3@0.1.5: {}
electron-to-chromium@1.5.260: {}
electron-to-chromium@1.5.262: {}
emoji-regex@8.0.0: {}
@@ -4529,7 +4529,7 @@ snapshots:
'@eslint/config-array': 0.21.1
'@eslint/config-helpers': 0.4.2
'@eslint/core': 0.17.0
'@eslint/eslintrc': 3.3.1
'@eslint/eslintrc': 3.3.3
'@eslint/js': 9.39.1
'@eslint/plugin-kit': 0.4.1
'@humanfs/node': 0.16.7
@@ -5487,7 +5487,7 @@ snapshots:
prepend-http@2.0.0: {}
prettier@3.6.2: {}
prettier@3.7.3: {}
process-nextick-args@2.0.1: {}
@@ -5533,7 +5533,7 @@ snapshots:
react-router@7.9.6(react-dom@19.2.0(react@19.2.0))(react@19.2.0):
dependencies:
cookie: 1.1.0
cookie: 1.1.1
react: 19.2.0
set-cookie-parser: 2.7.2
optionalDependencies:

1
interface/src/app/settings/MqttSettings.tsx
View File

@@ -266,6 +266,7 @@ const MqttSettings = () => {
label={LL.CERT()}
variant="outlined"
value={data.rootCA}
sx={{ width: '50ch' }}
onChange={updateFormValue}
margin="normal"
/>