diff --git a/package-lock.json b/package-lock.json index c34874549..b397c1fcf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,6 +13,7 @@ "@aw-labs/ui": "0.0.0-69", "@popperjs/core": "^2.11.6", "echarts": "^5.4.0", + "pretty-bytes": "^6.0.0", "prismjs": "^1.29.0", "tippy.js": "^6.3.7", "web-vitals": "^3.0.3" @@ -5942,6 +5943,17 @@ "svelte": "^3.2.0" } }, + "node_modules/pretty-bytes": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-6.0.0.tgz", + "integrity": "sha512-6UqkYefdogmzqAZWzJ7laYeJnaXDy2/J+ZqiiMtS7t7OfpXWTlaeGMwX8U6EFvPV/YWWEKRkS8hKS4k60WHTOg==", + "engines": { + "node": "^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/pretty-format": { "version": "27.5.1", "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz", @@ -11977,6 +11989,11 @@ "dev": true, "requires": {} }, + "pretty-bytes": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-6.0.0.tgz", + "integrity": "sha512-6UqkYefdogmzqAZWzJ7laYeJnaXDy2/J+ZqiiMtS7t7OfpXWTlaeGMwX8U6EFvPV/YWWEKRkS8hKS4k60WHTOg==" + }, "pretty-format": { "version": "27.5.1", "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz", diff --git a/package.json b/package.json index c332b80f2..853131868 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "@aw-labs/ui": "0.0.0-69", "@popperjs/core": "^2.11.6", "echarts": "^5.4.0", + "pretty-bytes": "^6.0.0", "prismjs": "^1.29.0", "tippy.js": "^6.3.7", "web-vitals": "^3.0.3" 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.json b/src/lib/charts/base.json index 29d166045..0cbfc0897 100644 --- a/src/lib/charts/base.json +++ b/src/lib/charts/base.json @@ -6,7 +6,7 @@ "borderWidth": 1 }, "lineStyle": { - "width": 2 + "width": 1 }, "symbolSize": 4, "symbol": "emptyCircle", diff --git a/src/lib/charts/base.svelte b/src/lib/charts/base.svelte index 91a5064a0..09f5b5ee2 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 }; @@ -39,7 +42,7 @@ (await import('echarts/components')).TransformComponent, (await import('echarts/components')).LegendComponent, (await import('echarts/features')).LabelLayout, - (await import('echarts/renderers')).CanvasRenderer + (await import('echarts/renderers')).SVGRenderer ]); makeChart(); }); @@ -85,7 +88,7 @@ diff --git a/src/lib/charts/config.ts b/src/lib/charts/config.ts index 541b51e30..c43f04c63 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', @@ -27,6 +27,11 @@ export const defaultConfig: EChartsOption = { yAxis: { type: 'value', splitNumber: 3, - minInterval: 1 + minInterval: 1, + splitLine: { + lineStyle: { + width: 1 + } + } } }; diff --git a/src/lib/charts/dark.json b/src/lib/charts/dark.json index 0bc23c3cf..94a660131 100644 --- a/src/lib/charts/dark.json +++ b/src/lib/charts/dark.json @@ -45,11 +45,11 @@ } }, "axisLabel": { - "color": "#666666" + "color": "#868EA3" }, "splitLine": { "lineStyle": { - "color": ["#333333"] + "color": ["#4F5769"] } }, "splitArea": { 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..3879c07dc 100644 --- a/src/lib/charts/line.svelte +++ b/src/lib/charts/line.svelte @@ -1,14 +1,24 @@ { s.type = 'line'; s.stack = 'total'; + s.lineStyle = { + shadowBlur: 38, + shadowColor: Colors.Primary, + shadowOffsetY: 15, + shadowOffsetX: 0 + }; s.showSymbol = false; return s; 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/lib/helpers/sizeConvertion.ts b/src/lib/helpers/sizeConvertion.ts index 989cf91b2..f5786b1eb 100644 --- a/src/lib/helpers/sizeConvertion.ts +++ b/src/lib/helpers/sizeConvertion.ts @@ -1,3 +1,5 @@ +import prettyBytes from 'pretty-bytes'; + const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']; export function calculateSize(bytes: number, decimals = 1) { @@ -20,55 +22,16 @@ export function bytesToSize(value: number, unit: string) { return value / Math.pow(1024, index); } -export function humanFileSize(value: number): { +export function humanFileSize(bytes: number): { value: string; unit: string; } { - if (!value) return { value: 'No', unit: 'Bytes' }; - const length = value.toString().length; - const unit = - length < 7 - ? 'kilobyte' - : length < 11 - ? 'megabyte' - : length < 15 - ? 'gigabyte' - : length < 19 - ? 'terabyte' - : 'petabyte'; - - const formatter = Intl.NumberFormat('en', { - style: 'unit', - maximumSignificantDigits: 3, - maximumFractionDigits: 2, - unit - }); - - while (value > 1000) { - value /= 1000; - } - - const parts: { - integer: string; - unit: string; - fraction?: string; - decimal?: string; - } = formatter.formatToParts(value).reduce( - (prev, curr) => { - prev[curr.type] = curr.value; - - return prev; - }, - { - integer: '', - unit: '', - decimal: '', - fraction: '' - } - ); + const value = prettyBytes(bytes, { + locale: 'en' + }).split(' '); return { - value: `${parts.integer}${parts.decimal}${parts.fraction}`, - unit: parts.unit + value: value[0], + unit: value[1] }; } diff --git a/src/routes/console/account/+layout.ts b/src/routes/console/account/+layout.ts index 2a85f109d..cd42223bd 100644 --- a/src/routes/console/account/+layout.ts +++ b/src/routes/console/account/+layout.ts @@ -5,6 +5,6 @@ import type { LayoutLoad } from './$types'; export const load: LayoutLoad = async () => { return { header: Header, - breadcrumb: Breadcrumbs + breadcrumbs: Breadcrumbs }; }; diff --git a/src/routes/console/project-[project]/auth/[[page]]/+page.ts b/src/routes/console/project-[project]/auth/[[page]]/+page.ts index e4f9856d4..132a73b2e 100644 --- a/src/routes/console/project-[project]/auth/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/auth/[[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]/databases/database-[database]/collection-[collection]/wizard/step1.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/wizard/step1.svelte index 0d4526dc3..0f84965e4 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 020c7f10b..90e9f4b3b 100644 --- a/src/routes/console/project-[project]/overview/+layout.svelte +++ b/src/routes/console/project-[project]/overview/+layout.svelte @@ -1,21 +1,41 @@ + + @@ -71,96 +61,14 @@ {#if $project} {#if $usage} - {@const bandwith = humanFileSize(total($usage.network))} {@const storage = humanFileSize(last($usage.storage).value)}
-
-
-
- {bandwith.value} - {bandwith.unit} -
-
Bandwidth
-
- - - - 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
@@ -259,21 +169,7 @@
- {#if $stats.get(projectId)} -
- {format($stats.get(projectId)[11][1])} -
-
Realtime Connections
- - {:else} -
waiting for realtime connections
- {/if} +
@@ -318,9 +214,3 @@
{/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..7e040eb61 --- /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/+page.svelte b/src/routes/console/project-[project]/overview/platforms/+page.svelte index 3ffb02aa9..11bab105f 100644 --- a/src/routes/console/project-[project]/overview/platforms/+page.svelte +++ b/src/routes/console/project-[project]/overview/platforms/+page.svelte @@ -1,6 +1,6 @@ + +
+ {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..9866b89d0 --- /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}