From 4a23b4aa1a12bc1f0285a0a6b4f3d0e4ea8f6f2d Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Mon, 7 Nov 2022 16:16:00 +0100 Subject: [PATCH 1/3] fix: overview issues --- src/lib/charts/bar.svelte | 3 ++ src/lib/charts/base.svelte | 5 ++- src/lib/charts/config.ts | 4 +- src/lib/charts/light.json | 2 +- src/lib/charts/line.svelte | 9 ++++ .../authentication/[[page]]/+page.ts | 2 +- .../authentication/user-[user]/+page.svelte | 1 - .../wizard/step1.svelte | 1 - .../project-[project]/overview/+layout.svelte | 28 ++++++------- .../overview/platforms/+page.svelte | 41 +++++++++++-------- 10 files changed, 57 insertions(+), 39 deletions(-) diff --git a/src/lib/charts/bar.svelte b/src/lib/charts/bar.svelte index 71377d401..d7658dfa6 100644 --- a/src/lib/charts/bar.svelte +++ b/src/lib/charts/bar.svelte @@ -1,11 +1,14 @@ { s.type = 'bar'; s.stack = 'total'; diff --git a/src/lib/charts/base.svelte b/src/lib/charts/base.svelte index 91a5064a0..6fc6f057f 100644 --- a/src/lib/charts/base.svelte +++ b/src/lib/charts/base.svelte @@ -8,10 +8,12 @@ import dark from './dark.json'; import type { ECharts } from 'echarts/core'; import type { BarSeriesOption, LineSeriesOption } from 'echarts/charts'; + import type { EChartsOption } from 'echarts'; registerTheme('light', { ...base, ...light }); registerTheme('dark', { ...base, ...dark }); + export let options: EChartsOption; export let series: (BarSeriesOption | LineSeriesOption)[]; let chart: ECharts; @@ -19,6 +21,7 @@ $: option = { ...defaultConfig, + ...options, series }; @@ -85,7 +88,7 @@ diff --git a/src/lib/charts/config.ts b/src/lib/charts/config.ts index 541b51e30..00645a151 100644 --- a/src/lib/charts/config.ts +++ b/src/lib/charts/config.ts @@ -17,8 +17,8 @@ export const defaultConfig: EChartsOption = { containLabel: true, left: 0, right: 0, - bottom: 15, - top: 15 + bottom: 0, + top: 45 }, xAxis: { type: 'time', diff --git a/src/lib/charts/light.json b/src/lib/charts/light.json index d94378d63..e6ddb057a 100644 --- a/src/lib/charts/light.json +++ b/src/lib/charts/light.json @@ -34,7 +34,7 @@ }, "splitLine": { "lineStyle": { - "color": ["#E0E6F1"] + "color": ["#E8E9F0"] } } }, diff --git a/src/lib/charts/line.svelte b/src/lib/charts/line.svelte index 4cebee6f9..05cbf248e 100644 --- a/src/lib/charts/line.svelte +++ b/src/lib/charts/line.svelte @@ -1,14 +1,23 @@ { s.type = 'line'; s.stack = 'total'; + s.lineStyle = { + shadowBlur: 1, + shadowColor: Colors.Primary, + shadowOffsetY: 0 + }; s.showSymbol = false; return s; diff --git a/src/routes/console/project-[project]/authentication/[[page]]/+page.ts b/src/routes/console/project-[project]/authentication/[[page]]/+page.ts index e4f9856d4..132a73b2e 100644 --- a/src/routes/console/project-[project]/authentication/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/authentication/[[page]]/+page.ts @@ -9,7 +9,7 @@ export const load: PageLoad = async ({ params, parent, url }) => { const page = Number(params.page); const offset = pageToOffset(page, PAGE_LIMIT); const search = url.search.slice(1) ?? undefined; - console.log(page); + return { offset, search, diff --git a/src/routes/console/project-[project]/authentication/user-[user]/+page.svelte b/src/routes/console/project-[project]/authentication/user-[user]/+page.svelte index 9561747ef..27220cacc 100644 --- a/src/routes/console/project-[project]/authentication/user-[user]/+page.svelte +++ b/src/routes/console/project-[project]/authentication/user-[user]/+page.svelte @@ -27,7 +27,6 @@ import { Dependencies } from '$lib/constants'; $: if (prefs) { - console.log(prefs); if (JSON.stringify(prefs) !== JSON.stringify(Object.entries($user.prefs))) { if (!!prefs[prefs.length - 1][0] && !!prefs[prefs.length - 1][1]) { arePrefsDisabled = false; diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/wizard/step1.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/wizard/step1.svelte index 12771674e..8ab6d1251 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/wizard/step1.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/wizard/step1.svelte @@ -23,7 +23,6 @@ return n; }); } - $: console.log($createDocument?.document['datearray'] ?? ''); diff --git a/src/routes/console/project-[project]/overview/+layout.svelte b/src/routes/console/project-[project]/overview/+layout.svelte index 2443f8e87..66c391f00 100644 --- a/src/routes/console/project-[project]/overview/+layout.svelte +++ b/src/routes/console/project-[project]/overview/+layout.svelte @@ -87,7 +87,8 @@ + childStart + noArrow> - - changePeriod('24h')}> - 24h - - changePeriod('30d')}> - 30d - - changePeriod('90d')}> - 90d - - - - - {#if network.length} -
- [e.date, e.value])] - } - ]} /> -
- {/if} + changePeriod(e.detail)} />
-
-
-
- {format(total($usage.requests))} -
-
Requests
-
- - - - changePeriod('24h')}> - 24h - - changePeriod('30d')}> - 30d - - changePeriod('90d')}> - 90d - - - -
- {#if network.length} -
- [e.date, e.value])] - } - ]} /> -
- {/if} + changePeriod(e.detail)} />
-
XX
-
Databases
+
+ {format(last($usage.documents).value)} +
+
Documents
-
Documents: {last($usage.documents).value}
+
Databases: XX
@@ -261,23 +169,7 @@
- {#if $stats.get(projectId)} -
- {format($stats.get(projectId)[11][1])} -
-
Realtime Connections
-
- -
- {:else} -
waiting for realtime connections
- {/if} +
diff --git a/src/routes/console/project-[project]/overview/bandwith.svelte b/src/routes/console/project-[project]/overview/bandwith.svelte new file mode 100644 index 000000000..1733dbd93 --- /dev/null +++ b/src/routes/console/project-[project]/overview/bandwith.svelte @@ -0,0 +1,77 @@ + + +
+
+
+ {bandwith.value} + {bandwith.unit} +
+
Bandwidth
+
+ + + + dispatch('change', '24h')}>24h + dispatch('change', '30d')}>30d + dispatch('change', '90d')}>90d + + +
+{#if bandwith.value !== '0'} +
+ + value + ? `${humanFileSize(+value).value} ${humanFileSize(+value).unit}` + : '0' + } + } + }} + series={[ + { + name: 'Bandwidth', + data: [...network.map((e) => [e.date, e.value])], + tooltip: { + valueFormatter: (value) => + `${humanFileSize(+value).value} ${humanFileSize(+value).unit}` + } + } + ]} /> +
+{:else} + +
+
+
+{/if} diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/+page.ts b/src/routes/console/project-[project]/overview/platforms/[platform]/+page.ts index 41ce2475f..2779bbeb7 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/+page.ts +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/+page.ts @@ -9,7 +9,7 @@ export const load: PageLoad = async ({ params, depends }) => { return { header: Header, - breadcrumb: Breadcrumbs, + breadcrumbs: Breadcrumbs, platform: await sdkForConsole.projects.getPlatform(params.project, params.platform) }; }; diff --git a/src/routes/console/project-[project]/overview/realtime.svelte b/src/routes/console/project-[project]/overview/realtime.svelte new file mode 100644 index 000000000..ae75be126 --- /dev/null +++ b/src/routes/console/project-[project]/overview/realtime.svelte @@ -0,0 +1,45 @@ + + +
+ {format(current)} +
+
Realtime Connections
+{#if total} +
+ +
+{:else} + +
+
+
+{/if} diff --git a/src/routes/console/project-[project]/overview/requests.svelte b/src/routes/console/project-[project]/overview/requests.svelte new file mode 100644 index 000000000..3431b737e --- /dev/null +++ b/src/routes/console/project-[project]/overview/requests.svelte @@ -0,0 +1,67 @@ + + +
+
+
+ {format(total($usage.requests))} +
+
Requests
+
+ + + + dispatch('change', '24h')}>24h + dispatch('change', '30d')}>30d + dispatch('change', '90d')}>90d + + +
+{#if total($usage.requests) !== 0} +
+ [e.date, e.value])] + } + ]} /> +
+{:else} + +
+
+
+{/if} From a0233d4d26d31bb83940bbb594f1e6eeb9f24d7d Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Tue, 8 Nov 2022 17:07:13 +0100 Subject: [PATCH 3/3] fix: dashed cards --- src/lib/components/card.svelte | 3 ++- src/routes/console/project-[project]/overview/bandwith.svelte | 4 ++-- src/routes/console/project-[project]/overview/realtime.svelte | 4 ++-- src/routes/console/project-[project]/overview/requests.svelte | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/lib/components/card.svelte b/src/lib/components/card.svelte index a9d12f9bc..cac926f54 100644 --- a/src/lib/components/card.svelte +++ b/src/lib/components/card.svelte @@ -1,7 +1,8 @@ -
+
diff --git a/src/routes/console/project-[project]/overview/bandwith.svelte b/src/routes/console/project-[project]/overview/bandwith.svelte index 1733dbd93..7e040eb61 100644 --- a/src/routes/console/project-[project]/overview/bandwith.svelte +++ b/src/routes/console/project-[project]/overview/bandwith.svelte @@ -65,12 +65,12 @@ ]} /> {:else} - +
diff --git a/src/routes/console/project-[project]/overview/realtime.svelte b/src/routes/console/project-[project]/overview/realtime.svelte index ae75be126..8bcd55239 100644 --- a/src/routes/console/project-[project]/overview/realtime.svelte +++ b/src/routes/console/project-[project]/overview/realtime.svelte @@ -26,14 +26,14 @@ ]} /> {:else} - +
{:else} - +