avatar to main merge

I have completed the character creation screen on the avatar branch and am preparing to merge it into main.
This commit is contained in:
pricewowen
2026-05-23 23:24:36 -06:00
parent 8957ecb81d
commit 61f98866e8
39 changed files with 2361 additions and 436 deletions

View File

@@ -3,6 +3,7 @@ import { Geist } from "next/font/google";
import { ThemeProvider } from "next-themes";
import { GlobalBottomNav } from "@/components/layout/global-bottom-nav";
import { ToastProvider } from "@/components/ui/toast-provider";
import "./globals.css";
const defaultUrl = process.env.VERCEL_URL
@@ -35,8 +36,10 @@ export default function RootLayout({
enableSystem
disableTransitionOnChange
>
<div className="min-h-svh pb-24">{children}</div>
<GlobalBottomNav />
<ToastProvider>
<div className="min-h-svh pb-24">{children}</div>
<GlobalBottomNav />
</ToastProvider>
</ThemeProvider>
</body>
</html>