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 #7

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

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

@@ -9,7 +9,7 @@ export default function PolicyPage() {
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 navItems={navItems} /></div>
<LegalSection layout="page" title="Terms & Policy" sections={[{heading: "Policies", content: {type: 'paragraph', text: "Standard hardware store policies apply."}}]} />
<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: "/" }] }]} bottomLeftText="© 2024 Tradesman Hardware" bottomRightText="All rights reserved." />
</ThemeProvider>
);

5
src/app/shop/[id]/page.tsx
View File

@@ -2,10 +2,11 @@
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
export default function ProductDetailPage() {
export default function ShopProductPage() {
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>
</ThemeProvider>
);
}