fix(org-site): stabilize landing-page nav auth button

The auth button derived from stores that hydrate in stages, so it
flashed through Login -> Dashboard -> Go to LMS as isLoggedIn and the
role/basePath settled at different times. Gate the label on
appInitApi.isInitializedAndReady so it only renders once the account
(and thus role) has loaded, and show a spinner in the button while a
logged-in user's experience resolves. Add separate loading and disabled
flags to authAction and wire them through all theme navs.
This commit is contained in:
Rotimi Best
2026-06-14 10:10:14 +01:00
parent a411c50526
commit 0c395e9f1b
12 changed files with 86 additions and 16 deletions
@@ -4,6 +4,7 @@
import type { Component } from 'svelte'; import type { Component } from 'svelte';
import { orgApi } from '$features/org/api/org.svelte'; import { orgApi } from '$features/org/api/org.svelte';
import { appInitApi } from '$features/app/init.svelte';
import PageLoader from './page-loader.svelte'; import PageLoader from './page-loader.svelte';
import type { AccountOrg } from '$features/app/types'; import type { AccountOrg } from '$features/app/types';
import { import {
@@ -26,17 +27,21 @@
// eslint-disable-next-line @typescript-eslint/no-explicit-any // eslint-disable-next-line @typescript-eslint/no-explicit-any
let ThemeComponent = $state<Component<any> | null>(null); let ThemeComponent = $state<Component<any> | null>(null);
const authAction = $derived( const authAction = $derived.by(() => {
$user.isLoggedIn if (!$user.isLoggedIn) {
? { return { label: t.get('navigation.login'), href: '/login' };
label: t.get($basePath === '/lms' || $basePath === '#' ? 'navigation.goto_lms' : 'navigation.goto_dashboard'), }
href: resolve($basePath !== '#' ? $basePath : '/lms', {})
} if (!appInitApi.isInitializedAndReady) {
: { return { label: '', href: '#', loading: true };
label: t.get('navigation.login'), }
href: '/login'
} const goToLms = $basePath === '/lms' || $basePath === '#';
); return {
label: t.get(goToLms ? 'navigation.goto_lms' : 'navigation.goto_dashboard'),
href: resolve($basePath !== '#' ? $basePath : '/lms', {})
};
});
const landingPageProps = $derived( const landingPageProps = $derived(
buildOrgLandingPageProps( buildOrgLandingPageProps(
@@ -10,6 +10,8 @@
authAction?: { authAction?: {
label: string; label: string;
href: string; href: string;
loading?: boolean;
disabled?: boolean;
}; };
} }
@@ -41,7 +43,13 @@
{/each} {/each}
</nav> </nav>
{#if authAction} {#if authAction}
<Button href={authAction.href} variant="outline" class="ui:rounded-xl ui:font-bold"> <Button
href={authAction.href}
loading={authAction.loading}
disabled={authAction.disabled}
variant="outline"
class="ui:rounded-xl ui:font-bold"
>
{authAction.label} {authAction.label}
</Button> </Button>
{/if} {/if}
@@ -10,6 +10,8 @@
authAction?: { authAction?: {
label: string; label: string;
href: string; href: string;
loading?: boolean;
disabled?: boolean;
}; };
} }
@@ -41,6 +43,8 @@
{#if authAction} {#if authAction}
<Button <Button
href={authAction.href} href={authAction.href}
loading={authAction.loading}
disabled={authAction.disabled}
variant="outline" variant="outline"
class="ui:bg-transparent ui:text-[var(--landing-bg)] ui:border-[var(--landing-bg)]/40 ui:hover:bg-[var(--landing-bg)]/10 ui:hover:text-[var(--landing-bg)] ui:hover:border-[var(--landing-bg)]/60" class="ui:bg-transparent ui:text-[var(--landing-bg)] ui:border-[var(--landing-bg)]/40 ui:hover:bg-[var(--landing-bg)]/10 ui:hover:text-[var(--landing-bg)] ui:hover:border-[var(--landing-bg)]/60"
> >
@@ -10,6 +10,8 @@
authAction?: { authAction?: {
label: string; label: string;
href: string; href: string;
loading?: boolean;
disabled?: boolean;
}; };
} }
@@ -47,7 +49,13 @@
<div class="ui:flex ui:items-center ui:gap-3"> <div class="ui:flex ui:items-center ui:gap-3">
{#if authAction} {#if authAction}
<Button href={authAction.href} size="sm" class="ui:rounded-none ui:px-4 ui:font-medium"> <Button
href={authAction.href}
loading={authAction.loading}
disabled={authAction.disabled}
size="sm"
class="ui:rounded-none ui:px-4 ui:font-medium"
>
{authAction.label} {authAction.label}
</Button> </Button>
{/if} {/if}
@@ -10,6 +10,8 @@
authAction?: { authAction?: {
label: string; label: string;
href: string; href: string;
loading?: boolean;
disabled?: boolean;
}; };
} }
@@ -50,6 +52,8 @@
{#if authAction} {#if authAction}
<Button <Button
href={authAction.href} href={authAction.href}
loading={authAction.loading}
disabled={authAction.disabled}
size="sm" size="sm"
class="ui:rounded-full ui:px-4 ui:font-medium ui:bg-[var(--landing-fg)] ui:text-[var(--landing-bg)] ui:hover:opacity-90" class="ui:rounded-full ui:px-4 ui:font-medium ui:bg-[var(--landing-fg)] ui:text-[var(--landing-bg)] ui:hover:opacity-90"
> >
@@ -10,6 +10,8 @@
authAction?: { authAction?: {
label: string; label: string;
href: string; href: string;
loading?: boolean;
disabled?: boolean;
}; };
} }
@@ -46,7 +48,13 @@
{/each} {/each}
</nav> </nav>
{#if authAction} {#if authAction}
<Button href={authAction.href} variant="outline" class="ui:rounded-full"> <Button
href={authAction.href}
loading={authAction.loading}
disabled={authAction.disabled}
variant="outline"
class="ui:rounded-full"
>
{authAction.label} {authAction.label}
</Button> </Button>
{/if} {/if}
@@ -10,6 +10,8 @@
authAction?: { authAction?: {
label: string; label: string;
href: string; href: string;
loading?: boolean;
disabled?: boolean;
}; };
} }
@@ -45,7 +47,14 @@
<div class="ui:flex ui:items-center ui:gap-1.5"> <div class="ui:flex ui:items-center ui:gap-1.5">
{#if authAction} {#if authAction}
<Button href={authAction.href} variant="default" size="sm" class="ui:rounded-full ui:px-4"> <Button
href={authAction.href}
loading={authAction.loading}
disabled={authAction.disabled}
variant="default"
size="sm"
class="ui:rounded-full ui:px-4"
>
{authAction.label} {authAction.label}
</Button> </Button>
{/if} {/if}
@@ -10,6 +10,8 @@
authAction?: { authAction?: {
label: string; label: string;
href: string; href: string;
loading?: boolean;
disabled?: boolean;
}; };
} }
@@ -49,7 +51,13 @@
<div class="ui:justify-self-end ui:flex ui:items-center ui:gap-1"> <div class="ui:justify-self-end ui:flex ui:items-center ui:gap-1">
{#if authAction} {#if authAction}
<Button href={authAction.href} size="sm" class="ui:rounded-md ui:px-3.5"> <Button
href={authAction.href}
loading={authAction.loading}
disabled={authAction.disabled}
size="sm"
class="ui:rounded-md ui:px-3.5"
>
{authAction.label} {authAction.label}
</Button> </Button>
{/if} {/if}
@@ -10,6 +10,8 @@
authAction?: { authAction?: {
label: string; label: string;
href: string; href: string;
loading?: boolean;
disabled?: boolean;
}; };
} }
@@ -44,6 +46,8 @@
{#if authAction} {#if authAction}
<Button <Button
href={authAction.href} href={authAction.href}
loading={authAction.loading}
disabled={authAction.disabled}
size="sm" size="sm"
variant="outline" variant="outline"
class="ui:rounded-none ui:font-semibold ui:border-[var(--landing-accent-fg)] ui:text-[var(--landing-accent-fg)] ui:bg-transparent ui:hover:bg-[var(--landing-accent-fg)]/10 ui:hover:text-[var(--landing-accent-fg)]" class="ui:rounded-none ui:font-semibold ui:border-[var(--landing-accent-fg)] ui:text-[var(--landing-accent-fg)] ui:bg-transparent ui:hover:bg-[var(--landing-accent-fg)]/10 ui:hover:text-[var(--landing-accent-fg)]"
@@ -10,6 +10,8 @@
authAction?: { authAction?: {
label: string; label: string;
href: string; href: string;
loading?: boolean;
disabled?: boolean;
}; };
} }
@@ -60,6 +62,8 @@
{#if authAction} {#if authAction}
<Button <Button
href={authAction.href} href={authAction.href}
loading={authAction.loading}
disabled={authAction.disabled}
size="sm" size="sm"
variant="outline" variant="outline"
class="ui:rounded-full ui:px-4 ui:font-medium ui:bg-transparent ui:border-[var(--landing-border)] ui:text-[var(--landing-fg)] ui:hover:bg-white/5" class="ui:rounded-full ui:px-4 ui:font-medium ui:bg-transparent ui:border-[var(--landing-border)] ui:text-[var(--landing-fg)] ui:hover:bg-white/5"
@@ -297,6 +297,8 @@ export interface CourseLandingPageProps {
authAction?: { authAction?: {
label: string; label: string;
href: string; href: string;
loading?: boolean;
disabled?: boolean;
}; };
hero: { hero: {
heading: string; heading: string;
@@ -327,6 +329,8 @@ export interface OrgLandingPageProps {
authAction?: { authAction?: {
label: string; label: string;
href: string; href: string;
loading?: boolean;
disabled?: boolean;
}; };
hero: { hero: {
heading: string; heading: string;
@@ -10,6 +10,8 @@
authAction?: { authAction?: {
label: string; label: string;
href: string; href: string;
loading?: boolean;
disabled?: boolean;
}; };
} }
@@ -58,6 +60,8 @@
<div class="ui:flex ui:items-center ui:gap-4"> <div class="ui:flex ui:items-center ui:gap-4">
<Button <Button
href={authAction.href} href={authAction.href}
loading={authAction.loading}
disabled={authAction.disabled}
size="sm" size="sm"
class="ui:rounded-md ui:px-4 ui:font-medium ui:bg-[var(--landing-accent)] ui:text-[var(--landing-accent-fg)] ui:hover:opacity-90" class="ui:rounded-md ui:px-4 ui:font-medium ui:bg-[var(--landing-accent)] ui:text-[var(--landing-accent-fg)] ui:hover:opacity-90"
> >