From abc30a2a03ef6f1a6a34a616618983ed1c410366 Mon Sep 17 00:00:00 2001
From: Baobeld <benjaminpalko@hotmail.com>
Date: Thu, 19 Dec 2024 22:24:44 -0500
Subject: [PATCH] Greet user (#21)

* ignore underscores

* great user and redirect to login on /app

* format

* pass user as property of data object
---
 eslint.config.js                              | 12 +++++++++
 .../Navigation/Navbar/Navbar.svelte           |  6 +++--
 src/routes/+page.server.ts                    |  3 ++-
 src/routes/+page.svelte                       |  2 +-
 src/routes/app/+layout.server.ts              | 26 +++++++++++++++++++
 src/routes/app/+layout.svelte                 | 15 ++++++++---
 src/routes/app/+page.svelte                   |  2 ++
 7 files changed, 59 insertions(+), 7 deletions(-)
 create mode 100644 src/routes/app/+layout.server.ts

diff --git a/eslint.config.js b/eslint.config.js
index 5c68edc..4c9cdec 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -30,5 +30,17 @@ export default ts.config(
 				parser: ts.parser,
 			},
 		},
+	},
+	{
+		rules: {
+			'@typescript-eslint/no-unused-vars': [
+				'error',
+				{
+					argsIgnorePattern: '^_',
+					varsIgnorePattern: '^_',
+					caughtErrorsIgnorePattern: '^_',
+				},
+			],
+		},
 	}
 );
diff --git a/src/lib/components/Navigation/Navbar/Navbar.svelte b/src/lib/components/Navigation/Navbar/Navbar.svelte
index c16b463..f3f1bc8 100644
--- a/src/lib/components/Navigation/Navbar/Navbar.svelte
+++ b/src/lib/components/Navigation/Navbar/Navbar.svelte
@@ -1,11 +1,13 @@
 <script lang="ts">
-	let { title }: { title: string } = $props();
+	let { title, username }: { title: string; username: string } = $props();
+
+	let greeting = $derived(`Welcome ${username}!`);
 </script>
 
 <header class="navbar justify-between bg-base-200 px-4">
 	<h2 class="prose prose-xl">Hestia</h2>
 	<h1 class="prose prose-2xl">{title}</h1>
-	<p class="prose prose-lg">Welcome!</p>
+	<p class="prose prose-lg">{greeting}</p>
 </header>
 
 <style>
diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts
index 89bd867..8ff2993 100644
--- a/src/routes/+page.server.ts
+++ b/src/routes/+page.server.ts
@@ -1,5 +1,6 @@
 import { prisma } from '$lib/server/prisma';
 import { redirect } from '@sveltejs/kit';
+
 export async function load(event) {
 	const sessionId = event.cookies.get('auth_session');
 	if (!sessionId) {
@@ -11,7 +12,7 @@ export async function load(event) {
 		},
 	});
 	if (!user) {
-		redirect(401, '/login');
+		redirect(300, '/login');
 	}
 	return {};
 }
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 378f71c..0342404 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -19,4 +19,4 @@
 	.site-loader {
 		@apply flex h-screen w-screen flex-col items-center justify-center gap-6;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/routes/app/+layout.server.ts b/src/routes/app/+layout.server.ts
new file mode 100644
index 0000000..dfefb8f
--- /dev/null
+++ b/src/routes/app/+layout.server.ts
@@ -0,0 +1,26 @@
+import { prisma } from '$lib/server/prisma';
+import { redirect } from '@sveltejs/kit';
+import dayjs from 'dayjs';
+
+export async function load(event) {
+	const sessionId = event.cookies.get('auth_session');
+	if (!sessionId) {
+		redirect(300, '/login');
+	}
+	const session = await prisma.session.findUnique({
+		where: { id: sessionId },
+		include: { user: true },
+	});
+	if (!session) {
+		redirect(300, '/login');
+	}
+	const expiry = session.expiresAt;
+	if (dayjs(expiry).isBefore(dayjs())) {
+		redirect(300, '/login');
+	}
+
+	const { password: _, ...rest } = session.user;
+	return {
+		user: rest,
+	};
+}
\ No newline at end of file
diff --git a/src/routes/app/+layout.svelte b/src/routes/app/+layout.svelte
index c14e9a4..8429527 100644
--- a/src/routes/app/+layout.svelte
+++ b/src/routes/app/+layout.svelte
@@ -1,8 +1,17 @@
 <script lang="ts">
 	import { Navbar } from '$lib/components/Navigation';
+	import type { User } from '@prisma/client';
+	import type { Snippet } from 'svelte';
 
-	let { children } = $props();
+	type Props = {
+		children: Snippet;
+		data: {
+			user: Omit<User, 'password'>;
+		};
+	};
+
+	let { children, data }: Props = $props();
 </script>
 
-<Navbar title="Svelte" />
-{@render children()}
+<Navbar title="Svelte" username={data.user.name} />
+{@render children()}
\ No newline at end of file
diff --git a/src/routes/app/+page.svelte b/src/routes/app/+page.svelte
index e69de29..0fbba99 100644
--- a/src/routes/app/+page.svelte
+++ b/src/routes/app/+page.svelte
@@ -0,0 +1,2 @@
+<script lang="ts">
+</script>