From 1ae9a2516b82de173c7e34a963840cef3d2aee30 Mon Sep 17 00:00:00 2001
From: Baobeld <benjaminpalko@hotmail.com>
Date: Thu, 16 Jan 2025 13:46:14 -0500
Subject: [PATCH 1/4] Chore: Paraglide wrapping wrong thing lol (#53)

lmao what
---
 src/routes/+layout.svelte | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 3542e54..d2e1c32 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -9,15 +9,15 @@
 </script>
 
 <div class="layout">
-	<ClerkProvider publishableKey={PUBLIC_CLERK_PUBLISHABLE_KEY}>
-		{@render children()}
-	</ClerkProvider>
+	<ParaglideJS {i18n}>
+		<ClerkProvider publishableKey={PUBLIC_CLERK_PUBLISHABLE_KEY}>
+			{@render children()}
+		</ClerkProvider>
+	</ParaglideJS>
 </div>
 
-<ParaglideJS {i18n}>
-	<style>
-		.layout {
-			@apply h-screen w-screen bg-base-100;
-		}
-	</style>
-</ParaglideJS>
+<style>
+	.layout {
+		@apply h-screen w-screen bg-base-100;
+	}
+</style>

From 6f6df743d32b28dfea468bbedc1e5e484f2a8593 Mon Sep 17 00:00:00 2001
From: Baobeld <benjaminpalko@hotmail.com>
Date: Thu, 16 Jan 2025 13:46:31 -0500
Subject: [PATCH 2/4] Chore: update TextInput to extend input element (#52)

update TextInput to extend input element
---
 src/lib/components/DataInput/TextInput.svelte | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/lib/components/DataInput/TextInput.svelte b/src/lib/components/DataInput/TextInput.svelte
index b91d6cf..816dab8 100644
--- a/src/lib/components/DataInput/TextInput.svelte
+++ b/src/lib/components/DataInput/TextInput.svelte
@@ -1,26 +1,23 @@
 <script lang="ts">
 	import type { DaisyColor, DaisySize } from '$lib/types';
 	import type { Snippet } from 'svelte';
-	import type { HTMLInputTypeAttribute } from 'svelte/elements';
+	import type { HTMLInputTypeAttribute, SvelteHTMLElements } from 'svelte/elements';
 	import { fade as fadeTransition } from 'svelte/transition';
 
 	type Props = {
 		bordered?: boolean;
 		color?: Exclude<DaisyColor, 'neutral'>;
-		disabled?: boolean;
 		error?: string | Snippet;
 		fade?: boolean;
 		start?: string | Snippet;
 		end?: string | Snippet;
 		label?: string | Snippet;
-		name: string;
-		placeholder?: string;
 		size?: DaisySize;
 		type?: Extract<
 			HTMLInputTypeAttribute,
 			'email' | 'password' | 'search' | 'tel' | 'text' | 'url'
 		>;
-	};
+	} & Omit<SvelteHTMLElements['input'], 'type'>;
 
 	let {
 		bordered = false,
@@ -35,10 +32,11 @@
 		placeholder,
 		size,
 		type = 'text',
+		...props
 	}: Props = $props();
 </script>
 
-<label class="form-control w-full">
+<label class="form-control w-full" transition:fadeTransition={{ duration: fade ? 200 : 0 }}>
 	<div class="label">
 		<span
 			class="label-text"
@@ -65,7 +63,6 @@
 		</span>
 	</div>
 	<div
-		transition:fadeTransition={{ duration: fade ? 200 : 0 }}
 		class="input flex w-full items-center gap-2"
 		class:input-bordered={bordered}
 		class:input-xs={size === 'xs'}
@@ -85,7 +82,7 @@
 		{:else}
 			{@render start?.()}
 		{/if}
-		<input {disabled} {name} {placeholder} {type} class="grow" />
+		<input {...props} {disabled} {name} {placeholder} {type} class="grow" />
 		{#if typeof end === 'string'}
 			{end}
 		{:else}

From 5f3026961735af90148101d759ae0d1c6481b5e5 Mon Sep 17 00:00:00 2001
From: Baobeld <benjaminpalko@hotmail.com>
Date: Thu, 16 Jan 2025 13:46:43 -0500
Subject: [PATCH 3/4] Chore: remove flaticons from storybook css (#56)

remove from storybook css
---
 .storybook/preview.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.storybook/preview.css b/.storybook/preview.css
index 4e7ba75..a31e444 100644
--- a/.storybook/preview.css
+++ b/.storybook/preview.css
@@ -1,4 +1,3 @@
 @import 'tailwindcss/base';
 @import 'tailwindcss/components';
 @import 'tailwindcss/utilities';
-@import '@flaticon/flaticon-uicons/css/all/all';

From b9fd3e30c4a9d76322b903916ec304bc61c7c45f Mon Sep 17 00:00:00 2001
From: Baobeld <benjaminpalko@hotmail.com>
Date: Thu, 16 Jan 2025 13:46:55 -0500
Subject: [PATCH 4/4] Chore: add menu dropdown on navbar (#54)

add menu dropdown on navbar

add messages to navbar
---
 messages/en.json                              |  3 +
 .../Navigation/Navbar/Navbar.stories.svelte   | 18 +++++-
 .../Navigation/Navbar/Navbar.svelte           | 17 ++----
 src/lib/server/auth/index.ts                  |  2 +-
 src/routes/app/+layout.svelte                 | 60 +++++++++++++++++--
 src/routes/app/+page.svelte                   |  2 -
 6 files changed, 80 insertions(+), 22 deletions(-)

diff --git a/messages/en.json b/messages/en.json
index 0deea6c..efe0d28 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -1,6 +1,9 @@
 {
 	"$schema": "https://inlang.com/schema/inlang-message-format",
 	"nav_greeting": "Hello {name}!",
+	"nav_menu_sms": "SMS",
+	"nav_menu_settings": "Settings",
+	"nav_menu_logout": "Logout",
 	"login_tab_login": "Login",
 	"login_tab_register": "Register",
 	"login_label_email": "Email",
diff --git a/src/lib/components/Navigation/Navbar/Navbar.stories.svelte b/src/lib/components/Navigation/Navbar/Navbar.stories.svelte
index d9fa299..0b35c92 100644
--- a/src/lib/components/Navigation/Navbar/Navbar.stories.svelte
+++ b/src/lib/components/Navigation/Navbar/Navbar.stories.svelte
@@ -8,4 +8,20 @@
 	});
 </script>
 
-<Story name="Default" args={{ title: 'Storybook' }} />
+<Story name="Default">
+	<Navbar>
+		{#snippet start()}
+			<button class="btn">Home</button>
+		{/snippet}
+		{#snippet center()}
+			<h2 class="text-xl">Title</h2>
+		{/snippet}
+		{#snippet end()}
+			<div class="avatar placeholder">
+				<div class="w-8 rounded-full bg-neutral text-neutral-content">
+					<span class="text-xs">UI</span>
+				</div>
+			</div>
+		{/snippet}
+	</Navbar>
+</Story>
diff --git a/src/lib/components/Navigation/Navbar/Navbar.svelte b/src/lib/components/Navigation/Navbar/Navbar.svelte
index ce41227..ad57fe6 100644
--- a/src/lib/components/Navigation/Navbar/Navbar.svelte
+++ b/src/lib/components/Navigation/Navbar/Navbar.svelte
@@ -1,18 +1,11 @@
 <script lang="ts">
-	import { messages } from '$lib/i18n';
-	import SignOutButton from 'clerk-sveltekit/client/SignOutButton.svelte';
+	import type { Snippet } from 'svelte';
 
-	let { title, username }: { title: string; username: string } = $props();
-
-	let message = $derived(messages.nav_greeting({ name: username }));
+	let { start, center, end }: { start?: Snippet; center?: Snippet; end?: Snippet } = $props();
 </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">{message}</p>
-	<SignOutButton />
+	<div class="navbar-start">{@render start?.()}</div>
+	<div class="navbar-center">{@render center?.()}</div>
+	<div class="navbar-end">{@render end?.()}</div>
 </header>
-
-<style>
-</style>
diff --git a/src/lib/server/auth/index.ts b/src/lib/server/auth/index.ts
index e628e58..6e60334 100644
--- a/src/lib/server/auth/index.ts
+++ b/src/lib/server/auth/index.ts
@@ -74,6 +74,6 @@ export async function validateSession({ locals }: ServerLoadEvent) {
 	}
 
 	return {
-		user: { name: user.name },
+		user: { name: user.name, hasImage: clerkUser.hasImage, imageUrl: clerkUser.imageUrl },
 	};
 }
diff --git a/src/routes/app/+layout.svelte b/src/routes/app/+layout.svelte
index a01f36b..4ea34d0 100644
--- a/src/routes/app/+layout.svelte
+++ b/src/routes/app/+layout.svelte
@@ -1,15 +1,18 @@
 <script lang="ts">
+	import { goto } from '$app/navigation';
+	import { Button } from '$lib/components/Actions';
 	import { Navbar } from '$lib/components/Navigation';
-	import type { User } from '@prisma/client';
+	import { messages } from '$lib/i18n';
+	import 'clerk-sveltekit/client';
+	import SignOutButton from 'clerk-sveltekit/client/SignOutButton.svelte';
+	import { LogOut, MessageCircleMore } from 'lucide-svelte';
 	import type { Snippet } from 'svelte';
 	import { onMount } from 'svelte';
-	import 'clerk-sveltekit/client';
+	import type { PageData } from './$types';
 
 	type Props = {
 		children: Snippet;
-		data: {
-			user: Omit<User, 'password'>;
-		};
+		data: PageData;
 	};
 
 	let { children, data }: Props = $props();
@@ -42,7 +45,52 @@
 			}
 		}
 	});
+
+	let message = $derived(messages.nav_greeting({ name: data.user.name }));
 </script>
 
-<Navbar title="Svelte" username={data.user.name} />
+{#snippet userMenu()}
+	<div class="dropdown dropdown-end">
+		<div tabindex="0" role="button" class="btn btn-circle btn-primary btn-sm ring">
+			<div class="avatar placeholder online">
+				<div class="w-8 rounded-full">
+					{#if data.user.hasImage}
+						<img src={data.user.imageUrl} alt="Avatar" />
+					{:else}
+						<span>{data.user.name.at(0)}</span>
+					{/if}
+				</div>
+			</div>
+		</div>
+		<!-- svelte-ignore a11y_no_noninteractive_tabindex -->
+		<ul
+			tabindex="0"
+			class="menu dropdown-content menu-lg z-[1] mt-4 w-52 rounded-box bg-base-200 p-2 text-right shadow"
+		>
+			<li>
+				<button onclick={() => goto('/app/sms')}
+					><MessageCircleMore /> {messages.nav_menu_sms()}</button
+				>
+			</li>
+			<li><SignOutButton><LogOut /> {messages.nav_menu_logout()}</SignOutButton></li>
+		</ul>
+	</div>
+{/snippet}
+
+<Navbar>
+	{#snippet start()}
+		<Button onclick={() => goto('/app')}>
+			<h2 class="prose prose-xl">Hestia</h2>
+		</Button>
+	{/snippet}
+	{#snippet center()}
+		<h1 class="prose prose-2xl">Svelte</h1>
+	{/snippet}
+	{#snippet end()}
+		<div class="flex items-center gap-3">
+			<p class="prose prose-lg">{message}</p>
+			{@render userMenu()}
+		</div>
+	{/snippet}
+</Navbar>
 {@render children()}
diff --git a/src/routes/app/+page.svelte b/src/routes/app/+page.svelte
index e3cf09f..0fbba99 100644
--- a/src/routes/app/+page.svelte
+++ b/src/routes/app/+page.svelte
@@ -1,4 +1,2 @@
 <script lang="ts">
 </script>
-
-<a href="/app/sms" class="btn btn-ghost">SMS</a>