feat: allow viewing homepage even if logged in

WhyAsh5114 · Oct 12, 2024 · 1194855 · 1194855
1 parent 5a1edf8
commit 1194855
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 24 deletions.
diff --git a/src/routes/(components)/layout/DesktopLayout.svelte b/src/routes/(components)/layout/DesktopLayout.svelte
@@ -17,7 +17,7 @@
 </script>
 
 <header class="flex h-screen w-96 flex-col bg-muted p-10">
-	<Button class="justify-start gap-2 text-foreground" href="/" variant="link">
+	<Button class="justify-start gap-2 text-foreground" href="/?forceView" variant="link">
 		{#if $navigating}
 			<div class="flex h-[72px] w-[72px] items-center justify-center">
 				<LoaderCircle class="animate-spin text-primary" height={48} width={48} />

diff --git a/src/routes/(components)/layout/MobileLayout.svelte b/src/routes/(components)/layout/MobileLayout.svelte
@@ -27,15 +27,13 @@
 		</Sheet.Trigger>
 		<Sheet.Content side="left">
 			<Sheet.Header class="items-start">
-				<Sheet.Title>
-					<Button
-						class="justify-start gap-2 text-foreground"
-						onclick={async () => {
-							await goto('/');
-							sheetOpen = false;
-						}}
-						variant="link"
-					>
+				<Sheet.Title
+					onclick={async () => {
+						await goto('/?forceView');
+						sheetOpen = false;
+					}}
+				>
+					<Button class="pointer-events-none justify-start gap-2 text-foreground" variant="link">
 						<img alt="MyFit logo" height={52} src="/favicon.webp" width={52} />
 						<h1 class="text-2xl font-bold">MyFit</h1>
 					</Button>

diff --git a/src/routes/(components)/layout/NavLinks.svelte b/src/routes/(components)/layout/NavLinks.svelte
@@ -3,11 +3,12 @@
 	export let sheetOpen: boolean | undefined = undefined;
 
 	const linkItems: { text: string; href: string }[] = [
-		{ text: 'Workouts', href: '/workouts' },
-		{ text: 'Mesocycles', href: '/mesocycles' },
+		{ text: 'Dashboard', href: '/dashboard' },
 		{ text: 'Exercise splits', href: '/exercise-splits' },
-		{ text: 'Privacy policy', href: '/privacy-policy' },
-		{ text: 'Donations', href: '/donations' }
+		{ text: 'Mesocycles', href: '/mesocycles' },
+		{ text: 'Workouts', href: '/workouts' },
+		{ text: 'Donations', href: '/donations' },
+		{ text: 'Privacy policy', href: '/privacy-policy' }
 	];
 </script>
 

diff --git a/src/routes/(components)/page/ActionButtons.svelte b/src/routes/(components)/page/ActionButtons.svelte
@@ -7,7 +7,9 @@
 	import GitHub from 'virtual:icons/lucide/github';
 	import Star from 'virtual:icons/lucide/star';
 	import LoginProviderMenu from '../layout/LoginProviderMenu.svelte';
+	import type { Session } from '@auth/sveltekit';
 
+	let { session }: { session: Session | null } = $props();
 	let stars: number | undefined = $state();
 
 	onMount(async () => {
@@ -30,10 +32,12 @@
 			</Badge>
 		{/if}
 	</Button>
-	<DropdownMenu.Root>
-		<DropdownMenu.Trigger asChild let:builder>
-			<Button builders={[builder]} class="w-fit">Login</Button>
-		</DropdownMenu.Trigger>
-		<LoginProviderMenu />
-	</DropdownMenu.Root>
+	{#if session === null}
+		<DropdownMenu.Root>
+			<DropdownMenu.Trigger asChild let:builder>
+				<Button builders={[builder]} class="w-fit">Login</Button>
+			</DropdownMenu.Trigger>
+			<LoginProviderMenu />
+		</DropdownMenu.Root>
+	{/if}
 </div>
diff --git a/src/routes/(components)/page/DesktopLandingPage.svelte b/src/routes/(components)/page/DesktopLandingPage.svelte
@@ -22,7 +22,7 @@
 		</div>
 		<CarouselComponent />
 		<StatsComponent {...counts} />
-		<ActionButtons />
+		<ActionButtons {...counts} />
 		<Features />
 		<Faq class="col-span-2" />
 	</div>

diff --git a/src/routes/(components)/page/MobileLandingPage.svelte b/src/routes/(components)/page/MobileLandingPage.svelte
@@ -18,7 +18,7 @@
 	</span>
 	<CarouselComponent />
 	<StatsComponent {...counts} />
-	<ActionButtons />
+	<ActionButtons {...counts} />
 	<Features />
 	<Faq />
 </div>
diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts
@@ -1,18 +1,21 @@
 import { prisma } from '$lib/prisma.js';
+import type { Session } from '@auth/sveltekit';
 import { redirect } from '@sveltejs/kit';
 
-export const load = async ({ parent }) => {
+export const load = async ({ parent, url }) => {
 	const { session } = await parent();
-	if (session) redirect(302, '/dashboard');
+	if (session && !url.searchParams.has('forceView')) redirect(302, '/dashboard');
 
 	return {
+		session,
 		workoutCount: prisma.workout.count(),
 		exerciseCount: prisma.workoutExercise.count(),
 		setsCount: prisma.workoutExerciseSet.count()
 	};
 };
 
 export type HomePageCounts = {
+	session: Session | null;
 	workoutCount: Promise<number>;
 	exerciseCount: Promise<number>;
 	setsCount: Promise<number>;