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 pull request #1847 from proddy/dev

Browse Source 
minor updates
This commit is contained in:
Proddy
2024-07-06 12:40:38 +02:00
committed by GitHub
parent af07572b1c 7f0cbe7226
commit dec7e2ec68
9 changed files with 140 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
interface/eslint.config.js
View File

@@ -16,7 +16,7 @@ export default tseslint.config(
} }
}, },
{ {
ignores: ['dist/*', '*.js', '**/*.cjs', '**/unpack.ts'] ignores: ['dist/*', '*.js', '**/*.cjs', '**/unpack.ts', 'i18*.ts']
}, },
{ {
rules: { rules: {

8
interface/package.json
View File

@@ -26,11 +26,11 @@
"@alova/scene-react": "^1.6.1", "@alova/scene-react": "^1.6.1",
"@emotion/react": "^11.11.4", "@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.5", "@emotion/styled": "^11.11.5",
"@mui/icons-material": "^5.15.21", "@mui/icons-material": "^5.16.0",
"@mui/material": "^5.15.21", "@mui/material": "^5.16.0",
"@table-library/react-table-library": "4.1.7", "@table-library/react-table-library": "4.1.7",
"@types/lodash-es": "^4.17.12", "@types/lodash-es": "^4.17.12",
"@types/node": "^20.14.9", "@types/node": "^20.14.10",
"@types/react": "^18.3.3", "@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0", "@types/react-dom": "^18.3.0",
"@types/react-router-dom": "^5.3.3", "@types/react-router-dom": "^5.3.3",
@@ -63,7 +63,7 @@
"prettier": "^3.3.2", "prettier": "^3.3.2",
"rollup-plugin-visualizer": "^5.12.0", "rollup-plugin-visualizer": "^5.12.0",
"terser": "^5.31.1", "terser": "^5.31.1",
"typescript-eslint": "^7.15.0", "typescript-eslint": "8.0.0-alpha.10",
"vite": "^5.3.3", "vite": "^5.3.3",
"vite-plugin-imagemin": "^0.6.1", "vite-plugin-imagemin": "^0.6.1",
"vite-tsconfig-paths": "^4.3.2" "vite-tsconfig-paths": "^4.3.2"

2
interface/src/contexts/authentication/Authentication.tsx
View File

@@ -33,7 +33,7 @@ const Authentication: FC<RequiredChildrenProps> = ({ children }) => {
const decodedMe = AuthenticationApi.decodeMeJWT(accessToken); const decodedMe = AuthenticationApi.decodeMeJWT(accessToken);
setMe(decodedMe); setMe(decodedMe);
toast.success(LL.LOGGED_IN({ name: decodedMe.username })); toast.success(LL.LOGGED_IN({ name: decodedMe.username }));
} catch (error) { } catch {
setMe(undefined); setMe(undefined);
throw new Error('Failed to parse JWT'); throw new Error('Failed to parse JWT');
} }

2
interface/src/framework/system/RestartMonitor.tsx
View File

@@ -21,7 +21,7 @@ const RestartMonitor: FC = () => {
try { try {
await send(); await send();
document.location.href = '/'; document.location.href = '/';
} catch (error) { } catch {
if (new Date().getTime() < timeoutAt.current) { if (new Date().getTime() < timeoutAt.current) {
setTimeoutId(setTimeout(poll.current, POLL_INTERVAL)); setTimeoutId(setTimeout(poll.current, POLL_INTERVAL));
} else { } else {

18
interface/src/framework/system/SystemStatus.tsx
View File

@@ -284,15 +284,6 @@ const SystemStatus: FC = () => {
> >
{LL.CANCEL()} {LL.CANCEL()}
</Button> </Button>
<Button
startIcon={<PowerSettingsNewIcon />}
variant="outlined"
onClick={restart}
disabled={processing}
color="error"
>
{LL.RESTART()}
</Button>
<Button <Button
startIcon={<PowerSettingsNewIcon />} startIcon={<PowerSettingsNewIcon />}
variant="outlined" variant="outlined"
@@ -302,6 +293,15 @@ const SystemStatus: FC = () => {
> >
EMS-ESP Loader EMS-ESP Loader
</Button> </Button>
<Button
startIcon={<PowerSettingsNewIcon />}
variant="outlined"
onClick={restart}
disabled={processing}
color="error"
>
{LL.RESTART()}
</Button>
</DialogActions> </DialogActions>
</Dialog> </Dialog>
); );

219
interface/yarn.lock
View File

@@ -1099,16 +1099,16 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/core-downloads-tracker@npm:^5.15.21": "@mui/core-downloads-tracker@npm:^5.16.0":
version: 5.15.21 version: 5.16.0
resolution: "@mui/core-downloads-tracker@npm:5.15.21" resolution: "@mui/core-downloads-tracker@npm:5.16.0"
checksum: 10c0/986d03f08253c839f142f15d2ec8f0b889eb802cdd0306e6fbc678b50689d42334bb8e1d85ca46fa7ff5c69a76657a91830e672059341dc7c1fd74b1cd134481 checksum: 10c0/ed2c7e4e87637435d138026837436527934cd9c4c340721859f2f24d21d63e922231beb3b916070d549e2e6133310b2d3cca5b1d8bc1b8f88a10e6de913a363d
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/icons-material@npm:^5.15.21": "@mui/icons-material@npm:^5.16.0":
version: 5.15.21 version: 5.16.0
resolution: "@mui/icons-material@npm:5.15.21" resolution: "@mui/icons-material@npm:5.16.0"
dependencies: dependencies:
"@babel/runtime": "npm:^7.23.9" "@babel/runtime": "npm:^7.23.9"
peerDependencies: peerDependencies:
@@ -1118,20 +1118,20 @@ __metadata:
peerDependenciesMeta: peerDependenciesMeta:
"@types/react": "@types/react":
optional: true optional: true
checksum: 10c0/28685825504a24aa497715ec519014e780e570d00e8edc8f3423da2cb55b2aa2c44e829429efc9059d82542035e6f121d79a9f503cb6ae19439aca9e5321e959 checksum: 10c0/c4aa6ea2941efe6bf50f477657234a946579f0ee0592cacec03a6e2bacefef04af2073e43c06cb69b1372f1ffb89ff4e4fc75f909ed4c54a04974176562f52f0
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/material@npm:^5.15.21": "@mui/material@npm:^5.16.0":
version: 5.15.21 version: 5.16.0
resolution: "@mui/material@npm:5.15.21" resolution: "@mui/material@npm:5.16.0"
dependencies: dependencies:
"@babel/runtime": "npm:^7.23.9" "@babel/runtime": "npm:^7.23.9"
"@mui/base": "npm:5.0.0-beta.40" "@mui/base": "npm:5.0.0-beta.40"
"@mui/core-downloads-tracker": "npm:^5.15.21" "@mui/core-downloads-tracker": "npm:^5.16.0"
"@mui/system": "npm:^5.15.20" "@mui/system": "npm:^5.16.0"
"@mui/types": "npm:^7.2.14" "@mui/types": "npm:^7.2.14"
"@mui/utils": "npm:^5.15.20" "@mui/utils": "npm:^5.16.0"
"@types/react-transition-group": "npm:^4.4.10" "@types/react-transition-group": "npm:^4.4.10"
clsx: "npm:^2.1.0" clsx: "npm:^2.1.0"
csstype: "npm:^3.1.3" csstype: "npm:^3.1.3"
@@ -1151,16 +1151,16 @@ __metadata:
optional: true optional: true
"@types/react": "@types/react":
optional: true optional: true
checksum: 10c0/005f8ec036f0742e35c7cf6e3bd6280cd996b416bfdc6ee05ba625d1a62a41bbc077a5244b71eba01016fa0df2b1ba115ef7028c962eed1bdd98108fab024a6e checksum: 10c0/59a302ad3168a9768980f9bc8b18044876194ecebc51fd166ff002ad86df9c73f43409ed451916ed8cbbeb86447ec27b234c469f654d9d0313e36ef2d487a55a
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/private-theming@npm:^5.15.20": "@mui/private-theming@npm:^5.16.0":
version: 5.15.20 version: 5.16.0
resolution: "@mui/private-theming@npm:5.15.20" resolution: "@mui/private-theming@npm:5.16.0"
dependencies: dependencies:
"@babel/runtime": "npm:^7.23.9" "@babel/runtime": "npm:^7.23.9"
"@mui/utils": "npm:^5.15.20" "@mui/utils": "npm:^5.16.0"
prop-types: "npm:^15.8.1" prop-types: "npm:^15.8.1"
peerDependencies: peerDependencies:
"@types/react": ^17.0.0 || ^18.0.0 "@types/react": ^17.0.0 || ^18.0.0
@@ -1168,7 +1168,7 @@ __metadata:
peerDependenciesMeta: peerDependenciesMeta:
"@types/react": "@types/react":
optional: true optional: true
checksum: 10c0/d6707ef884769a58a9dac23328138cd2dbb3dbdcfbf46beae406638628a77b2975aaf787f863143ae97ea2d5f6eca8d0ff929f2159f3f9b58bcedb2e01c7bce6 checksum: 10c0/cd7c1888f45da3db701806a1d127010514815bb4acf502c3cf711e63d2307b18387bdc7a9f3815031210814b6a1fd977722e5cef2133e077e9bc2ac0bdb5504f
languageName: node languageName: node
linkType: hard linkType: hard
@@ -1193,15 +1193,15 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/system@npm:^5.15.20": "@mui/system@npm:^5.16.0":
version: 5.15.20 version: 5.16.0
resolution: "@mui/system@npm:5.15.20" resolution: "@mui/system@npm:5.16.0"
dependencies: dependencies:
"@babel/runtime": "npm:^7.23.9" "@babel/runtime": "npm:^7.23.9"
"@mui/private-theming": "npm:^5.15.20" "@mui/private-theming": "npm:^5.16.0"
"@mui/styled-engine": "npm:^5.15.14" "@mui/styled-engine": "npm:^5.15.14"
"@mui/types": "npm:^7.2.14" "@mui/types": "npm:^7.2.14"
"@mui/utils": "npm:^5.15.20" "@mui/utils": "npm:^5.16.0"
clsx: "npm:^2.1.0" clsx: "npm:^2.1.0"
csstype: "npm:^3.1.3" csstype: "npm:^3.1.3"
prop-types: "npm:^15.8.1" prop-types: "npm:^15.8.1"
@@ -1217,7 +1217,7 @@ __metadata:
optional: true optional: true
"@types/react": "@types/react":
optional: true optional: true
checksum: 10c0/7561d14d613e882cbe8959cbb779e6641542242e5a79974bad306c59c1505b5924cb2b866619b55d064aae1a1e8421dc3a613ad1a4cf330be7eebd1881170cff checksum: 10c0/b5db097ba432653eba723424264204d3037ab1cdb30acc63b2d2fbcb98bae8999cbfd7ffff54173593dc2a4771558177602f01377da6f4134e7017f93a3624bf
languageName: node languageName: node
linkType: hard linkType: hard
@@ -1251,9 +1251,9 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/utils@npm:^5.15.20": "@mui/utils@npm:^5.16.0":
version: 5.15.20 version: 5.16.0
resolution: "@mui/utils@npm:5.15.20" resolution: "@mui/utils@npm:5.16.0"
dependencies: dependencies:
"@babel/runtime": "npm:^7.23.9" "@babel/runtime": "npm:^7.23.9"
"@types/prop-types": "npm:^15.7.11" "@types/prop-types": "npm:^15.7.11"
@@ -1265,7 +1265,7 @@ __metadata:
peerDependenciesMeta: peerDependenciesMeta:
"@types/react": "@types/react":
optional: true optional: true
checksum: 10c0/d745895db047ef016681482f3d4710aa487f9e7bcd457ac2a395bdaf719a6a98f8bf5f1920d4729b0bc69f7ef2153624aa6a565ec0e31f76c33d7167397ac4d9 checksum: 10c0/0b56f9265a8ea686b50195448f1dea41c637d504c30da44c5f3f315bc81d24598f3b2acb281dd24d15831f7756dcaab285b7b891883bbec5809c54ef24affb49
languageName: node languageName: node
linkType: hard linkType: hard
@@ -1720,6 +1720,13 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@types/json-schema@npm:^7.0.15":
version: 7.0.15
resolution: "@types/json-schema@npm:7.0.15"
checksum: 10c0/a996a745e6c5d60292f36731dd41341339d4eeed8180bb09226e5c8d23759067692b1d88e5d91d72ee83dfc00d3aca8e7bd43ea120516c17922cbcb7c3e252db
languageName: node
linkType: hard
"@types/keyv@npm:^3.1.1": "@types/keyv@npm:^3.1.1":
version: 3.1.4 version: 3.1.4
resolution: "@types/keyv@npm:3.1.4" resolution: "@types/keyv@npm:3.1.4"
@@ -1761,12 +1768,12 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@types/node@npm:^20.14.9": "@types/node@npm:^20.14.10":
version: 20.14.9 version: 20.14.10
resolution: "@types/node@npm:20.14.9" resolution: "@types/node@npm:20.14.10"
dependencies: dependencies:
undici-types: "npm:~5.26.4" undici-types: "npm:~5.26.4"
checksum: 10c0/911ffa444dc032897f4a23ed580c67903bd38ea1c5ec99b1d00fa10b83537a3adddef8e1f29710cbdd8e556a61407ed008e06537d834e48caf449ce59f87d387 checksum: 10c0/0b06cff14365c2d0085dc16cc8cbea5c40ec09cfc1fea966be9eeecf35562760bfde8f88e86de6edfaf394501236e229d9c1084fad04fb4dec472ae245d8ae69
languageName: node languageName: node
linkType: hard linkType: hard
@@ -1852,6 +1859,13 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@types/semver@npm:^7.5.8":
version: 7.5.8
resolution: "@types/semver@npm:7.5.8"
checksum: 10c0/8663ff927234d1c5fcc04b33062cb2b9fcfbe0f5f351ed26c4d1e1581657deebd506b41ff7fdf89e787e3d33ce05854bc01686379b89e9c49b564c4cfa988efa
languageName: node
linkType: hard
"@types/svgo@npm:2, @types/svgo@npm:^2.6.1": "@types/svgo@npm:2, @types/svgo@npm:^2.6.1":
version: 2.6.4 version: 2.6.4
resolution: "@types/svgo@npm:2.6.4" resolution: "@types/svgo@npm:2.6.4"
@@ -1861,87 +1875,87 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/eslint-plugin@npm:7.15.0": "@typescript-eslint/eslint-plugin@npm:8.0.0-alpha.10":
version: 7.15.0 version: 8.0.0-alpha.10
resolution: "@typescript-eslint/eslint-plugin@npm:7.15.0" resolution: "@typescript-eslint/eslint-plugin@npm:8.0.0-alpha.10"
dependencies: dependencies:
"@eslint-community/regexpp": "npm:^4.10.0" "@eslint-community/regexpp": "npm:^4.10.0"
"@typescript-eslint/scope-manager": "npm:7.15.0" "@typescript-eslint/scope-manager": "npm:8.0.0-alpha.10"
"@typescript-eslint/type-utils": "npm:7.15.0" "@typescript-eslint/type-utils": "npm:8.0.0-alpha.10"
"@typescript-eslint/utils": "npm:7.15.0" "@typescript-eslint/utils": "npm:8.0.0-alpha.10"
"@typescript-eslint/visitor-keys": "npm:7.15.0" "@typescript-eslint/visitor-keys": "npm:8.0.0-alpha.10"
debug: "npm:^4.3.4"
graphemer: "npm:^1.4.0" graphemer: "npm:^1.4.0"
ignore: "npm:^5.3.1" ignore: "npm:^5.3.1"
natural-compare: "npm:^1.4.0" natural-compare: "npm:^1.4.0"
semver: "npm:^7.6.0"
ts-api-utils: "npm:^1.3.0" ts-api-utils: "npm:^1.3.0"
peerDependencies: peerDependencies:
"@typescript-eslint/parser": ^7.0.0 "@typescript-eslint/parser": ^7.0.0
eslint: ^8.56.0 eslint: ^8.57.0 || ^9.0.0
peerDependenciesMeta: peerDependenciesMeta:
typescript: typescript:
optional: true optional: true
checksum: 10c0/7ed4ef8355cb60f02ed603673ef749928a001931c534960d1f3f9f9b8092f4abd7ec1e80a33b4c38efb6e8e66c902583bd56a4c4d6ccbd870677a40680a7d1f5 checksum: 10c0/8fe37477435f21507e6839328666ffe858254c21ea143c8885f5d299c15e66b0f222ef428174619e307c71d74e2ed394d315de281dc73e4656eff4376f328398
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/parser@npm:7.15.0": "@typescript-eslint/parser@npm:8.0.0-alpha.10":
version: 7.15.0 version: 8.0.0-alpha.10
resolution: "@typescript-eslint/parser@npm:7.15.0" resolution: "@typescript-eslint/parser@npm:8.0.0-alpha.10"
dependencies: dependencies:
"@typescript-eslint/scope-manager": "npm:7.15.0" "@typescript-eslint/scope-manager": "npm:8.0.0-alpha.10"
"@typescript-eslint/types": "npm:7.15.0" "@typescript-eslint/types": "npm:8.0.0-alpha.10"
"@typescript-eslint/typescript-estree": "npm:7.15.0" "@typescript-eslint/typescript-estree": "npm:8.0.0-alpha.10"
"@typescript-eslint/visitor-keys": "npm:7.15.0" "@typescript-eslint/visitor-keys": "npm:8.0.0-alpha.10"
debug: "npm:^4.3.4" debug: "npm:^4.3.4"
peerDependencies: peerDependencies:
eslint: ^8.56.0 eslint: ^8.57.0 || ^9.0.0
peerDependenciesMeta: peerDependenciesMeta:
typescript: typescript:
optional: true optional: true
checksum: 10c0/8dcad9b84e2cbf89afea97ee7f690f91b487eed21d01997126f98cb7dd56d3b6c98c7ecbdbeda35904af521c4ed746c47887e908f8a1e2148d47c05b491d7b9d checksum: 10c0/38ef1acbee833f98ad9d72dea434c952d015afc407d1b67b376a6a7574d54da07e09533a1bc1143a13dcc9537b217968f57be965e235e3e87772bf814868d08c
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/scope-manager@npm:7.15.0": "@typescript-eslint/scope-manager@npm:8.0.0-alpha.10":
version: 7.15.0 version: 8.0.0-alpha.10
resolution: "@typescript-eslint/scope-manager@npm:7.15.0" resolution: "@typescript-eslint/scope-manager@npm:8.0.0-alpha.10"
dependencies: dependencies:
"@typescript-eslint/types": "npm:7.15.0" "@typescript-eslint/types": "npm:8.0.0-alpha.10"
"@typescript-eslint/visitor-keys": "npm:7.15.0" "@typescript-eslint/visitor-keys": "npm:8.0.0-alpha.10"
checksum: 10c0/781ec31a07ab7f0bdfb07dd271ef6553aa98f8492f1b3a67c65d178c94d590f4fd2e0916450f2446f1da2fbe007f3454c360ccb25f4d69612f782eb499f400ab checksum: 10c0/10420acebd84fce1b8bf57b33c53a88c15bc32a8a44e8d928ef9ede7152f8eb4ef18f62163f1b598770907c463c8a0195fe1ed339670cabc39d1e9da2b48258f
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/type-utils@npm:7.15.0": "@typescript-eslint/type-utils@npm:8.0.0-alpha.10":
version: 7.15.0 version: 8.0.0-alpha.10
resolution: "@typescript-eslint/type-utils@npm:7.15.0" resolution: "@typescript-eslint/type-utils@npm:8.0.0-alpha.10"
dependencies: dependencies:
"@typescript-eslint/typescript-estree": "npm:7.15.0" "@typescript-eslint/typescript-estree": "npm:8.0.0-alpha.10"
"@typescript-eslint/utils": "npm:7.15.0" "@typescript-eslint/utils": "npm:8.0.0-alpha.10"
debug: "npm:^4.3.4" debug: "npm:^4.3.4"
ts-api-utils: "npm:^1.3.0" ts-api-utils: "npm:^1.3.0"
peerDependencies:
eslint: ^8.56.0
peerDependenciesMeta: peerDependenciesMeta:
typescript: typescript:
optional: true optional: true
checksum: 10c0/06189eb05d741f05977bbc029c6ac46edd566e0136f2f2c22429fd5f2be1224e2d9135b7021bc686871bfaec9c05a5c9990a321762d3abd06e457486956326ba checksum: 10c0/582aad57448d0bc2f1b50586aaed0e5d9e3b2e7cdac10b59d8ad4c1f4b5e6d2a672d1c086908711a367d4a2033d020d5688e544e039cbef6515a0e7bdf33223b
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/types@npm:7.15.0": "@typescript-eslint/types@npm:8.0.0-alpha.10":
version: 7.15.0 version: 8.0.0-alpha.10
resolution: "@typescript-eslint/types@npm:7.15.0" resolution: "@typescript-eslint/types@npm:8.0.0-alpha.10"
checksum: 10c0/935387b21d9fdff65de86f6350cdda1f0614e269324f3a4f0a2ca1b0d72ef4b1d40c7de2f3a20a6f8c83edca6507bfbac3168c860625859e59fc455c80392bed checksum: 10c0/5b9c6702c40c0299ca6c9954574383d35a16ae1cfdc9480a64bd5b238c47c58f60448dc9a5f7eeb47d2c9a7997a410a7bcbbfc33e2bb6bd5c91018ac1aaa0904
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/typescript-estree@npm:7.15.0": "@typescript-eslint/typescript-estree@npm:8.0.0-alpha.10":
version: 7.15.0 version: 8.0.0-alpha.10
resolution: "@typescript-eslint/typescript-estree@npm:7.15.0" resolution: "@typescript-eslint/typescript-estree@npm:8.0.0-alpha.10"
dependencies: dependencies:
"@typescript-eslint/types": "npm:7.15.0" "@typescript-eslint/types": "npm:8.0.0-alpha.10"
"@typescript-eslint/visitor-keys": "npm:7.15.0" "@typescript-eslint/visitor-keys": "npm:8.0.0-alpha.10"
debug: "npm:^4.3.4" debug: "npm:^4.3.4"
globby: "npm:^11.1.0" globby: "npm:^11.1.0"
is-glob: "npm:^4.0.3" is-glob: "npm:^4.0.3"
@@ -1951,31 +1965,34 @@ __metadata:
peerDependenciesMeta: peerDependenciesMeta:
typescript: typescript:
optional: true optional: true
checksum: 10c0/0d6e61cb36c4612147ceea796c2bdbb65fca59170d9d768cff314146c5564253a058cbcb9e251722cd76c92a90c257e1210a69f8d4377c8002f211c574d18d24 checksum: 10c0/4f5ef1929d4c2e8aa3bbe64d84f02bf13c07a39d329793017fa48b6f6ae5310cee011df15e25761020d5e810250753d071639c782a7cecad2133e6c848ce81f2
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/utils@npm:7.15.0": "@typescript-eslint/utils@npm:8.0.0-alpha.10":
version: 7.15.0 version: 8.0.0-alpha.10
resolution: "@typescript-eslint/utils@npm:7.15.0" resolution: "@typescript-eslint/utils@npm:8.0.0-alpha.10"
dependencies: dependencies:
"@eslint-community/eslint-utils": "npm:^4.4.0" "@eslint-community/eslint-utils": "npm:^4.4.0"
"@typescript-eslint/scope-manager": "npm:7.15.0" "@types/json-schema": "npm:^7.0.15"
"@typescript-eslint/types": "npm:7.15.0" "@types/semver": "npm:^7.5.8"
"@typescript-eslint/typescript-estree": "npm:7.15.0" "@typescript-eslint/scope-manager": "npm:8.0.0-alpha.10"
"@typescript-eslint/types": "npm:8.0.0-alpha.10"
"@typescript-eslint/typescript-estree": "npm:8.0.0-alpha.10"
semver: "npm:^7.6.0"
peerDependencies: peerDependencies:
eslint: ^8.56.0 eslint: ^8.57.0 || ^9.0.0
checksum: 10c0/26aced17976cee0aa39a79201f68b384bbce1dc96e1c70d0e5f790e1e5655b1b1ddb2afd9eaf3fce9a48c0fb69daecd37a99fdbcdbf1cb58c65ae89ecac88a2c checksum: 10c0/1ea9b78e616c35fc817ce6e9f42a59712d7a151d73fa39384f3e2d0217787ebf5111cd27af70905cf30fbc5151c2c8054a50a4e39677e26ce77d0b3fba0ac03a
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/visitor-keys@npm:7.15.0": "@typescript-eslint/visitor-keys@npm:8.0.0-alpha.10":
version: 7.15.0 version: 8.0.0-alpha.10
resolution: "@typescript-eslint/visitor-keys@npm:7.15.0" resolution: "@typescript-eslint/visitor-keys@npm:8.0.0-alpha.10"
dependencies: dependencies:
"@typescript-eslint/types": "npm:7.15.0" "@typescript-eslint/types": "npm:8.0.0-alpha.10"
eslint-visitor-keys: "npm:^3.4.3" eslint-visitor-keys: "npm:^3.4.3"
checksum: 10c0/7509f01c8cd2126a38213bc735a77aa7e976340af0d664be5b2ccd01b8211724b2ea129e33bfd32fe5feac848b7b68ca55bb533f6ccfeec1d2f26a91240489b9 checksum: 10c0/a4ab419cb6e4050edaeaafeb8e2e0338d1851cb8bf076c8e2815b12529eb0d4d60553cadf478ddd289dbd2a89d67346fc96d620a5463d69e9359ca62fb8180a1
languageName: node languageName: node
linkType: hard linkType: hard
@@ -1989,15 +2006,15 @@ __metadata:
"@emotion/react": "npm:^11.11.4" "@emotion/react": "npm:^11.11.4"
"@emotion/styled": "npm:^11.11.5" "@emotion/styled": "npm:^11.11.5"
"@eslint/js": "npm:^9.6.0" "@eslint/js": "npm:^9.6.0"
"@mui/icons-material": "npm:^5.15.21" "@mui/icons-material": "npm:^5.16.0"
"@mui/material": "npm:^5.15.21" "@mui/material": "npm:^5.16.0"
"@preact/compat": "npm:^17.1.2" "@preact/compat": "npm:^17.1.2"
"@preact/preset-vite": "npm:^2.8.3" "@preact/preset-vite": "npm:^2.8.3"
"@table-library/react-table-library": "npm:4.1.7" "@table-library/react-table-library": "npm:4.1.7"
"@trivago/prettier-plugin-sort-imports": "npm:^4.3.0" "@trivago/prettier-plugin-sort-imports": "npm:^4.3.0"
"@types/babel__core": "npm:^7" "@types/babel__core": "npm:^7"
"@types/lodash-es": "npm:^4.17.12" "@types/lodash-es": "npm:^4.17.12"
"@types/node": "npm:^20.14.9" "@types/node": "npm:^20.14.10"
"@types/react": "npm:^18.3.3" "@types/react": "npm:^18.3.3"
"@types/react-dom": "npm:^18.3.0" "@types/react-dom": "npm:^18.3.0"
"@types/react-router-dom": "npm:^5.3.3" "@types/react-router-dom": "npm:^5.3.3"
@@ -2022,7 +2039,7 @@ __metadata:
terser: "npm:^5.31.1" terser: "npm:^5.31.1"
typesafe-i18n: "npm:^5.26.2" typesafe-i18n: "npm:^5.26.2"
typescript: "npm:^5.5.3" typescript: "npm:^5.5.3"
typescript-eslint: "npm:^7.15.0" typescript-eslint: "npm:8.0.0-alpha.10"
vite: "npm:^5.3.3" vite: "npm:^5.3.3"
vite-plugin-imagemin: "npm:^0.6.1" vite-plugin-imagemin: "npm:^0.6.1"
vite-tsconfig-paths: "npm:^4.3.2" vite-tsconfig-paths: "npm:^4.3.2"
@@ -7167,19 +7184,17 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"typescript-eslint@npm:^7.15.0": "typescript-eslint@npm:8.0.0-alpha.10":
version: 7.15.0 version: 8.0.0-alpha.10
resolution: "typescript-eslint@npm:7.15.0" resolution: "typescript-eslint@npm:8.0.0-alpha.10"
dependencies: dependencies:
"@typescript-eslint/eslint-plugin": "npm:7.15.0" "@typescript-eslint/eslint-plugin": "npm:8.0.0-alpha.10"
"@typescript-eslint/parser": "npm:7.15.0" "@typescript-eslint/parser": "npm:8.0.0-alpha.10"
"@typescript-eslint/utils": "npm:7.15.0" "@typescript-eslint/utils": "npm:8.0.0-alpha.10"
peerDependencies:
eslint: ^8.56.0
peerDependenciesMeta: peerDependenciesMeta:
typescript: typescript:
optional: true optional: true
checksum: 10c0/98293831f7557831b80143b0e717d2a61dca289d637ef464da524880fab2ea62fb61dd952707c571719914c1565942504db2b4ccfe7178a48971e69f270c1abc checksum: 10c0/695149b15ea7910a1c05dbb6601096c6f2c5d4c074715517f34a208a3b5b9e4dedad5c4d2c4c9a3f41ac984c4507d84fb4e91a3e792f95f759c658b7cd0f78f9
languageName: node languageName: node
linkType: hard linkType: hard

5
mock-api/rest_server.ts
View File

@@ -339,6 +339,7 @@ const ACTIVITY_ENDPOINT = REST_ENDPOINT_ROOT + 'activity';
const ESPSYSTEM_STATUS_ENDPOINT = REST_ENDPOINT_ROOT + 'ESPSystemStatus'; const ESPSYSTEM_STATUS_ENDPOINT = REST_ENDPOINT_ROOT + 'ESPSystemStatus';
const SECURITY_SETTINGS_ENDPOINT = REST_ENDPOINT_ROOT + 'securitySettings'; const SECURITY_SETTINGS_ENDPOINT = REST_ENDPOINT_ROOT + 'securitySettings';
const RESTART_ENDPOINT = REST_ENDPOINT_ROOT + 'restart'; const RESTART_ENDPOINT = REST_ENDPOINT_ROOT + 'restart';
const RESTART_PARTITION_ENDPOINT = REST_ENDPOINT_ROOT + 'partition';
const FACTORY_RESET_ENDPOINT = REST_ENDPOINT_ROOT + 'factoryReset'; const FACTORY_RESET_ENDPOINT = REST_ENDPOINT_ROOT + 'factoryReset';
// SYSTEM SIGNIN // SYSTEM SIGNIN
@@ -4209,6 +4210,10 @@ router
console.log('restarting...'); console.log('restarting...');
return status(200); return status(200);
}) })
.post(RESTART_PARTITION_ENDPOINT, () => {
console.log('restarting...');
return status(200);
})
.post(FACTORY_RESET_ENDPOINT, () => status(200)) .post(FACTORY_RESET_ENDPOINT, () => status(200))
.post(SIGN_IN_ENDPOINT, () => signin) .post(SIGN_IN_ENDPOINT, () => signin)
.get(GENERATE_TOKEN_ENDPOINT, () => generate_token); .get(GENERATE_TOKEN_ENDPOINT, () => generate_token);

2
src/locale_common.h
View File

@@ -144,7 +144,7 @@ MAKE_WORD_CUSTOM(asterisks, "********")
MAKE_WORD_CUSTOM(n_mandatory, "<n>") MAKE_WORD_CUSTOM(n_mandatory, "<n>")
MAKE_WORD_CUSTOM(sensorid_optional, "[sensor ID]") MAKE_WORD_CUSTOM(sensorid_optional, "[sensor ID]")
MAKE_WORD_CUSTOM(id_optional, "[id|hc]") MAKE_WORD_CUSTOM(id_optional, "[id|hc]")
MAKE_WORD_CUSTOM(partitionname_optional, "[partitionsname]") MAKE_WORD_CUSTOM(partitionname_optional, "[partitionname]")
MAKE_WORD_CUSTOM(data_optional, "[data]") MAKE_WORD_CUSTOM(data_optional, "[data]")
MAKE_WORD_CUSTOM(nvs_optional, "[nvs]") MAKE_WORD_CUSTOM(nvs_optional, "[nvs]")
MAKE_WORD_CUSTOM(offset_optional, "[offset]") MAKE_WORD_CUSTOM(offset_optional, "[offset]")

2
src/system.cpp
View File

@@ -604,7 +604,7 @@ void System::send_info_mqtt() {
} }
_connection = connection; _connection = connection;
JsonDocument doc; JsonDocument doc;
doc["event"] = "connected"; // doc["event"] = "connected";
doc["version"] = EMSESP_APP_VERSION; doc["version"] = EMSESP_APP_VERSION;
// if NTP is enabled send the boot_time in local time in ISO 8601 format (eg: 2022-11-15 20:46:38) // if NTP is enabled send the boot_time in local time in ISO 8601 format (eg: 2022-11-15 20:46:38)