From 0d7f42b06cb1976e7b5dc23df279bf0403b53e67 Mon Sep 17 00:00:00 2001 From: Sean S Date: Wed, 20 Nov 2024 13:44:41 -0500 Subject: [PATCH 01/11] fix link issue --- app/Fragments/Armory/index.tsx | 8 +- app/Fragments/GroundZero/index.tsx | 9 +-- app/Fragments/Information/index.tsx | 8 +- .../Footer/FooterLinks/index copy.js | 80 +++++++++---------- app/components/Footer/index.tsx | 4 +- app/components/Header/index.tsx | 60 +++++++------- app/components/Info/Copyright/index.tsx | 9 +-- app/page.tsx | 33 ++++---- pages/oldindex.js | 33 ++++---- 9 files changed, 119 insertions(+), 125 deletions(-) diff --git a/app/Fragments/Armory/index.tsx b/app/Fragments/Armory/index.tsx index aab471b..c333b76 100644 --- a/app/Fragments/Armory/index.tsx +++ b/app/Fragments/Armory/index.tsx @@ -11,19 +11,19 @@ let linksArray = [ ]; export const Armory = (props) => { return ( -
+ (
{armoryLinks.length}

{props.titleText}

    {linksArray.map((link, index) => (
  • - {link.TEXT} + {link.TEXT}
    • ))}
-
- ) +
) + ); } export default Armory; \ No newline at end of file diff --git a/app/Fragments/GroundZero/index.tsx b/app/Fragments/GroundZero/index.tsx index c371a9d..61a14b8 100644 --- a/app/Fragments/GroundZero/index.tsx +++ b/app/Fragments/GroundZero/index.tsx @@ -10,19 +10,18 @@ let linksArray = [ export const GroundZero = (props) => { return ( -
+ (

{props.titleText}

    {linksArray.map((link, index) => (
  • - {link.TEXT} + {link.TEXT}
    • ))}
-
- - ) +
) + ); } export default GroundZero; \ No newline at end of file diff --git a/app/Fragments/Information/index.tsx b/app/Fragments/Information/index.tsx index 4d631f0..84c3623 100644 --- a/app/Fragments/Information/index.tsx +++ b/app/Fragments/Information/index.tsx @@ -10,18 +10,18 @@ let linksArray = [ ]; export const Information = (props) => { return ( -
+ (

{props.titleText}

    {linksArray.map((link, index) => (
  • - {link.TEXT} + {link.TEXT}
    • ))}
-
- ) +
) + ); } export default Information; \ No newline at end of file diff --git a/app/components/Footer/FooterLinks/index copy.js b/app/components/Footer/FooterLinks/index copy.js index 0b3be57..674c18d 100644 --- a/app/components/Footer/FooterLinks/index copy.js +++ b/app/components/Footer/FooterLinks/index copy.js @@ -25,50 +25,50 @@ export default function FooterLinks() { const classes = useStyles(); return ( -
- - - - - - FAQ - - + (
+ + + + + + FAQ + + - - - Terms Of Service - - + + + Terms Of Service + + - - - Contact Us - - + + + Contact Us + + - - - Privacy Policy - - + + + Privacy Policy + + - - - Personal Information Policy - - + + + Personal Information Policy + + - - - Disclosure - - - - - - -
- ) + + + Disclosure + + + + + + +
) + ); } diff --git a/app/components/Footer/index.tsx b/app/components/Footer/index.tsx index 79a2dfb..69c67f6 100644 --- a/app/components/Footer/index.tsx +++ b/app/components/Footer/index.tsx @@ -16,7 +16,7 @@ export const Footer = () => { // // // - <> + (<> - + ) ); } diff --git a/app/components/Header/index.tsx b/app/components/Header/index.tsx index 312c75e..2dc7f12 100644 --- a/app/components/Header/index.tsx +++ b/app/components/Header/index.tsx @@ -21,41 +21,39 @@ export default class Header extends Component { render() { return ( -
-
- Gun Builder - -
+ (
+
+ Gun Builder + +
+ + + + + + {sectionLinks.UPPERS.TEXT} + - - - - - {sectionLinks.UPPERS.TEXT} + {sectionLinks.PARTSLIST.TEXT} - - {sectionLinks.PARTSLIST.TEXT} - + + {sectionLinks.BUILDS.TEXT} + - - {sectionLinks.BUILDS.TEXT} - - - - {sectionLinks.BLOG.TEXT} - - - {/* - Admin - */} - - - - - + + {sectionLinks.BLOG.TEXT} + + {/* + Admin + */} + + + + + -
- ) +
) + ); } } diff --git a/app/components/Info/Copyright/index.tsx b/app/components/Info/Copyright/index.tsx index 5ae1961..8bb59ea 100644 --- a/app/components/Info/Copyright/index.tsx +++ b/app/components/Info/Copyright/index.tsx @@ -10,16 +10,15 @@ import styled from '@emotion/styled' export default class Copyright extends Component { render() { return ( - + (
©  {new Date().getFullYear()} {' '} - {COMPANY_NAME} + {COMPANY_NAME} {' '} All Rights Reserved.
- - - ) + ) + ); } } 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 diff --git a/pages/oldindex.js b/pages/oldindex.js index 8c443e7..3f88a2e 100644 --- a/pages/oldindex.js +++ b/pages/oldindex.js @@ -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 c52ee2e0d2150cfc464156621bc7b7f9ca9acd7a Mon Sep 17 00:00:00 2001 From: Don Starwsburg Date: Wed, 20 Nov 2024 13:48:04 -0500 Subject: [PATCH 02/11] 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 15bc578fa497d13f0a286d68c467b25730f28d53 Mon Sep 17 00:00:00 2001 From: Sean S Date: Wed, 20 Nov 2024 13:49:58 -0500 Subject: [PATCH 03/11] fixed name and pull products from api --- app/layout.tsx | 4 +- app/page.tsx | 2 +- pages/builder.js | 109 ++++++++++++++++++++++++++++++----------------- 3 files changed, 73 insertions(+), 42 deletions(-) diff --git a/app/layout.tsx b/app/layout.tsx index a36cde0..aa2539a 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -14,8 +14,8 @@ const geistMono = localFont({ }); export const metadata: Metadata = { - title: "Create Next App", - description: "Generated by create next app", + title: "Ballistic Builder", + description: "Freedom On", }; export default function RootLayout({ diff --git a/app/page.tsx b/app/page.tsx index 3f88a2e..99636a2 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -6,7 +6,7 @@ export default function Home() { {/* Header Section */}
-

Firearm Builder

+

Ballistic Builder