File Struct Changes and Layout Fixes

This commit is contained in:
2025-04-12 15:51:11 -04:00
parent 903f90f33e
commit 9508fa33f4
5 changed files with 33 additions and 8 deletions

28
src/app/(app)/layout.tsx Normal file
View File

@@ -0,0 +1,28 @@
"use client";
import MobileNav from "@/lib/components/MobileNav";
import { useDevice } from "@/lib/context/DeviceContext";
export default function RootLayout({
children,
}: Readonly<{
children: React.ReactNode;
}>) {
const { isMobile, isSafari } = useDevice();
return (
<main>
{children}
<div className="fixed bottom-0 left-0 right-0 z-50 bg-white border-t border-gray-300">
<MobileNav />
</div>
{ isMobile && isSafari ? (
<div className="fixed bottom-0 left-0 right-0 z-50 bg-white border-t border-gray-300">
<MobileNav />
</div>
) : null }
</main>
);
}

View File

@@ -1,6 +1,5 @@
"use client"; "use client";
import "./globals.css";
import { useDevice } from "@/lib/context/DeviceContext"; import { useDevice } from "@/lib/context/DeviceContext";
function Mobile() { function Mobile() {
@@ -32,9 +31,6 @@ function Mobile() {
function Web() { function Web() {
const {session } = useDevice(); const {session } = useDevice();
console.log("session", session);
return ( return (
<div className="grid grid-rows-[20px_1fr_20px] items-center justify-items-center min-h-screen p-8 pb-20 gap-16 sm:p-20 font-[family-name:var(--font-geist-sans)]"> <div className="grid grid-rows-[20px_1fr_20px] items-center justify-items-center min-h-screen p-8 pb-20 gap-16 sm:p-20 font-[family-name:var(--font-geist-sans)]">
<main className="flex flex-col gap-[32px] row-start-2 items-center sm:items-start"> <main className="flex flex-col gap-[32px] row-start-2 items-center sm:items-start">
@@ -60,7 +56,6 @@ function Web() {
export default function Home() { export default function Home() {
const { isMobile, isSafari } = useDevice(); const { isMobile, isSafari } = useDevice();
if (isMobile && isSafari) return Mobile(); if (isMobile && isSafari) return Mobile();
else return Web(); else return Web();
} }

View File

@@ -1,9 +1,9 @@
"use client"; "use client";
import { Geist, Geist_Mono } from "next/font/google"; import { Geist, Geist_Mono } from "next/font/google";
import "./globals.css"; import "../lib/css/globals.css";
import { DeviceProvider } from "@/lib/context/DeviceContext"; import { DeviceProvider, useDevice } from "@/lib/context/DeviceContext";
import MobileNav from "@/lib/components/MobileNav"; import MobileNav from "@/lib/components/MobileNav";
const geistSans = Geist({ const geistSans = Geist({
@@ -29,6 +29,8 @@ export default function RootLayout({
> >
<DeviceProvider> <DeviceProvider>
{children} {children}
</DeviceProvider> </DeviceProvider>
</body> </body>
</html> </html>

View File

@@ -6,7 +6,7 @@
@source '../../node_modules/@skeletonlabs/skeleton-react/dist'; @source '../../node_modules/@skeletonlabs/skeleton-react/dist';
@import "../drinky.css"; @import "./drinky.css";
body { body {
font-family: Arial, Helvetica, sans-serif; font-family: Arial, Helvetica, sans-serif;