bender/b786f741-b2e9-4791-8024-8bebb6c2e4f7
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #6

Merged
bender merged 4 commits from version_2 into main 2026-04-09 11:39:06 +00:00
Conversation 0 Commits 4 Files Changed 4 +12 -8
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/about/page.tsx
View File

@@ -5,11 +5,12 @@ import InlineImageSplitTextAbout from '@/components/sections/about/InlineImageSp
import FooterSimple from '@/components/sections/footer/FooterSimple';
export default function AboutPage() {
const navItems = [{ name: "Home", id: "/" }, { name: "About", id: "/about" }, { name: "Contact", id: "/contact" }, { name: "Shop", id: "/shop" }];
return (
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<div id="nav" data-section="nav"><NavbarLayoutFloatingOverlay /></div>
<div id="nav" data-section="nav"><NavbarLayoutFloatingOverlay navItems={navItems} /></div>
<InlineImageSplitTextAbout heading={[{type: 'text', content: 'About Tradesman Hardware'}]} useInvertedBackground={false} />
<FooterSimple columns={[{ title: "Links", items: [{ label: "Home", href: "/" }] }]} />
<FooterSimple columns={[{ title: "Links", items: [{ label: "Home", href: "/" }] }]} bottomLeftText="© 2024 Tradesman Hardware" bottomRightText="All rights reserved." />
</ThemeProvider>
);
}

5
src/app/contact/page.tsx
View File

@@ -5,11 +5,12 @@ import ContactCTA from '@/components/sections/contact/ContactCTA';
import FooterSimple from '@/components/sections/footer/FooterSimple';
export default function ContactPage() {
const navItems = [{ name: "Home", id: "/" }, { name: "About", id: "/about" }, { name: "Contact", id: "/contact" }, { name: "Shop", id: "/shop" }];
return (
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<div id="nav" data-section="nav"><NavbarLayoutFloatingOverlay /></div>
<div id="nav" data-section="nav"><NavbarLayoutFloatingOverlay navItems={navItems} /></div>
<ContactCTA tag="Support" title="Get in Touch" description="Reach out for any hardware queries." buttons={[{text: "Email Us"}]} background={{ variant: "plain" }} useInvertedBackground={false} />
<FooterSimple columns={[{ title: "Links", items: [{ label: "Home", href: "/" }] }]} />
<FooterSimple columns={[{ title: "Links", items: [{ label: "Home", href: "/" }] }]} bottomLeftText="© 2024 Tradesman Hardware" bottomRightText="All rights reserved." />
</ThemeProvider>
);
}

5
src/app/policy/page.tsx
View File

@@ -5,11 +5,12 @@ import LegalSection from '@/components/legal/LegalSection';
import FooterSimple from '@/components/sections/footer/FooterSimple';
export default function PolicyPage() {
const navItems = [{ name: "Home", id: "/" }, { name: "About", id: "/about" }, { name: "Contact", id: "/contact" }, { name: "Shop", id: "/shop" }];
return (
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<div id="nav" data-section="nav"><NavbarLayoutFloatingOverlay /></div>
<div id="nav" data-section="nav"><NavbarLayoutFloatingOverlay navItems={navItems} /></div>
<LegalSection layout="page" title="Terms & Policy" sections={[{heading: "Policies", content: {type: 'paragraph', text: "Standard hardware store policies apply."}}]} />
<FooterSimple columns={[{ title: "Links", items: [{ label: "Home", href: "/" }] }]} />
<FooterSimple columns={[{ title: "Links", items: [{ label: "Home", href: "/" }] }]} bottomLeftText="© 2024 Tradesman Hardware" bottomRightText="All rights reserved." />
</ThemeProvider>
);
}

5
src/app/shop/page.tsx
View File

@@ -5,9 +5,10 @@ import ProductCardOne from '@/components/sections/product/ProductCardOne';
import FooterSimple from '@/components/sections/footer/FooterSimple';
export default function ShopPage() {
const navItems = [{ name: "Home", id: "/" }, { name: "About", id: "/about" }, { name: "Contact", id: "/contact" }, { name: "Shop", id: "/shop" }];
return (
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<div id="nav" data-section="nav"><NavbarLayoutFloatingOverlay /></div>
<div id="nav" data-section="nav"><NavbarLayoutFloatingOverlay navItems={navItems} /></div>
<ProductCardOne
title="Our Product Catalog"
description="Browse our full selection of professional-grade hardware and tools."
@@ -21,7 +22,7 @@ export default function ShopPage() {
{ id: "s3", name: "Hammer Set", price: "R 500", imageSrc: "http://img.b2bpic.net/free-photo/creative-man-working-wood-workshop_23-2148970802.jpg" }
]}
/>
<FooterSimple columns={[]} />
<FooterSimple columns={[{ title: "Links", items: [{ label: "Home", href: "/" }] }]} bottomLeftText="© 2024 Tradesman Hardware" bottomRightText="All rights reserved." />
</ThemeProvider>
);
}