From 8853515f07db35fbfb9893d38f682c0e7e488c0f Mon Sep 17 00:00:00 2001
From: Face <69168154+face-hh@users.noreply.github.com>
Date: Sat, 28 Jun 2025 13:54:46 +0300
Subject: [PATCH] ssr on

---
 .../ui/dropdown-menu/dropdown-menu-group.svelte     | 11 +++++++++--
 .../ui/dropdown-menu/dropdown-menu-trigger.svelte   | 11 +++++++++--
 .../src/lib/components/ui/skeleton/skeleton.svelte  |  6 +++---
 website/src/routes/+layout.server.ts                | 13 ++++++++-----
 website/src/routes/+layout.ts                       |  1 -
 website/src/routes/api/v1/hopium/[id]/+server.ts    |  2 +-
 6 files changed, 30 insertions(+), 14 deletions(-)
 delete mode 100644 website/src/routes/+layout.ts

diff --git a/website/src/lib/components/ui/dropdown-menu/dropdown-menu-group.svelte b/website/src/lib/components/ui/dropdown-menu/dropdown-menu-group.svelte
index aca1f7b..ad1a3ea 100644
--- a/website/src/lib/components/ui/dropdown-menu/dropdown-menu-group.svelte
+++ b/website/src/lib/components/ui/dropdown-menu/dropdown-menu-group.svelte
@@ -1,7 +1,14 @@
 <script lang="ts">
 	import { DropdownMenu as DropdownMenuPrimitive } from "bits-ui";
 
-	let { ref = $bindable(null), ...restProps }: DropdownMenuPrimitive.GroupProps = $props();
+	let {
+		ref = $bindable(null),
+		...restProps
+	}: DropdownMenuPrimitive.GroupProps = $props();
 </script>
 
-<DropdownMenuPrimitive.Group bind:ref data-slot="dropdown-menu-group" {...restProps} />
+<DropdownMenuPrimitive.Group
+	bind:ref
+	data-slot="dropdown-menu-group"
+	{...restProps}
+/>
diff --git a/website/src/lib/components/ui/dropdown-menu/dropdown-menu-trigger.svelte b/website/src/lib/components/ui/dropdown-menu/dropdown-menu-trigger.svelte
index cb05344..abfaa93 100644
--- a/website/src/lib/components/ui/dropdown-menu/dropdown-menu-trigger.svelte
+++ b/website/src/lib/components/ui/dropdown-menu/dropdown-menu-trigger.svelte
@@ -1,7 +1,14 @@
 <script lang="ts">
 	import { DropdownMenu as DropdownMenuPrimitive } from "bits-ui";
 
-	let { ref = $bindable(null), ...restProps }: DropdownMenuPrimitive.TriggerProps = $props();
+	let {
+		ref = $bindable(null),
+		...restProps
+	}: DropdownMenuPrimitive.TriggerProps = $props();
 </script>
 
-<DropdownMenuPrimitive.Trigger bind:ref data-slot="dropdown-menu-trigger" {...restProps} />
+<DropdownMenuPrimitive.Trigger
+	bind:ref
+	data-slot="dropdown-menu-trigger"
+	{...restProps}
+/>
diff --git a/website/src/lib/components/ui/skeleton/skeleton.svelte b/website/src/lib/components/ui/skeleton/skeleton.svelte
index c7e3d26..f0e544e 100644
--- a/website/src/lib/components/ui/skeleton/skeleton.svelte
+++ b/website/src/lib/components/ui/skeleton/skeleton.svelte
@@ -6,12 +6,12 @@
 		ref = $bindable(null),
 		class: className,
 		...restProps
-	}: WithoutChildren<WithElementRef<HTMLAttributes<HTMLDivElement>>> = $props();
+	}: WithoutChildren<WithElementRef<HTMLAttributes<HTMLSpanElement>>> = $props();
 </script>
 
-<div
+<span
 	bind:this={ref}
 	data-slot="skeleton"
 	class={cn("bg-accent animate-pulse rounded-md", className)}
 	{...restProps}
-></div>
+></span>
diff --git a/website/src/routes/+layout.server.ts b/website/src/routes/+layout.server.ts
index 4f62bd0..17125ad 100644
--- a/website/src/routes/+layout.server.ts
+++ b/website/src/routes/+layout.server.ts
@@ -2,11 +2,14 @@ import type { LayoutServerLoad } from './$types';
 import { dev } from '$app/environment';
 
 export const load: LayoutServerLoad = async (event) => {
-    event.setHeaders({
-        'Cache-Control': dev
-            ? 'no-cache'
-            : 'private, max-age=30'
-    });
+    // Only set Cache-Control if not already set
+    if (!event.request.headers.get('cache-control')) {
+        event.setHeaders({
+            'Cache-Control': dev
+                ? 'no-cache'
+                : 'private, max-age=30'
+        });
+    }
 
     // Use the user data already fetched and processed in hooks
     return {
diff --git a/website/src/routes/+layout.ts b/website/src/routes/+layout.ts
deleted file mode 100644
index 5829b7e..0000000
--- a/website/src/routes/+layout.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const ssr = false;
\ No newline at end of file
diff --git a/website/src/routes/api/v1/hopium/[id]/+server.ts b/website/src/routes/api/v1/hopium/[id]/+server.ts
index 1c3f9b5..1821732 100644
--- a/website/src/routes/api/v1/hopium/[id]/+server.ts
+++ b/website/src/routes/api/v1/hopium/[id]/+server.ts
@@ -16,5 +16,5 @@ export async function GET(event) {
         route: { id: "/api/hopium/questions/[id]" }
     };
 
-    return await getHopiumQuestion(hopiumEvent);
+    return await getHopiumQuestion(hopiumEvent as any);
 }