Merge branch 'develop' of ssh://gitea.gofwd.group:2225/dstrawsb/ballistic-builder into develop

This commit is contained in:
2024-12-13 09:51:19 -05:00
63 changed files with 13 additions and 4427 deletions

View File

@@ -1,4 +1,4 @@
import { Provider } from "../components/ui/provider"
//import { Provider } from "../components/ui/provider"
import "../styles/globals.css";
import Navbar from "../components/Navbar";
import PopNav from "@src/components/PopNav/page";
@@ -22,10 +22,10 @@ export default function RootLayout(props: { children: React.ReactNode }) {
return (
<html suppressHydrationWarning className={inter.className}>
<body className="bg-slate-200 ">
<Provider>
<Navbar />
<PopNav />
{children}</Provider>
{children}
</body>
</html>
)