From 16a807ed0ea666b9b08cb04f013c3e54a84a8c5f Mon Sep 17 00:00:00 2001 From: ernstmul Date: Mon, 10 Feb 2025 16:30:23 +0100 Subject: [PATCH 01/13] Fix: irregular sidebar behaviour --- src/lib/layout/shell.svelte | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte index b8729558b..dd414ba4e 100644 --- a/src/lib/layout/shell.svelte +++ b/src/lib/layout/shell.svelte @@ -15,7 +15,6 @@ import { type Models } from '@appwrite.io/console'; import { isCloud } from '$lib/system'; import SideNavigation from '$lib/layout/navigation.svelte'; - import { isTabletViewport } from '$lib/stores/viewport'; import { hasOnboardingDismissed } from '$lib/helpers/onboarding'; import { isSidebarOpen } from '$lib/stores/sidebar'; @@ -77,7 +76,6 @@ let subNavigation: undefined | ComponentType = $page.data.subNavigation; let state: undefined | 'open' | 'closed' | 'icons' = 'closed'; $: state = $isSidebarOpen ? 'open' : 'closed'; - $: state = !$isTabletViewport ? 'icons' : $isSidebarOpen ? 'open' : 'closed'; function handleResize() { $isSidebarOpen = false; From a347e79a965ae970caa35ddb1d6cbbe7502a0bf4 Mon Sep 17 00:00:00 2001 From: ernstmul Date: Mon, 10 Feb 2025 16:37:17 +0100 Subject: [PATCH 02/13] Active state on overview --- src/lib/components/sidebar.svelte | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/components/sidebar.svelte b/src/lib/components/sidebar.svelte index 65dd133ce..ea53ad605 100644 --- a/src/lib/components/sidebar.svelte +++ b/src/lib/components/sidebar.svelte @@ -136,6 +136,7 @@ { sideBarIsOpen = false; }} From 0276d4cba6a8f04e5c2dc6e3297ff434d5569a55 Mon Sep 17 00:00:00 2001 From: ernstmul Date: Mon, 10 Feb 2025 16:40:47 +0100 Subject: [PATCH 03/13] Active state on settings --- src/lib/components/sidebar.svelte | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lib/components/sidebar.svelte b/src/lib/components/sidebar.svelte index ea53ad605..43b62664e 100644 --- a/src/lib/components/sidebar.svelte +++ b/src/lib/components/sidebar.svelte @@ -226,7 +226,10 @@ {#if project}
- Date: Mon, 10 Feb 2025 16:46:14 +0100 Subject: [PATCH 04/13] Make sure database image is always covering entire card --- .../(console)/project-[project]/overview/onboard.svelte | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/routes/(console)/project-[project]/overview/onboard.svelte b/src/routes/(console)/project-[project]/overview/onboard.svelte index c1e13238e..0953a0b63 100644 --- a/src/routes/(console)/project-[project]/overview/onboard.svelte +++ b/src/routes/(console)/project-[project]/overview/onboard.svelte @@ -371,12 +371,6 @@ background-size: cover; background-position: bottom; background-repeat: no-repeat; - - @media (min-width: 768px) { - background-size: contain; - background-position: top; - background-repeat: no-repeat; - } } .full-height-card { height: 100%; From 2f58cdce5e470756362fc16015700126cc6cb0c0 Mon Sep 17 00:00:00 2001 From: ernstmul Date: Mon, 10 Feb 2025 17:01:37 +0100 Subject: [PATCH 05/13] Show get started flow correctly --- src/routes/(console)/project-[project]/+page.ts | 6 +++++- .../(console)/project-[project]/get-started/+page.svelte | 3 +-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/routes/(console)/project-[project]/+page.ts b/src/routes/(console)/project-[project]/+page.ts index 200bfa858..53c3af2a9 100644 --- a/src/routes/(console)/project-[project]/+page.ts +++ b/src/routes/(console)/project-[project]/+page.ts @@ -1,7 +1,11 @@ import { redirect } from '@sveltejs/kit'; import { base } from '$app/paths'; import type { PageLoad } from './$types'; +import { hasOnboardingDismissed } from '$lib/helpers/onboarding'; export const load: PageLoad = async ({ params }) => { - redirect(302, `${base}/project-${params.project}/overview`); + if (hasOnboardingDismissed(params.project)) { + redirect(302, `${base}/project-${params.project}/overview`); + } + redirect(302, `${base}/project-${params.project}/get-started`); }; diff --git a/src/routes/(console)/project-[project]/get-started/+page.svelte b/src/routes/(console)/project-[project]/get-started/+page.svelte index 572bf9bf8..7642ec0fa 100644 --- a/src/routes/(console)/project-[project]/get-started/+page.svelte +++ b/src/routes/(console)/project-[project]/get-started/+page.svelte @@ -1,6 +1,5 @@ @@ -93,7 +97,15 @@
- + + {#if isCloud && currentOrg.showUpgrade} + Upgrade + {/if} + Feedback diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte index 342b39a55..82de60f3d 100644 --- a/src/lib/layout/shell.svelte +++ b/src/lib/layout/shell.svelte @@ -17,6 +17,7 @@ import SideNavigation from '$lib/layout/navigation.svelte'; import { hasOnboardingDismissed } from '$lib/helpers/onboarding'; import { isSidebarOpen } from '$lib/stores/sidebar'; + import { BillingPlan } from '$lib/constants'; export let showSideNavigation = false; export let showHeader = true; @@ -68,6 +69,7 @@ return { name: org.name, $id: org.$id, + showUpgrade: org.billingPlan === BillingPlan.FREE, tierName: isCloud ? tierToPlan(org.billingPlan).name : null, isSelected: $organization?.$id === org.$id, projects: loadedProjects From c276063a2372bd7cfacc2b3c041b35aff671d54d Mon Sep 17 00:00:00 2001 From: ernstmul Date: Tue, 11 Feb 2025 11:25:20 +0100 Subject: [PATCH 08/13] Add dep to organization so the navbar data reloads on name change of org --- src/routes/(console)/+layout.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/routes/(console)/+layout.ts b/src/routes/(console)/+layout.ts index 8008c6c66..84eb809a5 100644 --- a/src/routes/(console)/+layout.ts +++ b/src/routes/(console)/+layout.ts @@ -10,6 +10,7 @@ export const load: LayoutLoad = async ({ params, fetch, depends, parent }) => { await parent(); depends(Dependencies.RUNTIMES); depends(Dependencies.CONSOLE_VARIABLES); + depends(Dependencies.ORGANIZATION); const prefs = await sdk.forConsole.account.getPrefs(); From 4a89f2d997efe1b9ee1a42ba4af227b71876b468 Mon Sep 17 00:00:00 2001 From: ernstmul Date: Tue, 11 Feb 2025 11:37:11 +0100 Subject: [PATCH 09/13] Make button deselectable --- src/lib/components/navbar.svelte | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/components/navbar.svelte b/src/lib/components/navbar.svelte index 91eeea61b..ade39d8e7 100644 --- a/src/lib/components/navbar.svelte +++ b/src/lib/components/navbar.svelte @@ -147,7 +147,9 @@ on:click={() => { showAccountMenu = !showAccountMenu; }}> - +
+ +
{#if showAccountMenu}