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

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

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

@@ -26,42 +26,48 @@ export default function BlogPage() {
headingFontWeight="bold"
>
<ReactLenis root>
<NavbarStyleCentered
navItems={[
{ name: "Home", id: "/" },
{ 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 id="nav" data-section="nav">
<NavbarStyleCentered
navItems={[
{ name: "Home", id: "/" },
{ 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>
<main>
{isLoading ? (
<div className="w-full min-h-[50vh] flex items-center justify-center">
<p className="text-foreground">Loading posts...</p>
</div>
) : (
<BlogCardThree
blogs={posts}
title="Featured Articles"
description="Explore our latest insights"
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={false}
/>
)}
</main>
<div id="blog-content" data-section="blog-content">
<main>
{isLoading ? (
<div className="w-full min-h-[50vh] flex items-center justify-center">
<p className="text-foreground">Loading posts...</p>
</div>
) : (
<BlogCardThree
blogs={posts}
title="Featured Articles"
description="Explore our latest insights"
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={false}
/>
)}
</main>
</div>
<FooterLogoEmphasis
columns={[
{ 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"
/>
<div id="footer" data-section="footer">
<FooterLogoEmphasis
columns={[
{ 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"
/>
</div>
</ReactLenis>
</ThemeProvider>
);

10
src/app/page.tsx
View File

@@ -43,8 +43,8 @@ export default function LandingPage() {
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"
tagAnimation="background-highlight"
buttonAnimation="background-highlight"
tagAnimation="slide-up"
buttonAnimation="slide-up"
textBoxClassName="max-w-3xl"
titleClassName="text-balance"
descriptionClassName="max-w-2xl text-balance"
@@ -64,7 +64,7 @@ export default function LandingPage() {
imageSrc="https://img.b2bpic.net/free-photo/smiling-asian-girl-barista-cafe-staff-pouring-steamed-milk-coffee-prepare-cappuccino-with-latte_1258-134426.jpg"
imageAlt="A friendly barista preparing a latte behind a coffee machine."
useInvertedBackground={false}
tagAnimation="background-highlight"
tagAnimation="slide-up"
mediaAnimation="opacity"
className="bg-card"
/>
@@ -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={[
@@ -116,7 +116,7 @@ export default function LandingPage() {
{src:"https://img.b2bpic.net/free-photo/smiling-man-using-mobile-phone-cafa_1170-720.jpg",alt:"David R."}
]}
useInvertedBackground={false}
ratingAnimation="background-highlight"
ratingAnimation="slide-up"
avatarsAnimation="opacity"
className="bg-card"
/>

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

@@ -74,6 +74,19 @@ function ProductPageContent({ params }: ProductPageProps) {
await checkout(getCheckoutItems(), { successUrl: currentUrl.toString() });
}, [cartItems, checkout, getCheckoutItems]);
const navItems = [
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Menu", id: "/#product" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "Contact", id: "/#contact" },
];
const footerColumns = [
{ 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" }] },
];
if (isLoading) {
return (
<ThemeProvider
@@ -91,10 +104,7 @@ function ProductPageContent({ params }: ProductPageProps) {
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarStyleCentered
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" }
]}
navItems={navItems}
brandName="Bean Haven"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -107,10 +117,7 @@ function ProductPageContent({ params }: ProductPageProps) {
<div id="footer" data-section="footer">
<FooterLogoEmphasis
logoText="Bean Haven"
columns={[
{ items: [{ label: "Home", href: "/" }] },
{ items: [{ label: "Privacy Policy", href: "/privacy" }] }
]}
columns={footerColumns}
/>
</div>
</ReactLenis>
@@ -135,10 +142,7 @@ function ProductPageContent({ params }: ProductPageProps) {
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarStyleCentered
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" }
]}
navItems={navItems}
brandName="Bean Haven"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -159,10 +163,7 @@ function ProductPageContent({ params }: ProductPageProps) {
<div id="footer" data-section="footer">
<FooterLogoEmphasis
logoText="Bean Haven"
columns={[
{ items: [{ label: "Home", href: "/" }] },
{ items: [{ label: "Privacy Policy", href: "/privacy" }] }
]}
columns={footerColumns}
/>
</div>
</ReactLenis>
@@ -186,10 +187,7 @@ function ProductPageContent({ params }: ProductPageProps) {
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarStyleCentered
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" }
]}
navItems={navItems}
brandName="Bean Haven"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -233,10 +231,7 @@ function ProductPageContent({ params }: ProductPageProps) {
<div id="footer" data-section="footer">
<FooterLogoEmphasis
logoText="Bean Haven"
columns={[
{ items: [{ label: "Home", href: "/" }] },
{ items: [{ label: "Privacy Policy", href: "/privacy" }] }
]}
columns={footerColumns}
/>
</div>
</ReactLenis>

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

@@ -17,6 +17,19 @@ function ShopPageContent() {
filters,
} = useProductCatalog({ basePath: "/shop" });
const navItems = [
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Menu", id: "/#product" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "Contact", id: "/#contact" },
];
const footerColumns = [
{ 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" }] },
];
if (isLoading) {
return (
<ThemeProvider
@@ -34,10 +47,7 @@ function ShopPageContent() {
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarStyleCentered
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" }
]}
navItems={navItems}
brandName="Bean Haven"
button={{ text: "Cart", onClick: () => {} }}
/>
@@ -50,10 +60,7 @@ function ShopPageContent() {
<div id="footer" data-section="footer">
<FooterLogoEmphasis
logoText="Bean Haven"
columns={[
{ items: [{ label: "Home", href: "/" }] },
{ items: [{ label: "Privacy Policy", href: "/privacy" }] }
]}
columns={footerColumns}
/>
</div>
</ReactLenis>
@@ -77,10 +84,7 @@ function ShopPageContent() {
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarStyleCentered
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" }
]}
navItems={navItems}
brandName="Bean Haven"
button={{ text: "Cart", onClick: () => {} }}
/>
@@ -99,10 +103,7 @@ function ShopPageContent() {
<div id="footer" data-section="footer">
<FooterLogoEmphasis
logoText="Bean Haven"
columns={[
{ items: [{ label: "Home", href: "/" }] },
{ items: [{ label: "Privacy Policy", href: "/privacy" }] }
]}
columns={footerColumns}
/>
</div>
</ReactLenis>