From c824ec3339b0d0e9f114816e6986133e1b414446 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Thu, 13 Oct 2022 15:17:39 +0200 Subject: [PATCH 1/4] fix: proper colors for usage charts --- src/lib/charts/base.json | 2 +- src/lib/charts/dark.json | 1 - src/lib/charts/light.json | 1 - src/lib/layout/usage.svelte | 13 ++++++++++++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/lib/charts/base.json b/src/lib/charts/base.json index dc424ad86..3ba778aa9 100644 --- a/src/lib/charts/base.json +++ b/src/lib/charts/base.json @@ -1,5 +1,5 @@ { - "color": ["#ff80b7", "#a1c4ff", "#cbb1fc", "#94dbd1", "#fdc584", "#f02e65", "#ffa1a1"], + "color": ["#F02E65", "#94DBD1", "#A1C4FF", "#CBB1FC", "#FDC584"], "backgroundColor": "rgba(255,255,255,0)", "textStyle": {}, "line": { diff --git a/src/lib/charts/dark.json b/src/lib/charts/dark.json index 0dc125052..0bc23c3cf 100644 --- a/src/lib/charts/dark.json +++ b/src/lib/charts/dark.json @@ -1,5 +1,4 @@ { - "color": ["#f02e65", "#a1c4ff", "#cbb1fc", "#94dbd1", "#fdc584", "#f02e65", "#ffa1a1"], "backgroundColor": "rgba(0,0,0,0)", "title": { "textStyle": { diff --git a/src/lib/charts/light.json b/src/lib/charts/light.json index 5461fff77..d94378d63 100644 --- a/src/lib/charts/light.json +++ b/src/lib/charts/light.json @@ -1,5 +1,4 @@ { - "color": ["#ff80b7", "#a1c4ff", "#cbb1fc", "#94dbd1", "#fdc584", "#f02e65", "#ffa1a1"], "backgroundColor": "rgba(255,255,255,0)", "title": { "textStyle": { diff --git a/src/lib/layout/usage.svelte b/src/lib/layout/usage.svelte index 9b7f6c6c9..80def311b 100644 --- a/src/lib/layout/usage.svelte +++ b/src/lib/layout/usage.svelte @@ -73,6 +73,7 @@
[e.date, e.value])] @@ -87,6 +88,8 @@
[e.date, e.value])] @@ -101,6 +104,9 @@
[e.date, e.value])] @@ -115,9 +121,14 @@
[e.date, e.value])] + data: [...deleted.map((e) => [e.date, e.value])], + zlevel: 2 } ]} /> {/if} From 49bd3f391cdea0338aaf5eb0d7f5376699721841 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Thu, 13 Oct 2022 15:21:25 +0200 Subject: [PATCH 2/4] fix: applying colors to charts --- src/lib/layout/usage.svelte | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/lib/layout/usage.svelte b/src/lib/layout/usage.svelte index 80def311b..69917ba6e 100644 --- a/src/lib/layout/usage.svelte +++ b/src/lib/layout/usage.svelte @@ -73,10 +73,10 @@
[e.date, e.value])] + data: [...created.map((e) => [e.date, e.value])], + color: '#94DBD1' } ]} /> {/if} @@ -88,11 +88,10 @@
[e.date, e.value])] + data: [...read.map((e) => [e.date, e.value])], + color: '#A1C4FF' } ]} /> {/if} @@ -104,12 +103,10 @@
[e.date, e.value])] + data: [...updated.map((e) => [e.date, e.value])], + color: '#CBB1FC' } ]} /> {/if} @@ -121,14 +118,10 @@
[e.date, e.value])], - zlevel: 2 + color: '#FDC584' } ]} /> {/if} From ad69ce56a4e2007968dbe19826fb25a12d422a10 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Thu, 13 Oct 2022 15:27:30 +0200 Subject: [PATCH 3/4] fix: use enum for chart colors --- src/lib/charts/config.ts | 8 ++++++++ src/lib/layout/usage.svelte | 9 +++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/lib/charts/config.ts b/src/lib/charts/config.ts index 0e3ff1b27..541b51e30 100644 --- a/src/lib/charts/config.ts +++ b/src/lib/charts/config.ts @@ -1,6 +1,14 @@ import type { EChartsOption } from 'echarts'; +export enum Colors { + Primary = '#F02E65', + Secondary = '#94DBD1', + Tertiary = '#A1C4FF', + Quaternary = '#CBB1FC', + Quinary = '#FDC584' +} export const defaultConfig: EChartsOption = { + color: Object.values(Colors), animation: false, tooltip: { trigger: 'axis' diff --git a/src/lib/layout/usage.svelte b/src/lib/layout/usage.svelte index 69917ba6e..7f3b15f66 100644 --- a/src/lib/layout/usage.svelte +++ b/src/lib/layout/usage.svelte @@ -6,6 +6,7 @@ import { Container } from '$lib/layout'; import { BarChart, LineChart } from '$lib/charts'; import { Card, DropTabs, DropTabsItem, Tiles } from '$lib/components'; + import { Colors } from '$lib/charts/config'; import type { Models } from '@aw-labs/appwrite-console'; type MetricMetadata = { @@ -76,7 +77,7 @@ { name: createdMetadata.legend, data: [...created.map((e) => [e.date, e.value])], - color: '#94DBD1' + color: Colors.Secondary } ]} /> {/if} @@ -91,7 +92,7 @@ { name: readMetadata.legend, data: [...read.map((e) => [e.date, e.value])], - color: '#A1C4FF' + color: Colors.Tertiary } ]} /> {/if} @@ -106,7 +107,7 @@ { name: updatedMetadata.legend, data: [...updated.map((e) => [e.date, e.value])], - color: '#CBB1FC' + color: Colors.Quaternary } ]} /> {/if} @@ -121,7 +122,7 @@ { name: deletedMetadata.legend, data: [...deleted.map((e) => [e.date, e.value])], - color: '#FDC584' + color: Colors.Quinary } ]} /> {/if} From 4d194e31542aa7401236c49e8bc7acb822a37eef Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Thu, 13 Oct 2022 15:28:25 +0200 Subject: [PATCH 4/4] fix: remove base colors from charts config file --- src/lib/charts/base.json | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib/charts/base.json b/src/lib/charts/base.json index 3ba778aa9..29d166045 100644 --- a/src/lib/charts/base.json +++ b/src/lib/charts/base.json @@ -1,5 +1,4 @@ { - "color": ["#F02E65", "#94DBD1", "#A1C4FF", "#CBB1FC", "#FDC584"], "backgroundColor": "rgba(255,255,255,0)", "textStyle": {}, "line": {