From c52ee2e0d2150cfc464156621bc7b7f9ca9acd7a Mon Sep 17 00:00:00 2001 From: Don Starwsburg Date: Wed, 20 Nov 2024 13:48:04 -0500 Subject: [PATCH 1/2] fixed merge conflict --- app/page.tsx | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/app/page.tsx b/app/page.tsx index 8c443e7..3f88a2e 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -2,22 +2,21 @@ import Link from "next/link"; export default function Home() { return ( -
+ (
{/* Header Section */}

Firearm Builder

- {/* Hero Section */}
@@ -25,14 +24,15 @@ export default function Home() {

Customize every component of your firearm with ease and precision.

- - + + Get Started - +
- {/* Features Section */}
@@ -59,7 +59,6 @@ export default function Home() {
- {/* About Section */}
@@ -71,7 +70,6 @@ export default function Home() {

- {/* Contact Section */}
@@ -79,20 +77,21 @@ export default function Home() {

Have questions or feedback? We’d love to hear from you!

- - + + Email Us - +
- {/* Footer Section */}

© {new Date().getFullYear()} Firearm Builder. All rights reserved.

-
+ ) ); } \ No newline at end of file From b29d1b5722e14a9dec6c8b2bda0baf5462b3a979 Mon Sep 17 00:00:00 2001 From: Don Starwsburg Date: Wed, 20 Nov 2024 14:53:30 -0500 Subject: [PATCH 2/2] restrucuring --- app/components/About/index.tsx | 20 +++ app/components/Base_Component/index.tsx | 10 ++ app/components/Contact/index.tsx | 24 ++++ app/components/FeaturesSection/index.tsx | 34 +++++ app/components/Footer /index.tsx | 14 ++ .../FooterLinks/index copy.js | 0 .../FooterLinks/index.js | 0 .../FooterLinks/package.json | 0 .../FooterLinks/styles.module.css | 0 .../{Footer => GB_Footer}/index.tsx | 2 +- .../{Footer => GB_Footer}/package.json | 0 .../{Footer => GB_Footer}/styles.module.scss | 0 app/components/GB_Header/index.tsx | 106 +++++++++++++++ .../{Header => GB_Header}/package.json | 0 .../{Header => GB_Header}/styles.module.css | 0 app/components/GB_Hero/index.tsx | 45 +++++++ app/components/{Hero => GB_Hero}/package.json | 0 .../{Hero => GB_Hero}/styles.module.css | 0 .../{Info => GB_Info}/About/index.tsx | 0 .../{Info => GB_Info}/About/package.json | 0 .../{Info => GB_Info}/About/styles.module.css | 0 .../{Info => GB_Info}/ContactUs/index.tsx | 0 .../{Info => GB_Info}/ContactUs/package.json | 0 .../ContactUs/styles.module.css | 0 .../{Info => GB_Info}/Copyright/index.tsx | 0 .../{Info => GB_Info}/Copyright/package.json | 0 .../Copyright/styles.module.css | 0 .../{Info => GB_Info}/Disclosure/index.tsx | 0 .../{Info => GB_Info}/Disclosure/package.json | 0 .../Disclosure/styles.module.css | 0 .../{Info => GB_Info}/Faq/index.tsx | 0 .../{Info => GB_Info}/Faq/package.json | 0 .../{Info => GB_Info}/Faq/styles.module.css | 0 .../{Info => GB_Info}/PIP/index.tsx | 0 .../{Info => GB_Info}/PIP/package.json | 0 .../{Info => GB_Info}/PIP/styles.module.css | 0 .../{Info => GB_Info}/PrivacyPolicy/index.tsx | 0 .../PrivacyPolicy/package.json | 0 .../PrivacyPolicy/styles.module.css | 0 .../TermsOfService/index.tsx | 0 .../TermsOfService/package.json | 0 .../TermsOfService/styles.module.css | 0 .../{SignIn => GB_SignIn}/index.tsx | 0 .../{SignIn => GB_SignIn}/package.json | 0 .../{SignIn => GB_SignIn}/styles.module.css | 0 app/components/Header/index.tsx | 121 +++--------------- app/components/Hero/index.tsx | 59 +++------ app/components/HomeContent/index.tsx | 24 ++++ app/page-orig.tsx | 97 ++++++++++++++ app/page.tsx | 101 ++------------- 50 files changed, 425 insertions(+), 232 deletions(-) create mode 100644 app/components/About/index.tsx create mode 100644 app/components/Base_Component/index.tsx create mode 100644 app/components/Contact/index.tsx create mode 100644 app/components/FeaturesSection/index.tsx create mode 100644 app/components/Footer /index.tsx rename app/components/{Footer => GB_Footer}/FooterLinks/index copy.js (100%) rename app/components/{Footer => GB_Footer}/FooterLinks/index.js (100%) rename app/components/{Footer => GB_Footer}/FooterLinks/package.json (100%) rename app/components/{Footer => GB_Footer}/FooterLinks/styles.module.css (100%) rename app/components/{Footer => GB_Footer}/index.tsx (95%) rename app/components/{Footer => GB_Footer}/package.json (100%) rename app/components/{Footer => GB_Footer}/styles.module.scss (100%) create mode 100644 app/components/GB_Header/index.tsx rename app/components/{Header => GB_Header}/package.json (100%) rename app/components/{Header => GB_Header}/styles.module.css (100%) create mode 100644 app/components/GB_Hero/index.tsx rename app/components/{Hero => GB_Hero}/package.json (100%) rename app/components/{Hero => GB_Hero}/styles.module.css (100%) rename app/components/{Info => GB_Info}/About/index.tsx (100%) rename app/components/{Info => GB_Info}/About/package.json (100%) rename app/components/{Info => GB_Info}/About/styles.module.css (100%) rename app/components/{Info => GB_Info}/ContactUs/index.tsx (100%) rename app/components/{Info => GB_Info}/ContactUs/package.json (100%) rename app/components/{Info => GB_Info}/ContactUs/styles.module.css (100%) rename app/components/{Info => GB_Info}/Copyright/index.tsx (100%) rename app/components/{Info => GB_Info}/Copyright/package.json (100%) rename app/components/{Info => GB_Info}/Copyright/styles.module.css (100%) rename app/components/{Info => GB_Info}/Disclosure/index.tsx (100%) rename app/components/{Info => GB_Info}/Disclosure/package.json (100%) rename app/components/{Info => GB_Info}/Disclosure/styles.module.css (100%) rename app/components/{Info => GB_Info}/Faq/index.tsx (100%) rename app/components/{Info => GB_Info}/Faq/package.json (100%) rename app/components/{Info => GB_Info}/Faq/styles.module.css (100%) rename app/components/{Info => GB_Info}/PIP/index.tsx (100%) rename app/components/{Info => GB_Info}/PIP/package.json (100%) rename app/components/{Info => GB_Info}/PIP/styles.module.css (100%) rename app/components/{Info => GB_Info}/PrivacyPolicy/index.tsx (100%) rename app/components/{Info => GB_Info}/PrivacyPolicy/package.json (100%) rename app/components/{Info => GB_Info}/PrivacyPolicy/styles.module.css (100%) rename app/components/{Info => GB_Info}/TermsOfService/index.tsx (100%) rename app/components/{Info => GB_Info}/TermsOfService/package.json (100%) rename app/components/{Info => GB_Info}/TermsOfService/styles.module.css (100%) rename app/components/{SignIn => GB_SignIn}/index.tsx (100%) rename app/components/{SignIn => GB_SignIn}/package.json (100%) rename app/components/{SignIn => GB_SignIn}/styles.module.css (100%) create mode 100644 app/components/HomeContent/index.tsx create mode 100644 app/page-orig.tsx diff --git a/app/components/About/index.tsx b/app/components/About/index.tsx new file mode 100644 index 0000000..289e090 --- /dev/null +++ b/app/components/About/index.tsx @@ -0,0 +1,20 @@ +import Link from "next/link"; + +export default function About() { + + return ( + + ( +
+
+

About Us

+

+ Ballistic Builderis your go-to platform for customizing, building, + and exploring firearm parts. Designed for enthusiasts by + enthusiasts, we make firearm building easy and accessible. +

+
+
+ ) + ) +} \ No newline at end of file diff --git a/app/components/Base_Component/index.tsx b/app/components/Base_Component/index.tsx new file mode 100644 index 0000000..d650f9d --- /dev/null +++ b/app/components/Base_Component/index.tsx @@ -0,0 +1,10 @@ +import Link from "next/link"; + +export default function BB_Base_Component() { + + return ( + ( +
+ ) + ) +} \ No newline at end of file diff --git a/app/components/Contact/index.tsx b/app/components/Contact/index.tsx new file mode 100644 index 0000000..80c56f5 --- /dev/null +++ b/app/components/Contact/index.tsx @@ -0,0 +1,24 @@ +import Link from "next/link"; + +export default function Contact() { + + return ( + ( +
+
+

Contact Us

+

+ Have questions or feedback? We’d love to hear from you! +

+ + + Email Us + + +
+
+ ) + ) +} \ No newline at end of file diff --git a/app/components/FeaturesSection/index.tsx b/app/components/FeaturesSection/index.tsx new file mode 100644 index 0000000..6fa895d --- /dev/null +++ b/app/components/FeaturesSection/index.tsx @@ -0,0 +1,34 @@ +import Link from "next/link"; + +export default function FeaturesSection() { + + return ( + ( +
+
+

Features

+
+
+

Extensive Database

+

+ Access thousands of firearm parts from trusted resellers. +

+
+
+

Compatibility Checker

+

+ Ensure every part works perfectly together. +

+
+
+

Save & Share Builds

+

+ Save your builds or share them with friends. +

+
+
+
+
+ ) + ) +} \ No newline at end of file diff --git a/app/components/Footer /index.tsx b/app/components/Footer /index.tsx new file mode 100644 index 0000000..80e8a06 --- /dev/null +++ b/app/components/Footer /index.tsx @@ -0,0 +1,14 @@ +import Link from "next/link"; + +export default function Footer() { + + return ( + ( +
+
+

© {new Date().getFullYear()} Firearm Builder. All rights reserved.

+
+
+ ) + ) +} \ No newline at end of file diff --git a/app/components/Footer/FooterLinks/index copy.js b/app/components/GB_Footer/FooterLinks/index copy.js similarity index 100% rename from app/components/Footer/FooterLinks/index copy.js rename to app/components/GB_Footer/FooterLinks/index copy.js diff --git a/app/components/Footer/FooterLinks/index.js b/app/components/GB_Footer/FooterLinks/index.js similarity index 100% rename from app/components/Footer/FooterLinks/index.js rename to app/components/GB_Footer/FooterLinks/index.js diff --git a/app/components/Footer/FooterLinks/package.json b/app/components/GB_Footer/FooterLinks/package.json similarity index 100% rename from app/components/Footer/FooterLinks/package.json rename to app/components/GB_Footer/FooterLinks/package.json diff --git a/app/components/Footer/FooterLinks/styles.module.css b/app/components/GB_Footer/FooterLinks/styles.module.css similarity index 100% rename from app/components/Footer/FooterLinks/styles.module.css rename to app/components/GB_Footer/FooterLinks/styles.module.css diff --git a/app/components/Footer/index.tsx b/app/components/GB_Footer/index.tsx similarity index 95% rename from app/components/Footer/index.tsx rename to app/components/GB_Footer/index.tsx index 69c67f6..48e8079 100644 --- a/app/components/Footer/index.tsx +++ b/app/components/GB_Footer/index.tsx @@ -1,7 +1,7 @@ import React, { Component } from "react"; import PropTypes from "prop-types"; import styles from './styles.module.scss'; -import Copyright from "@/app/components/Info/Copyright"; +import Copyright from "@/app/components/GB_Info/Copyright"; import FooterLinks from "./FooterLinks"; import Link from "next/link"; import { infoLinks } from "@/app/lib/linkList/infoLinks"; diff --git a/app/components/Footer/package.json b/app/components/GB_Footer/package.json similarity index 100% rename from app/components/Footer/package.json rename to app/components/GB_Footer/package.json diff --git a/app/components/Footer/styles.module.scss b/app/components/GB_Footer/styles.module.scss similarity index 100% rename from app/components/Footer/styles.module.scss rename to app/components/GB_Footer/styles.module.scss diff --git a/app/components/GB_Header/index.tsx b/app/components/GB_Header/index.tsx new file mode 100644 index 0000000..2dc7f12 --- /dev/null +++ b/app/components/GB_Header/index.tsx @@ -0,0 +1,106 @@ +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; //ES6 +import styles from './styles.module.css'; +import Link from 'next/link'; +import AppBar from '@mui/material/AppBar'; +import Toolbar from '@mui/material/Toolbar'; +import List from '@mui/material/List'; +import ListItem from '@mui/material/ListItem'; +import ListItemText from '@mui/material//ListItemText'; +// import TypoGraphy from '@mui/material/Typography'; +import Button from '@mui/material//Button'; +import { infoLinks } from '@/app/lib/linkList/infoLinks'; +import sectionLinks from '@/app/lib/linkList/sectionLinks'; + +export default class Header extends Component { + constructor(props) { + super(props) + this.state = { + } + } + + render() { + return ( + (
+
+ Gun Builder + +
+ + + + + + {sectionLinks.UPPERS.TEXT} + + + + {sectionLinks.PARTSLIST.TEXT} + + + + {sectionLinks.BUILDS.TEXT} + + + + {sectionLinks.BLOG.TEXT} + + + {/* + Admin + */} + + + + + + +
) + ); + } +} + + +Header.propTypes = { + +}; diff --git a/app/components/Header/package.json b/app/components/GB_Header/package.json similarity index 100% rename from app/components/Header/package.json rename to app/components/GB_Header/package.json diff --git a/app/components/Header/styles.module.css b/app/components/GB_Header/styles.module.css similarity index 100% rename from app/components/Header/styles.module.css rename to app/components/GB_Header/styles.module.css diff --git a/app/components/GB_Hero/index.tsx b/app/components/GB_Hero/index.tsx new file mode 100644 index 0000000..1d87420 --- /dev/null +++ b/app/components/GB_Hero/index.tsx @@ -0,0 +1,45 @@ +import React from 'react'; +import Typography from '@mui/material/Typography'; +import MuiLink from '@mui/material/Link'; +import Button from '@mui/material/Button'; + +export default class Hero extends React.Component { + constructor(props) { + super(props); + this.state = { + show: true, + }; + } + + render() { + return ( + +
+
+

{this.props.heading}

+

{this.props.subheading}

+ +
+ + +
+ ); + } + +} + diff --git a/app/components/Hero/package.json b/app/components/GB_Hero/package.json similarity index 100% rename from app/components/Hero/package.json rename to app/components/GB_Hero/package.json diff --git a/app/components/Hero/styles.module.css b/app/components/GB_Hero/styles.module.css similarity index 100% rename from app/components/Hero/styles.module.css rename to app/components/GB_Hero/styles.module.css diff --git a/app/components/Info/About/index.tsx b/app/components/GB_Info/About/index.tsx similarity index 100% rename from app/components/Info/About/index.tsx rename to app/components/GB_Info/About/index.tsx diff --git a/app/components/Info/About/package.json b/app/components/GB_Info/About/package.json similarity index 100% rename from app/components/Info/About/package.json rename to app/components/GB_Info/About/package.json diff --git a/app/components/Info/About/styles.module.css b/app/components/GB_Info/About/styles.module.css similarity index 100% rename from app/components/Info/About/styles.module.css rename to app/components/GB_Info/About/styles.module.css diff --git a/app/components/Info/ContactUs/index.tsx b/app/components/GB_Info/ContactUs/index.tsx similarity index 100% rename from app/components/Info/ContactUs/index.tsx rename to app/components/GB_Info/ContactUs/index.tsx diff --git a/app/components/Info/ContactUs/package.json b/app/components/GB_Info/ContactUs/package.json similarity index 100% rename from app/components/Info/ContactUs/package.json rename to app/components/GB_Info/ContactUs/package.json diff --git a/app/components/Info/ContactUs/styles.module.css b/app/components/GB_Info/ContactUs/styles.module.css similarity index 100% rename from app/components/Info/ContactUs/styles.module.css rename to app/components/GB_Info/ContactUs/styles.module.css diff --git a/app/components/Info/Copyright/index.tsx b/app/components/GB_Info/Copyright/index.tsx similarity index 100% rename from app/components/Info/Copyright/index.tsx rename to app/components/GB_Info/Copyright/index.tsx diff --git a/app/components/Info/Copyright/package.json b/app/components/GB_Info/Copyright/package.json similarity index 100% rename from app/components/Info/Copyright/package.json rename to app/components/GB_Info/Copyright/package.json diff --git a/app/components/Info/Copyright/styles.module.css b/app/components/GB_Info/Copyright/styles.module.css similarity index 100% rename from app/components/Info/Copyright/styles.module.css rename to app/components/GB_Info/Copyright/styles.module.css diff --git a/app/components/Info/Disclosure/index.tsx b/app/components/GB_Info/Disclosure/index.tsx similarity index 100% rename from app/components/Info/Disclosure/index.tsx rename to app/components/GB_Info/Disclosure/index.tsx diff --git a/app/components/Info/Disclosure/package.json b/app/components/GB_Info/Disclosure/package.json similarity index 100% rename from app/components/Info/Disclosure/package.json rename to app/components/GB_Info/Disclosure/package.json diff --git a/app/components/Info/Disclosure/styles.module.css b/app/components/GB_Info/Disclosure/styles.module.css similarity index 100% rename from app/components/Info/Disclosure/styles.module.css rename to app/components/GB_Info/Disclosure/styles.module.css diff --git a/app/components/Info/Faq/index.tsx b/app/components/GB_Info/Faq/index.tsx similarity index 100% rename from app/components/Info/Faq/index.tsx rename to app/components/GB_Info/Faq/index.tsx diff --git a/app/components/Info/Faq/package.json b/app/components/GB_Info/Faq/package.json similarity index 100% rename from app/components/Info/Faq/package.json rename to app/components/GB_Info/Faq/package.json diff --git a/app/components/Info/Faq/styles.module.css b/app/components/GB_Info/Faq/styles.module.css similarity index 100% rename from app/components/Info/Faq/styles.module.css rename to app/components/GB_Info/Faq/styles.module.css diff --git a/app/components/Info/PIP/index.tsx b/app/components/GB_Info/PIP/index.tsx similarity index 100% rename from app/components/Info/PIP/index.tsx rename to app/components/GB_Info/PIP/index.tsx diff --git a/app/components/Info/PIP/package.json b/app/components/GB_Info/PIP/package.json similarity index 100% rename from app/components/Info/PIP/package.json rename to app/components/GB_Info/PIP/package.json diff --git a/app/components/Info/PIP/styles.module.css b/app/components/GB_Info/PIP/styles.module.css similarity index 100% rename from app/components/Info/PIP/styles.module.css rename to app/components/GB_Info/PIP/styles.module.css diff --git a/app/components/Info/PrivacyPolicy/index.tsx b/app/components/GB_Info/PrivacyPolicy/index.tsx similarity index 100% rename from app/components/Info/PrivacyPolicy/index.tsx rename to app/components/GB_Info/PrivacyPolicy/index.tsx diff --git a/app/components/Info/PrivacyPolicy/package.json b/app/components/GB_Info/PrivacyPolicy/package.json similarity index 100% rename from app/components/Info/PrivacyPolicy/package.json rename to app/components/GB_Info/PrivacyPolicy/package.json diff --git a/app/components/Info/PrivacyPolicy/styles.module.css b/app/components/GB_Info/PrivacyPolicy/styles.module.css similarity index 100% rename from app/components/Info/PrivacyPolicy/styles.module.css rename to app/components/GB_Info/PrivacyPolicy/styles.module.css diff --git a/app/components/Info/TermsOfService/index.tsx b/app/components/GB_Info/TermsOfService/index.tsx similarity index 100% rename from app/components/Info/TermsOfService/index.tsx rename to app/components/GB_Info/TermsOfService/index.tsx diff --git a/app/components/Info/TermsOfService/package.json b/app/components/GB_Info/TermsOfService/package.json similarity index 100% rename from app/components/Info/TermsOfService/package.json rename to app/components/GB_Info/TermsOfService/package.json diff --git a/app/components/Info/TermsOfService/styles.module.css b/app/components/GB_Info/TermsOfService/styles.module.css similarity index 100% rename from app/components/Info/TermsOfService/styles.module.css rename to app/components/GB_Info/TermsOfService/styles.module.css diff --git a/app/components/SignIn/index.tsx b/app/components/GB_SignIn/index.tsx similarity index 100% rename from app/components/SignIn/index.tsx rename to app/components/GB_SignIn/index.tsx diff --git a/app/components/SignIn/package.json b/app/components/GB_SignIn/package.json similarity index 100% rename from app/components/SignIn/package.json rename to app/components/GB_SignIn/package.json diff --git a/app/components/SignIn/styles.module.css b/app/components/GB_SignIn/styles.module.css similarity index 100% rename from app/components/SignIn/styles.module.css rename to app/components/GB_SignIn/styles.module.css diff --git a/app/components/Header/index.tsx b/app/components/Header/index.tsx index 2dc7f12..737b26d 100644 --- a/app/components/Header/index.tsx +++ b/app/components/Header/index.tsx @@ -1,106 +1,23 @@ -import React, { Component } from 'react'; -import PropTypes from 'prop-types'; //ES6 -import styles from './styles.module.css'; -import Link from 'next/link'; -import AppBar from '@mui/material/AppBar'; -import Toolbar from '@mui/material/Toolbar'; -import List from '@mui/material/List'; -import ListItem from '@mui/material/ListItem'; -import ListItemText from '@mui/material//ListItemText'; -// import TypoGraphy from '@mui/material/Typography'; -import Button from '@mui/material//Button'; -import { infoLinks } from '@/app/lib/linkList/infoLinks'; -import sectionLinks from '@/app/lib/linkList/sectionLinks'; +import Link from "next/link"; -export default class Header extends Component { - constructor(props) { - super(props) - this.state = { - } - } - - render() { - return ( - (
-
- Gun Builder - +export default function Header() { + {/* Header Section */ } + return ( + ( +
+
+

Ballistic Builder

+
- - - - - - {sectionLinks.UPPERS.TEXT} - - - {sectionLinks.PARTSLIST.TEXT} - +
- - {sectionLinks.BUILDS.TEXT} - - - - {sectionLinks.BLOG.TEXT} - - - {/* - Admin - */} - - - - - - -
) - ); - } -} - - -Header.propTypes = { - -}; + ) +)} \ No newline at end of file diff --git a/app/components/Hero/index.tsx b/app/components/Hero/index.tsx index 1d87420..425361f 100644 --- a/app/components/Hero/index.tsx +++ b/app/components/Hero/index.tsx @@ -1,45 +1,24 @@ -import React from 'react'; -import Typography from '@mui/material/Typography'; -import MuiLink from '@mui/material/Link'; -import Button from '@mui/material/Button'; +import Link from "next/link"; -export default class Hero extends React.Component { - constructor(props) { - super(props); - this.state = { - show: true, - }; - } +export default function Hero() { + {/* Hero Section */ } + return ( - render() { - return ( +
+
+

Build Your Dream Firearm

+

+ Customize every component of your firearm with ease and precision. +

+ -
-
-

{this.props.heading}

-

{this.props.subheading}

- -
+ Get Started - -
- ); - } - -} + +
+
+ ) +} \ No newline at end of file diff --git a/app/components/HomeContent/index.tsx b/app/components/HomeContent/index.tsx new file mode 100644 index 0000000..100a0a9 --- /dev/null +++ b/app/components/HomeContent/index.tsx @@ -0,0 +1,24 @@ +import Link from "next/link"; +import Header from "../Header"; +import Hero from "../Hero"; +import FeaturesSection from "../FeaturesSection"; +import About from "../About"; +import Contact from "../Contact"; +import Footer from "../Footer "; + +export default function HomeContent() { + + return ( + ( + <> +
+ + + + +