Merge branch 'main' of https://github.com/GamerBoss101/Bitcamp-2025

src/app/(app)/layout.tsx

@@ -11,6 +11,7 @@ export default function RootLayout({
 }: Readonly<{
 	children: React.ReactNode;
 }>) {
+<<<<<<< HEAD
 	const { isMobile, isSafari } = useDevice();
 	return (
 		<main>
@@ -32,4 +33,26 @@ export default function RootLayout({
 			) : null}
 		</main>
 	);
+=======
+
+    const { isMobile, isSafari } = useDevice();
+    return (
+        <main className="card grid grid-rows-[1fr_auto]">
+
+            <Image 
+                src="/drinkhappylogo.png"
+                alt="Drink Happy Logo Image"
+                width={500}
+                height={500}
+                className="h-auto mx-auto w-1/3"
+            />
+            {children}
+            { isMobile && isSafari ? (
+                <div className="fixed bottom-0 left-0 right-0 z-50 bg-white border-t border-gray-300">
+                    <MobileNav />
+                </div>
+            ) : null }
+        </main>
+    );
+>>>>>>> 3361d0451f88d7bbe1a241b09f5cc013c2abf8f7
 }

src/app/(app)/page.tsx

@@ -12,12 +12,21 @@ function Mobile() {
 					Welcome, {session?.name || "NULL"} !!
 				</h1>
 
-				<button>
+				<div className="card preset-tonal-success items-center gap-4 p-4 lg:grid-cols-[1fr_auto]">
+					<div className="gap-1">
+						<button type="button" className="btn hover:preset-tonal">
 							<a href="/auth/login?screen_hint=signup">Sign up</a>
 						</button>
-				<button>
-					<a href="/auth/login?screen_hint=login">Log in</a>
+					</div>
+				</div>
+
+				<div className="card preset-tonal-success items-center gap-4 p-4 lg:grid-cols-[1fr_auto]">
+					<div className="gap-1">
+						<button type="button" className="btn hover:preset-tonal">
+							<a href="/auth/login?screen_hint=login">Log In</a>
 						</button>
+					</div>
+				</div>
 			</main>
 		</div>
 	);
@@ -33,6 +42,7 @@ function Web() {
 				Welcome, {session?.name || "NULL"} !!
 			</h1>
 
+<<<<<<< HEAD
 			{isAuthenticated ? (
 				<div>
 					<button type="button" className="btn bg-surface-500">
@@ -49,6 +59,23 @@ function Web() {
 					</button>
 				</div>
 			)}
+=======
+			<div className="card preset-tonal-success items-center gap-4 p-4 lg:grid-cols-[1fr_auto]">
+				<div className="gap-1">
+					<button type="button" className="btn hover:preset-tonal">
+						<a href="/auth/login?screen_hint=signup">Sign up</a>
+					</button>
+				</div>
+			</div>
+
+			<div className="card preset-tonal-success items-center gap-4 p-4 lg:grid-cols-[1fr_auto]">
+				<div className="gap-1">
+					<button type="button" className="btn hover:preset-tonal">
+						<a href="/auth/login?screen_hint=login">Log in</a>
+					</button>
+				</div>
+			</div>
+>>>>>>> 3361d0451f88d7bbe1a241b09f5cc013c2abf8f7
 		</main>
 	);
 }