andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 07:49:52 +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
2024-12-01 17:11:47 +01:00
parent 5528f29b6a 76151c4395
commit 4547a5ceb0
5 changed files with 117 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
interface/package.json
View File

@@ -21,13 +21,13 @@
"lint": "eslint . --fix"
},
"dependencies": {
"@alova/adapter-xhr": "2.0.10",
"@alova/adapter-xhr": "2.0.11",
"@emotion/react": "^11.13.5",
"@emotion/styled": "^11.13.5",
"@mui/icons-material": "^6.1.9",
"@mui/material": "^6.1.9",
"@table-library/react-table-library": "4.1.7",
"alova": "3.2.5",
"alova": "3.2.6",
"async-validator": "^4.2.5",
"jwt-decode": "^4.0.0",
"mime-types": "^2.1.35",
@@ -42,7 +42,7 @@
},
"devDependencies": {
"@babel/core": "^7.26.0",
"@eslint/js": "^9.15.0",
"@eslint/js": "^9.16.0",
"@preact/compat": "^18.3.1",
"@preact/preset-vite": "^2.9.2",
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
@@ -51,7 +51,7 @@
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"concurrently": "^9.1.0",
"eslint": "^9.15.0",
"eslint": "^9.16.0",
"eslint-config-prettier": "^9.1.0",
"formidable": "^3.5.2",
"prettier": "^3.4.1",

7
interface/src/app/settings/network/Network.tsx
View File

@@ -42,8 +42,11 @@ const Network = () => {
}}
>
<RouterTabs value={routerTab}>
<Tab value="settings" label={LL.SETTINGS_OF(LL.NETWORK(1))} />
<Tab value="scan" label={LL.NETWORK_SCAN()} />
<Tab
value="/settings/network/settings"
label={LL.SETTINGS_OF(LL.NETWORK(1))}
/>
<Tab value="/settings/network/scan" label={LL.NETWORK_SCAN()} />
</RouterTabs>
<Routes>
<Route path="scan" element={<WiFiNetworkScanner />} />

7
interface/src/app/settings/security/Security.tsx
View File

