Skip to content

Commit 7f4bd41

Browse files
committed
fix: get-started state being wrong
1 parent 32df519 commit 7f4bd41

3 files changed

Lines changed: 10 additions & 19 deletions

File tree

src/lib/components/sidebar.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
</div>
125125
</div>
126126
<div slot="middle" class="middle-container" class:icons={state === 'icons'}>
127-
{#if progressCard}
127+
{#if progressCard && project}
128128
<Tooltip placement="right" disabled={state !== 'icons'}>
129129
<a
130130
class="progress-card"

src/lib/components/support.svelte

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -214,10 +214,6 @@
214214
color: var(--fgcolor-neutral-secondary, #56565c);
215215
}
216216
217-
:global(.theme-dark) .support-hours-text {
218-
color: var(--fgcolor-neutral-secondary, #a0a0a8);
219-
}
220-
221217
@media (max-width: 520px) {
222218
.support-premium-row {
223219
flex-direction: column;

src/lib/layout/shell.svelte

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import SideNavigation from '$lib/layout/navigation.svelte';
1515
import { hasOnboardingDismissed } from '$lib/helpers/onboarding';
1616
import { isSidebarOpen, noWidthTransition } from '$lib/stores/sidebar';
17-
import { page } from '$app/stores';
17+
import { page } from '$app/state';
1818
import { BillingPlanGroup, type Models } from '@appwrite.io/console';
1919
import { getSidebarState, isInDatabasesRoute, updateSidebarState } from '$lib/helpers/sidebar';
2020
import { isTabletViewport } from '$lib/stores/viewport';
@@ -25,13 +25,7 @@
2525
export let showSideNavigation = false;
2626
export let selectedProject: Models.Project = null;
2727
28-
/** Only treat `page.data.project` as active outside project routes (e.g. account, org) it can linger. */
29-
$: activeProject =
30-
selectedProject &&
31-
($page.route.id?.includes('project-[region]-[project]') ||
32-
$page.url.pathname.includes('/project-'))
33-
? selectedProject
34-
: null;
28+
$: activeProject = selectedProject && page.params.project ? selectedProject : null;
3529
3630
// variables
3731
let yOnMenuOpen: number;
@@ -145,8 +139,9 @@
145139
// subscriptions
146140
isNewWizardStatusOpen.subscribe((value) => (showHeader = !value));
147141
148-
page.subscribe(({ url }) => {
149-
$showSubNavigation = url.searchParams.get('openNavbar') === 'true';
142+
$: {
143+
const url = page.url;
144+
showSubNavigation.set(url.searchParams.get('openNavbar') === 'true');
150145
clearTimeout(timeoutId);
151146
152147
if (url.pathname.includes('project-')) {
@@ -156,7 +151,7 @@
156151
} else {
157152
showContentTransition = false;
158153
}
159-
});
154+
}
160155
161156
// reactive blocks
162157
$: sideSize = $hasSubNavigation ? ($isNarrow ? '17rem' : '25rem') : '12.5rem';
@@ -196,7 +191,7 @@
196191
197192
$: state = $isSidebarOpen ? 'open' : 'closed';
198193
199-
$: subNavigation = $page.data.subNavigation;
194+
$: subNavigation = page.data.subNavigation;
200195
201196
$: shouldRenderSidebar =
202197
!$isNewWizardStatusOpen && showSideNavigation && !$showOnboardingAnimation;
@@ -257,9 +252,9 @@
257252
class:icons-content={state === 'icons' && activeProject}
258253
class:no-sidebar={!hasSidebarSpace}>
259254
<section class="main-content" data-test={showSideNavigation}>
260-
{#if $page.data?.header}
255+
{#if page.data?.header}
261256
<div class="layout-header">
262-
<svelte:component this={$page.data.header} />
257+
<svelte:component this={page.data.header} />
263258
</div>
264259
{/if}
265260
<slot />

0 commit comments

Comments
 (0)