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

12
src/app/page.tsx
View File

@@ -1,9 +1,9 @@
import About from "../components/site/About";
import Contact from "../components/site/Contact";
import FeaturesSection from "../components/FeaturesSection";
import Footer from "../components/site/Footer ";
import Header from "../components/Header";
import Hero from "../components/Hero";
import About from "@components/site/About";
import Contact from "@components/site/Contact";
import FeaturesSection from "@components/FeaturesSection";
import Footer from "@components/site/Footer";
import Header from "@components/Header";
import Hero from "@components/Hero";
export default async function Home() {

3
src/components/Brand/BrandsList.tsx
View File

@@ -4,6 +4,8 @@ import { brandType } from "src/types/brandType";
import Brand from "./brand";
import AddBrand from "./addBrand";
import { addBrand, deleteBrand, editBrand } from "../../actions/brandActions";
import Footer from "@components/site/Footer";
interface Props {
brands: brandType[];
}
@@ -50,6 +52,7 @@ const BrandsList: FC<Props> = ({ brands }) => {
</div>
{/* Adding brand component for creating new brand */}
<AddBrand createBrand={createBrand} />
<Footer/>
</main>
);
};

14
src/components/UserRegistration/index.tsx
View File

@@ -1,15 +1,9 @@
// components/UserRegistration.js
import { useState } from 'react';
import { useToast } from '@chakra-ui/react';
import {
FormControl,
FormLabel,
Input,
Button,
Stack,
Heading,
} from '@chakra-ui/react';
import { drizzle } from 'drizzle-orm';
import { useToast } from '@chakra-ui/toast';
import { FormControl, FormLabel, } from '@chakra-ui/form-control';
import { Input, Button, Stack, Heading } from '@chakra-ui/react';
import { drizzle } from 'drizzle-orm/node-postgres';
export default function UserRegistration() {
const [formData, setFormData] = useState({

0
src/components/site/Footer /index.tsx → src/components/site/Footer/index.tsx
View File