Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
140 changes: 138 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"prepare": "husky"
},
"dependencies": {
"@supabase/supabase-js": "^2.76.1",
"@tanstack/react-query": "5.69.0",
"lucide-react": "0.484.0",
"next": "15.2.4",
Expand Down
73 changes: 73 additions & 0 deletions src/app/auth/callback/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
"use client";

import { useEffect, useState } from "react";
import { useRouter } from "next/navigation";
import { supabase } from "@/lib/supabase";
import Image from "next/image";
import logo from "@/public/home/cookCraftLogo.webp";

const AuthCallbackPage = () => {
const router = useRouter();
const [error, setError] = useState<string | null>(null);

useEffect(() => {
const handleCallback = async () => {
try {
const hashParams = new URLSearchParams(
window.location.hash.substring(1),
);
const accessToken = hashParams.get("access_token");
const refreshToken = hashParams.get("refresh_token");

if (accessToken && refreshToken) {
const { error } = await supabase.auth.setSession({
access_token: accessToken,
refresh_token: refreshToken,
});

if (error) throw error;

router.push("/profile");
} else {
throw new Error("No tokens found in URL");
}
} catch (err) {
setError(err instanceof Error ? err.message : "Authentication failed");
}
};

handleCallback();
}, [router]);

if (error) {
return (
<div className="bg-cookcraft-white flex h-screen w-screen flex-col items-center justify-center">
<Image src={logo} alt="CookCraft Logo" className="mb-6 w-48" />
<div className="border-cookcraft-red bg-cookcraft-white flex w-full max-w-md flex-col gap-4 rounded-2xl border-3 p-8">
<h2 className="text-cookcraft-red text-2xl font-bold">
Authentication Error
</h2>
<p className="text-cookcraft-olive">{error}</p>
<button
onClick={() => router.push("/login")}
className="bg-cookcraft-red hover:bg-cookcraft-yellow mt-2 rounded-2xl p-4 text-lg font-bold text-white transition-colors"
>
Back to Login
</button>
</div>
</div>
);
}

return (
<div className="bg-cookcraft-white text-cookcraft-olive flex h-screen w-screen flex-col items-center justify-center">
<Image src={logo} alt="CookCraft Logo" className="mb-6 w-48" />
<div className="flex flex-col items-center gap-4">
<div className="border-cookcraft-olive h-12 w-12 animate-spin rounded-full border-4 border-t-transparent"></div>
<p className="text-xl font-medium">Signing you in...</p>
</div>
</div>
);
};

export default AuthCallbackPage;
7 changes: 5 additions & 2 deletions src/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import "./globals.css";
import { Roboto } from "next/font/google";
import { ReactQueryClientProvider } from "@/utils/react-query";
import { AuthProvider } from "@/contexts/AuthContext";
import NavBar from "@/components/NavBar";

const roboto = Roboto({
Expand All @@ -22,8 +23,10 @@ export default function RootLayout({ children }: LayoutProps) {
return (
<html lang="en">
<body className={roboto.className}>
<NavBar />
<ReactQueryClientProvider>{children}</ReactQueryClientProvider>
<AuthProvider>
<NavBar />
<ReactQueryClientProvider>{children}</ReactQueryClientProvider>
</AuthProvider>
</body>
</html>
);
Expand Down
Loading
Loading