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

Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into idf4

Browse Source
This commit is contained in:
MichaelDvP
2022-05-02 15:42:02 +02:00
parent 8dc5f0a5ac 8a4decd48b
commit 579c869688
13 changed files with 107 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
interface/package-lock.json generated
View File

@@ -12,10 +12,10 @@
"@emotion/styled": "^11.8.1",
"@msgpack/msgpack": "^2.7.2",
"@mui/icons-material": "^5.6.2",
"@mui/material": "^5.6.3",
"@mui/material": "^5.6.4",
"@table-library/react-table-library": "^3.1.0",
"@types/lodash": "^4.14.182",
"@types/node": "^17.0.30",
"@types/node": "^17.0.31",
"@types/react": "^17.0.43",
"@types/react-dom": "^17.0.14",
"@types/react-router-dom": "^5.3.3",
@@ -29,7 +29,7 @@
"react": "^17.0.2",
"react-app-rewired": "^2.2.1",
"react-dom": "^17.0.2",
"react-dropzone": "^14.0.1",
"react-dropzone": "^14.1.1",
"react-icons": "^4.3.1",
"react-router-dom": "^6.3.0",
"react-scripts": "5.0.1",
@@ -2888,9 +2888,9 @@
}
},
"node_modules/@mui/base": {
"version": "5.0.0-alpha.78",
"resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.78.tgz",
"integrity": "sha512-5L+GNe2M9/tFjQpjK2r837+kzRg/l6D5R9SQbG1wmSWejw5Ei8P+KXIgS/NLNi9g7dUT8bnCyzz9AZKQX1Jsfg==",
"version": "5.0.0-alpha.79",
"resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.79.tgz",
"integrity": "sha512-/lZLF027BkiEjM8MIYoeS/FEhTKf+41ePU9SOijMGrCin1Y0Igucw+IHa1fF8HXD7wDbFKqHuso3J1jMG8wyNw==",
"dependencies": {
"@babel/runtime": "^7.17.2",
"@emotion/is-prop-valid": "^1.1.2",
@@ -2945,13 +2945,13 @@
}
},
"node_modules/@mui/material": {
"version": "5.6.3",
"resolved": "https://registry.npmjs.org/@mui/material/-/material-5.6.3.tgz",
"integrity": "sha512-2VovFsbCEhic29NYoBF7zFrpH2sEOlKXXDhGjzxmWiI9OnC3SX63hapWunjaVsiRINVnjuMHuW1MOs4UtV8Gfg==",
"version": "5.6.4",
"resolved": "https://registry.npmjs.org/@mui/material/-/material-5.6.4.tgz",
"integrity": "sha512-7TD+u/SExZK2a55w6reX56oPk37gKr/M/XGt156X+m0d9LhzOsW864nkErIX/H8oSkX/6kCimxu1FDsO+gjiVw==",
"dependencies": {
"@babel/runtime": "^7.17.2",
"@mui/base": "5.0.0-alpha.78",
"@mui/system": "^5.6.3",
"@mui/base": "5.0.0-alpha.79",
"@mui/system": "^5.6.4",
"@mui/types": "^7.1.3",
"@mui/utils": "^5.6.1",
"@types/react-transition-group": "^4.4.4",
@@ -3045,9 +3045,9 @@
}
},
"node_modules/@mui/system": {
"version": "5.6.3",
"resolved": "https://registry.npmjs.org/@mui/system/-/system-5.6.3.tgz",
"integrity": "sha512-4SRi52a4ttZ2S4EHEDE8arVNuKqyQLTYUTF80WAZ0tQwnG20qwlBtzcrywCGItmVAMl7RUaYopyWOx3yVPvrmQ==",
"version": "5.6.4",
"resolved": "https://registry.npmjs.org/@mui/system/-/system-5.6.4.tgz",
"integrity": "sha512-7rsWED1wMFMePySJobsBerFZNu7ga580QSi3Zd6sJR8nVj12qD3yIdfvxA70/PxJ/805KbIT0GX7edKI+hpyhA==",
"dependencies": {
"@babel/runtime": "^7.17.2",
"@mui/private-theming": "^5.6.2",
@@ -19904,9 +19904,9 @@
"integrity": "sha512-rYEi46+gIzufyYUAoHDnRzkWGxajpD9vVXFQ3g1vbjrBm6P7MBmm+s/fqPa46sxa+8FOUdEuRQKaugo5a4JWpw=="
},
"@mui/base": {
"version": "5.0.0-alpha.78",
"resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.78.tgz",
"integrity": "sha512-5L+GNe2M9/tFjQpjK2r837+kzRg/l6D5R9SQbG1wmSWejw5Ei8P+KXIgS/NLNi9g7dUT8bnCyzz9AZKQX1Jsfg==",
"version": "5.0.0-alpha.79",
"resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.79.tgz",
"integrity": "sha512-/lZLF027BkiEjM8MIYoeS/FEhTKf+41ePU9SOijMGrCin1Y0Igucw+IHa1fF8HXD7wDbFKqHuso3J1jMG8wyNw==",
"requires": {
"@babel/runtime": "^7.17.2",
"@emotion/is-prop-valid": "^1.1.2",
@@ -19927,13 +19927,13 @@
}
},
"@mui/material": {
"version": "5.6.3",
"resolved": "https://registry.npmjs.org/@mui/material/-/material-5.6.3.tgz",
"integrity": "sha512-2VovFsbCEhic29NYoBF7zFrpH2sEOlKXXDhGjzxmWiI9OnC3SX63hapWunjaVsiRINVnjuMHuW1MOs4UtV8Gfg==",
"version": "5.6.4",
"resolved": "https://registry.npmjs.org/@mui/material/-/material-5.6.4.tgz",
"integrity": "sha512-7TD+u/SExZK2a55w6reX56oPk37gKr/M/XGt156X+m0d9LhzOsW864nkErIX/H8oSkX/6kCimxu1FDsO+gjiVw==",
"requires": {
"@babel/runtime": "^7.17.2",
"@mui/base": "5.0.0-alpha.78",
"@mui/system": "^5.6.3",
"@mui/base": "5.0.0-alpha.79",
"@mui/system": "^5.6.4",
"@mui/types": "^7.1.3",
"@mui/utils": "^5.6.1",
"@types/react-transition-group": "^4.4.4",
@@ -19966,9 +19966,9 @@
}
},
"@mui/system": {
"version": "5.6.3",
"resolved": "https://registry.npmjs.org/@mui/system/-/system-5.6.3.tgz",
"integrity": "sha512-4SRi52a4ttZ2S4EHEDE8arVNuKqyQLTYUTF80WAZ0tQwnG20qwlBtzcrywCGItmVAMl7RUaYopyWOx3yVPvrmQ==",
"version": "5.6.4",
"resolved": "https://registry.npmjs.org/@mui/system/-/system-5.6.4.tgz",
"integrity": "sha512-7rsWED1wMFMePySJobsBerFZNu7ga580QSi3Zd6sJR8nVj12qD3yIdfvxA70/PxJ/805KbIT0GX7edKI+hpyhA==",
"requires": {
"@babel/runtime": "^7.17.2",
"@mui/private-theming": "^5.6.2",

6
interface/package.json
View File

@@ -8,10 +8,10 @@
"@emotion/styled": "^11.8.1",
"@msgpack/msgpack": "^2.7.2",
"@mui/icons-material": "^5.6.2",
"@mui/material": "^5.6.3",
"@mui/material": "^5.6.4",
"@table-library/react-table-library": "^3.1.0",
"@types/lodash": "^4.14.182",
"@types/node": "^17.0.30",
"@types/node": "^17.0.31",
"@types/react": "^17.0.43",
"@types/react-dom": "^17.0.14",
"@types/react-router-dom": "^5.3.3",
@@ -25,7 +25,7 @@
"react": "^17.0.2",
"react-app-rewired": "^2.2.1",
"react-dom": "^17.0.2",
"react-dropzone": "^14.0.1",
"react-dropzone": "^14.1.1",
"react-icons": "^4.3.1",
"react-router-dom": "^6.3.0",
"react-scripts": "5.0.1",

2
interface/src/framework/security/ManageUsersForm.tsx
View File

@@ -38,11 +38,13 @@ const ManageUsersForm: FC = () => {
BaseRow: `
font-size: 14px;
color: white;
padding-left: 8px;
`,
HeaderRow: `
text-transform: uppercase;
background-color: black;
color: #90CAF9;
font-weight: 500;
border-bottom: 1px solid #e0e0e0;
`,
Row: `

1
interface/src/project/DashboardStatus.tsx
View File

@@ -97,6 +97,7 @@ const DashboardStatus: FC = () => {
text-transform: uppercase;
background-color: black;
color: #90CAF9;
font-weight: 500;
border-bottom: 1px solid #e0e0e0;
`,
Row: `