From 6d99f02102657078bd895061a891e4b494b6e106 Mon Sep 17 00:00:00 2001
From: stopyz <stopyz@gmail.com>
Date: Sat, 1 Jul 2023 23:08:27 +0200
Subject: [PATCH] Dashboard App for ACF
---
README.md | 2 +-
app/acf-util/welcome-html.lsp | 6 +++---
app/alpine-baselayout/health-model.lua | 2 +-
css/dashboard-pages/welcome.css | 6 +++---
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/README.md b/README.md
index 01f593a..c43e5df 100644
--- a/README.md
+++ b/README.md
@@ -62,4 +62,4 @@ skin=/skins/dashboard
- **Dashboard**
-<img src="https://github.com/trinity-labs/dashboard-skin/assets/45216746/9e465dad-57b6-4cf7-b9eb-3d9b1c25fb0c">
\ No newline at end of file
+<img src="https://github.com/trinity-labs/dashboard-skin/assets/45216746/688761b9-20c0-40a4-8af3-191aabacae0b">
\ No newline at end of file
diff --git a/app/acf-util/welcome-html.lsp b/app/acf-util/welcome-html.lsp
index 41da5b2..d2b526f 100644
--- a/app/acf-util/welcome-html.lsp
+++ b/app/acf-util/welcome-html.lsp
@@ -209,9 +209,9 @@ end
<p class="dashboard-infos dash-info-cpu">
<span class="data-title">CPU : </span><%= string.sub((proc.value.model.value), 14) %>
</p>
- <!--<p class="dashboard-infos dash-info-cpu"> -->
- <!--<span class="data-title">GPU : </span><%= proc.value.gpu.value %>-->
- <!--</p>-->
+ <p class="dashboard-infos dash-info-cpu">
+ <span class="data-title">GPU : </span><%= proc.value.gpu.value %>
+ </p>
<p class="dashboard-infos dash-info-memory">
<span class="data-title">Memory : </span>
<%= bytesToSize(tonumber(sys.value.memory.totalData)) %> Total |
diff --git a/app/alpine-baselayout/health-model.lua b/app/alpine-baselayout/health-model.lua
index 0fb0590..399b010 100644
--- a/app/alpine-baselayout/health-model.lua
+++ b/app/alpine-baselayout/health-model.lua
@@ -152,7 +152,7 @@ mymodule.get_proc = function (self)
proc.memory = cfe({ value=fs.read_file("/proc/meminfo") or "", label="Memory" })
proc.model = cfe({ value=querycmd("sed -n 5p /proc/cpuinfo") or "", label="CPU Model" })
proc.temp = cfe({ value=querycmd("cat /sys/class/thermal/thermal_zone2/temp") or "N/A", label="CPU Temp" })
- proc.gpu = cfe({ value=string.match(querycmd("lspci"), "VGA compatible controller:(%s+%a+%s+%a+)") or "Unknow", label="VGA GPU" })
+ proc.gpu = cfe({ value=string.match(querycmd("lspci"), "VGA compatible controller:(%s+%w+%s+%w+%s+%w+%s+%w+)") or "Unknow", label="VGA GPU" })
return cfe({ type="group", value=proc, label="Hardware Information" })
end
diff --git a/css/dashboard-pages/welcome.css b/css/dashboard-pages/welcome.css
index 1f008bb..b77f157 100644
--- a/css/dashboard-pages/welcome.css
+++ b/css/dashboard-pages/welcome.css
@@ -25,11 +25,11 @@
}
.uptime {
- font-size: 1rem;
+ font-size: 0.85rem;
color: #16597a;
font-weight: 900;
- position: relative;
- top: 0.1rem;
+ position: relative;
+ top: 0.075rem;
}
.dashboard-block-title {
--
GitLab