theopenco · thebeyondr · Sep 17, 2025 · Sep 17, 2025 · Sep 17, 2025 · Sep 17, 2025
diff --git a/.husky/commit-msg b/.husky/commit-msg
@@ -1 +1,2 @@
-pnpm commitlint --edit $1
+#!/usr/bin/env bash
+pnpm commitlint --edit "$1"
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1 +1,2 @@
+#!/usr/bin/env bash
 pnpm lint-staged
diff --git a/apps/ui/src/app/globals.css b/apps/ui/src/app/globals.css
@@ -7,16 +7,30 @@
 
 body {
 	@apply m-0;
-	font-family:
-		-apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu",
-		"Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
+	font-family: var(
+		--font-geist-sans,
+		system-ui,
+		-apple-system,
+		BlinkMacSystemFont,
+		"Inter",
+		"Segoe UI",
+		"Roboto",
+		"Oxygen",
+		"Ubuntu",
+		"Cantarell",
+		"Fira Sans",
+		"Droid Sans",
+		"Helvetica Neue",
+		sans-serif
+	);
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
 }
 
 code {
 	font-family:
-		source-code-pro, Menlo, Monaco, Consolas, "Courier New", monospace;
+		var(--font-geist-mono), source-code-pro, Menlo, Monaco, Consolas,
+		"Courier New", monospace;
 }
 
 :root {
@@ -129,18 +143,22 @@ code {
 	--color-sidebar-ring: var(--sidebar-ring);
 	--animate-marquee: marquee var(--duration) infinite linear;
 	--animate-marquee-vertical: marquee-vertical var(--duration) linear infinite;
+
 	@keyframes marquee {
 		from {
 			transform: translateX(0);
 		}
+
 		to {
 			transform: translateX(calc(-100% - var(--gap)));
 		}
 	}
+
 	@keyframes marquee-vertical {
 		from {
 			transform: translateY(0);
 		}
+
 		to {
 			transform: translateY(calc(-100% - var(--gap)));
 		}
@@ -151,6 +169,7 @@ code {
 	* {
 		@apply border-border outline-ring/50;
 	}
+
 	body {
 		@apply bg-background text-foreground;
 	}
@@ -159,6 +178,7 @@ code {
 		from {
 			height: 0;
 		}
+
 		to {
 			height: var(--radix-accordion-content-height);
 		}
@@ -168,6 +188,7 @@ code {
 		from {
 			height: var(--radix-accordion-content-height);
 		}
+
 		to {
 			height: 0;
 		}

diff --git a/apps/ui/src/app/layout.tsx b/apps/ui/src/app/layout.tsx
@@ -49,10 +49,12 @@ export default function RootLayout({ children }: { children: ReactNode }) {
 	const config = getConfig();
 
 	return (
-		<html lang="en" suppressHydrationWarning>
-			<body
-				className={`${geistSans.variable} ${geistMono.variable} min-h-screen antialiased`}
-			>
+		<html
+			lang="en"
+			suppressHydrationWarning
+			className={`${geistSans.variable} ${geistMono.variable}`}
+		>
+			<body className="min-h-screen antialiased">
 				<Providers config={config}>{children}</Providers>
 			</body>
 		</html>

diff --git a/apps/ui/src/app/onboarding/onboarding-client.tsx b/apps/ui/src/app/onboarding/onboarding-client.tsx
@@ -4,21 +4,53 @@ import { useRouter } from "next/navigation";
 import { useEffect } from "react";
 
 import { OnboardingWizard } from "@/components/onboarding/onboarding-wizard";
+import { UserProvider } from "@/components/providers/user-provider";
 import { useUser } from "@/hooks/useUser";
 
 export function OnboardingClient() {
 	const router = useRouter();
-	const { user } = useUser();
+	const { user, isLoading, error } = useUser();
 
 	useEffect(() => {
-		if (!user) {
+		if (!isLoading && !user && !error) {
 			router.push("/login");
 		}
-	}, [user, router]);
+	}, [user, isLoading, error, router]);
+
+	if (isLoading) {
+		return (
+			<div className="container mx-auto max-w-6xl py-10 flex items-center justify-center">
+				<div className="text-center">
+					<div className="animate-spin rounded-full h-8 w-8 border-b-2 border-primary mx-auto mb-4" />
+					<p className="text-muted-foreground">Loading...</p>
+				</div>
+			</div>
+		);
+	}
+
+	if (error) {
+		return (
+			<div className="container mx-auto max-w-6xl py-10 flex items-center justify-center">
+				<div className="text-center">
+					<p className="text-destructive mb-4">Failed to load user data</p>
+					<button
+						onClick={() => window.location.reload()}
+						className="px-4 py-2 bg-primary text-primary-foreground rounded"
+					>
+						Retry
+					</button>
+				</div>
+			</div>
+		);
+	}
 
 	if (!user) {
 		return null;
 	}
 
-	return <OnboardingWizard />;
+	return (
+		<UserProvider>
+			<OnboardingWizard />
+		</UserProvider>
+	);
 }
diff --git a/apps/ui/src/app/onboarding/page.tsx b/apps/ui/src/app/onboarding/page.tsx
@@ -1,22 +1,8 @@
-import { UserProvider } from "@/components/providers/user-provider";
-import { fetchServerData } from "@/lib/server-api";
-
 import { OnboardingClient } from "./onboarding-client";
 
-import type { User } from "@/lib/types";
-
-// Force dynamic rendering since this page uses server-side data fetching with cookies
+// Force dynamic rendering since this page uses client-side data fetching
 export const dynamic = "force-dynamic";
 
-export default async function OnboardingPage() {
-	const initialUserData = await fetchServerData<{ user: User }>(
-		"GET",
-		"/user/me",
-	);
-
-	return (
-		<UserProvider initialUserData={initialUserData}>
-			<OnboardingClient />
-		</UserProvider>
-	);
+export default function OnboardingPage() {
+	return <OnboardingClient />;
 }