bender/ac866e37-71c0-4327-847a-e6010954fb25
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #1

Merged
bender merged 4 commits from version_1 into main 2026-02-23 12:56:21 +00:00
Conversation 0 Commits 4 Files Changed 4 +12 -23
4 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/blog/page.tsx
View File

@@ -29,12 +29,12 @@ export default function BlogPage() {
<NavbarStyleCentered
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "about" },
{ name: "Menu", id: "menu" },
{ name: "Testimonials", id: "testimonials" },
{ name: "Contact", id: "contact" },
{ name: "About", id: "/#about" },
{ name: "Menu", id: "/#product" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "Contact", id: "/#contact" },
]}
button={{ text: "Order Now", href: "#menu" }}
button={{ text: "Order Now", href: "/#product" }}
brandName="Bean Haven"
/>
@@ -57,11 +57,10 @@ export default function BlogPage() {
<FooterLogoEmphasis
columns={[
{ items: [{ label: "Home", href: "/" }, { label: "Menu", href: "#menu" }, { label: "About Us", href: "#about" }] },
{ items: [{ label: "Contact", href: "#contact" }, { label: "Blog", href: "#blog" }, { label: "Privacy Policy", href: "/privacy" }] },
{ items: [{ label: "Home", href: "/" }, { label: "Menu", href: "/#product" }, { label: "About Us", href: "/#about" }] },
{ items: [{ label: "Contact", href: "/#contact" }, { label: "Blog", href: "/blog" }, { label: "Privacy Policy", href: "/privacy" }] },
]}
logoText="Bean Haven"
useInvertedBackground={false}
/>
</ReactLenis>
</ThemeProvider>

10
src/app/page.tsx
View File

@@ -28,8 +28,8 @@ export default function LandingPage() {
>
<div id="nav" data-section="nav">
<NavbarStyleCentered
navItems={[{name:"Home",id:"home"},{name:"About",id:"about"},{name:"Menu",id:"menu"},{name:"Testimonials",id:"testimonials"},{name:"Contact",id:"contact"}]}
button={{text:"Order Now",href:"#menu"}}
navItems={[{name:"Home",id:"hero"},{name:"About",id:"about"},{name:"Menu",id:"product"},{name:"Testimonials",id:"testimonials"},{name:"Contact",id:"contact"}]}
button={{text:"Order Now",href:"#product"}}
brandName="Bean Haven"
/>
</div>
@@ -39,7 +39,7 @@ export default function LandingPage() {
title="Your Daily Ritual Starts Here."
description="Discover the perfect blend of rich aroma, exquisite taste, and cozy ambiance at Bean Haven."
background={{variant:"plain"}}
buttons={[{text:"Explore Our Menu",href:"#menu"},{text:"Find Us",href:"#contact"}]}
buttons={[{text:"Explore Our Menu",href:"#product"},{text:"Find Us",href:"#contact"}]}
imageSrc="https://img.b2bpic.net/free-photo/close-up-image-man-holds-coffee-with-heart-foam-top-view_613910-8884.jpg"
imageAlt="Close-up of a coffee cup with latte art on a wooden table in a cozy coffee shop."
tag="Welcome to Bean Haven"
@@ -106,7 +106,7 @@ export default function LandingPage() {
<div id="testimonials" data-section="testimonials">
<TestimonialCardFifteen
testimonial="\"Bean Haven is my absolute favorite coffee shop. The coffee is consistently amazing, and the atmosphere is so relaxing. It's the perfect place to start my day or unwind.\""
testimonial={`"Bean Haven is my absolute favorite coffee shop. The coffee is consistently amazing, and the atmosphere is so relaxing. It's the perfect place to start my day or unwind."`}
rating={5}
author="Jessica L., Regular Customer"
avatars={[
@@ -153,7 +153,7 @@ export default function LandingPage() {
<div id="footer" data-section="footer">
<FooterLogoEmphasis
columns={[
{items:[{label:"Home",href:"/"},{label:"Menu",href:"#menu"},{label:"About Us",href:"#about"}]},
{items:[{label:"Home",href:"/"},{label:"Menu",href:"#product"},{label:"About Us",href:"#about"}]},
{items:[{label:"Contact",href:"#contact"},{label:"Blog",href:"#blog"},{label:"Privacy Policy",href:"/privacy"}]}
]}
logoText="Bean Haven"

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

@@ -97,7 +97,6 @@ function ProductPageContent({ params }: ProductPageProps) {
]}
brandName="Bean Haven"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
mobileButton={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<div id="loading-section" data-section="loading-section">
@@ -112,7 +111,6 @@ function ProductPageContent({ params }: ProductPageProps) {
{ items: [{ label: "Home", href: "/" }] },
{ items: [{ label: "Privacy Policy", href: "/privacy" }] }
]}
useInvertedBackground={false}
/>
</div>
</ReactLenis>
@@ -143,7 +141,6 @@ function ProductPageContent({ params }: ProductPageProps) {
]}
brandName="Bean Haven"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
mobileButton={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<div id="not-found-section" data-section="not-found-section">
@@ -166,7 +163,6 @@ function ProductPageContent({ params }: ProductPageProps) {
{ items: [{ label: "Home", href: "/" }] },
{ items: [{ label: "Privacy Policy", href: "/privacy" }] }
]}
useInvertedBackground={false}
/>
</div>
</ReactLenis>
@@ -196,7 +192,6 @@ function ProductPageContent({ params }: ProductPageProps) {
]}
brandName="Bean Haven"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
mobileButton={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<div id="product-detail-card" data-section="product-detail-card">
@@ -242,7 +237,6 @@ function ProductPageContent({ params }: ProductPageProps) {
{ items: [{ label: "Home", href: "/" }] },
{ items: [{ label: "Privacy Policy", href: "/privacy" }] }
]}
useInvertedBackground={false}
/>
</div>
</ReactLenis>

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

@@ -40,7 +40,6 @@ function ShopPageContent() {
]}
brandName="Bean Haven"
button={{ text: "Cart", onClick: () => {} }}
mobileButton={{ text: "Cart", onClick: () => {} }}
/>
</div>
<div id="loading-section" data-section="loading-section">
@@ -55,7 +54,6 @@ function ShopPageContent() {
{ items: [{ label: "Home", href: "/" }] },
{ items: [{ label: "Privacy Policy", href: "/privacy" }] }
]}
useInvertedBackground={false}
/>
</div>
</ReactLenis>
@@ -85,7 +83,6 @@ function ShopPageContent() {
]}
brandName="Bean Haven"
button={{ text: "Cart", onClick: () => {} }}
mobileButton={{ text: "Cart", onClick: () => {} }}
/>
</div>
<div id="product-catalog" data-section="product-catalog">
@@ -106,7 +103,6 @@ function ShopPageContent() {
{ items: [{ label: "Home", href: "/" }] },
{ items: [{ label: "Privacy Policy", href: "/privacy" }] }
]}
useInvertedBackground={false}
/>
</div>
</ReactLenis>