Merge version_1 into main #2

Merged
bender merged 7 commits from version_1 into main 2026-02-24 10:17:22 +00:00
4 changed files with 82 additions and 75 deletions

View File

@@ -9,6 +9,10 @@ import FooterMedia from '@/components/sections/footer/FooterMedia';
export default function BlogPage() {
const { posts, isLoading } = useBlogPosts();
const navItems = [
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" },
];
return (
<ThemeProvider
@@ -24,56 +28,62 @@ export default function BlogPage() {
headingFontWeight="normal"
>
<ReactLenis root>
<NavbarStyleFullscreen
navItems={[{ "name": "Home", "id": "/" }, { "name": "Menu", "id": "menu" }, { "name": "About", "id": "about" }, { "name": "Reviews", "id": "reviews" }, { "name": "Contact", "id": "contact" }]}
brandName="InCup"
bottomLeftText="Experience the best coffee"
bottomRightText="hello@incup.com"
/>
<div id="nav" data-section="nav">
<NavbarStyleFullscreen
navItems={navItems}
brandName="InCup"
bottomLeftText="Experience the best coffee"
bottomRightText="hello@incup.com"
/>
</div>
{isLoading ? (
<div className="w-content-width mx-auto py-20 text-center">
<p className="text-foreground">Loading posts...</p>
</div>
) : (
<BlogCardOne
blogs={posts}
title="Latest Articles"
description="Insights and updates from our team"
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={false}
carouselMode="buttons"
/>
<div id="blog" data-section="blog">
<BlogCardOne
blogs={posts}
title="Latest Articles"
description="Insights and updates from our team"
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={false}
carouselMode="buttons"
/>
</div>
)}
<FooterMedia
imageSrc="https://img.b2bpic.net/free-photo/crop-hand-holding-portafilter-with-coffee_23-2147830571.jpg?_wi=3"
imageAlt="Roasted coffee beans in a wooden scoop"
columns={[
{
title: "Menu", items: [
{ label: "Coffee", href: "#menu" },
{ label: "Pastries", href: "#menu" },
{ label: "Sandwiches", href: "#menu" },
],
},
{
title: "About Us", items: [
{ label: "Our Story", href: "#about" },
{ label: "Team", href: "#" },
],
},
{
title: "Support", items: [
{ label: "FAQ", href: "#faq" },
{ label: "Contact", href: "#contact" },
],
},
]}
logoText="InCup"
copyrightText="© 2024 InCup. All rights reserved."
/>
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="https://img.b2bpic.net/free-photo/crop-hand-holding-portafilter-with-coffee_23-2147830571.jpg"
imageAlt="Roasted coffee beans in a wooden scoop"
columns={[
{
title: "Menu", items: [
{ label: "Coffee", href: "/#menu" },
{ label: "Pastries", href: "/#menu" },
{ label: "Sandwiches", href: "/#menu" },
],
},
{
title: "About Us", items: [
{ label: "Our Story", href: "/#about" },
{ label: "Team", href: "#" },
],
},
{
title: "Support", items: [
{ label: "FAQ", href: "/#faq" },
{ label: "Contact", href: "/#contact" },
],
},
]}
logoText="InCup"
copyrightText="© 2024 InCup. All rights reserved."
/>
</div>
</ReactLenis>
</ThemeProvider>
);

View File

@@ -11,6 +11,11 @@ import ContactCTA from '@/components/sections/contact/ContactCTA';
import FooterMedia from '@/components/sections/footer/FooterMedia';
export default function SitePage() {
const navItems = [
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" },
];
return (
<ThemeProvider
defaultButtonVariant="shift-hover"
@@ -26,13 +31,7 @@ export default function SitePage() {
>
<div id="nav" data-section="nav">
<NavbarStyleFullscreen
navItems={[
{ name: "Home", id: "home" },
{ name: "Menu", id: "menu" },
{ name: "About", id: "about" },
{ name: "Reviews", id: "reviews" },
{ name: "Contact", id: "contact" },
]}
navItems={navItems}
brandName="InCup"
bottomLeftText="Experience the best coffee"
bottomRightText="hello@incup.com"
@@ -47,7 +46,7 @@ export default function SitePage() {
tag="The Perfect Start"
mediaItems={[
{
imageSrc: "https://img.b2bpic.net/free-photo/crop-hand-holding-portafilter-with-coffee_23-2147830571.jpg?_wi=1", imageAlt: "Coffee beans and espresso machine"},
imageSrc: "https://img.b2bpic.net/free-photo/crop-hand-holding-portafilter-with-coffee_23-2147830571.jpg", imageAlt: "Coffee beans and espresso machine"},
{
imageSrc: "https://img.b2bpic.net/free-photo/vertical-shot-man-pouring-milk-into-cappuccino_181624-19406.jpg", imageAlt: "Close up of latte art"},
]}
@@ -94,17 +93,17 @@ export default function SitePage() {
<TestimonialCardSix
testimonials={[
{
id: "1", name: "Sarah M.", handle: "@sarah_lovescoffee", testimonial: "InCup is my favorite spot! The coffee is always perfect, and the atmosphere is so inviting. It's truly a gem.", imageSrc: "https://img.b2bpic.net/free-photo/beautiful-young-woman-is-using-app-her-smartphone-device-send-text-message-near-business-buildings_158595-6785.jpg?_wi=1", imageAlt: "Sarah M. avatar"},
id: "1", name: "Sarah M.", handle: "@sarah_lovescoffee", testimonial: "InCup is my favorite spot! The coffee is always perfect, and the atmosphere is so inviting. It's truly a gem.", imageSrc: "https://img.b2bpic.net/free-photo/beautiful-young-woman-is-using-app-her-smartphone-device-send-text-message-near-business-buildings_158595-6785.jpg", imageAlt: "Sarah M. avatar"},
{
id: "2", name: "David K.", handle: "@davidk_dailygrind", testimonial: "I've tried every coffee shop in town, and InCup stands out. Their lattes are exceptional and the staff are incredibly friendly.", imageSrc: "https://img.b2bpic.net/free-photo/portrait-young-man-drinking-coffee-smiling-looking-camera-closeup_657883-686.jpg?_wi=1", imageAlt: "David K. avatar"},
id: "2", name: "David K.", handle: "@davidk_dailygrind", testimonial: "I've tried every coffee shop in town, and InCup stands out. Their lattes are exceptional and the staff are incredibly friendly.", imageSrc: "https://img.b2bpic.net/free-photo/portrait-young-man-drinking-coffee-smiling-looking-camera-closeup_657883-686.jpg", imageAlt: "David K. avatar"},
{
id: "3", name: "Emily R.", handle: "@emilyeatsandsips", testimonial: "Beyond the amazing coffee, their pastries are a must-try. This place has become my daily ritual for good reason.", imageSrc: "https://img.b2bpic.net/free-photo/young-woman-sitting-indoor-urban-cafe_158595-669.jpg", imageAlt: "Emily R. avatar"},
{
id: "4", name: "Michael S.", handle: "@michaels_brew", testimonial: "Consistently excellent coffee and a cozy environment to work or relax. Highly recommend the cold brew!", imageSrc: "https://img.b2bpic.net/free-photo/close-up-portrait-happy-businesswoman-white-blouse-smiling-cheerfully-as-sitting-cafe_197531-23018.jpg", imageAlt: "Michael S. avatar"},
{
id: "5", name: "Jessica L.", handle: "@jess_beans", testimonial: "The best coffee in the city! The baristas remember my order, and it feels like home every time I visit.", imageSrc: "https://img.b2bpic.net/free-photo/beautiful-young-woman-is-using-app-her-smartphone-device-send-text-message-near-business-buildings_158595-6785.jpg?_wi=2", imageAlt: "Jessica L. avatar"},
id: "5", name: "Jessica L.", handle: "@jess_beans", testimonial: "The best coffee in the city! The baristas remember my order, and it feels like home every time I visit.", imageSrc: "https://img.b2bpic.net/free-photo/beautiful-young-woman-is-using-app-her-smartphone-device-send-text-message-near-business-buildings_158595-6785.jpg", imageAlt: "Jessica L. avatar"},
{
id: "6", name: "Chris T.", handle: "@chris_cup", testimonial: "A true coffee connoisseur's paradise. The attention to detail in every cup is evident.", imageSrc: "https://img.b2bpic.net/free-photo/portrait-young-man-drinking-coffee-smiling-looking-camera-closeup_657883-686.jpg?_wi=2", imageAlt: "Chris T. avatar"},
id: "6", name: "Chris T.", handle: "@chris_cup", testimonial: "A true coffee connoisseur's paradise. The attention to detail in every cup is evident.", imageSrc: "https://img.b2bpic.net/free-photo/portrait-young-man-drinking-coffee-smiling-looking-camera-closeup_657883-686.jpg", imageAlt: "Chris T. avatar"},
]}
animationType="slide-up"
title="What Our Community Says"
@@ -154,7 +153,7 @@ export default function SitePage() {
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="https://img.b2bpic.net/free-photo/crop-hand-holding-portafilter-with-coffee_23-2147830571.jpg?_wi=2"
imageSrc="https://img.b2bpic.net/free-photo/crop-hand-holding-portafilter-with-coffee_23-2147830571.jpg"
imageAlt="Roasted coffee beans in a wooden scoop"
columns={[
{

View File

@@ -1,4 +1,4 @@
use client";
"use client";
import { Suspense, use, useCallback } from "react";
import { useRouter } from "next/navigation";
@@ -80,14 +80,13 @@ function ProductPageContent({ params }: ProductPageProps) {
const navbarProps = {
navItems: [{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }],
brandName: "InCup", bottomLeftText: "Experience the best coffee", bottomRightText: "hello@incup.com", button: { text: "Cart", onClick: () => setCartOpen(true) }
};
brandName: "InCup", bottomLeftText: "Experience the best coffee", bottomRightText: "hello@incup.com"};
const footerProps = {
imageSrc: "https://img.b2bpic.net/free-photo/crop-hand-holding-portafilter-with-coffee_23-2147830571.jpg?_wi=5", imageAlt: "Roasted coffee beans in a wooden scoop", columns: [
{ title: "Menu", items: [{ label: "Coffee", href: "#menu" }, { label: "Pastries", href: "#menu" }, { label: "Sandwiches", href: "#menu" }] },
{ title: "About Us", items: [{ label: "Our Story", href: "#about" }, { label: "Team", href: "#" }] },
{ title: "Support", items: [{ label: "FAQ", href: "#faq" }, { label: "Contact", href: "#contact" }] }
imageSrc: "https://img.b2bpic.net/free-photo/crop-hand-holding-portafilter-with-coffee_23-2147830571.jpg", imageAlt: "Roasted coffee beans in a wooden scoop", columns: [
{ title: "Menu", items: [{ label: "Coffee", href: "/#menu" }, { label: "Pastries", href: "/#menu" }, { label: "Sandwiches", href: "/#menu" }] },
{ title: "About Us", items: [{ label: "Our Story", href: "/#about" }, { label: "Team", href: "#" }] },
{ title: "Support", items: [{ label: "FAQ", href: "/#faq" }, { label: "Contact", href: "/#contact" }] }
],
logoText: "InCup", copyrightText: "© 2024 InCup. All rights reserved."
};
@@ -96,7 +95,7 @@ function ProductPageContent({ params }: ProductPageProps) {
return (
<ThemeProvider {...themeProviderProps}>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleFullscreen {...navbarProps} />
</div>
<div id="loading-state" data-section="loading-state">
@@ -116,7 +115,7 @@ function ProductPageContent({ params }: ProductPageProps) {
return (
<ThemeProvider {...themeProviderProps}>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleFullscreen {...navbarProps} />
</div>
<div id="not-found-state" data-section="not-found-state">
@@ -143,7 +142,7 @@ function ProductPageContent({ params }: ProductPageProps) {
return (
<ThemeProvider {...themeProviderProps}>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleFullscreen {...navbarProps} />
</div>
<div id="product-detail-card" data-section="product-detail-card">

View File

@@ -1,4 +1,4 @@
use client";
"use client";
import { Suspense, useCallback } from "react";
import ReactLenis from "lenis/react";
@@ -47,14 +47,13 @@ function ShopPageContent() {
const navbarProps = {
navItems: [{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }],
brandName: "InCup", bottomLeftText: "Experience the best coffee", bottomRightText: "hello@incup.com", button: { text: "Cart", onClick: () => setCartOpen(true) }
};
brandName: "InCup", bottomLeftText: "Experience the best coffee", bottomRightText: "hello@incup.com"};
const footerProps = {
imageSrc: "https://img.b2bpic.net/free-photo/crop-hand-holding-portafilter-with-coffee_23-2147830571.jpg?_wi=4", imageAlt: "Roasted coffee beans in a wooden scoop", columns: [
{ title: "Menu", items: [{ label: "Coffee", href: "#menu" }, { label: "Pastries", href: "#menu" }, { label: "Sandwiches", href: "#menu" }] },
{ title: "About Us", items: [{ label: "Our Story", href: "#about" }, { label: "Team", href: "#" }] },
{ title: "Support", items: [{ label: "FAQ", href: "#faq" }, { label: "Contact", href: "#contact" }] }
imageSrc: "https://img.b2bpic.net/free-photo/crop-hand-holding-portafilter-with-coffee_23-2147830571.jpg", imageAlt: "Roasted coffee beans in a wooden scoop", columns: [
{ title: "Menu", items: [{ label: "Coffee", href: "/#menu" }, { label: "Pastries", href: "/#menu" }, { label: "Sandwiches", href: "/#menu" }] },
{ title: "About Us", items: [{ label: "Our Story", href: "/#about" }, { label: "Team", href: "#" }] },
{ title: "Support", items: [{ label: "FAQ", href: "/#faq" }, { label: "Contact", href: "/#contact" }] }
],
logoText: "InCup", copyrightText: "© 2024 InCup. All rights reserved."
};
@@ -63,7 +62,7 @@ function ShopPageContent() {
return (
<ThemeProvider {...themeProviderProps}>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleFullscreen {...navbarProps} />
</div>
<div id="loading-state" data-section="loading-state">
@@ -97,7 +96,7 @@ function ShopPageContent() {
return (
<ThemeProvider {...themeProviderProps}>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleFullscreen {...navbarProps} />
</div>
<div id="product-catalog" data-section="product-catalog">