settings and fixes

2026-04-04 17:37:17 -05:00 · 2026-04-04 17:37:17 -05:00 · 3925f4e67a
commit 3925f4e67a
parent a0efc6c628
16 changed files with 217 additions and 71 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -24,7 +24,7 @@
 				"@eslint/compat": "^1.4.0",
 				"@eslint/js": "^9.36.0",
 				"@internationalized/date": "^3.10.1",
-				"@lucide/svelte": "^0.561.0",
+				"@lucide/svelte": "^1.7.0",
 				"@sveltejs/adapter-node": "^5.3.2",
 				"@sveltejs/kit": "2.49.5",
 				"@sveltejs/vite-plugin-svelte": "^6.2.0",
@ -47,6 +47,7 @@
 				"prettier-plugin-tailwindcss": "^0.6.14",
 				"svelte": "^5.39.5",
 				"svelte-check": "^4.3.2",
+				"svelte-sonner": "^1.1.0",
 				"tailwind-merge": "^3.4.0",
 				"tailwind-variants": "^3.2.2",
 				"tailwindcss": "^4.1.13",
@ -1337,9 +1338,9 @@
 			}
 		},
 		"node_modules/@lucide/svelte": {
-			"version": "0.561.0",
-			"resolved": "https://registry.npmjs.org/@lucide/svelte/-/svelte-0.561.0.tgz",
-			"integrity": "sha512-vofKV2UFVrKE6I4ewKJ3dfCXSV6iP6nWVmiM83MLjsU91EeJcEg7LoWUABLp/aOTxj1HQNbJD1f3g3L0JQgH9A==",
+			"version": "1.7.0",
+			"resolved": "https://registry.npmjs.org/@lucide/svelte/-/svelte-1.7.0.tgz",
+			"integrity": "sha512-YytBKOUBGox7yWcykZnYxOkn5WpR5G1qYXLYXV/j1B79SOTTEKzB+s5yF5Rq9l9OkweDStNH2b4yTqfvhEhV8g==",
 			"dev": true,
 			"license": "ISC",
 			"peerDependencies": {
@ -6311,6 +6312,36 @@
 				}
 			}
 		},
+		"node_modules/svelte-sonner": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/svelte-sonner/-/svelte-sonner-1.1.0.tgz",
+			"integrity": "sha512-3lYM6ZIqWe+p9vwwWHGWP/ZdvHiUtzURsud2quIxivrX4rvpXh6i+geBGn0m3JS6KwW6W8VgbOl3xQMcDuh6gg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"runed": "^0.28.0"
+			},
+			"peerDependencies": {
+				"svelte": "^5.0.0"
+			}
+		},
+		"node_modules/svelte-sonner/node_modules/runed": {
+			"version": "0.28.0",
+			"resolved": "https://registry.npmjs.org/runed/-/runed-0.28.0.tgz",
+			"integrity": "sha512-k2xx7RuO9hWcdd9f+8JoBeqWtYrm5CALfgpkg2YDB80ds/QE4w0qqu34A7fqiAwiBBSBQOid7TLxwxVC27ymWQ==",
+			"dev": true,
+			"funding": [
+				"https://github.com/sponsors/huntabyte",
+				"https://github.com/sponsors/tglide"
+			],
+			"license": "MIT",
+			"dependencies": {
+				"esm-env": "^1.0.0"
+			},
+			"peerDependencies": {
+				"svelte": "^5.7.0"
+			}
+		},
 		"node_modules/svelte-toolbelt": {
 			"version": "0.10.6",
 			"resolved": "https://registry.npmjs.org/svelte-toolbelt/-/svelte-toolbelt-0.10.6.tgz",
--- a/package.json
+++ b/package.json
@ -19,7 +19,7 @@
 		"@eslint/compat": "^1.4.0",
 		"@eslint/js": "^9.36.0",
 		"@internationalized/date": "^3.10.1",
-		"@lucide/svelte": "^0.561.0",
+		"@lucide/svelte": "^1.7.0",
 		"@sveltejs/adapter-node": "^5.3.2",
 		"@sveltejs/kit": "2.49.5",
 		"@sveltejs/vite-plugin-svelte": "^6.2.0",
@ -42,6 +42,7 @@
 		"prettier-plugin-tailwindcss": "^0.6.14",
 		"svelte": "^5.39.5",
 		"svelte-check": "^4.3.2",
+		"svelte-sonner": "^1.1.0",
 		"tailwind-merge": "^3.4.0",
 		"tailwind-variants": "^3.2.2",
 		"tailwindcss": "^4.1.13",
--- a/src/app.css
+++ b/src/app.css
@ -133,3 +133,64 @@
    }
 }

