From 4f7fce859f406a73fa8d109ebd93816345cd16a0 Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 5 Mar 2025 12:24:10 +0100 Subject: [PATCH] design review: settings page, invites page, refactor cardGrid --- src/lib/helpers/logout.ts | 4 +- .../sites/site-[site]/logs/+page.svelte | 4 +- .../sites/site-[site]/settings/+page.svelte | 2 - .../settings/updateBuildSettings.svelte | 125 +++++++++---- .../site-[site]/settings/updateSPA.svelte | 87 --------- .../project-[project]/updateVariables.svelte | 2 +- src/routes/(public)/auth/+layout.svelte | 17 +- src/routes/(public)/auth/preview/+page.svelte | 10 +- .../(public)/auth/preview/access/+page.svelte | 167 ++++++++++-------- 9 files changed, 205 insertions(+), 213 deletions(-) delete mode 100644 src/routes/(console)/project-[project]/sites/site-[site]/settings/updateSPA.svelte diff --git a/src/lib/helpers/logout.ts b/src/lib/helpers/logout.ts index 8549ef383..0e5e9507f 100644 --- a/src/lib/helpers/logout.ts +++ b/src/lib/helpers/logout.ts @@ -5,10 +5,10 @@ import { Submit, trackEvent } from '$lib/actions/analytics'; import { base } from '$app/paths'; import { uploader } from '$lib/stores/uploader'; -export async function logout() { +export async function logout(redirect: boolean = true) { await sdk.forConsole.account.deleteSession('current'); await invalidate(Dependencies.ACCOUNT); uploader.reset(); trackEvent(Submit.AccountLogout); - await goto(`${base}/login`); + if (redirect) await goto(`${base}/login`); } diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/logs/+page.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/logs/+page.svelte index f75336558..eef03d2f4 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/logs/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/logs/+page.svelte @@ -65,7 +65,8 @@ - + {#if data.logs.total} {/if} @@ -93,6 +94,7 @@ {:else} diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/+page.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/+page.svelte index b359d73c6..0b32fe200 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/+page.svelte @@ -13,7 +13,6 @@ import UpdateRepository from './updateRepository.svelte'; import { onMount } from 'svelte'; import { showConnectRepo } from './store'; - import UpdateSpa from './updateSPA.svelte'; export let data; @@ -67,7 +66,6 @@ globalVariableList={data.globalVariables} variableList={data.variables} product="site" /> - diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateBuildSettings.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateBuildSettings.svelte index c351f0928..39d4f4aa9 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateBuildSettings.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateBuildSettings.svelte @@ -8,10 +8,11 @@ import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import { Adapter, BuildRuntime, Framework, type Models } from '@appwrite.io/console'; - import { Card, Fieldset, InlineCode, Layout } from '@appwrite.io/pink-svelte'; + import { Card, Fieldset, Icon, InlineCode, Layout, Tooltip } from '@appwrite.io/pink-svelte'; import { iconPath } from '$lib/stores/app'; import { getFrameworkIcon } from '../../store'; import { Link } from '$lib/elements'; + import { IconInfo } from '@appwrite.io/pink-icons-svelte'; export let site: Models.Site; export let frameworks: Models.Framework[]; @@ -20,8 +21,10 @@ let buildCommand = undefined; let outputDirectory = undefined; let frameworkKey = site.framework; + let adapter: Adapter = site.adapter as Adapter; + let fallback = site.fallbackFile; let isButtonDisabled = true; - let adapter: Adapter; + let showFallback = site.adapter === Adapter.Static; onMount(async () => { selectedFramework ??= frameworks.find((framework) => framework.key === site.framework); @@ -47,8 +50,8 @@ buildCommand || undefined, outputDirectory || undefined, (site?.buildRuntime as BuildRuntime) || undefined, - site.adapter, - site.fallbackFile || undefined, + adapter || undefined, + fallback || undefined, site.installationId || undefined, site.providerRepositoryId || undefined, site.providerBranch || undefined, @@ -75,12 +78,23 @@ installCommand === site?.installCommand && buildCommand === site?.buildCommand && outputDirectory === site?.outputDirectory && - selectedFramework?.key === site?.framework + selectedFramework?.key === site?.framework && + fallback === site?.fallbackFile ) { isButtonDisabled = true; } else { isButtonDisabled = false; } + + $: if (adapter === Adapter.Static) { + showFallback = true; + } else { + showFallback = false; + } + + $: if (fallback === '') { + fallback = null; + }
@@ -129,35 +143,78 @@
- - - - - - - - - - - + + + + + + + + + + + + + + + {#if showFallback} + + + + + Provide a fallback file for advanced routing and proper page + handling in SPA mode. + + + + {/if}
diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateSPA.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateSPA.svelte deleted file mode 100644 index ea3e771b4..000000000 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateSPA.svelte +++ /dev/null @@ -1,87 +0,0 @@ - - - - - Single page application - - - { - if (value.detail) { - fallback = ''; - } else { - fallback = null; - } - }} /> - - {#if fallback !== null} - - {/if} - - - - - - -
diff --git a/src/routes/(console)/project-[project]/updateVariables.svelte b/src/routes/(console)/project-[project]/updateVariables.svelte index 71d5f5fdc..0a757b8c8 100644 --- a/src/routes/(console)/project-[project]/updateVariables.svelte +++ b/src/routes/(console)/project-[project]/updateVariables.svelte @@ -259,7 +259,7 @@ {/if} - Key + Key Value diff --git a/src/routes/(public)/auth/+layout.svelte b/src/routes/(public)/auth/+layout.svelte index 7fa83f589..a2ac0dc4f 100644 --- a/src/routes/(public)/auth/+layout.svelte +++ b/src/routes/(public)/auth/+layout.svelte @@ -1,5 +1,4 @@ -
-
- +
+
- -
+
+