bender/01b700d6-b422-4404-bff6-416fcf782a60
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #1

Merged
bender merged 4 commits from version_1 into main 2026-02-25 11:13:55 +00:00
Conversation 0 Commits 4 Files Changed 4 +15 -9
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 61201b2ba6 - Show all commits

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

@@ -74,6 +74,15 @@ function ProductPageContent({ params }: ProductPageProps) {
await checkout(getCheckoutItems(), { successUrl: currentUrl.toString() });
}, [cartItems, checkout, getCheckoutItems]);
const navItems = [
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Shop", id: "/shop" },
{ name: "Blog", id: "/blog" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "Contact", id: "/#contact" },
];
if (isLoading) {
return (
<ThemeProvider
@@ -89,10 +98,10 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="light"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple
brandName="Olla"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }, { name: "Contact", id: "/contact" }]}
navItems={navItems}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
@@ -108,7 +117,6 @@ function ProductPageContent({ params }: ProductPageProps) {
]}
logoText="Olla"
copyrightText="© 2024 Olla Flowers Studio. All rights reserved."
useInvertedBackground={false}
ariaLabel="Site footer"
/>
</div>
@@ -132,10 +140,10 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="light"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple
brandName="Olla"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }, { name: "Contact", id: "/contact" }]}
navItems={navItems}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
@@ -159,7 +167,6 @@ function ProductPageContent({ params }: ProductPageProps) {
]}
logoText="Olla"
copyrightText="© 2024 Olla Flowers Studio. All rights reserved."
useInvertedBackground={false}
ariaLabel="Site footer"
/>
</div>
@@ -182,10 +189,10 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="light"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple
brandName="Olla"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }, { name: "Contact", id: "/contact" }]}
navItems={navItems}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
@@ -234,7 +241,6 @@ function ProductPageContent({ params }: ProductPageProps) {
]}
logoText="Olla"
copyrightText="© 2024 Olla Flowers Studio. All rights reserved."
useInvertedBackground={false}
ariaLabel="Site footer"
/>
</div>