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

layout changes

Browse Source
This commit is contained in:
Proddy
2023-10-18 15:40:55 +02:00
parent a1bb49359f
commit fddfa47b51
3 changed files with 43 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
interface/package.json
View File

@@ -26,9 +26,9 @@
"@mui/icons-material": "^5.14.14", "@mui/icons-material": "^5.14.14",
"@mui/material": "^5.14.14", "@mui/material": "^5.14.14",
"@table-library/react-table-library": "4.1.7", "@table-library/react-table-library": "4.1.7",
"@types/lodash-es": "^4.17.9", "@types/lodash-es": "^4.17.10",
"@types/node": "^20.8.6", "@types/node": "^20.8.7",
"@types/react": "^18.2.28", "@types/react": "^18.2.29",
"@types/react-dom": "^18.2.13", "@types/react-dom": "^18.2.13",
"@types/react-router-dom": "^5.3.3", "@types/react-router-dom": "^5.3.3",
"alova": "^2.13.1", "alova": "^2.13.1",
@@ -68,7 +68,7 @@
"prettier": "^3.0.3", "prettier": "^3.0.3",
"rollup-plugin-visualizer": "^5.9.2", "rollup-plugin-visualizer": "^5.9.2",
"terser": "^5.22.0", "terser": "^5.22.0",
"vite": "^4.4.11", "vite": "^4.5.0",
"vite-plugin-imagemin": "^0.6.1", "vite-plugin-imagemin": "^0.6.1",
"vite-tsconfig-paths": "^4.2.1" "vite-tsconfig-paths": "^4.2.1"
}, },

8
interface/src/project/DashboardDevices.tsx
View File

@@ -136,7 +136,7 @@ const DashboardDevices: FC = () => {
common_theme, common_theme,
{ {
Table: ` Table: `
--data-table-library_grid-template-columns: 40px repeat(1, minmax(0, 1fr)); --data-table-library_grid-template-columns: 40px repeat(1, minmax(0, 1fr)) 130px;
`, `,
BaseRow: ` BaseRow: `
.td { .td {
@@ -418,6 +418,7 @@ const DashboardDevices: FC = () => {
<HeaderRow> <HeaderRow>
<HeaderCell stiff /> <HeaderCell stiff />
<HeaderCell resize>{LL.DESCRIPTION()}</HeaderCell> <HeaderCell resize>{LL.DESCRIPTION()}</HeaderCell>
<HeaderCell stiff>{LL.TYPE(0)}</HeaderCell>
</HeaderRow> </HeaderRow>
</Header> </Header>
<Body> <Body>
@@ -430,6 +431,7 @@ const DashboardDevices: FC = () => {
{device.n} {device.n}
<span style={{ color: 'lightblue' }}>&nbsp;&nbsp;({device.e})</span> <span style={{ color: 'lightblue' }}>&nbsp;&nbsp;({device.e})</span>
</Cell> </Cell>
<Cell stiff>{device.tn}</Cell>
</Row> </Row>
))} ))}
</Body> </Body>
@@ -482,8 +484,8 @@ const DashboardDevices: FC = () => {
right: 16, right: 16,
bottom: 0, bottom: 0,
top: 128, top: 128,
maxHeight: () => size[1] - 210, zIndex: 'modal',
zIndex: 'modal' border: '1px solid #177ac9'
}} }}
> >
<Box sx={{ border: '1px solid #177ac9' }}> <Box sx={{ border: '1px solid #177ac9' }}>

48
interface/yarn.lock
View File

