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

Merge pull request #2430 from proddy/dev

Browse Source 
#2427 links open in new window
This commit is contained in:
Proddy
2025-02-26 21:00:39 +01:00
committed by GitHub
parent 1cb078cd3c bfd5082054
commit cefbf2d4d6
3 changed files with 67 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
interface/package.json
View File

@@ -24,8 +24,8 @@
"@alova/adapter-xhr": "2.1.1", "@alova/adapter-xhr": "2.1.1",
"@emotion/react": "^11.14.0", "@emotion/react": "^11.14.0",
"@emotion/styled": "^11.14.0", "@emotion/styled": "^11.14.0",
"@mui/icons-material": "^6.4.5", "@mui/icons-material": "^6.4.6",
"@mui/material": "^6.4.5", "@mui/material": "^6.4.6",
"@table-library/react-table-library": "4.1.12", "@table-library/react-table-library": "4.1.12",
"alova": "3.2.8", "alova": "3.2.8",
"async-validator": "^4.2.5", "async-validator": "^4.2.5",
@@ -52,7 +52,7 @@
"@types/react-dom": "^19.0.4", "@types/react-dom": "^19.0.4",
"concurrently": "^9.1.2", "concurrently": "^9.1.2",
"eslint": "^9.21.0", "eslint": "^9.21.0",
"eslint-config-prettier": "^10.0.1", "eslint-config-prettier": "^10.0.2",
"formidable": "^3.5.2", "formidable": "^3.5.2",
"prettier": "^3.5.2", "prettier": "^3.5.2",
"rollup-plugin-visualizer": "^5.14.0", "rollup-plugin-visualizer": "^5.14.0",

23
interface/src/app/main/Help.tsx
View File

