Merge version_1_1781383692085 into main #1

Merged
bender merged 2 commits from version_1_1781383692085 into main 2026-06-13 20:49:24 +00:00

View File

@@ -8,32 +8,25 @@ import { StyleProvider } from "@/components/ui/StyleProvider";
export default function Layout() {
const navItems = [
{
"name": "Home",
"href": "/"
"name": "Home", "href": "/"
},
{
"name": "Shop",
"href": "/shop"
"name": "Shop", "href": "/shop"
},
{
"name": "About",
"href": "/about"
"name": "About", "href": "/about"
},
{
"name": "FAQ",
"href": "/faq"
"name": "FAQ", "href": "/faq"
},
{
"name": "Contact",
"href": "/contact"
"name": "Contact", "href": "/contact"
},
{
"name": "Hero",
"href": "#hero"
"name": "Hero", "href": "#hero"
},
{
"name": "Featured",
"href": "#featured"
"name": "Featured", "href": "#featured"
}
];
@@ -43,10 +36,9 @@ export default function Layout() {
<SectionErrorBoundary name="navbar">
<NavbarFloatingLogo
logo="ApexAthletics"
logoImageSrc="https://storage.googleapis.com/webild/default/no-image.jpg?id=ir47pp"
ctaButton={{
text: "Shop Shorts",
href: "/shop",
}}
text: "Shop Shorts", href: "/shop"}}
navItems={navItems} />
</SectionErrorBoundary>
<main className="flex-grow">
@@ -57,42 +49,28 @@ export default function Layout() {
brand="Apex Athletics"
columns={[
{
title: "Shop",
items: [
title: "Shop", items: [
{
label: "Shorts",
href: "/shop",
},
label: "Shorts", href: "/shop"},
{
label: "New Arrivals",
href: "/shop",
},
label: "New Arrivals", href: "/shop"},
],
},
{
title: "Company",
items: [
title: "Company", items: [
{
label: "About Us",
href: "/about",
},
label: "About Us", href: "/about"},
{
label: "Contact",
href: "/contact",
},
label: "Contact", href: "/contact"},
],
},
]}
copyright="© 2024 Apex Athletics. All rights reserved."
links={[
{
label: "Privacy Policy",
href: "#",
},
label: "Privacy Policy", href: "#"},
{
label: "Terms of Service",
href: "#",
},
label: "Terms of Service", href: "#"},
]}
/>
</SectionErrorBoundary>