diff --git a/interface/package.json b/interface/package.json index d19e380d4..bfebd9e4a 100644 --- a/interface/package.json +++ b/interface/package.json @@ -24,7 +24,7 @@ "@msgpack/msgpack": "^2.8.0", "@mui/icons-material": "^5.11.11", "@mui/material": "^5.11.12", - "@remix-run/router": "^1.3.3", + "@remix-run/router": "^1.4.0", "@table-library/react-table-library": "4.0.29", "@types/lodash-es": "^4.17.6", "@types/node": "^18.15.0", @@ -42,7 +42,7 @@ "react-dom": "latest", "react-dropzone": "^14.2.3", "react-icons": "^4.8.0", - "react-router-dom": "^6.8.2", + "react-router-dom": "^6.9.0", "react-toastify": "^9.1.1", "sockette": "^2.0.6", "typesafe-i18n": "^5.24.2", @@ -54,7 +54,7 @@ "@typescript-eslint/eslint-plugin": "^5.54.1", "@typescript-eslint/parser": "^5.54.1", "@vitejs/plugin-react-swc": "^3.2.0", - "eslint": "^8.35.0", + "eslint": "^8.36.0", "eslint-config-prettier": "^8.7.0", "eslint-import-resolver-typescript": "^3.5.3", "eslint-plugin-deprecation": "^1.3.3", diff --git a/interface/public/css/roboto.css b/interface/public/css/roboto.css index f0a860dda..43dced13f 100644 --- a/interface/public/css/roboto.css +++ b/interface/public/css/roboto.css @@ -1,9 +1,9 @@ /* * Just supporting latin due to size constrains on the esp chip * -* The framework only makes use of 400 (regular) + 500 (medium) weight fonts. +* The framework only makes use of 400 (regular) weight fonts. * -* If using light or strong typography variants you will need to add additional fonts. +* If using medium (500), light or strong typography variants you will need to add additional fonts. */ @font-face { font-family: 'Roboto'; @@ -14,13 +14,3 @@ U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } - -@font-face { - font-family: 'Roboto'; - font-style: normal; - font-weight: 500; - src: local('Roboto Medium'), local('Roboto-Medium'), url(../fonts/md.woff2) format('woff2'); - unicode-range: U+0000-00FF, U+0104-0107, U+0118-0119, U+0131, U+0141-0144, U+0152-0153, U+015A-015B, U+0179-017C, - U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, - U+FFFD; -} diff --git a/interface/public/fonts/md.woff2 b/interface/public/fonts/md.woff2 deleted file mode 100644 index 9f8bc681e..000000000 Binary files a/interface/public/fonts/md.woff2 and /dev/null differ diff --git a/interface/src/App.tsx b/interface/src/App.tsx index 553c5045d..7f2526d05 100644 --- a/interface/src/App.tsx +++ b/interface/src/App.tsx @@ -1,7 +1,7 @@ import { FC, useEffect, useState } from 'react'; -import { ToastContainer } from 'react-toastify'; -import 'react-toastify/dist/ReactToastify.minimal.css'; +import { ToastContainer, Slide } from 'react-toastify'; +import 'react-toastify/dist/ReactToastify.min.css'; import CustomTheme from 'CustomTheme'; import AppRouting from 'AppRouting'; @@ -31,12 +31,13 @@ const App: FC = () => { autoClose={2000} hideProgressBar={false} newestOnTop={false} - closeOnClick + closeOnClick={false} rtl={false} - pauseOnFocusLoss + pauseOnFocusLoss={false} draggable={false} - pauseOnHover - theme="dark" + pauseOnHover={false} + transition={Slide} + theme="light" /> diff --git a/interface/src/framework/security/ManageUsersForm.tsx b/interface/src/framework/security/ManageUsersForm.tsx index 5e7ca5186..43d7b45a5 100644 --- a/interface/src/framework/security/ManageUsersForm.tsx +++ b/interface/src/framework/security/ManageUsersForm.tsx @@ -50,8 +50,7 @@ const ManageUsersForm: FC = () => { color: #90CAF9; .th { padding: 8px; - height: 42px; - font-weight: 500; + height: 36px; border-bottom: 1px solid #565656; } `, diff --git a/interface/src/project/DashboardData.tsx b/interface/src/project/DashboardData.tsx index b7bfdd84b..566fd6a97 100644 --- a/interface/src/project/DashboardData.tsx +++ b/interface/src/project/DashboardData.tsx @@ -120,8 +120,6 @@ const DashboardData: FC = () => { &.tr.tr-body.row-select.row-select-single-selected { background-color: #3d4752; - color: white; - font-weight: normal; } &:hover .td { @@ -158,8 +156,7 @@ const DashboardData: FC = () => { HeaderRow: ` .th { padding: 8px; - height: 42px; - font-weight: 500; + height: 36px; ` } ]); @@ -182,7 +179,7 @@ const DashboardData: FC = () => { `, HeaderRow: ` .th { - height: 32px; + height: 86px; } `, Row: ` diff --git a/interface/src/project/DashboardStatus.tsx b/interface/src/project/DashboardStatus.tsx index 30c053e7d..842bd0371 100644 --- a/interface/src/project/DashboardStatus.tsx +++ b/interface/src/project/DashboardStatus.tsx @@ -108,8 +108,7 @@ const DashboardStatus: FC = () => { color: #90CAF9; .th { - height: 42px; - font-weight: 500; + height: 36px; border-bottom: 1px solid #565656; } `, diff --git a/interface/src/project/SettingsCustomization.tsx b/interface/src/project/SettingsCustomization.tsx index ff05ac1b4..00e2b5711 100644 --- a/interface/src/project/SettingsCustomization.tsx +++ b/interface/src/project/SettingsCustomization.tsx @@ -102,8 +102,7 @@ const SettingsCustomization: FC = () => { .th { border-bottom: 1px solid #565656; - font-weight: 500; - height: 32px; + height: 36px; } &:nth-of-type(1) .th { @@ -122,8 +121,6 @@ const SettingsCustomization: FC = () => { &.tr.tr-body.row-select.row-select-single-selected { background-color: #3d4752; - color: white; - font-weight: normal; } &:hover .td { diff --git a/interface/src/project/SettingsScheduler.tsx b/interface/src/project/SettingsScheduler.tsx index c37f34ced..8d4e200a0 100644 --- a/interface/src/project/SettingsScheduler.tsx +++ b/interface/src/project/SettingsScheduler.tsx @@ -128,7 +128,6 @@ const SettingsScheduler: FC = () => { color: #90CAF9; .th { border-bottom: 1px solid #565656; - font-weight: 500; height: 36px; } `, @@ -140,11 +139,6 @@ const SettingsScheduler: FC = () => { border-top: 1px solid #565656; border-bottom: 1px solid #565656; } - &.tr.tr-body.row-select.row-select-single-selected { - background-color: #3d4752; - color: white; - font-weight: normal; - } &:hover .td { border-top: 1px solid #177ac9; border-bottom: 1px solid #177ac9; diff --git a/interface/yarn.lock b/interface/yarn.lock index 77b40d8c5..9994bd695 100644 --- a/interface/yarn.lock +++ b/interface/yarn.lock @@ -560,27 +560,45 @@ __metadata: languageName: node linkType: hard -"@eslint/eslintrc@npm:^2.0.0": - version: 2.0.0 - resolution: "@eslint/eslintrc@npm:2.0.0" +"@eslint-community/eslint-utils@npm:^4.2.0": + version: 4.2.0 + resolution: "@eslint-community/eslint-utils@npm:4.2.0" + dependencies: + eslint-visitor-keys: ^3.3.0 + peerDependencies: + eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 + checksum: 82fdd1cc2a5d169def0e665ec790580ef708e7df9c91f20006595dc90e3bd42ec31c8976a2eeccd336286301a72e937c0ddf3ab4b7377d7014997c36333a7d22 + languageName: node + linkType: hard + +"@eslint-community/regexpp@npm:^4.4.0": + version: 4.4.0 + resolution: "@eslint-community/regexpp@npm:4.4.0" + checksum: 2d127af0c752b80e8a782eacfe996a86925d21de92da3ffc6f9e615e701145e44a62e26bdd88bfac2cd76779c39ba8d9875a91046ec5e7e5f23cb647c247ea6a + languageName: node + linkType: hard + +"@eslint/eslintrc@npm:^2.0.1": + version: 2.0.1 + resolution: "@eslint/eslintrc@npm:2.0.1" dependencies: ajv: ^6.12.4 debug: ^4.3.2 - espree: ^9.4.0 + espree: ^9.5.0 globals: ^13.19.0 ignore: ^5.2.0 import-fresh: ^3.2.1 js-yaml: ^4.1.0 minimatch: ^3.1.2 strip-json-comments: ^3.1.1 - checksum: 31119c8ca06723d80384f18f5c78e0530d8e6306ad36379868650131a8b10dd7cffd7aff79a5deb3a2e9933660823052623d268532bae9538ded53d5b19a69a6 + checksum: 56b9192a687a450db53a7b883daf9f0f447c43b3510189cf88808a7a2467c2a302a42a50f184cc6d5a9faf3d1df890a2ef0fd0d60b751f32a3e9dfea717c6b48 languageName: node linkType: hard -"@eslint/js@npm:8.35.0": - version: 8.35.0 - resolution: "@eslint/js@npm:8.35.0" - checksum: 6687ceff659a6d617e37823f809dc9c4b096535961a81acead27d26b1a51a4cf608a5e59d831ddd57f24f6f8bb99340a4a0e19f9c99b390fbb4b275f51ed5f5e +"@eslint/js@npm:8.36.0": + version: 8.36.0 + resolution: "@eslint/js@npm:8.36.0" + checksum: b7d6b84b823c8c7784be390741196617565527b1f7c0977fde9455bfb57fd88f81c074a03dd878757d2c33fa29f24291e9ecbc1425710f067917324b55e1bf3a languageName: node linkType: hard @@ -930,10 +948,10 @@ __metadata: languageName: node linkType: hard -"@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 +"@remix-run/router@npm:1.4.0, @remix-run/router@npm:^1.4.0": + version: 1.4.0 + resolution: "@remix-run/router@npm:1.4.0" + checksum: 707dce35a2b8138005cf19e63f6fd3c4da05b4b892e9e9118e8b727c3b95953efe27307ca2df35084044df30fa1fc367cf0bbc98d1ded9020c82e61e6242caaf languageName: node linkType: hard @@ -1785,7 +1803,7 @@ __metadata: "@msgpack/msgpack": ^2.8.0 "@mui/icons-material": ^5.11.11 "@mui/material": ^5.11.12 - "@remix-run/router": ^1.3.3 + "@remix-run/router": ^1.4.0 "@table-library/react-table-library": 4.0.29 "@types/lodash-es": ^4.17.6 "@types/mime-types": ^2 @@ -1800,7 +1818,7 @@ __metadata: "@yarnpkg/pnpify": ^4.0.0-rc.40 async-validator: ^4.2.5 axios: ^1.3.4 - eslint: ^8.35.0 + eslint: ^8.36.0 eslint-config-prettier: ^8.7.0 eslint-import-resolver-typescript: ^3.5.3 eslint-plugin-deprecation: ^1.3.3 @@ -1818,7 +1836,7 @@ __metadata: react-dom: latest react-dropzone: ^14.2.3 react-icons: ^4.8.0 - react-router-dom: ^6.8.2 + react-router-dom: ^6.9.0 react-toastify: ^9.1.1 rollup-plugin-visualizer: ^5.9.0 sockette: ^2.0.6 @@ -3088,12 +3106,14 @@ __metadata: languageName: node linkType: hard -"eslint@npm:^8.35.0": - version: 8.35.0 - resolution: "eslint@npm:8.35.0" +"eslint@npm:^8.36.0": + version: 8.36.0 + resolution: "eslint@npm:8.36.0" dependencies: - "@eslint/eslintrc": ^2.0.0 - "@eslint/js": 8.35.0 + "@eslint-community/eslint-utils": ^4.2.0 + "@eslint-community/regexpp": ^4.4.0 + "@eslint/eslintrc": ^2.0.1 + "@eslint/js": 8.36.0 "@humanwhocodes/config-array": ^0.11.8 "@humanwhocodes/module-importer": ^1.0.1 "@nodelib/fs.walk": ^1.2.8 @@ -3104,9 +3124,8 @@ __metadata: doctrine: ^3.0.0 escape-string-regexp: ^4.0.0 eslint-scope: ^7.1.1 - eslint-utils: ^3.0.0 eslint-visitor-keys: ^3.3.0 - espree: ^9.4.0 + espree: ^9.5.0 esquery: ^1.4.2 esutils: ^2.0.2 fast-deep-equal: ^3.1.3 @@ -3128,24 +3147,23 @@ __metadata: minimatch: ^3.1.2 natural-compare: ^1.4.0 optionator: ^0.9.1 - regexpp: ^3.2.0 strip-ansi: ^6.0.1 strip-json-comments: ^3.1.0 text-table: ^0.2.0 bin: eslint: bin/eslint.js - checksum: 6212173691d90b1bc94dd3d640e1f210374b30c3905fc0a15e501cf71c6ca52aa3d80ea7a9a245adaaed26d6019169e01fb6881b3f2885b188d37069c749308c + checksum: e9a961fc3b3de5cff5a1cb2c92eeffaa7e155a715489e30b3e1e76f186bd1255e0481e09564f2094733c0b1dbd3453499fb72ae7c043c83156e11e6d965b2304 languageName: node linkType: hard -"espree@npm:^9.4.0": - version: 9.4.1 - resolution: "espree@npm:9.4.1" +"espree@npm:^9.5.0": + version: 9.5.0 + resolution: "espree@npm:9.5.0" dependencies: acorn: ^8.8.0 acorn-jsx: ^5.3.2 eslint-visitor-keys: ^3.3.0 - checksum: 4d266b0cf81c7dfe69e542c7df0f246e78d29f5b04dda36e514eb4c7af117ee6cfbd3280e560571ed82ff6c9c3f0003c05b82583fc7a94006db7497c4fe4270e + checksum: a7f110aefb6407e0d3237aa635ab3cea87106ae63748dd23c67031afccc640d04c4209fca2daf16e2233c82efb505faead0fb84097478fd9cc6e8f8dd80bf99d languageName: node linkType: hard @@ -5163,27 +5181,27 @@ __metadata: languageName: node linkType: hard -"react-router-dom@npm:^6.8.2": - version: 6.8.2 - resolution: "react-router-dom@npm:6.8.2" +"react-router-dom@npm:^6.9.0": + version: 6.9.0 + resolution: "react-router-dom@npm:6.9.0" dependencies: - "@remix-run/router": 1.3.3 - react-router: 6.8.2 + "@remix-run/router": 1.4.0 + react-router: 6.9.0 peerDependencies: react: ">=16.8" react-dom: ">=16.8" - checksum: eddc8b88e26c66408df894bdcf95efd6731e21b7cbfd7417cd456f0043916279e0559b06c6cdc19c2a55c6aefc4cc745fa4065d3505e519a95adbef0cc89e77f + checksum: 4d593491ab8db5611feda70002c62902baebb84d5c1c5e5b6172496f31f91130deee132bf4240dea634a88cb86c76d6da348f15b9cd5e5197be455efd88edf72 languageName: node linkType: hard -"react-router@npm:6.8.2": - version: 6.8.2 - resolution: "react-router@npm:6.8.2" +"react-router@npm:6.9.0": + version: 6.9.0 + resolution: "react-router@npm:6.9.0" dependencies: - "@remix-run/router": 1.3.3 + "@remix-run/router": 1.4.0 peerDependencies: react: ">=16.8" - checksum: 9e98d03e1f18bfd5a35144a0c675adaf7c46a9ad436efdea2b52ef3a6e501ac6174a67ea90004e1339cd45019d6b1eb370627518320f7af9323ae74e0c6756ad + checksum: b2a5f42e042bee7a7f116ca7817b0e58359e5353d84887c9fe7a633d7490c03b1e0ae37cd01830c2a381e3d1e7d501bb4751e53cc3d491e25f36582d3f6e0546 languageName: node linkType: hard