Hackathons/Bitcamp-2025
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
GamerBoss101
2025-04-12 16:53:35 -04:00
parent 131b0ff948 3361d0451f
commit 2cf0d14528
2 changed files with 56 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/app/(app)/layout.tsx
View File

@@ -11,6 +11,7 @@ export default function RootLayout({
}: Readonly<{ }: Readonly<{
children: React.ReactNode; children: React.ReactNode;
}>) { }>) {
<<<<<<< HEAD
const { isMobile, isSafari } = useDevice(); const { isMobile, isSafari } = useDevice();
return ( return (
<main> <main>
@@ -32,4 +33,26 @@ export default function RootLayout({
) : null} ) : null}
</main> </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
} }

39
src/app/(app)/page.tsx
View File

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