bender/48d86b40-e9e1-469b-9967-b584dc248b36
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 14:35:35 +00:00
Conversation 0 Commits 4 Files Changed 4 +31 -36
4 changed files with 31 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,10 +27,10 @@ export default function BlogPage() {
<NavbarStyleFullscreen
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: "/#menu" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "Contact", id: "/#contact" },
]}
brandName="Pia"
bottomLeftText="Experience the perfect brew."
@@ -56,14 +56,14 @@ export default function BlogPage() {
columns={[
{
title: "Explore", items: [
{ label: "Home", href: "#home" },
{ label: "Menu", href: "#menu" },
{ label: "About Us", href: "#about" },
{ label: "Home", href: "/" },
{ label: "Menu", href: "/#menu" },
{ label: "About Us", href: "/#about" },
],
},
{
title: "Connect", items: [
{ label: "Contact", href: "#contact" },
{ label: "Contact", href: "/#contact" },
{ label: "Instagram", href: "https://www.instagram.com/pia.coffeeshop" },
],
},

16
src/app/page.tsx
View File

@@ -41,10 +41,10 @@ export default function SitePage() {
background={{ variant: 'plain' }}
mediaItems={[
{ imageSrc: 'https://img.b2bpic.net/free-photo/portrait-smiling-waitress-using-coffee-machine_107420-12297.jpg', imageAlt: 'Cozy coffeeshop interior' },
{ imageSrc: 'https://img.b2bpic.net/free-photo/coffee-cup-with-cookies-coffee-beans-grinded-coffee-cinnamon-sticks-top-view-grey-plaster-background_176474-64438.jpg?_wi=1', imageAlt: 'A cup of coffee with latte art' },
{ imageSrc: 'https://img.b2bpic.net/free-photo/bakery-atmospheric-photo_1321-4640.jpg?_wi=1', imageAlt: 'Freshly baked pastries on display' },
{ imageSrc: 'https://img.b2bpic.net/free-photo/close-up-coffee-with-heart_1203-1992.jpg?_wi=1', imageAlt: 'Barista making latte art' },
{ imageSrc: 'https://img.b2bpic.net/free-photo/smiley-friends-cafe-enjoying-their-time_23-2148735439.jpg?_wi=1', imageAlt: 'Customer enjoying coffee in a cafe' }
{ imageSrc: 'https://img.b2bpic.net/free-photo/coffee-cup-with-cookies-coffee-beans-grinded-coffee-cinnamon-sticks-top-view-grey-plaster-background_176474-64438.jpg', imageAlt: 'A cup of coffee with latte art' },
{ imageSrc: 'https://img.b2bpic.net/free-photo/bakery-atmospheric-photo_1321-4640.jpg', imageAlt: 'Freshly baked pastries on display' },
{ imageSrc: 'https://img.b2bpic.net/free-photo/close-up-coffee-with-heart_1203-1992.jpg', imageAlt: 'Barista making latte art' },
{ imageSrc: 'https://img.b2bpic.net/free-photo/smiley-friends-cafe-enjoying-their-time_23-2148735439.jpg', imageAlt: 'Customer enjoying coffee in a cafe' }
]}
buttons={[{ text: 'View Our Menu', href: '#menu' }, { text: 'Find Us', href: '#contact' }]}
tag="Welcome to Pia"
@@ -86,10 +86,10 @@ export default function SitePage() {
description="Explore our selection of handcrafted beverages and delicious treats."
tag="Menu"
products={[
{ id: '1', name: 'Espresso Macchiato', price: '$4.50', variant: 'Rich & Bold', imageSrc: 'https://img.b2bpic.net/free-photo/coffee-cup-with-cookies-coffee-beans-grinded-coffee-cinnamon-sticks-top-view-grey-plaster-background_176474-64438.jpg?_wi=2', imageAlt: 'Espresso Macchiato' },
{ id: '2', name: 'Cappuccino', price: '$5.00', variant: 'Creamy & Frothy', imageSrc: 'https://img.b2bpic.net/free-photo/close-up-coffee-with-heart_1203-1992.jpg?_wi=2', imageAlt: 'Cappuccino with latte art' },
{ id: '3', name: 'Almond Croissant', price: '$3.75', variant: 'Flaky & Sweet', imageSrc: 'https://img.b2bpic.net/free-photo/bakery-atmospheric-photo_1321-4640.jpg?_wi=2', imageAlt: 'Almond Croissant' },
{ id: '4', name: 'Cold Brew', price: '$5.50', variant: 'Smooth & Refreshing', imageSrc: 'https://img.b2bpic.net/free-photo/smiley-friends-cafe-enjoying-their-time_23-2148735439.jpg?_wi=2', imageAlt: 'Cold Brew coffee' }
{ id: '1', name: 'Espresso Macchiato', price: '$4.50', variant: 'Rich & Bold', imageSrc: 'https://img.b2bpic.net/free-photo/coffee-cup-with-cookies-coffee-beans-grinded-coffee-cinnamon-sticks-top-view-grey-plaster-background_176474-64438.jpg', imageAlt: 'Espresso Macchiato' },
{ id: '2', name: 'Cappuccino', price: '$5.00', variant: 'Creamy & Frothy', imageSrc: 'https://img.b2bpic.net/free-photo/close-up-coffee-with-heart_1203-1992.jpg', imageAlt: 'Cappuccino with latte art' },
{ id: '3', name: 'Almond Croissant', price: '$3.75', variant: 'Flaky & Sweet', imageSrc: 'https://img.b2bpic.net/free-photo/bakery-atmospheric-photo_1321-4640.jpg', imageAlt: 'Almond Croissant' },
{ id: '4', name: 'Cold Brew', price: '$5.50', variant: 'Smooth & Refreshing', imageSrc: 'https://img.b2bpic.net/free-photo/smiley-friends-cafe-enjoying-their-time_23-2148735439.jpg', imageAlt: 'Cold Brew coffee' }
]}
gridVariant="four-items-2x2-equal-grid"
animationType="slide-up"

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

@@ -1,6 +1,6 @@
use client";
"use client";
import { Suspense, use, useCallback } from "react";
import { Suspense, useCallback } from "react";
import { useRouter } from "next/navigation";
import ReactLenis from "lenis/react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
@@ -13,7 +13,7 @@ import { useCart } from "@/hooks/useCart";
import { useCheckout } from "@/hooks/useCheckout";
interface ProductPageProps {
params: Promise<{ id: string }>;
params: { id: string };
}
export default function ProductPage({ params }: ProductPageProps) {
@@ -25,7 +25,7 @@ export default function ProductPage({ params }: ProductPageProps) {
}
function ProductPageContent({ params }: ProductPageProps) {
const { id } = use(params);
const { id } = params;
const router = useRouter();
const {
@@ -95,7 +95,6 @@ function ProductPageContent({ params }: ProductPageProps) {
brandName="Pia"
bottomLeftText="Experience the perfect brew."
bottomRightText="hello@piacoffee.com"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<main id="loading-section" data-section="loading-section" className="min-h-screen flex items-center justify-center pt-20">
@@ -104,8 +103,8 @@ function ProductPageContent({ params }: ProductPageProps) {
<div id="footer" data-section="footer">
<FooterSimple
columns={[
{ title: "Explore", items: [{ label: "Home", href: "#home" }, { label: "Menu", href: "#menu" }, { label: "About Us", href: "#about" }] },
{ title: "Connect", items: [{ label: "Contact", href: "#contact" }, { label: "Instagram", href: "https://www.instagram.com/pia.coffeeshop" }] },
{ title: "Explore", items: [{ label: "Home", href: "/" }, { label: "Menu", href: "/#menu" }, { label: "About Us", href: "/#about" }] },
{ title: "Connect", items: [{ label: "Contact", href: "/#contact" }, { label: "Instagram", href: "https://www.instagram.com/pia.coffeeshop" }] },
{ title: "Legal", items: [{ label: "Privacy Policy", href: "/privacy" }, { label: "Terms of Service", href: "/terms" }] }
]}
bottomLeftText="© 2024 Pia Coffeeshop. All rights reserved."
@@ -138,7 +137,6 @@ function ProductPageContent({ params }: ProductPageProps) {
brandName="Pia"
bottomLeftText="Experience the perfect brew."
bottomRightText="hello@piacoffee.com"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<main id="not-found-section" data-section="not-found-section" className="min-h-screen flex items-center justify-center pt-20">
@@ -155,8 +153,8 @@ function ProductPageContent({ params }: ProductPageProps) {
<div id="footer" data-section="footer">
<FooterSimple
columns={[
{ title: "Explore", items: [{ label: "Home", href: "#home" }, { label: "Menu", href: "#menu" }, { label: "About Us", href: "#about" }] },
{ title: "Connect", items: [{ label: "Contact", href: "#contact" }, { label: "Instagram", href: "https://www.instagram.com/pia.coffeeshop" }] },
{ title: "Explore", items: [{ label: "Home", href: "/" }, { label: "Menu", href: "/#menu" }, { label: "About Us", href: "/#about" }] },
{ title: "Connect", items: [{ label: "Contact", href: "/#contact" }, { label: "Instagram", href: "https://www.instagram.com/pia.coffeeshop" }] },
{ title: "Legal", items: [{ label: "Privacy Policy", href: "/privacy" }, { label: "Terms of Service", href: "/terms" }] }
]}
bottomLeftText="© 2024 Pia Coffeeshop. All rights reserved."
@@ -188,7 +186,6 @@ function ProductPageContent({ params }: ProductPageProps) {
brandName="Pia"
bottomLeftText="Experience the perfect brew."
bottomRightText="hello@piacoffee.com"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<div id="product-detail-card" data-section="product-detail-card">
@@ -230,8 +227,8 @@ function ProductPageContent({ params }: ProductPageProps) {
<div id="footer" data-section="footer">
<FooterSimple
columns={[
{ title: "Explore", items: [{ label: "Home", href: "#home" }, { label: "Menu", href: "#menu" }, { label: "About Us", href: "#about" }] },
{ title: "Connect", items: [{ label: "Contact", href: "#contact" }, { label: "Instagram", href: "https://www.instagram.com/pia.coffeeshop" }] },
{ title: "Explore", items: [{ label: "Home", href: "/" }, { label: "Menu", href: "/#menu" }, { label: "About Us", href: "/#about" }] },
{ title: "Connect", items: [{ label: "Contact", href: "/#contact" }, { label: "Instagram", href: "https://www.instagram.com/pia.coffeeshop" }] },
{ title: "Legal", items: [{ label: "Privacy Policy", href: "/privacy" }, { label: "Terms of Service", href: "/terms" }] }
]}
bottomLeftText="© 2024 Pia Coffeeshop. All rights reserved."

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

@@ -1,4 +1,4 @@
use client";
"use client";
import { Suspense, useCallback } from "react";
import ReactLenis from "lenis/react";
@@ -62,7 +62,6 @@ function ShopPageContent() {
brandName="Pia"
bottomLeftText="Experience the perfect brew."
bottomRightText="hello@piacoffee.com"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
@@ -71,8 +70,8 @@ function ShopPageContent() {
<div id="footer" data-section="footer">
<FooterSimple
columns={[
{ title: "Explore", items: [{ label: "Home", href: "#home" }, { label: "Menu", href: "#menu" }, { label: "About Us", href: "#about" }] },
{ title: "Connect", items: [{ label: "Contact", href: "#contact" }, { label: "Instagram", href: "https://www.instagram.com/pia.coffeeshop" }] },
{ title: "Explore", items: [{ label: "Home", href: "/" }, { label: "Menu", href: "/#menu" }, { label: "About Us", href: "/#about" }] },
{ title: "Connect", items: [{ label: "Contact", href: "/#contact" }, { label: "Instagram", href: "https://www.instagram.com/pia.coffeeshop" }] },
{ title: "Legal", items: [{ label: "Privacy Policy", href: "/privacy" }, { label: "Terms of Service", href: "/terms" }] }
]}
bottomLeftText="© 2024 Pia Coffeeshop. All rights reserved."
@@ -104,7 +103,6 @@ function ShopPageContent() {
brandName="Pia"
bottomLeftText="Experience the perfect brew."
bottomRightText="hello@piacoffee.com"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<div id="product-catalog" data-section="product-catalog">
@@ -136,8 +134,8 @@ function ShopPageContent() {
<div id="footer" data-section="footer">
<FooterSimple
columns={[
{ title: "Explore", items: [{ label: "Home", href: "#home" }, { label: "Menu", href: "#menu" }, { label: "About Us", href: "#about" }] },
{ title: "Connect", items: [{ label: "Contact", href: "#contact" }, { label: "Instagram", href: "https://www.instagram.com/pia.coffeeshop" }] },
{ title: "Explore", items: [{ label: "Home", href: "/" }, { label: "Menu", href: "/#menu" }, { label: "About Us", href: "/#about" }] },
{ title: "Connect", items: [{ label: "Contact", href: "/#contact" }, { label: "Instagram", href: "https://www.instagram.com/pia.coffeeshop" }] },
{ title: "Legal", items: [{ label: "Privacy Policy", href: "/privacy" }, { label: "Terms of Service", href: "/terms" }] }
]}
bottomLeftText="© 2024 Pia Coffeeshop. All rights reserved."