@@ -17,8 +17,11 @@ const Security = () => {
return (
<>
<RouterTabs value={routerTab}>
<Tab value="settings" label={LL.SETTINGS_OF(LL.SECURITY(1))} />
<Tab value="users" label={LL.MANAGE_USERS()} />
<Tab
value="/settings/security/settings"
label={LL.SETTINGS_OF(LL.SECURITY(1))}
/>
<Tab value="/settings/security/users" label={LL.MANAGE_USERS()} />
</RouterTabs>
<Routes>
<Route path="users" element={<ManageUsers />} />

204
interface/yarn.lock
View File

@@ -5,21 +5,21 @@ __metadata:
version: 8
cacheKey: 10c0
"@alova/adapter-xhr@npm:2.0.10":
version: 2.0.10
resolution: "@alova/adapter-xhr@npm:2.0.10"
"@alova/adapter-xhr@npm:2.0.11":
version: 2.0.11
resolution: "@alova/adapter-xhr@npm:2.0.11"
dependencies:
"@alova/shared": "npm:1.1.0"
"@alova/shared": "npm:1.1.1"
peerDependencies:
alova: ^3.0.20
checksum: 10c0/d277ab0cc5b6468585529a4e121610260cefbda37f80570578f35a3615f85432f9ba9b97859b7557d9640d340bfa7841a449806576f8334470df5b471aa391fa
checksum: 10c0/798dd0794c30750f59859de684744f71705d25cbd97bf7f159fa024f8a729c94aff2050c3f3a3019466b9b964ea56241d1cfb6b0ea1f1b15ece37503f074ddd6
languageName: node
linkType: hard
"@alova/shared@npm:1.1.0":
version: 1.1.0
resolution: "@alova/shared@npm:1.1.0"
checksum: 10c0/ec7c3eae893644354fea737a63abe14c4334bd7f6337b102c8ed8049459eeb12e52a98b5f846adaf314d31230ef631a994dc4c9c6e15ef569fa7a6c6ee7b9568
"@alova/shared@npm:1.1.1":
version: 1.1.1
resolution: "@alova/shared@npm:1.1.1"
checksum: 10c0/98aa4bb9d917532aabdf0c2e32fdd8b3708c8e5635a822ce87cff4b1617e8c282cf301c0ef73a352d16a3da9960446a94dea2b585ea805f5d7a92bb3a1e2af4b
languageName: node
linkType: hard
@@ -713,10 +713,10 @@ __metadata:
languageName: node
linkType: hard
"@eslint/js@npm:9.15.0, @eslint/js@npm:^9.15.0":
version: 9.15.0
resolution: "@eslint/js@npm:9.15.0"
checksum: 10c0/56552966ab1aa95332f70d0e006db5746b511c5f8b5e0c6a9b2d6764ff6d964e0b2622731877cbc4e3f0e74c5b39191290d5f48147be19175292575130d499ab
"@eslint/js@npm:9.16.0, @eslint/js@npm:^9.16.0":
version: 9.16.0
resolution: "@eslint/js@npm:9.16.0"
checksum: 10c0/a55846a4ddade720662d36682f3eaaf38eac06eeee12c83bb837bba2b7d550dadcb3445b104219f0bc1da2e09b4fe5fb5ba123b8338c8c787bcfbd540878df75
languageName: node
linkType: hard
@@ -1143,128 +1143,128 @@ __metadata:
languageName: node
linkType: hard
"@rollup/rollup-android-arm-eabi@npm:4.27.4":
version: 4.27.4
resolution: "@rollup/rollup-android-arm-eabi@npm:4.27.4"
"@rollup/rollup-android-arm-eabi@npm:4.28.0":
version: 4.28.0
resolution: "@rollup/rollup-android-arm-eabi@npm:4.28.0"
conditions: os=android & cpu=arm
languageName: node
linkType: hard
"@rollup/rollup-android-arm64@npm:4.27.4":
version: 4.27.4
resolution: "@rollup/rollup-android-arm64@npm:4.27.4"
"@rollup/rollup-android-arm64@npm:4.28.0":
version: 4.28.0
resolution: "@rollup/rollup-android-arm64@npm:4.28.0"
conditions: os=android & cpu=arm64
languageName: node
linkType: hard
"@rollup/rollup-darwin-arm64@npm:4.27.4":
version: 4.27.4
resolution: "@rollup/rollup-darwin-arm64@npm:4.27.4"
"@rollup/rollup-darwin-arm64@npm:4.28.0":
version: 4.28.0
resolution: "@rollup/rollup-darwin-arm64@npm:4.28.0"
conditions: os=darwin & cpu=arm64
languageName: node
linkType: hard
"@rollup/rollup-darwin-x64@npm:4.27.4":
version: 4.27.4
resolution: "@rollup/rollup-darwin-x64@npm:4.27.4"
"@rollup/rollup-darwin-x64@npm:4.28.0":
version: 4.28.0
resolution: "@rollup/rollup-darwin-x64@npm:4.28.0"
conditions: os=darwin & cpu=x64
languageName: node
linkType: hard
"@rollup/rollup-freebsd-arm64@npm:4.27.4":
version: 4.27.4
resolution: "@rollup/rollup-freebsd-arm64@npm:4.27.4"
"@rollup/rollup-freebsd-arm64@npm:4.28.0":
version: 4.28.0
resolution: "@rollup/rollup-freebsd-arm64@npm:4.28.0"
conditions: os=freebsd & cpu=arm64
languageName: node
linkType: hard
"@rollup/rollup-freebsd-x64@npm:4.27.4":
version: 4.27.4
resolution: "@rollup/rollup-freebsd-x64@npm:4.27.4"
"@rollup/rollup-freebsd-x64@npm:4.28.0":
version: 4.28.0
resolution: "@rollup/rollup-freebsd-x64@npm:4.28.0"
conditions: os=freebsd & cpu=x64
languageName: node
linkType: hard
"@rollup/rollup-linux-arm-gnueabihf@npm:4.27.4":
version: 4.27.4
resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.27.4"
"@rollup/rollup-linux-arm-gnueabihf@npm:4.28.0":
version: 4.28.0
resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.28.0"
conditions: os=linux & cpu=arm & libc=glibc
languageName: node
linkType: hard
"@rollup/rollup-linux-arm-musleabihf@npm:4.27.4":
version: 4.27.4
resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.27.4"
"@rollup/rollup-linux-arm-musleabihf@npm:4.28.0":
version: 4.28.0
resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.28.0"
conditions: os=linux & cpu=arm & libc=musl
languageName: node
linkType: hard
"@rollup/rollup-linux-arm64-gnu@npm:4.27.4":
version: 4.27.4
resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.27.4"
"@rollup/rollup-linux-arm64-gnu@npm:4.28.0":
version: 4.28.0
resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.28.0"
conditions: os=linux & cpu=arm64 & libc=glibc
languageName: node
linkType: hard
"@rollup/rollup-linux-arm64-musl@npm:4.27.4":
version: 4.27.4
resolution: "@rollup/rollup-linux-arm64-musl@npm:4.27.4"
"@rollup/rollup-linux-arm64-musl@npm:4.28.0":
version: 4.28.0
resolution: "@rollup/rollup-linux-arm64-musl@npm:4.28.0"
conditions: os=linux & cpu=arm64 & libc=musl
languageName: node
linkType: hard
"@rollup/rollup-linux-powerpc64le-gnu@npm:4.27.4":
version: 4.27.4
resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.27.4"
"@rollup/rollup-linux-powerpc64le-gnu@npm:4.28.0":
version: 4.28.0
resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.28.0"
conditions: os=linux & cpu=ppc64 & libc=glibc
languageName: node
linkType: hard
"@rollup/rollup-linux-riscv64-gnu@npm:4.27.4":
version: 4.27.4
resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.27.4"
"@rollup/rollup-linux-riscv64-gnu@npm:4.28.0":
version: 4.28.0
resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.28.0"
conditions: os=linux & cpu=riscv64 & libc=glibc
languageName: node
linkType: hard
"@rollup/rollup-linux-s390x-gnu@npm:4.27.4":
version: 4.27.4
resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.27.4"
"@rollup/rollup-linux-s390x-gnu@npm:4.28.0":
version: 4.28.0
resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.28.0"
conditions: os=linux & cpu=s390x & libc=glibc
languageName: node
linkType: hard
"@rollup/rollup-linux-x64-gnu@npm:4.27.4":
version: 4.27.4
resolution: "@rollup/rollup-linux-x64-gnu@npm:4.27.4"
"@rollup/rollup-linux-x64-gnu@npm:4.28.0":
version: 4.28.0
resolution: "@rollup/rollup-linux-x64-gnu@npm:4.28.0"
conditions: os=linux & cpu=x64 & libc=glibc
languageName: node
linkType: hard
"@rollup/rollup-linux-x64-musl@npm:4.27.4":
version: 4.27.4
resolution: "@rollup/rollup-linux-x64-musl@npm:4.27.4"
"@rollup/rollup-linux-x64-musl@npm:4.28.0":
version: 4.28.0
resolution: "@rollup/rollup-linux-x64-musl@npm:4.28.0"
conditions: os=linux & cpu=x64 & libc=musl
languageName: node
linkType: hard
"@rollup/rollup-win32-arm64-msvc@npm:4.27.4":
version: 4.27.4
resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.27.4"
"@rollup/rollup-win32-arm64-msvc@npm:4.28.0":
version: 4.28.0
resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.28.0"
conditions: os=win32 & cpu=arm64
languageName: node
linkType: hard
"@rollup/rollup-win32-ia32-msvc@npm:4.27.4":
version: 4.27.4
resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.27.4"
"@rollup/rollup-win32-ia32-msvc@npm:4.28.0":
version: 4.28.0
resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.28.0"
conditions: os=win32 & cpu=ia32
languageName: node
linkType: hard
"@rollup/rollup-win32-x64-msvc@npm:4.27.4":
version: 4.27.4
resolution: "@rollup/rollup-win32-x64-msvc@npm:4.27.4"
"@rollup/rollup-win32-x64-msvc@npm:4.28.0":
version: 4.28.0
resolution: "@rollup/rollup-win32-x64-msvc@npm:4.28.0"
conditions: os=win32 & cpu=x64
languageName: node
linkType: hard
@@ -1641,11 +1641,11 @@ __metadata:
version: 0.0.0-use.local
resolution: "EMS-ESP@workspace:."
dependencies:
"@alova/adapter-xhr": "npm:2.0.10"
"@alova/adapter-xhr": "npm:2.0.11"
"@babel/core": "npm:^7.26.0"
"@emotion/react": "npm:^11.13.5"
"@emotion/styled": "npm:^11.13.5"
"@eslint/js": "npm:^9.15.0"
"@eslint/js": "npm:^9.16.0"
"@mui/icons-material": "npm:^6.1.9"
"@mui/material": "npm:^6.1.9"
"@preact/compat": "npm:^18.3.1"
@@ -1656,10 +1656,10 @@ __metadata:
"@types/node": "npm:^22.10.1"
"@types/react": "npm:^18.3.12"
"@types/react-dom": "npm:^18.3.1"
alova: "npm:3.2.5"
alova: "npm:3.2.6"
async-validator: "npm:^4.2.5"
concurrently: "npm:^9.1.0"
eslint: "npm:^9.15.0"
eslint: "npm:^9.16.0"
eslint-config-prettier: "npm:^9.1.0"
formidable: "npm:^3.5.2"
jwt-decode: "npm:^4.0.0"
@@ -1738,13 +1738,13 @@ __metadata:
languageName: node
linkType: hard
"alova@npm:3.2.5":
version: 3.2.5
resolution: "alova@npm:3.2.5"
"alova@npm:3.2.6":
version: 3.2.6
resolution: "alova@npm:3.2.6"
dependencies:
"@alova/shared": "npm:1.1.0"
"@alova/shared": "npm:1.1.1"
rate-limiter-flexible: "npm:^5.0.3"
checksum: 10c0/9c928fca4187fac4b0cabc148355c003c6d706c2fd8294e2877ee500bccfeff7ef0abb4e8b22245f482b7cb4050e2c4219d5ef7e1b3ef9bf2c06c054b820ad58
checksum: 10c0/d9915f999d1678d190a7e0a39afcefcfd96d8788a0503a6ee34fe44979280fe1cdc45d060b13d6531323c3e02accc6ebb50f071064da4ec01744c67d99ab1d66
languageName: node
linkType: hard
@@ -3120,16 +3120,16 @@ __metadata:
languageName: node
linkType: hard
"eslint@npm:^9.15.0":
version: 9.15.0
resolution: "eslint@npm:9.15.0"
"eslint@npm:^9.16.0":
version: 9.16.0
resolution: "eslint@npm:9.16.0"
dependencies:
"@eslint-community/eslint-utils": "npm:^4.2.0"
"@eslint-community/regexpp": "npm:^4.12.1"
"@eslint/config-array": "npm:^0.19.0"
"@eslint/core": "npm:^0.9.0"
"@eslint/eslintrc": "npm:^3.2.0"
"@eslint/js": "npm:9.15.0"
"@eslint/js": "npm:9.16.0"
"@eslint/plugin-kit": "npm:^0.2.3"
"@humanfs/node": "npm:^0.16.6"
"@humanwhocodes/module-importer": "npm:^1.0.1"
@@ -3165,7 +3165,7 @@ __metadata:
optional: true
bin:
eslint: bin/eslint.js
checksum: 10c0/d0d7606f36bfcccb1c3703d0a24df32067b207a616f17efe5fb1765a91d13f085afffc4fc97ecde4ab9c9f4edd64d9b4ce750e13ff7937a25074b24bee15b20f
checksum: 10c0/f36d12652c6f20bab8a77375b8ad29a6af030c3840deb0a5f9dd4cee49d68a2d68d7dc73b0c25918df59d83cd686dd5712e11387e696e1f3842e8dde15cd3255
languageName: node
linkType: hard
@@ -5953,27 +5953,27 @@ __metadata:
linkType: hard
"rollup@npm:^4.23.0":
version: 4.27.4
resolution: "rollup@npm:4.27.4"
version: 4.28.0
resolution: "rollup@npm:4.28.0"
dependencies:
"@rollup/rollup-android-arm-eabi": "npm:4.27.4"
"@rollup/rollup-android-arm64": "npm:4.27.4"
"@rollup/rollup-darwin-arm64": "npm:4.27.4"
"@rollup/rollup-darwin-x64": "npm:4.27.4"
"@rollup/rollup-freebsd-arm64": "npm:4.27.4"
"@rollup/rollup-freebsd-x64": "npm:4.27.4"
"@rollup/rollup-linux-arm-gnueabihf": "npm:4.27.4"
"@rollup/rollup-linux-arm-musleabihf": "npm:4.27.4"
"@rollup/rollup-linux-arm64-gnu": "npm:4.27.4"
"@rollup/rollup-linux-arm64-musl": "npm:4.27.4"
"@rollup/rollup-linux-powerpc64le-gnu": "npm:4.27.4"
"@rollup/rollup-linux-riscv64-gnu": "npm:4.27.4"
"@rollup/rollup-linux-s390x-gnu": "npm:4.27.4"
"@rollup/rollup-linux-x64-gnu": "npm:4.27.4"
"@rollup/rollup-linux-x64-musl": "npm:4.27.4"
"@rollup/rollup-win32-arm64-msvc": "npm:4.27.4"
"@rollup/rollup-win32-ia32-msvc": "npm:4.27.4"
"@rollup/rollup-win32-x64-msvc": "npm:4.27.4"
"@rollup/rollup-android-arm-eabi": "npm:4.28.0"
"@rollup/rollup-android-arm64": "npm:4.28.0"
"@rollup/rollup-darwin-arm64": "npm:4.28.0"
"@rollup/rollup-darwin-x64": "npm:4.28.0"
"@rollup/rollup-freebsd-arm64": "npm:4.28.0"
"@rollup/rollup-freebsd-x64": "npm:4.28.0"
"@rollup/rollup-linux-arm-gnueabihf": "npm:4.28.0"
"@rollup/rollup-linux-arm-musleabihf": "npm:4.28.0"
"@rollup/rollup-linux-arm64-gnu": "npm:4.28.0"
"@rollup/rollup-linux-arm64-musl": "npm:4.28.0"
"@rollup/rollup-linux-powerpc64le-gnu": "npm:4.28.0"
"@rollup/rollup-linux-riscv64-gnu": "npm:4.28.0"
"@rollup/rollup-linux-s390x-gnu": "npm:4.28.0"
"@rollup/rollup-linux-x64-gnu": "npm:4.28.0"
"@rollup/rollup-linux-x64-musl": "npm:4.28.0"
"@rollup/rollup-win32-arm64-msvc": "npm:4.28.0"
"@rollup/rollup-win32-ia32-msvc": "npm:4.28.0"
"@rollup/rollup-win32-x64-msvc": "npm:4.28.0"
"@types/estree": "npm:1.0.6"
fsevents: "npm:~2.3.2"
dependenciesMeta:
@@ -6017,7 +6017,7 @@ __metadata:
optional: true
bin:
rollup: dist/bin/rollup
checksum: 10c0/1442650cfea5e4617ce14743784f6f578817e31db56f9c8aaf96a82daa9bc20b6ccd66c0d677dbf302a4da3e70664dc3bef11a1aec85e6aff3cecccb945b1d35
checksum: 10c0/98d3bc2b784eff71b997cfc2be97c00e2f100ee38adc2f8ada7b9b9ecbbc96937f667a6a247a45491807b3f2adef3c73d1f5df40d71771bff0c2d8c0cca9b369
languageName: node
linkType: hard

2
src/version.h
View File

@@ -1 +1 @@
#define EMSESP_APP_VERSION "3.7.2-dev.0"
#define EMSESP_APP_VERSION "3.7.2-dev.1"