bender/47c777da-e083-493d-a3ca-610895819fa0
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-20 13:01:33 +00:00
Conversation 0 Commits 4 Files Changed 4 +8 -13
4 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,10 +35,10 @@ export default function BlogPage() {
brandName="PandaCoffee"
navItems={[
{ name: "Home", id: "/" },
{ name: "Menu", id: "menu" },
{ name: "About", id: "about" },
{ name: "Reviews", id: "testimonials" },
{ name: "Contact", id: "contact" },
{ name: "Menu", id: "/#menu" },
{ name: "About", id: "/#about" },
{ name: "Reviews", id: "/#testimonials" },
{ name: "Contact", id: "/#contact" },
]}
/>
</div>

4
src/app/page.tsx
View File

@@ -87,7 +87,7 @@ export default function LandingPage() {
{ id: "2", name: "Espresso Shot", price: "$3.00", variant: "Rich, bold, and aromatic.", imageSrc: "https://img.b2bpic.net/free-photo/coffee-preparation-concept-still-life_23-2150354586.jpg", imageAlt: "Espresso Shot" },
{ id: "3", name: "Cold Brew", price: "$5.00", variant: "Smooth, low-acid, and refreshing.", imageSrc: "https://img.b2bpic.net/free-photo/cold-summer-coffee-drink-with-ice-orange-juice_169016-21399.jpg", imageAlt: "Cold Brew" },
{ id: "4", name: "Matcha Latte", price: "$5.50", variant: "Earthy, vibrant, and energizing.", imageSrc: "https://img.b2bpic.net/free-photo/top-view-woman-holding-hands-trendy-green-matcha-drink-with-latte-art_169016-34119.jpg", imageAlt: "Matcha Latte" },
{ id: "5", name: "Freshly Baked Pastries", price: "$3.75", variant: "A delightful selection daily.", imageSrc: "https://img.b2bpic.net/free-photo/variety-sweet-biscuits-wooden-piece-with-dried-fruits-high-quality-photo_114579-68830.jpg?_wi=1", imageAlt: "Freshly Baked Pastries" }
{ id: "5", name: "Freshly Baked Pastries", price: "$3.75", variant: "A delightful selection daily.", imageSrc: "https://img.b2bpic.net/free-photo/variety-sweet-biscuits-wooden-piece-with-dried-fruits-high-quality-photo_114579-68830.jpg", imageAlt: "Freshly Baked Pastries" }
]}
/>
</div>
@@ -102,7 +102,7 @@ export default function LandingPage() {
{ title: "Ethically Sourced Beans", description: "We partner with farms dedicated to sustainable practices and exceptional quality.", imageSrc: "https://img.b2bpic.net/free-photo/tattooed-barista-hand-holds-raw-green-coffee-beans-from-white-plastic-basket-cotton-bags-europalet-warehouse_346278-886.jpg", imageAlt: "Ethically sourced coffee beans", buttonIcon: Leaf, buttonHref: "#beans" },
{ title: "Expert Baristas", description: "Our team crafts every drink with passion and precision.", imageSrc: "https://img.b2bpic.net/free-photo/black-bearded-coffee-seller-pouring-coffee-shop_613910-443.jpg", imageAlt: "Barista making coffee", buttonIcon: Coffee, buttonHref: "#team" },
{ title: "Cozy Atmosphere", description: "Relax and unwind in our welcoming space, perfect for work or leisure.", imageSrc: "https://img.b2bpic.net/free-photo/woman-works-cafe-evening_1153-3549.jpg", imageAlt: "Cozy cafe interior", buttonIcon: Home, buttonHref: "#ambiance" },
{ title: "Delicious Pairings", description: "Enjoy our selection of freshly baked goods and snacks.", imageSrc: "https://img.b2bpic.net/free-photo/variety-sweet-biscuits-wooden-piece-with-dried-fruits-high-quality-photo_114579-68830.jpg?_wi=2", imageAlt: "Pastries and coffee", buttonIcon: Croissant, buttonHref: "#pastries" }
{ title: "Delicious Pairings", description: "Enjoy our selection of freshly baked goods and snacks.", imageSrc: "https://img.b2bpic.net/free-photo/variety-sweet-biscuits-wooden-piece-with-dried-fruits-high-quality-photo_114579-68830.jpg", imageAlt: "Pastries and coffee", buttonIcon: Croissant, buttonHref: "#pastries" }
]}
/>
</div>

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

@@ -1,4 +1,4 @@
use client";
"use client";
import { use, useCallback } from "react";
import { useRouter } from "next/navigation";
@@ -84,7 +84,6 @@ export default function ProductPage({ params }: ProductPageProps) {
<NavbarStyleApple
brandName="PandaCoffee"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<div id="loading-state" data-section="loading-state">
@@ -116,7 +115,6 @@ export default function ProductPage({ params }: ProductPageProps) {
<NavbarStyleApple
brandName="PandaCoffee"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<div id="not-found-state" data-section="not-found-state">
@@ -155,7 +153,6 @@ export default function ProductPage({ params }: ProductPageProps) {
<NavbarStyleApple
brandName="PandaCoffee"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<div id="product-detail-card" data-section="product-detail-card">

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

@@ -1,4 +1,4 @@
use client";
"use client";
import ReactLenis from "lenis/react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
@@ -59,7 +59,6 @@ export default function ShopPage() {
<NavbarStyleApple
brandName="PandaCoffee"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<div id="loading-state" data-section="loading-state">
@@ -90,7 +89,6 @@ export default function ShopPage() {
<NavbarStyleApple
brandName="PandaCoffee"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<div id="product-catalog" data-section="product-catalog">