From 7cefd845ebde2d46378cbe48ac132e7c088ac355 Mon Sep 17 00:00:00 2001 From: Arman Date: Mon, 30 Oct 2023 19:42:13 +0100 Subject: [PATCH] fix: login flow, files and more --- src/routes/+layout.ts | 3 +- .../account/payments/deleteAddress.svelte | 1 - .../billing/store.ts | 3 +- .../storage/bucket-[bucket]/+page.svelte | 45 +++++++++++-------- .../storage/bucket-[bucket]/+page.ts | 11 ++++- src/routes/login/+page.svelte | 33 +++++++++++--- 6 files changed, 67 insertions(+), 29 deletions(-) diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts index 405236748..5482a57ed 100644 --- a/src/routes/+layout.ts +++ b/src/routes/+layout.ts @@ -38,7 +38,8 @@ export const load: LayoutLoad = async ({ depends, url }) => { ]; if (!acceptedRoutes.some((n) => url.pathname.startsWith(n))) { - throw redirect(303, '/login'); + const redirectUrl = `${url.search}&redirect=${url.pathname}`; + throw redirect(303, `/login${redirectUrl}`); } } }; diff --git a/src/routes/console/account/payments/deleteAddress.svelte b/src/routes/console/account/payments/deleteAddress.svelte index bf2c7495c..2f11083c3 100644 --- a/src/routes/console/account/payments/deleteAddress.svelte +++ b/src/routes/console/account/payments/deleteAddress.svelte @@ -14,7 +14,6 @@ async function handleDelete() { try { - console.log(selectedAddress); await sdk.forConsole.billing.deleteAddress(selectedAddress.$id); await invalidate(Dependencies.PAYMENT_METHODS); showDelete = false; diff --git a/src/routes/console/organization-[organization]/billing/store.ts b/src/routes/console/organization-[organization]/billing/store.ts index 388585534..57b6cc703 100644 --- a/src/routes/console/organization-[organization]/billing/store.ts +++ b/src/routes/console/organization-[organization]/billing/store.ts @@ -1,7 +1,8 @@ import { page } from '$app/stores'; +import type { AggregationList } from '$lib/sdk/billing'; import { derived } from 'svelte/store'; export const aggregationList = derived( page, - ($page) => $page.data.aggregationList as string | null + ($page) => $page.data.aggregationList as AggregationList | null ); diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte index 3393c087b..8bd0685a2 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte @@ -57,6 +57,10 @@ const projectId = $page.params.project; const bucketId = $page.params.bucket; + const totalStorage = data.aggregationList.aggregations.reduce((acc, curr) => { + acc += curr.usageStorage; + return acc; + }, 0); const getPreview = (fileId: string) => sdk.forProject.storage.getFilePreview(bucketId, fileId, 32, 32).toString() + '&mode=admin'; @@ -85,12 +89,15 @@ trackError(error, Submit.FileDelete); } } - - // TODO: fetch the total storage used - + @@ -101,21 +108,23 @@ - -
- -
-
+ + +
+ +
+
+

You are limited to {limit} of storage on the {tier} plan. diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.ts b/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.ts index 203ea2410..27a355cab 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.ts +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.ts @@ -3,6 +3,10 @@ import { sdk } from '$lib/stores/sdk'; import { getLimit, getPage, getSearch, pageToOffset } from '$lib/helpers/load'; import { Dependencies, PAGE_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; +import { isCloud } from '$lib/system'; +import type { AggregationList } from '$lib/sdk/billing'; +import { organization } from '$lib/stores/organization'; +import { get } from 'svelte/store'; export const load: PageLoad = async ({ params, depends, url, route }) => { depends(Dependencies.FILES); @@ -10,6 +14,10 @@ export const load: PageLoad = async ({ params, depends, url, route }) => { const search = getSearch(url); const limit = getLimit(url, route, PAGE_LIMIT); const offset = pageToOffset(page, limit); + let aggregationList: AggregationList = null; + if (isCloud && get(organization)) { + aggregationList = await sdk.forConsole.billing.listUsage(get(organization)?.$id); + } return { offset, @@ -19,6 +27,7 @@ export const load: PageLoad = async ({ params, depends, url, route }) => { params.bucket, [Query.limit(limit), Query.offset(offset), Query.orderDesc('')], search - ) + ), + aggregationList }; }; diff --git a/src/routes/login/+page.svelte b/src/routes/login/+page.svelte index 13ef9c298..e77a3fbfb 100644 --- a/src/routes/login/+page.svelte +++ b/src/routes/login/+page.svelte @@ -15,6 +15,7 @@ import { Dependencies } from '$lib/constants'; import { Submit, trackEvent, trackError } from '$lib/actions/analytics'; import { isCloud } from '$lib/system'; + import { page } from '$app/stores'; let mail: string, pass: string, disabled: boolean; @@ -28,7 +29,17 @@ message: 'Successfully logged in.' }); trackEvent(Submit.AccountCreate); - await goto(`${base}/console`); + if ($page.url.searchParams) { + const redirect = $page.url.searchParams.get('redirect'); + $page.url.searchParams.delete('redirect'); + if (redirect) { + await goto(`${base}${redirect}${$page.url.search}`); + } else { + await goto(`${base}/console${$page.url.search ?? ''}`); + } + } else { + await goto(`${base}/console`); + } } catch (error) { disabled = false; addNotification({ @@ -40,12 +51,20 @@ } function onGithubLogin() { - sdk.forConsole.account.createOAuth2Session( - 'github', - window.location.origin, - window.location.origin, - ['read:user', 'user:email'] - ); + let url = window.location.origin; + if ($page.url.searchParams) { + const redirect = $page.url.searchParams.get('redirect'); + $page.url.searchParams.delete('redirect'); + if (redirect) { + url = `${base}${redirect}${$page.url.search}`; + } else { + url = `${base}/console${$page.url.search ?? ''}`; + } + } + sdk.forConsole.account.createOAuth2Session('github', url, window.location.origin, [ + 'read:user', + 'user:email' + ]); }