+ 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 - - - (showPeriodBandwidth = !showPeriodBandwidth)}> - {period} - - - - 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 - - - (showPeriodRequests = !showPeriodRequests)}> - {period} - - - - 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 + + + (showPeriod = !showPeriod)}> + {period} + + + + 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} + + + + No data to show + + +{/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} + + + + No data to show + Get started with Realtime + + +{/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 + + + (showPeriod = !showPeriod)}> + {period} + + + + dispatch('change', '24h')}>24h + dispatch('change', '30d')}>30d + dispatch('change', '90d')}>90d + + + +{#if total($usage.requests) !== 0} + + [e.date, e.value])] + } + ]} /> + +{:else} + + + + No data to show + + +{/if}