@@ -1265,12 +1265,12 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@types/lodash-es@npm:^4.17.9": "@types/lodash-es@npm:^4.17.10":
version: 4.17.9 version: 4.17.10
resolution: "@types/lodash-es@npm:4.17.9" resolution: "@types/lodash-es@npm:4.17.10"
dependencies: dependencies:
"@types/lodash": "npm:*" "@types/lodash": "npm:*"
checksum: 5e3a8a74134e67c37f1b8eb4a2897c88038f1b1bd7f508feec9e5561b52787d7efcc30c18981e9c6edec2b894f127b60312a431d98b84e12e785bea9cb5d1d40 checksum: a6c68872425418491d693186238e22c9da0e88bdf7ffe2b26e5436a19027ffedabeaec162e336b3722d5c43411866e859beae76a1a8f737bb5b115d5a574f758
languageName: node languageName: node
linkType: hard linkType: hard
@@ -1288,7 +1288,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@types/node@npm:*, @types/node@npm:^20.8.6": "@types/node@npm:*":
version: 20.8.6 version: 20.8.6
resolution: "@types/node@npm:20.8.6" resolution: "@types/node@npm:20.8.6"
dependencies: dependencies:
@@ -1297,6 +1297,15 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@types/node@npm:^20.8.7":
version: 20.8.7
resolution: "@types/node@npm:20.8.7"
dependencies:
undici-types: "npm:~5.25.1"
checksum: a347ac7e6a9748ffff018ca01142ba625e774cb0b53785abb58b16a5a8468cc9b7656686dbe4c39c2f3fc477439994ee8aeae9b80ced86f320598bafaf83f802
languageName: node
linkType: hard
"@types/parse-json@npm:^4.0.0": "@types/parse-json@npm:^4.0.0":
version: 4.0.0 version: 4.0.0
resolution: "@types/parse-json@npm:4.0.0" resolution: "@types/parse-json@npm:4.0.0"
@@ -1350,7 +1359,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@types/react@npm:*, @types/react@npm:^18.2.28": "@types/react@npm:*":
version: 18.2.28 version: 18.2.28
resolution: "@types/react@npm:18.2.28" resolution: "@types/react@npm:18.2.28"
dependencies: dependencies:
@@ -1361,6 +1370,17 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@types/react@npm:^18.2.29":
version: 18.2.29
resolution: "@types/react@npm:18.2.29"
dependencies:
"@types/prop-types": "npm:*"
"@types/scheduler": "npm:*"
csstype: "npm:^3.0.2"
checksum: c261e4e2ec18a7244c959cb40ac2f43b0fa7f0b40fcce615243402fc61699cbebf6f2eae2632b8a0f0a2775a1ca735279b15543349cafa276c064b591712b85b
languageName: node
linkType: hard
"@types/responselike@npm:^1.0.0": "@types/responselike@npm:^1.0.0":
version: 1.0.1 version: 1.0.1
resolution: "@types/responselike@npm:1.0.1" resolution: "@types/responselike@npm:1.0.1"
@@ -1528,9 +1548,9 @@ __metadata:
"@preact/compat": "npm:^17.1.2" "@preact/compat": "npm:^17.1.2"
"@preact/preset-vite": "npm:^2.6.0" "@preact/preset-vite": "npm:^2.6.0"
"@table-library/react-table-library": "npm:4.1.7" "@table-library/react-table-library": "npm:4.1.7"
"@types/lodash-es": "npm:^4.17.9" "@types/lodash-es": "npm:^4.17.10"
"@types/node": "npm:^20.8.6" "@types/node": "npm:^20.8.7"
"@types/react": "npm:^18.2.28" "@types/react": "npm:^18.2.29"
"@types/react-dom": "npm:^18.2.13" "@types/react-dom": "npm:^18.2.13"
"@types/react-router-dom": "npm:^5.3.3" "@types/react-router-dom": "npm:^5.3.3"
"@typescript-eslint/eslint-plugin": "npm:^6.8.0" "@typescript-eslint/eslint-plugin": "npm:^6.8.0"
@@ -1566,7 +1586,7 @@ __metadata:
terser: "npm:^5.22.0" terser: "npm:^5.22.0"
typesafe-i18n: "npm:^5.26.2" typesafe-i18n: "npm:^5.26.2"
typescript: "npm:^5.2.2" typescript: "npm:^5.2.2"
vite: "npm:^4.4.11" vite: "npm:^4.5.0"
vite-plugin-imagemin: "npm:^0.6.1" vite-plugin-imagemin: "npm:^0.6.1"
vite-tsconfig-paths: "npm:^4.2.1" vite-tsconfig-paths: "npm:^4.2.1"
languageName: unknown languageName: unknown
@@ -8298,9 +8318,9 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"vite@npm:^4.4.11": "vite@npm:^4.5.0":
version: 4.4.11 version: 4.5.0
resolution: "vite@npm:4.4.11" resolution: "vite@npm:4.5.0"
dependencies: dependencies:
esbuild: "npm:^0.18.10" esbuild: "npm:^0.18.10"
fsevents: "npm:~2.3.2" fsevents: "npm:~2.3.2"
@@ -8334,7 +8354,7 @@ __metadata:
optional: true optional: true
bin: bin:
vite: bin/vite.js vite: bin/vite.js
checksum: 325e2955fe939bc5706aab2aa46498d98adace1df4d11f42cf4539754b886798b6bf7c247c94d23fb6cf3a569e56bad4a11561bf25e8e6dcc8c0e2f73ecc5e5b checksum: b262ea4880ba7de8a77b0a665c771561ae3cb7f0d6c5b90e65298039755192550bf90cb96a2910d564506e2d499aa20e9becd330b835c34d414249083ac6e40c
languageName: node languageName: node
linkType: hard linkType: hard