Skip to content

Commit 49b49ed

Browse files
authored
Merge pull request #2836 from appwrite/fix-remove-navbar-during-onboarding-animation
fix: remove navbar during onboarding animation
2 parents b5b7382 + d3b0ba3 commit 49b49ed

File tree

3 files changed

+20
-7
lines changed

3 files changed

+20
-7
lines changed

src/lib/layout/shell.svelte

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
import { activeHeaderAlert } from '$routes/(console)/store';
66
import { onMount, setContext } from 'svelte';
77
import { writable } from 'svelte/store';
8-
import { showSubNavigation } from '$lib/stores/layout';
8+
import { showSubNavigation, showOnboardingAnimation } from '$lib/stores/layout';
99
import { organization, organizationList } from '$lib/stores/organization';
10+
1011
import { sdk } from '$lib/stores/sdk';
1112
import { user } from '$lib/stores/user';
1213
import { isCloud } from '$lib/system';
@@ -176,7 +177,8 @@
176177
177178
$: subNavigation = $page.data.subNavigation;
178179
179-
$: shouldRenderSidebar = !$isNewWizardStatusOpen && showSideNavigation;
180+
$: shouldRenderSidebar =
181+
!$isNewWizardStatusOpen && showSideNavigation && !$showOnboardingAnimation;
180182
$: hasSidebarSpace = shouldRenderSidebar && !$isTabletViewport && !!selectedProject;
181183
182184
$: {
@@ -203,9 +205,9 @@
203205
class:is-open={$showSubNavigation}
204206
class:u-hide={$wizard.show || $wizard.cover}
205207
class:is-fixed-layout={$activeHeaderAlert?.show}
206-
class:no-header={!showHeader}
208+
class:no-header={!showHeader || $showOnboardingAnimation}
207209
style:--p-side-size={sideSize}>
208-
{#if showHeader}
210+
{#if showHeader && !$showOnboardingAnimation}
209211
<Navbar {...navbarProps} bind:sideBarIsOpen={$isSidebarOpen} bind:showAccountMenu />
210212
{/if}
211213

@@ -220,7 +222,9 @@
220222
bind:state />
221223
{/if}
222224

223-
<SideNavigation bind:subNavigation />
225+
{#if !$showOnboardingAnimation}
226+
<SideNavigation bind:subNavigation />
227+
{/if}
224228

225229
<div
226230
class="content"

src/lib/stores/layout.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,4 @@ export function updateLayout(args: updateLayoutArguments) {
2727
}
2828

2929
export const showSubNavigation = writable(false);
30+
export const showOnboardingAnimation = writable(false);

src/routes/(console)/onboarding/create-project/+page.svelte

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@
88
import { Dependencies } from '$lib/constants';
99
import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
1010
import { goto, invalidate } from '$app/navigation';
11-
import { base } from '$app/paths';
11+
import { base, resolve } from '$app/paths';
1212
import { addNotification } from '$lib/stores/notifications';
1313
import CreateProject from '$lib/layout/createProject.svelte';
1414
import { loadAvailableRegions } from '$routes/(console)/regions';
1515
import { regions as regionsStore } from '$lib/stores/organization';
1616
import { user } from '$lib/stores/user';
17+
import { showOnboardingAnimation } from '$lib/stores/layout';
1718
1819
let isLoading = false;
1920
let startAnimation = false;
@@ -57,10 +58,17 @@
5758
});
5859
5960
startAnimation = true;
61+
showOnboardingAnimation.set(true);
6062
6163
setTimeout(async () => {
6264
await invalidate(Dependencies.ACCOUNT);
63-
goto(`${base}/project-${project.region ?? 'default'}-${project.$id}`);
65+
await goto(
66+
resolve('/(console)/project-[region]-[project]', {
67+
region: project.region ?? 'default',
68+
project: project.$id
69+
})
70+
);
71+
showOnboardingAnimation.set(false);
6472
}, 3000);
6573
} catch (e) {
6674
trackError(e, Submit.ProjectCreate);

0 commit comments

Comments
 (0)