From 3b95d7278d817ddd3eb9a6551e0dd0daeb32103c Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 26 Aug 2022 10:22:50 +0200 Subject: [PATCH] ui: dashboard fine-tunes --- apps/ui/src/lib/components/Usage.svelte | 24 +++--- .../components/svg/applications/Docker.svelte | 81 ++----------------- .../svg/services/PlausibleAnalytics.svelte | 2 +- .../components/svg/services/Searxng.svelte | 3 +- apps/ui/src/routes/index.svelte | 62 +++++++------- 5 files changed, 47 insertions(+), 125 deletions(-) diff --git a/apps/ui/src/lib/components/Usage.svelte b/apps/ui/src/lib/components/Usage.svelte index 46854145e..00915b767 100644 --- a/apps/ui/src/lib/components/Usage.svelte +++ b/apps/ui/src/lib/components/Usage.svelte @@ -54,68 +54,68 @@

Hardware details

-
+
Total Memory
-
+
{(usage?.memory.totalMemMb).toFixed(0)}MB
Used Memory
-
+
{(usage?.memory.usedMemMb).toFixed(0)}MB
Free Memory
-
+
{usage?.memory.freeMemPercentage}%
-
+
Total CPUs
-
+
{usage?.cpu.count}
CPU Usage
-
+
{usage?.cpu.usage}%
Load Average (5,10,30mins)
-
{usage?.cpu.load}
+
{usage?.cpu.load}
-
+
Total Disk
-
+
{usage?.disk.totalGb}GB
Used Disk
-
+
{usage?.disk.usedGb}GB
Free Disk
-
{usage?.disk.freePercentage}%
+
{usage?.disk.freePercentage}%
diff --git a/apps/ui/src/lib/components/svg/applications/Docker.svelte b/apps/ui/src/lib/components/svg/applications/Docker.svelte index 981d4d225..ea1787bd9 100644 --- a/apps/ui/src/lib/components/svg/applications/Docker.svelte +++ b/apps/ui/src/lib/components/svg/applications/Docker.svelte @@ -2,79 +2,8 @@ export let isAbsolute = true; - - - + + + + + diff --git a/apps/ui/src/lib/components/svg/services/PlausibleAnalytics.svelte b/apps/ui/src/lib/components/svg/services/PlausibleAnalytics.svelte index c02a9e6d9..e10ead645 100644 --- a/apps/ui/src/lib/components/svg/services/PlausibleAnalytics.svelte +++ b/apps/ui/src/lib/components/svg/services/PlausibleAnalytics.svelte @@ -4,6 +4,6 @@ plausible logo diff --git a/apps/ui/src/lib/components/svg/services/Searxng.svelte b/apps/ui/src/lib/components/svg/services/Searxng.svelte index 52cbaed81..bb775d2bf 100644 --- a/apps/ui/src/lib/components/svg/services/Searxng.svelte +++ b/apps/ui/src/lib/components/svg/services/Searxng.svelte @@ -3,7 +3,6 @@ diff --git a/apps/ui/src/routes/index.svelte b/apps/ui/src/routes/index.svelte index 896c029b8..e5ba5c05e 100644 --- a/apps/ui/src/routes/index.svelte +++ b/apps/ui/src/routes/index.svelte @@ -108,14 +108,14 @@
{#each applications as application} -
+
{#await getStatus(application)} - + {:then status} - {#if status === 'Running'}1 - + {#if status === 'Running'} + {:else} - + {/if} {/await}
@@ -129,12 +129,12 @@

{application.name}

-
+
{#if application.fqdn} - + - Website {/if} {#if application.settings.isBot && application.exposePort} - Server {/if} - + - Manage
@@ -208,14 +205,14 @@
{#each services as service} -
+
{#await getStatus(service)} - + {:then status} {#if status === 'Running'}1 - + {:else} - + {/if} {/await}
@@ -226,12 +223,12 @@

{service.name}

-
+
{#if service.fqdn} - + - Website {/if} - + - Manage
@@ -281,14 +276,14 @@
{#each databases as database} -
+
{#await getStatus(database)} - + {:then status} {#if status === 'Running'}1 - + {:else} - + {/if} {/await}
@@ -299,11 +294,11 @@

{database.name}

-
- +
+ - Manage