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

fixed merge conflict

Browse Source
This commit is contained in:
Don Starwsburg
2024-11-20 13:48:04 -05:00
parent 090e23e59c
commit c52ee2e0d2
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/page.tsx
View File

@@ -2,22 +2,21 @@ import Link from "next/link";
export default function Home() { export default function Home() {
return ( return (
<div className="bg-gray-100 min-h-screen flex flex-col"> (<div className="bg-gray-100 min-h-screen flex flex-col">
{/* Header Section */} {/* Header Section */}
<header className="bg-gray-800 text-white py-4 shadow-md"> <header className="bg-gray-800 text-white py-4 shadow-md">
<div className="container mx-auto px-6 flex justify-between items-center"> <div className="container mx-auto px-6 flex justify-between items-center">
<h1 className="text-2xl font-bold">Firearm Builder</h1> <h1 className="text-2xl font-bold">Firearm Builder</h1>
<nav> <nav>
<ul className="flex space-x-4"> <ul className="flex space-x-4">
<li><Link href="#features"><a className="hover:underline">Features</a></Link></li> <li><Link href="#features" className="hover:underline">Features</Link></li>
<li><Link href="/builder"><a className="hover:underline">Builder</a></Link></li> <li><Link href="/builder" className="hover:underline">Builder</Link></li>
<li><Link href="/products"><a className="hover:underline">Products</a></Link></li> <li><Link href="/products" className="hover:underline">Products</Link></li>
<li><Link href="#contact"><a className="hover:underline">Contact</a></Link></li> <li><Link href="#contact" className="hover:underline">Contact</Link></li>
</ul> </ul>
</nav> </nav>
</div> </div>
</header> </header>
{/* Hero Section */} {/* Hero Section */}
<section className="bg-gray-700 text-white py-20 text-center"> <section className="bg-gray-700 text-white py-20 text-center">
<div className="container mx-auto px-6"> <div className="container mx-auto px-6">
@@ -25,14 +24,15 @@ export default function Home() {
<p className="text-lg mb-6"> <p className="text-lg mb-6">
Customize every component of your firearm with ease and precision. Customize every component of your firearm with ease and precision.
</p> </p>
<Link href="/builder"> <Link
<a className="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded"> href="/builder"
className="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded">
Get Started Get Started
</a>
</Link> </Link>
</div> </div>
</section> </section>
{/* Features Section */} {/* Features Section */}
<section id="features" className="py-20"> <section id="features" className="py-20">
<div className="container mx-auto px-6 text-center"> <div className="container mx-auto px-6 text-center">
@@ -59,7 +59,6 @@ export default function Home() {
</div> </div>
</div> </div>
</section> </section>
{/* About Section */} {/* About Section */}
<section id="about" className="bg-gray-200 py-20"> <section id="about" className="bg-gray-200 py-20">
<div className="container mx-auto px-6 text-center"> <div className="container mx-auto px-6 text-center">
@@ -71,7 +70,6 @@ export default function Home() {
</p> </p>
</div> </div>
</section> </section>
{/* Contact Section */} {/* Contact Section */}
<section id="contact" className="py-20"> <section id="contact" className="py-20">
<div className="container mx-auto px-6 text-center"> <div className="container mx-auto px-6 text-center">
@@ -79,20 +77,21 @@ export default function Home() {
<p className="text-gray-700 mb-6"> <p className="text-gray-700 mb-6">
Have questions or feedback? We’d love to hear from you! Have questions or feedback? We’d love to hear from you!
</p> </p>
<Link href="mailto:support@firearmbuilder.com"> <Link
<a className="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded"> href="mailto:support@firearmbuilder.com"
className="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded">
Email Us Email Us
</a>
</Link> </Link>
</div> </div>
</section> </section>
{/* Footer Section */} {/* Footer Section */}
<footer className="bg-gray-800 text-white py-4"> <footer className="bg-gray-800 text-white py-4">
<div className="container mx-auto px-6 text-center"> <div className="container mx-auto px-6 text-center">
<p>&copy; {new Date().getFullYear()} Firearm Builder. All rights reserved.</p> <p>&copy; {new Date().getFullYear()} Firearm Builder. All rights reserved.</p>
</div> </div>
</footer> </footer>
</div> </div>)
); );
} }