diff --git a/.prettierignore b/.prettierignore index 3d50cd51d..3e5b7d2ea 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,3 +1,4 @@ node_modules/ build/ -.prettierrc \ No newline at end of file +.prettierrc +.yarn/ \ No newline at end of file diff --git a/interface/.eslintignore b/interface/.eslintignore index a76ed7f5c..13595478c 100644 --- a/interface/.eslintignore +++ b/interface/.eslintignore @@ -2,4 +2,5 @@ node_modules/ build/ .prettierrc .eslintrc.js +.yarn/ env.d.ts diff --git a/interface/.prettierignore b/interface/.prettierignore new file mode 100644 index 000000000..3e5b7d2ea --- /dev/null +++ b/interface/.prettierignore @@ -0,0 +1,4 @@ +node_modules/ +build/ +.prettierrc +.yarn/ \ No newline at end of file diff --git a/interface/.prettierrc b/interface/.prettierrc new file mode 100644 index 000000000..4197de585 --- /dev/null +++ b/interface/.prettierrc @@ -0,0 +1,8 @@ +{ + "trailingComma": "none", + "tabWidth": 2, + "semi": true, + "singleQuote": true, + "printWidth": 120, + "bracketSpacing": true +} \ No newline at end of file diff --git a/interface/.typesafe-i18n.json b/interface/.typesafe-i18n.json index e90733f75..b3352c3f7 100644 --- a/interface/.typesafe-i18n.json +++ b/interface/.typesafe-i18n.json @@ -1,5 +1,5 @@ { - "adapter": "react", - "baseLocale": "pl", - "$schema": "https://unpkg.com/typesafe-i18n@5.24.1/schema/typesafe-i18n.json" -} \ No newline at end of file + "adapter": "react", + "baseLocale": "pl", + "$schema": "https://unpkg.com/typesafe-i18n@5.24.1/schema/typesafe-i18n.json" +} diff --git a/interface/package.json b/interface/package.json index 11e04a3ad..8f70f3b96 100644 --- a/interface/package.json +++ b/interface/package.json @@ -22,9 +22,9 @@ "@emotion/react": "^11.10.6", "@emotion/styled": "^11.10.6", "@msgpack/msgpack": "^2.8.0", - "@mui/icons-material": "^5.11.9", - "@mui/material": "^5.11.10", - "@remix-run/router": "^1.3.2", + "@mui/icons-material": "^5.11.11", + "@mui/material": "^5.11.11", + "@remix-run/router": "^1.3.3", "@table-library/react-table-library": "4.0.28", "@types/lodash-es": "^4.17.6", "@types/node": "^18.14.2", @@ -42,15 +42,15 @@ "react-dom": "^18.2.0", "react-dropzone": "^14.2.3", "react-icons": "^4.7.1", - "react-router-dom": "^6.8.1", + "react-router-dom": "^6.8.2", "sockette": "^2.0.6", "typesafe-i18n": "^5.24.1", "typescript": "^4.9.5" }, "devDependencies": { "@types/mime-types": "^2", - "@typescript-eslint/eslint-plugin": "^5.53.0", - "@typescript-eslint/parser": "^5.53.0", + "@typescript-eslint/eslint-plugin": "^5.54.0", + "@typescript-eslint/parser": "^5.54.0", "@vitejs/plugin-react-swc": "^3.2.0", "eslint": "^8.35.0", "eslint-config-prettier": "^8.6.0", diff --git a/interface/src/SignIn.tsx b/interface/src/SignIn.tsx index 872ef156f..c19390c28 100644 --- a/interface/src/SignIn.tsx +++ b/interface/src/SignIn.tsx @@ -103,10 +103,12 @@ const SignIn: FC = () => { > {PROJECT_NAME} diff --git a/interface/src/components/upload/useFileUpload.ts b/interface/src/components/upload/useFileUpload.ts index 4ba9ff827..bf6d80a3f 100644 --- a/interface/src/components/upload/useFileUpload.ts +++ b/interface/src/components/upload/useFileUpload.ts @@ -7,7 +7,7 @@ import { FileUploadConfig } from 'api/endpoints'; import { useI18nContext } from 'i18n/i18n-react'; -interface MediaUploadOptions { +interface MediaUploadOptions { upload: (file: File, config?: FileUploadConfig) => AxiosPromise; } diff --git a/interface/src/project/DashboardData.tsx b/interface/src/project/DashboardData.tsx index ee74d2ef2..c20887e62 100644 --- a/interface/src/project/DashboardData.tsx +++ b/interface/src/project/DashboardData.tsx @@ -651,7 +651,7 @@ const DashboardData: FC = () => { - + diff --git a/interface/yarn.lock b/interface/yarn.lock index 89da5d15a..de53a82cf 100644 --- a/interface/yarn.lock +++ b/interface/yarn.lock @@ -201,7 +201,7 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.7": +"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.7": version: 7.20.13 resolution: "@babel/runtime@npm:7.20.13" dependencies: @@ -210,6 +210,15 @@ __metadata: languageName: node linkType: hard +"@babel/runtime@npm:^7.21.0": + version: 7.21.0 + resolution: "@babel/runtime@npm:7.21.0" + dependencies: + regenerator-runtime: ^0.13.11 + checksum: 7b33e25bfa9e0e1b9e8828bb61b2d32bdd46b41b07ba7cb43319ad08efc6fda8eb89445193e67d6541814627df0ca59122c0ea795e412b99c5183a0540d338ab + languageName: node + linkType: hard + "@babel/template@npm:^7.18.10, @babel/template@npm:^7.20.7": version: 7.20.7 resolution: "@babel/template@npm:7.20.7" @@ -665,14 +674,14 @@ __metadata: languageName: node linkType: hard -"@mui/base@npm:5.0.0-alpha.118": - version: 5.0.0-alpha.118 - resolution: "@mui/base@npm:5.0.0-alpha.118" +"@mui/base@npm:5.0.0-alpha.119": + version: 5.0.0-alpha.119 + resolution: "@mui/base@npm:5.0.0-alpha.119" dependencies: - "@babel/runtime": ^7.20.13 + "@babel/runtime": ^7.21.0 "@emotion/is-prop-valid": ^1.2.0 "@mui/types": ^7.2.3 - "@mui/utils": ^5.11.9 + "@mui/utils": ^5.11.11 "@popperjs/core": ^2.11.6 clsx: ^1.2.1 prop-types: ^15.8.1 @@ -684,22 +693,22 @@ __metadata: peerDependenciesMeta: "@types/react": optional: true - checksum: 0de774b9208042a9c64eb1ccc8b10119a804d130cad4722e0efc47f2396c5e90a64ffd54698ee947d39da230401ec48000ddedf4649b69b3043aa91b6a842b2c + checksum: 1ad5876a0b455cdc880abc51c331771d954bac769daa5b4c91bccceaaca8c2cf15401e2fa4030e46cdfb0ab876edd6e33818db1b365203e61bb1ec513618bba8 languageName: node linkType: hard -"@mui/core-downloads-tracker@npm:^5.11.9": - version: 5.11.9 - resolution: "@mui/core-downloads-tracker@npm:5.11.9" - checksum: 2fcb81a43afb9be4a14509f7e48097968ae32c4ad22380a0dc3d516fa1b6b6cc927384585e797a6c461f79e8453331ce49aa7658830e8a4dc3b8904ce7084a6a +"@mui/core-downloads-tracker@npm:^5.11.11": + version: 5.11.11 + resolution: "@mui/core-downloads-tracker@npm:5.11.11" + checksum: 8c79c1a760eee497fb65f867117251adaaca435a8813394c6bf3d014d5e26148af1ff89beef2f50cea76c43412b722d3bd78bc71d8fc85aadcd57c8b22f17ec6 languageName: node linkType: hard -"@mui/icons-material@npm:^5.11.9": - version: 5.11.9 - resolution: "@mui/icons-material@npm:5.11.9" +"@mui/icons-material@npm:^5.11.11": + version: 5.11.11 + resolution: "@mui/icons-material@npm:5.11.11" dependencies: - "@babel/runtime": ^7.20.13 + "@babel/runtime": ^7.21.0 peerDependencies: "@mui/material": ^5.0.0 "@types/react": ^17.0.0 || ^18.0.0 @@ -707,20 +716,20 @@ __metadata: peerDependenciesMeta: "@types/react": optional: true - checksum: bb7e4478272a8758c253c6fa89215247d735b3ead47a87f88dc6dde69a2f44e523a84304346eb7a3f07529e3aea08f649646b3d03a2f4ef3f534fcb7b6b692cb + checksum: 6ec89f3c68aaedd521f6a5106964394c410b08cec6875166d3ee97dcbaf2983c67d3b19cd58113d767d9f934cc0e9439fb5856e45471f5094656c0f87bbefecd languageName: node linkType: hard -"@mui/material@npm:^5.11.10": - version: 5.11.10 - resolution: "@mui/material@npm:5.11.10" +"@mui/material@npm:^5.11.11": + version: 5.11.11 + resolution: "@mui/material@npm:5.11.11" dependencies: - "@babel/runtime": ^7.20.13 - "@mui/base": 5.0.0-alpha.118 - "@mui/core-downloads-tracker": ^5.11.9 - "@mui/system": ^5.11.9 + "@babel/runtime": ^7.21.0 + "@mui/base": 5.0.0-alpha.119 + "@mui/core-downloads-tracker": ^5.11.11 + "@mui/system": ^5.11.11 "@mui/types": ^7.2.3 - "@mui/utils": ^5.11.9 + "@mui/utils": ^5.11.11 "@types/react-transition-group": ^4.4.5 clsx: ^1.2.1 csstype: ^3.1.1 @@ -740,16 +749,16 @@ __metadata: optional: true "@types/react": optional: true - checksum: 7d0ee8b7bc8a39146464a9a3ccc18766aff55914e7d801590b401f79c36e98b3b17aacd069e2620166024dd1020e67ad3a38da0d72e6aa0283d760a488c79501 + checksum: 132af11ab4aff98c2c98dd22f10dcbc58221a8b3949f9ff3747c76362acaf1b2fb07ce8afd1a12ed905ebf1a7f778f7eb508a08d63fe56ea2bd703699e51e5cf languageName: node linkType: hard -"@mui/private-theming@npm:^5.11.9": - version: 5.11.9 - resolution: "@mui/private-theming@npm:5.11.9" +"@mui/private-theming@npm:^5.11.11": + version: 5.11.11 + resolution: "@mui/private-theming@npm:5.11.11" dependencies: - "@babel/runtime": ^7.20.13 - "@mui/utils": ^5.11.9 + "@babel/runtime": ^7.21.0 + "@mui/utils": ^5.11.11 prop-types: ^15.8.1 peerDependencies: "@types/react": ^17.0.0 || ^18.0.0 @@ -757,15 +766,15 @@ __metadata: peerDependenciesMeta: "@types/react": optional: true - checksum: c0cfdf6d790ce219e59f2d222847b88e0ab1d3281a427935460f8a652b54faaf0ad483f13a5fafdec37df7cc87a489821b20e9fa26d49251e714fa6fef8da5c2 + checksum: e1db9423d000fc377201dd74a78f8f1cb627fade1b17f83171d4d8a18c1f9bb24e5fa86b1e08e3766961a0be23f84d87a6323da25e9bc08fc21b44288fa8d2b9 languageName: node linkType: hard -"@mui/styled-engine@npm:^5.11.9": - version: 5.11.9 - resolution: "@mui/styled-engine@npm:5.11.9" +"@mui/styled-engine@npm:^5.11.11": + version: 5.11.11 + resolution: "@mui/styled-engine@npm:5.11.11" dependencies: - "@babel/runtime": ^7.20.13 + "@babel/runtime": ^7.21.0 "@emotion/cache": ^11.10.5 csstype: ^3.1.1 prop-types: ^15.8.1 @@ -778,19 +787,19 @@ __metadata: optional: true "@emotion/styled": optional: true - checksum: c32dd4b1e90fd19664dce92b3188a4ae3e239bcf6c1baa0e608478f41047aba4f0b796543a213337aa905a86c44284cf99198ceaccb1e444dee3ab0cc3092829 + checksum: 63b71aafe79afbe1638a31d9cc1361d11edd5b4a8eacc50da86d83b5db11c9a1713c5744d1533360488aef85afc8d4a5429517447b78b598493c7a7d639390dd languageName: node linkType: hard -"@mui/system@npm:^5.11.9": - version: 5.11.9 - resolution: "@mui/system@npm:5.11.9" +"@mui/system@npm:^5.11.11": + version: 5.11.11 + resolution: "@mui/system@npm:5.11.11" dependencies: - "@babel/runtime": ^7.20.13 - "@mui/private-theming": ^5.11.9 - "@mui/styled-engine": ^5.11.9 + "@babel/runtime": ^7.21.0 + "@mui/private-theming": ^5.11.11 + "@mui/styled-engine": ^5.11.11 "@mui/types": ^7.2.3 - "@mui/utils": ^5.11.9 + "@mui/utils": ^5.11.11 clsx: ^1.2.1 csstype: ^3.1.1 prop-types: ^15.8.1 @@ -806,7 +815,7 @@ __metadata: optional: true "@types/react": optional: true - checksum: d3cc0efbb992299f030369c09d6d0db44c7b29f436d1eaa271de9e06b78575d63e6b3df389cbf37191870a478a5267b43e995d27361236cfceac1f5a88b71a5b + checksum: 4f91a2855e50d8cac629424f9cd8bac2aa2c81d0a307d6a6db552f035da28e3b7916fc3a5d7aa98e448962cf06f4ff066f8cbf37ac39886cffd27f755ea2a012 languageName: node linkType: hard @@ -822,18 +831,18 @@ __metadata: languageName: node linkType: hard -"@mui/utils@npm:^5.11.9": - version: 5.11.9 - resolution: "@mui/utils@npm:5.11.9" +"@mui/utils@npm:^5.11.11": + version: 5.11.11 + resolution: "@mui/utils@npm:5.11.11" dependencies: - "@babel/runtime": ^7.20.13 + "@babel/runtime": ^7.21.0 "@types/prop-types": ^15.7.5 "@types/react-is": ^16.7.1 || ^17.0.0 prop-types: ^15.8.1 react-is: ^18.2.0 peerDependencies: react: ^17.0.0 || ^18.0.0 - checksum: 23761e646443a8f9ad5e0715587491e65f5164fd99f6730f134068f9c859a6af9e3f9d218d193c9a9217da1c91182f76352c120de4f70ab19539afa7504698a2 + checksum: 268ac11cfcf5acc90137502f1fb999c4b5a4a05b00769056f48a15c9aa0c358b2ce93655c04929136282ed2f3b8b0a62d12653449c3463ed4b79723764ab6d71 languageName: node linkType: hard @@ -905,10 +914,10 @@ __metadata: languageName: node linkType: hard -"@remix-run/router@npm:1.3.2, @remix-run/router@npm:^1.3.2": - version: 1.3.2 - resolution: "@remix-run/router@npm:1.3.2" - checksum: ee2108b87d4a1241cdea137dd7e1741ee679228bd33fd81e22a6bb2940f81186cefe9a85e26d60cc49bbcc1bdbc57d1954b7d4d62f8a51ef69feddfc899f55fa +"@remix-run/router@npm:1.3.3, @remix-run/router@npm:^1.3.3": + version: 1.3.3 + resolution: "@remix-run/router@npm:1.3.3" + checksum: 9280f1c3e44c0fb84a74b401b5a47022dace06d5da0f26a7a68c7c0e57ad5ef95d30f3c2d333df2db3b63f84de81f7f8caa7e53189a7709d6c3eb466d126ed76 languageName: node linkType: hard @@ -1331,13 +1340,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:^5.53.0": - version: 5.53.0 - resolution: "@typescript-eslint/eslint-plugin@npm:5.53.0" +"@typescript-eslint/eslint-plugin@npm:^5.54.0": + version: 5.54.0 + resolution: "@typescript-eslint/eslint-plugin@npm:5.54.0" dependencies: - "@typescript-eslint/scope-manager": 5.53.0 - "@typescript-eslint/type-utils": 5.53.0 - "@typescript-eslint/utils": 5.53.0 + "@typescript-eslint/scope-manager": 5.54.0 + "@typescript-eslint/type-utils": 5.54.0 + "@typescript-eslint/utils": 5.54.0 debug: ^4.3.4 grapheme-splitter: ^1.0.4 ignore: ^5.2.0 @@ -1351,7 +1360,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 12dffe65969d8e5248c86a700fe46a737e55ecafb276933e747b4731eab6266fe55e2d43a34b8b340179fe248e127d861cd016a7614b1b9804cd0687c99616d1 + checksum: 4fdb520b8e0f6b9eb878206ddfa4212522f170d1507d7aba8a975159a198efa37af6d2d17982dd560317452d0748f2e2da5dd7347b172bc4446d1c5562ce2e94 languageName: node linkType: hard @@ -1366,20 +1375,20 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/parser@npm:^5.53.0": - version: 5.53.0 - resolution: "@typescript-eslint/parser@npm:5.53.0" +"@typescript-eslint/parser@npm:^5.54.0": + version: 5.54.0 + resolution: "@typescript-eslint/parser@npm:5.54.0" dependencies: - "@typescript-eslint/scope-manager": 5.53.0 - "@typescript-eslint/types": 5.53.0 - "@typescript-eslint/typescript-estree": 5.53.0 + "@typescript-eslint/scope-manager": 5.54.0 + "@typescript-eslint/types": 5.54.0 + "@typescript-eslint/typescript-estree": 5.54.0 debug: ^4.3.4 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 979e5d63793a9e64998b1f956ba0f00f8a2674db3a664fafce7b2433323f5248bd776af8305e2419d73a9d94c55176fee099abc5c153b4cc52e5765c725c1edd + checksum: 368d6dd85be42c3f518f0ddeed23ecd1d3c9484a77ae291ee4e08e2703ed379bed613bde014cd8ab2a3e06e85dd8aef201112ae5e3d2a07deba29ae80bb1fe06 languageName: node linkType: hard @@ -1393,12 +1402,22 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:5.53.0": - version: 5.53.0 - resolution: "@typescript-eslint/type-utils@npm:5.53.0" +"@typescript-eslint/scope-manager@npm:5.54.0": + version: 5.54.0 + resolution: "@typescript-eslint/scope-manager@npm:5.54.0" dependencies: - "@typescript-eslint/typescript-estree": 5.53.0 - "@typescript-eslint/utils": 5.53.0 + "@typescript-eslint/types": 5.54.0 + "@typescript-eslint/visitor-keys": 5.54.0 + checksum: e50f12396de0ddb94aab119bdd5f4769b80dd2c273e137fd25e5811e25114d7a3d3668cdb3c454aca9537e940744881d62a1fed2ec86f07f60533dc7382ae15c + languageName: node + linkType: hard + +"@typescript-eslint/type-utils@npm:5.54.0": + version: 5.54.0 + resolution: "@typescript-eslint/type-utils@npm:5.54.0" + dependencies: + "@typescript-eslint/typescript-estree": 5.54.0 + "@typescript-eslint/utils": 5.54.0 debug: ^4.3.4 tsutils: ^3.21.0 peerDependencies: @@ -1406,7 +1425,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 52c40967c5fabd58c2ae8bf519ef89e4feb511e4df630aeaeac8335661a79b6b3a32d30a61a5f1d8acc703f21c4d90751a5d41cda1b35d08867524da11bc2e1d + checksum: 9cb5b52c7277bdf74b9ea3282fc40f41fda90ea4b1d33039044476e43cf05a766b1294e7d45f429594f2776828f7d17729cfa4ea027315f3df883e748ba57514 languageName: node linkType: hard @@ -1417,6 +1436,13 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/types@npm:5.54.0": + version: 5.54.0 + resolution: "@typescript-eslint/types@npm:5.54.0" + checksum: 0f66b1b93078f3afea6dfcd3d4e2f0abea4f60cd0c613c2cf13f85098e5bf786185484c9846ed80b6c4272de2c31a70c5a8aacb91314cf1b6da7dcb8855cb7ac + languageName: node + linkType: hard + "@typescript-eslint/typescript-estree@npm:5.53.0": version: 5.53.0 resolution: "@typescript-eslint/typescript-estree@npm:5.53.0" @@ -1435,6 +1461,24 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/typescript-estree@npm:5.54.0": + version: 5.54.0 + resolution: "@typescript-eslint/typescript-estree@npm:5.54.0" + dependencies: + "@typescript-eslint/types": 5.54.0 + "@typescript-eslint/visitor-keys": 5.54.0 + debug: ^4.3.4 + globby: ^11.1.0 + is-glob: ^4.0.3 + semver: ^7.3.7 + tsutils: ^3.21.0 + peerDependenciesMeta: + typescript: + optional: true + checksum: 377c75c34c4f95b7ab6218c1d96a6db3ea6ed6727711b6a09354582fe0157861dc1b6fb9e3f7113cd09741f713735d59d5ab5845457f5733a4ebad7470bf600a + languageName: node + linkType: hard + "@typescript-eslint/utils@npm:5.53.0": version: 5.53.0 resolution: "@typescript-eslint/utils@npm:5.53.0" @@ -1453,6 +1497,24 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/utils@npm:5.54.0": + version: 5.54.0 + resolution: "@typescript-eslint/utils@npm:5.54.0" + dependencies: + "@types/json-schema": ^7.0.9 + "@types/semver": ^7.3.12 + "@typescript-eslint/scope-manager": 5.54.0 + "@typescript-eslint/types": 5.54.0 + "@typescript-eslint/typescript-estree": 5.54.0 + eslint-scope: ^5.1.1 + eslint-utils: ^3.0.0 + semver: ^7.3.7 + peerDependencies: + eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + checksum: b8f344fc2961c7af530b93e53d5a17b5084cdf550b381082e3fb7f349ef16e718d9eebde1b9fc2d8fc4ecf8d60d334b004359977247554265c1afc87323bed37 + languageName: node + linkType: hard + "@typescript-eslint/visitor-keys@npm:5.53.0": version: 5.53.0 resolution: "@typescript-eslint/visitor-keys@npm:5.53.0" @@ -1463,6 +1525,16 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/visitor-keys@npm:5.54.0": + version: 5.54.0 + resolution: "@typescript-eslint/visitor-keys@npm:5.54.0" + dependencies: + "@typescript-eslint/types": 5.54.0 + eslint-visitor-keys: ^3.3.0 + checksum: 17fc323c09e6272b603cdaec30a99916600fbbb737e1fbc8c1727a487753b4363cea112277fa43e0562bff34bdd1de9ad73ff9433118b1fd469b112fad0313ca + languageName: node + linkType: hard + "@vitejs/plugin-react-swc@npm:^3.2.0": version: 3.2.0 resolution: "@vitejs/plugin-react-swc@npm:3.2.0" @@ -1481,9 +1553,9 @@ __metadata: "@emotion/react": ^11.10.6 "@emotion/styled": ^11.10.6 "@msgpack/msgpack": ^2.8.0 - "@mui/icons-material": ^5.11.9 - "@mui/material": ^5.11.10 - "@remix-run/router": ^1.3.2 + "@mui/icons-material": ^5.11.11 + "@mui/material": ^5.11.11 + "@remix-run/router": ^1.3.3 "@table-library/react-table-library": 4.0.28 "@types/lodash-es": ^4.17.6 "@types/mime-types": ^2 @@ -1491,8 +1563,8 @@ __metadata: "@types/react": ^18.0.28 "@types/react-dom": ^18.0.11 "@types/react-router-dom": ^5.3.3 - "@typescript-eslint/eslint-plugin": ^5.53.0 - "@typescript-eslint/parser": ^5.53.0 + "@typescript-eslint/eslint-plugin": ^5.54.0 + "@typescript-eslint/parser": ^5.54.0 "@vitejs/plugin-react-swc": ^3.2.0 async-validator: ^4.2.5 axios: ^1.3.4 @@ -1515,7 +1587,7 @@ __metadata: react-dom: ^18.2.0 react-dropzone: ^14.2.3 react-icons: ^4.7.1 - react-router-dom: ^6.8.1 + react-router-dom: ^6.8.2 rollup-plugin-visualizer: ^5.9.0 sockette: ^2.0.6 typesafe-i18n: ^5.24.1 @@ -4622,27 +4694,27 @@ __metadata: languageName: node linkType: hard -"react-router-dom@npm:^6.8.1": - version: 6.8.1 - resolution: "react-router-dom@npm:6.8.1" +"react-router-dom@npm:^6.8.2": + version: 6.8.2 + resolution: "react-router-dom@npm:6.8.2" dependencies: - "@remix-run/router": 1.3.2 - react-router: 6.8.1 + "@remix-run/router": 1.3.3 + react-router: 6.8.2 peerDependencies: react: ">=16.8" react-dom: ">=16.8" - checksum: fb1a9f5c7e4c83536ee7e6493f3c13f6abda66da69f9191fb8b087ab188ecc18a3a32575813a280cbeca67bcb8b0dcb6dbcef7ed599e03f38a44d694f4abcf14 + checksum: eddc8b88e26c66408df894bdcf95efd6731e21b7cbfd7417cd456f0043916279e0559b06c6cdc19c2a55c6aefc4cc745fa4065d3505e519a95adbef0cc89e77f languageName: node linkType: hard -"react-router@npm:6.8.1": - version: 6.8.1 - resolution: "react-router@npm:6.8.1" +"react-router@npm:6.8.2": + version: 6.8.2 + resolution: "react-router@npm:6.8.2" dependencies: - "@remix-run/router": 1.3.2 + "@remix-run/router": 1.3.3 peerDependencies: react: ">=16.8" - checksum: 8e7cc7a516adeb6060911861af99d9b512893c15ec732cbf8574872919be4f3fe439ffa8c0876d1bcbced880d081bfeda3c01cb505b5a243565d10500ee0ac36 + checksum: 9e98d03e1f18bfd5a35144a0c675adaf7c46a9ad436efdea2b52ef3a6e501ac6174a67ea90004e1339cd45019d6b1eb370627518320f7af9323ae74e0c6756ad languageName: node linkType: hard diff --git a/src/web/WebSettingsService.cpp b/src/web/WebSettingsService.cpp index 59ff94fbf..888c2e270 100644 --- a/src/web/WebSettingsService.cpp +++ b/src/web/WebSettingsService.cpp @@ -237,7 +237,7 @@ StateUpdateResult WebSettings::update(JsonObject & root, WebSettings & settings) check_flag(prev, settings.ems_bus_id, ChangeFlags::RESTART); prev = settings.low_clock; - settings.low_clock = root["low_clock"] | false; + settings.low_clock = root["low_clock"]; check_flag(prev, settings.low_clock, ChangeFlags::RESTART); // @@ -284,10 +284,10 @@ StateUpdateResult WebSettings::update(JsonObject & root, WebSettings & settings) settings.notoken_api = root["notoken_api"] | EMSESP_DEFAULT_NOTOKEN_API; settings.solar_maxflow = root["solar_maxflow"] | EMSESP_DEFAULT_SOLAR_MAXFLOW; - settings.fahrenheit = root["fahrenheit"] | false; + settings.fahrenheit = root["fahrenheit"]; EMSESP::system_.fahrenheit(settings.fahrenheit); - settings.readonly_mode = root["readonly_mode"] | false; + settings.readonly_mode = root["readonly_mode"]; EMSESP::system_.readonly_mode(settings.readonly_mode); settings.bool_dashboard = root["bool_dashboard"] | EMSESP_DEFAULT_BOOL_FORMAT;