Forward/ballistic-builder
3
0
Fork 0
mirror of https://gitea.gofwd.group/dstrawsb/ballistic-builder.git synced 2025-12-06 02:36:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

merge conflict fixed

Browse Source
This commit is contained in:
Don Strawsburg
2024-12-11 16:50:34 -05:00
parent e26ffde6c0
commit 7d9018ecb1
8 changed files with 418 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/app/layout.tsx
View File

@@ -1,7 +1,7 @@
import { Provider } from "../components/ui/provider"
import "../styles/globals.css";
import Navbar from "../components/Navbar";
import Navbar from "@components/Navbar";
import Footer from "@components/site/Footer";
export const metadata = {
title: 'Ballistic Builder',
@@ -9,15 +9,20 @@ export const metadata = {
}
export default function RootLayout(props: { children: React.ReactNode }) {
const { children } = props;
const { children } = props;
return (
<html suppressHydrationWarning>
<body className="bg-slate-200 ">
<Provider>
<Navbar />
{children}</Provider>
</body>
</html>
<html suppressHydrationWarning>
<body>
<Provider>
<Navbar />
{children}
<Footer />
</Provider>
</body>
</html>
)
}
}git status