+@custom-variant data-open {
+	&:where([data-state="open"]), &:where([data-open]:not([data-open="false"])) {
+		@slot;
+    }
+}
+
+@custom-variant data-closed {
+	&:where([data-state="closed"]), &:where([data-closed]:not([data-closed="false"])) {
+		@slot;
+    }
+}
+
+@custom-variant data-checked {
+	&:where([data-state="checked"]), &:where([data-checked]:not([data-checked="false"])) {
+		@slot;
+    }
+}
+
+@custom-variant data-unchecked {
+	&:where([data-state="unchecked"]), &:where([data-unchecked]:not([data-unchecked="false"])) {
+		@slot;
+    }
+}
+
+@custom-variant data-selected {
+	&:where([data-selected]) {
+		@slot;
+    }
+}
+
+@custom-variant data-disabled {
+	&:where([data-disabled="true"]), &:where([data-disabled]:not([data-disabled="false"])) {
+		@slot;
+    }
+}
+
+@custom-variant data-active {
+	&:where([data-state="active"]), &:where([data-active]:not([data-active="false"])) {
+		@slot;
+    }
+}
+
+@custom-variant data-horizontal {
+	&:where([data-orientation="horizontal"]) {
+		@slot;
+    }
+}
+
+@custom-variant data-vertical {
+	&:where([data-orientation="vertical"]) {
+		@slot;
+    }
+}
+
+@utility no-scrollbar {
+	-ms-overflow-style: none;
+	scrollbar-width: none;
+	&::-webkit-scrollbar {
+		display: none;
+    }
+}
--- a/src/hooks.server.ts
+++ b/src/hooks.server.ts
@ -14,9 +14,7 @@ export const handle = async ({ event, resolve }) => {
 		event.locals.user = null;
 	} else {
 		try {
-			console.log(jwt.verify(JWT, process.env.JWT_SECRET));
 			event.locals.user = jwt.verify(JWT, process.env.JWT_SECRET);
-			// console.log(event.locals.user);
 		} catch {
 			event.cookies.delete('jwt', { path: '/' });
 			event.locals.user = null;
--- a/src/lib/components/custom/image-upload/image-upload.svelte
+++ b/src/lib/components/custom/image-upload/image-upload.svelte
@ -30,7 +30,6 @@
 	}

 	function handleFiles(files: FileList | null) {
-		console.log('handleFiles');
 		if (!files || files.length === 0) return;

 		const selected = files[0];
--- a/src/lib/components/custom/item-listing.svelte
+++ b/src/lib/components/custom/item-listing.svelte
@ -72,9 +72,22 @@
 		</div>
 		<div class="flex-1">{item.description}</div>
 		{#if item.foundLocation}
-			<div class="mt-2">
-				<LocationIcon class="float-left mr-1" size={24} />
-				<div>{item.foundLocation}</div>
+			<div>
+
+				<Tooltip.Provider>
+					<Tooltip.Root>
+						<Tooltip.Trigger>
+							<div class="mt-2 text-muted-foreground flex">
+								<LocationIcon class="float-left mr-1" size={24} />
+								<div>{item.foundLocation}</div>
+							</div>
+						</Tooltip.Trigger
+						>
+						<Tooltip.Content>
+							<p>Item was found here</p>
+						</Tooltip.Content>
+					</Tooltip.Root>
+				</Tooltip.Provider>
 			</div>
 		{/if}
 		{#if user !== null}
@ -98,7 +111,7 @@
 					<Button variant="ghost" class="text-action"
 									onclick={() => {editCallback(item)}}>
 						<PencilIcon />
-						Manage
+						{!item.approvedDate ? 'Edit' : 'Manage'}
 					</Button>
 				{:else}
 					<Button variant="ghost" class="text-destructive"
--- a/src/lib/components/ui/button/button.svelte
+++ b/src/lib/components/ui/button/button.svelte
@ -1,54 +1,55 @@
 <script lang="ts" module>
-	import { cn, type WithElementRef } from "$lib/utils.js";
-	import type { HTMLAnchorAttributes, HTMLButtonAttributes } from "svelte/elements";
-	import { type VariantProps, tv } from "tailwind-variants";
+	import { cn, type WithElementRef } from '$lib/utils.js';
+	import type { HTMLAnchorAttributes, HTMLButtonAttributes } from 'svelte/elements';
+	import { type VariantProps, tv } from 'tailwind-variants';

 	export const buttonVariants = tv({
-		base: "focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive inline-flex shrink-0 items-center justify-center gap-2 rounded-md text-sm font-medium whitespace-nowrap transition-all outline-none focus-visible:ring-[3px] disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+		base: 'focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive inline-flex shrink-0 items-center justify-center gap-2 rounded-md text-sm font-medium whitespace-nowrap transition-all outline-none focus-visible:ring-[3px] disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*=\'size-\'])]:size-4',
 		variants: {
 			variant: {
-				default: "bg-primary text-primary-foreground hover:bg-primary/90 shadow-xs",
+				default: 'bg-primary text-primary-foreground hover:bg-primary/90 shadow-xs',
 				destructive:
-					"bg-destructive hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60 text-white shadow-xs",
+					'bg-destructive hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60 text-white shadow-xs',
 				outline:
-					"bg-background hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 border shadow-xs",
-				secondary: "bg-secondary text-secondary-foreground hover:bg-secondary/80 shadow-xs",
-				ghost: "hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50",
-				link: "text-primary underline-offset-4 hover:underline",
+					'bg-background hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 border shadow-xs',
+				secondary: 'bg-secondary text-secondary-foreground hover:bg-secondary/80 shadow-xs',
+				ghost: 'hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50',
+				link: 'text-primary underline-offset-4 hover:underline'
 			},
 			size: {
-				default: "h-9 px-4 py-2 has-[>svg]:px-3",
-				sm: "h-8 gap-1.5 rounded-md px-3 has-[>svg]:px-2.5",
-				lg: "h-10 rounded-md px-6 has-[>svg]:px-4",
-				icon: "size-9",
-				"icon-sm": "size-8",
-				"icon-lg": "size-10",
-			},
+				default: 'h-9 px-4 py-2 has-[>svg]:px-3',
+				sm: 'h-8 gap-1.5 rounded-md px-3 has-[>svg]:px-2.5',
+				lg: 'h-10 rounded-md px-6 has-[>svg]:px-4',
+				xl: 'h-14 rounded-md px-8 has-[>svg]:px-6',
+				icon: 'size-9',
+				'icon-sm': 'size-8',
+				'icon-lg': 'size-10'
+			}
 		},
 		defaultVariants: {
-			variant: "default",
-			size: "default",
-		},
+			variant: 'default',
+			size: 'default'
+		}
 	});

-	export type ButtonVariant = VariantProps<typeof buttonVariants>["variant"];
-	export type ButtonSize = VariantProps<typeof buttonVariants>["size"];
+	export type ButtonVariant = VariantProps<typeof buttonVariants>['variant'];
+	export type ButtonSize = VariantProps<typeof buttonVariants>['size'];

 	export type ButtonProps = WithElementRef<HTMLButtonAttributes> &
 		WithElementRef<HTMLAnchorAttributes> & {
-			variant?: ButtonVariant;
-			size?: ButtonSize;
-		};
+		variant?: ButtonVariant;
+		size?: ButtonSize;
+	};
 </script>

 <script lang="ts">
 	let {
 		class: className,
-		variant = "default",
-		size = "default",
+		variant = 'default',
+		size = 'default',
 		ref = $bindable(null),
 		href = undefined,
-		type = "button",
+		type = 'button',
 		disabled,
 		children,
 		...restProps
--- a/src/lib/db/items.remote.ts
+++ b/src/lib/db/items.remote.ts
@ -23,7 +23,6 @@ export const genDescription = command(v.string(), async (data) => {
 	const description = await LLMDescribe(
 		`data:image/jpeg;base64,${outputBuffer.toString('base64')}`
 	);
-	console.log(description);

 	return description;
 });
--- a/src/lib/email/sender.server.ts
+++ b/src/lib/email/sender.server.ts
@ -75,9 +75,6 @@ export async function sendNewInquiryEmail(inquiryId: number) {
 	};
 	const replyToken = jwt.sign(tokenPayload, process.env.JWT_SECRET!);

-	console.log(item);
-	console.log(item.threads);
-	console.log(replyToken);
 	// Send mail with defined transport object
 	await transporter.sendMail({
 		from: `Westuffind Notifier <${process.env.EMAIL_USER}>`,
@ -90,7 +87,6 @@ export async function sendNewInquiryEmail(inquiryId: number) {
 }

 export async function sendInquiryMessageEmail(inquiryId: number, sender: Sender) {
-	console.log(inquiryId);
 	const [item]: Item[] = await sql`
 		SELECT
 			i.*,
--- a/src/lib/llm/llm.server.ts
+++ b/src/lib/llm/llm.server.ts
@ -21,9 +21,6 @@ export async function LLMDescribe(imageData: string) {
 		temperature: 0.2
 	};

-	console.log('AIing it');
-	console.log(payload);
-
 	const res = await fetch(
 		`http://${process.env.LLAMA_HOST!}:${process.env.LLAMA_PORT!}/v1/chat/completions`,
 		{
@ -37,7 +34,7 @@ export async function LLMDescribe(imageData: string) {

 	if (!res.ok) {
 		console.log(await res.text());
-		process.exit(1);
+		// process.exit(1);
 	}

 	const data = await res.json();
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@ -21,22 +21,28 @@
 			This is the official place to reconnect items with their owners.
 		</p>

-		<div class="mt-10 flex flex-col items-center justify-center gap-4 sm:flex-row">
+		<div class="mt-10 flex flex-col items-center justify-center gap-4 ">
+			<a
+				href="/items"
+				class={cn(buttonVariants({ variant: 'default', size: 'xl' }), 'text-base')}
+				aria-label="Browse lost items"
+			>
+				Browse lost items
+			</a>
+			<div class="w-40 flex items-center gap-2 h-2">
+				<div class="flex-1 h-px bg-border"></div>
+				<span class="text-muted-foreground whitespace-nowrap">Or</span>
+				<div class="flex-1 h-px bg-border"></div>
+			</div>
 			<Button
-				size="lg"
-				class="px-8"
+				size="sm"
+				variant="outline"
+				class="text-muted-foreground"
 				onclick={openCreateDialog}
 				aria-label="Submit a found item"
 			>
-				Submit a Found Item
+				Submit found item
 			</Button>
-			<a
-				href="/items"
-				class={cn(buttonVariants({ variant: 'outline', size: 'lg' }), 'px-8')}
-				aria-label="Browse lost items"
-			>
-				Browse Lost Items
-			</a>
 		</div>
 	</div>

@ -66,6 +72,7 @@
 				</p>
 				<Button
 					class="mt-2 w-full"
+					variant="outline"
 					onclick={openCreateDialog}
 					aria-label="Submit a found item"
 				>
@ -97,7 +104,7 @@

 		<Card>
 			<CardHeader>
-				<CardTitle id="safe-heading">Safe &amp; School-Run</CardTitle>
+				<CardTitle id="safe-heading">Safe &amp; Effective</CardTitle>
 			</CardHeader>
 			<CardContent
 				class="space-y-3 text-sm text-muted-foreground"
@ -106,6 +113,9 @@
 				<p>
 					Managed by Waukesha West staff. Items are reviewed before being listed.
 				</p>
+				<p>
+					We've returned 120+ items back to their owners!
+				</p>
 			</CardContent>
 		</Card>
 	</div>
--- a/src/routes/account/+page.server.ts
+++ b/src/routes/account/+page.server.ts
@ -14,8 +14,6 @@ export const load: PageServerLoad = async ({ locals }) => {
 		SELECT * FROM users WHERE id = ${locals.user.id}
 	`;

-	console.log(userData);
-
 	return { userData };
 };

@ -47,7 +45,7 @@ export const actions: Actions = {
 			if (newPassword !== retypeNewPassword) {
 				fail(400, { password: 'New passwords dont match!' });
 			}
-			const passwordHash = await bcrypt.hash(newPassword!, 12);
+			const passwordHash = newPassword ? await bcrypt.hash(newPassword, 12) : null;

 			const settings: UserSettings = {
 				staleItemDays,
@ -58,12 +56,15 @@ export const actions: Actions = {
 			return await sql`
 				UPDATE users SET name = ${name},
 				                 email = ${email},
-				                 password_hash = ${passwordHash},
+												 ${passwordHash ? sql`password_hash = ${passwordHash},` : sql``}
 				                 settings = ${settings.toString()}
 				WHERE id = ${locals.user.id}
 				RETURNING *;
 			`;
 		} catch (e) {
+			console.log('fails');
+			console.log(e);
+
 			return fail(400, {
 				message: e instanceof Error ? e.message : 'Unknown error occurred',
 				success: false
--- a/src/routes/account/+page.svelte
+++ b/src/routes/account/+page.svelte
@ -1,4 +1,4 @@
-<!-- src/routes/account/+page.svelte -->
+<!-- src/routes/account/++page.svelte -->
 <script lang="ts">
 	import { Card, CardContent, CardHeader, CardTitle } from '$lib/components/ui/card';
 	import { Badge } from '$lib/components/ui/badge';
@ -9,8 +9,11 @@
 	import { Button } from '$lib/components/ui/button';
 	import { DefaultUserSettings } from '$lib/types/user';
 	import { enhance } from '$app/forms';
+	import { toast } from 'svelte-sonner';
+	import { Toaster } from '$lib/components/ui/sonner';
+	import CheckIcon from '@lucide/svelte/icons/check';

-	let { data } = $props();
+	let { data, form } = $props();

 	function signOut() {
 		document.cookie = 'jwt=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;';
@ -32,13 +35,18 @@
 		const d = new Date(date);
 		return d.toLocaleString();
 	};
+
+
 </script>

 <svelte:head>
 	<title>Account</title>
 </svelte:head>

+<Toaster></Toaster>
+
 <div class="container mx-auto max-w-3xl py-10">
+
 	<Card class="rounded-2xl shadow-sm">
 		<CardHeader>
 			<div class="flex items-center justify-between">
@ -49,7 +57,19 @@

 		<CardContent class="space-y-6">
 			<!-- Editable Profile Form -->
-			<form method="POST" use:enhance class="space-y-6">
+			<form method="POST" class="space-y-6" use:enhance={({ formElement, formData, action, cancel, submitter }) => {
+					return async ({ result, update }) => {
+						console.log("bleh")
+						console.log(result.status)
+						if (result.status === 200) {
+							toast('Saved', {
+								icon: CheckIcon,
+								description: 'Your account has been saved!',
+							});
+						}
+					};
+				}
+			}>

 				<div class="grid gap-4 sm:grid-cols-2">
 					<div class="space-y-2">
--- a/src/routes/items/[itemId]/inquiries/[inquiryId]/+page.server.ts
+++ b/src/routes/items/[itemId]/inquiries/[inquiryId]/+page.server.ts
@ -47,8 +47,6 @@ export const load: PageServerLoad = async ({ url, locals, params }) => {
 		WHERE i.id = (SELECT item_id FROM inquiry_threads WHERE id = ${inquiryId})
 		GROUP BY i.id;`;

-	console.log(item);
-
 	return { item };
 };

--- a/src/routes/page.svelte.spec.ts
+++ b/src/routes/page.svelte.spec.ts
@ -3,7 +3,7 @@ import { describe, expect, it } from 'vitest';
 import { render } from 'vitest-browser-svelte';
 import Page from './items/+page.svelte';

-describe('/+page.svelte', () => {
+describe('/++page.svelte', () => {
 	it('should render h1', async () => {
 		render(Page);

--- a/src/routes/test/+page.svelte
+++ b/src/routes/test/+page.svelte
@ -0,0 +1,21 @@
+<script lang="ts">
+	import { toast } from 'svelte-sonner';
+	import { Button } from '$lib/components/ui/button/index.js';
+	import { Toaster } from '$lib/components/ui/sonner';
+</script>
+
+<Button
+	variant="outline"
+	onclick={() =>
+  toast("Event has been created", {
+   description: "Sunday, December 03, 2023 at 9:00 AM",
+   action: {
+    label: "Undo",
+    onClick: () => console.info("Undo")
+   }
+  })}
+>
+	Show Toast
+</Button>
+
+<Toaster></Toaster>