@@ -100,7 +100,12 @@ const Help = () => {
{me.admin && ( {me.admin && (
<List sx={{ borderRadius: 3, border: '2px solid grey' }}> <List sx={{ borderRadius: 3, border: '2px solid grey' }}>
<ListItem> <ListItem>
<ListItemButton component="a" href="https://docs.emsesp.org"> <ListItemButton
component="a"
target="_blank"
rel="noreferrer"
href="https://docs.emsesp.org"
>
<ListItemAvatar> <ListItemAvatar>
<Avatar sx={{ bgcolor: '#72caf9' }}> <Avatar sx={{ bgcolor: '#72caf9' }}>
<MenuBookIcon /> <MenuBookIcon />
@@ -111,7 +116,12 @@ const Help = () => {
</ListItem> </ListItem>
<ListItem> <ListItem>
<ListItemButton component="a" href="https://discord.gg/3J3GgnzpyT"> <ListItemButton
component="a"
target="_blank"
rel="noreferrer"
href="https://discord.gg/3J3GgnzpyT"
>
<ListItemAvatar> <ListItemAvatar>
<Avatar sx={{ bgcolor: '#72caf9' }}> <Avatar sx={{ bgcolor: '#72caf9' }}>
<CommentIcon /> <CommentIcon />
@@ -124,6 +134,8 @@ const Help = () => {
<ListItem> <ListItem>
<ListItemButton <ListItemButton
component="a" component="a"
target="_blank"
rel="noreferrer"
href="https://github.com/emsesp/EMS-ESP32/issues/new/choose" href="https://github.com/emsesp/EMS-ESP32/issues/new/choose"
> >
<ListItemAvatar> <ListItemAvatar>
@@ -155,7 +167,12 @@ const Help = () => {
<Typography color="white" variant="subtitle1" align="center" mt={1}> <Typography color="white" variant="subtitle1" align="center" mt={1}>
&copy;&nbsp; &copy;&nbsp;
<Link target="_blank" href="https://emsesp.org" color="primary"> <Link
target="_blank"
rel="noreferrer"
href="https://emsesp.org"
color="primary"
>
{'emsesp.org'} {'emsesp.org'}
</Link> </Link>
</Typography> </Typography>

88
interface/yarn.lock
View File

@@ -783,38 +783,38 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/core-downloads-tracker@npm:^6.4.5": "@mui/core-downloads-tracker@npm:^6.4.6":
version: 6.4.5 version: 6.4.6
resolution: "@mui/core-downloads-tracker@npm:6.4.5" resolution: "@mui/core-downloads-tracker@npm:6.4.6"
checksum: 10c0/a236ed0f6b656cb06a4ea5d57c91d95434bbb9233132951b6fce955f1d7a90d46b399b7abbd45a616641f57ab8531f262a01576cfea114ba456281bda281d3a9 checksum: 10c0/8b696639c7e803f264080b7b35fb266ffc9442877edd3a25ef48b0b78986f717720bd20e034877078f123a23d63bc2e1489693f0438722201d68db4bd0cf438a
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/icons-material@npm:^6.4.5": "@mui/icons-material@npm:^6.4.6":
version: 6.4.5 version: 6.4.6
resolution: "@mui/icons-material@npm:6.4.5" resolution: "@mui/icons-material@npm:6.4.6"
dependencies: dependencies:
"@babel/runtime": "npm:^7.26.0" "@babel/runtime": "npm:^7.26.0"
peerDependencies: peerDependencies:
"@mui/material": ^6.4.5 "@mui/material": ^6.4.6
"@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0 "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
react: ^17.0.0 || ^18.0.0 || ^19.0.0 react: ^17.0.0 || ^18.0.0 || ^19.0.0
peerDependenciesMeta: peerDependenciesMeta:
"@types/react": "@types/react":
optional: true optional: true
checksum: 10c0/1b539b1e1d1cad9a1d5709b2ce03913cd8b75803e3f1f31631ac7eb022f159b96e3a03ceeba10d5dbf7fd079513655c3122a1247d11d56410428af0427bf68ce checksum: 10c0/a49cb504e12c10a852b4ebf67187b716ec41861d51d1dff3c7c0d6c3307b7ffca1f180fb512b1913361599655b6361c5ad1c2a98db61a2a45bedaa4ee6a1fb11
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/material@npm:^6.4.5": "@mui/material@npm:^6.4.6":
version: 6.4.5 version: 6.4.6
resolution: "@mui/material@npm:6.4.5" resolution: "@mui/material@npm:6.4.6"
dependencies: dependencies:
"@babel/runtime": "npm:^7.26.0" "@babel/runtime": "npm:^7.26.0"
"@mui/core-downloads-tracker": "npm:^6.4.5" "@mui/core-downloads-tracker": "npm:^6.4.6"
"@mui/system": "npm:^6.4.3" "@mui/system": "npm:^6.4.6"
"@mui/types": "npm:^7.2.21" "@mui/types": "npm:^7.2.21"
"@mui/utils": "npm:^6.4.3" "@mui/utils": "npm:^6.4.6"
"@popperjs/core": "npm:^2.11.8" "@popperjs/core": "npm:^2.11.8"
"@types/react-transition-group": "npm:^4.4.12" "@types/react-transition-group": "npm:^4.4.12"
clsx: "npm:^2.1.1" clsx: "npm:^2.1.1"
@@ -825,7 +825,7 @@ __metadata:
peerDependencies: peerDependencies:
"@emotion/react": ^11.5.0 "@emotion/react": ^11.5.0
"@emotion/styled": ^11.3.0 "@emotion/styled": ^11.3.0
"@mui/material-pigment-css": ^6.4.3 "@mui/material-pigment-css": ^6.4.6
"@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0 "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
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 react-dom: ^17.0.0 || ^18.0.0 || ^19.0.0
@@ -838,16 +838,16 @@ __metadata:
optional: true optional: true
"@types/react": "@types/react":
optional: true optional: true
checksum: 10c0/afbbcd9161d8329cf7563d57cb87e4ffe9e3ba481cea7438138a5a8cf0c925c3ede4c135bf9663eb802d88885034caf3054be92127b46a7833efac037ce9e3b0 checksum: 10c0/62658532b2217a3ddbec8e90b302720a57a848bc2395f974d0119f65a31169499ba85a2d1a4037a843b4a1b50e8e5adc1705a47e82dac5e681cdd9e0a542571a
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/private-theming@npm:^6.4.3": "@mui/private-theming@npm:^6.4.6":
version: 6.4.3 version: 6.4.6
resolution: "@mui/private-theming@npm:6.4.3" resolution: "@mui/private-theming@npm:6.4.6"
dependencies: dependencies:
"@babel/runtime": "npm:^7.26.0" "@babel/runtime": "npm:^7.26.0"
"@mui/utils": "npm:^6.4.3" "@mui/utils": "npm:^6.4.6"
prop-types: "npm:^15.8.1" prop-types: "npm:^15.8.1"
peerDependencies: peerDependencies:
"@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0 "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
@@ -855,13 +855,13 @@ __metadata:
peerDependenciesMeta: peerDependenciesMeta:
"@types/react": "@types/react":
optional: true optional: true
checksum: 10c0/f1f6afede4917eb04f007b0c2ff52536b5e7561259812663eb77bfd059dd41eb7f85ae80e1229ebde0d134f428241bbd91185053c6e06e70a32bdfb983981a2a checksum: 10c0/f8b3fdfd26e75b02e87374dae3bf9b2ecca0e60f35e9987c4b5138fba262f0845cba3a0ad3f0bc36db23ee07fd1e1ff2f928b4b5d6450cb060ffec07381a4bae
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/styled-engine@npm:^6.4.3": "@mui/styled-engine@npm:^6.4.6":
version: 6.4.3 version: 6.4.6
resolution: "@mui/styled-engine@npm:6.4.3" resolution: "@mui/styled-engine@npm:6.4.6"
dependencies: dependencies:
"@babel/runtime": "npm:^7.26.0" "@babel/runtime": "npm:^7.26.0"
"@emotion/cache": "npm:^11.13.5" "@emotion/cache": "npm:^11.13.5"
@@ -878,19 +878,19 @@ __metadata:
optional: true optional: true
"@emotion/styled": "@emotion/styled":
optional: true optional: true
checksum: 10c0/7968beec5878fbed0e22d04595bf9e05007d67fbf5c69aed1095e7bef2207ddab72331ef683be2ad61bb5a59aeaca16464d86621d4da43c87c1c8cf4c8db8cdb checksum: 10c0/a354d850f31de2fac342d5eba1865f2c6817d8bfbc44e102fc814dd1c0cb71d0033b3f664a018237bd85256b0eb53212210e095c1c15da39fac688e5200a65fc
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/system@npm:^6.4.3": "@mui/system@npm:^6.4.6":
version: 6.4.3 version: 6.4.6
resolution: "@mui/system@npm:6.4.3" resolution: "@mui/system@npm:6.4.6"
dependencies: dependencies:
"@babel/runtime": "npm:^7.26.0" "@babel/runtime": "npm:^7.26.0"
"@mui/private-theming": "npm:^6.4.3" "@mui/private-theming": "npm:^6.4.6"
"@mui/styled-engine": "npm:^6.4.3" "@mui/styled-engine": "npm:^6.4.6"
"@mui/types": "npm:^7.2.21" "@mui/types": "npm:^7.2.21"
"@mui/utils": "npm:^6.4.3" "@mui/utils": "npm:^6.4.6"
clsx: "npm:^2.1.1" clsx: "npm:^2.1.1"
csstype: "npm:^3.1.3" csstype: "npm:^3.1.3"
prop-types: "npm:^15.8.1" prop-types: "npm:^15.8.1"
@@ -906,7 +906,7 @@ __metadata:
optional: true optional: true
"@types/react": "@types/react":
optional: true optional: true
checksum: 10c0/e5bf5255672b21253390adfc843fa764d3e98e530dfe51b770ea6fba880a8b8c8b153d616f9b54828c99bbdb0f25911c2fc70e557434621d1eaa767de78aff1f checksum: 10c0/014deda953d252b9244ac759b7644472c5eda2eb2bfd8460f9e1f727e375ec4043db7bbc6def11fcd5a7074966edd7f9453c2aef5a06251a40f8621b51289231
languageName: node languageName: node
linkType: hard linkType: hard
@@ -922,9 +922,9 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/utils@npm:^6.4.3": "@mui/utils@npm:^6.4.6":
version: 6.4.3 version: 6.4.6
resolution: "@mui/utils@npm:6.4.3" resolution: "@mui/utils@npm:6.4.6"
dependencies: dependencies:
"@babel/runtime": "npm:^7.26.0" "@babel/runtime": "npm:^7.26.0"
"@mui/types": "npm:^7.2.21" "@mui/types": "npm:^7.2.21"
@@ -938,7 +938,7 @@ __metadata:
peerDependenciesMeta: peerDependenciesMeta:
"@types/react": "@types/react":
optional: true optional: true
checksum: 10c0/bf199e61bd5d92469b954dd74471db3d27bd6fe43fd13a306056f6cdeb60f5bb1fe1e9ffc4a99e56785c8f56928951e098f340d79aeaf2b3a91041ae8154f934 checksum: 10c0/1de7d6d42b9d9453e1e48013d97f212dc02379f607e72ab6505d284bb786dfeb02b4787f5ebf4aa4b077c2184740b964dcb8f91a96c3bc7c68cc31834ad34c42
languageName: node languageName: node
linkType: hard linkType: hard
@@ -1588,8 +1588,8 @@ __metadata:
"@emotion/react": "npm:^11.14.0" "@emotion/react": "npm:^11.14.0"
"@emotion/styled": "npm:^11.14.0" "@emotion/styled": "npm:^11.14.0"
"@eslint/js": "npm:^9.21.0" "@eslint/js": "npm:^9.21.0"
"@mui/icons-material": "npm:^6.4.5" "@mui/icons-material": "npm:^6.4.6"
"@mui/material": "npm:^6.4.5" "@mui/material": "npm:^6.4.6"
"@preact/compat": "npm:^18.3.1" "@preact/compat": "npm:^18.3.1"
"@preact/preset-vite": "npm:^2.10.1" "@preact/preset-vite": "npm:^2.10.1"
"@table-library/react-table-library": "npm:4.1.12" "@table-library/react-table-library": "npm:4.1.12"
@@ -1602,7 +1602,7 @@ __metadata:
async-validator: "npm:^4.2.5" async-validator: "npm:^4.2.5"
concurrently: "npm:^9.1.2" concurrently: "npm:^9.1.2"
eslint: "npm:^9.21.0" eslint: "npm:^9.21.0"
eslint-config-prettier: "npm:^10.0.1" eslint-config-prettier: "npm:^10.0.2"
formidable: "npm:^3.5.2" formidable: "npm:^3.5.2"
jwt-decode: "npm:^4.0.0" jwt-decode: "npm:^4.0.0"
mime-types: "npm:^2.1.35" mime-types: "npm:^2.1.35"
@@ -3011,14 +3011,14 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"eslint-config-prettier@npm:^10.0.1": "eslint-config-prettier@npm:^10.0.2":
version: 10.0.1 version: 10.0.2
resolution: "eslint-config-prettier@npm:10.0.1" resolution: "eslint-config-prettier@npm:10.0.2"
peerDependencies: peerDependencies:
eslint: ">=7.0.0" eslint: ">=7.0.0"
bin: bin:
eslint-config-prettier: build/bin/cli.js eslint-config-prettier: build/bin/cli.js
checksum: 10c0/e2434931669d211663c0493f2c1640a670a02ba4503a68f056a7eda133f383acbbb983a4a7bd0ad6cb3b2bc4d5731c3be8b32fe28e35087a76fea45f7061ae70 checksum: 10c0/e0ef3c442661a26fc6e82acec5bb9a418c4a8f65ec8adf0983d3aaba7716d2ed448358b063cce6e3c272c847d14cb856ddf30031770c6571e2b2c3e2a439afd4
languageName: node languageName: node
linkType: hard linkType: hard