diff --git a/src/app/(app)/layout.tsx b/src/app/(app)/layout.tsx index f0ee87f..d7415ee 100644 --- a/src/app/(app)/layout.tsx +++ b/src/app/(app)/layout.tsx @@ -16,7 +16,7 @@ export default function RootLayout({
{!isMobile && !isSafari ? : null}
- Drink Happy Logo Image + Drink Happy Logo Image {children}
{isMobile && isSafari ? ( diff --git a/src/app/(app)/page.tsx b/src/app/(app)/page.tsx index 8ecf2a6..f52906d 100644 --- a/src/app/(app)/page.tsx +++ b/src/app/(app)/page.tsx @@ -8,7 +8,7 @@ function Mobile() { return (

- Welcome, {isAuthenticated ? session.username : ""} !! + {isAuthenticated ? `Welcome, ${session.username} !!` : ""}

); @@ -20,7 +20,7 @@ function Web() { return (

- Welcome, {isAuthenticated ? session.username : ""} !! + {isAuthenticated ? `Welcome, ${session.username} !!` : ""}

); diff --git a/src/app/auth/session/route.ts b/src/app/auth/session/route.ts index aca6294..341b79b 100644 --- a/src/app/auth/session/route.ts +++ b/src/app/auth/session/route.ts @@ -8,7 +8,7 @@ export async function GET() { const session = await auth0.getSession(); if (!session) { - return NextResponse.json({ session: null }, { status: 401 }); + return NextResponse.json({ session: null }, { status: 200 }); } const sessionUser = session.user; @@ -17,8 +17,6 @@ export async function GET() { if (!userData) { console.log("User not found in database, creating new user..."); userData = await db.users.create(sessionUser?.email as string, sessionUser?.nickname as string); - } else { - console.log("User found in database:", userData); } return NextResponse.json({ session: userData }); diff --git a/src/lib/context/DeviceContext.tsx b/src/lib/context/DeviceContext.tsx index 2edaf8f..be211de 100644 --- a/src/lib/context/DeviceContext.tsx +++ b/src/lib/context/DeviceContext.tsx @@ -27,11 +27,7 @@ export const DeviceProvider: React.FC<{ children: React.ReactNode }> = ({ childr const res = await fetch("/auth/session"); const data = await res.json(); - if (res.ok) { - setSession(data.session); - } else { - console.error("Error fetching session:", data); - } + if (res.ok) setSession(data.session); }; checkAuthentication();