bender/60ec6950-af7e-44d4-a13f-45c79c5f4c1b
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-22 00:32:21 +00:00
Conversation 0 Commits 4 Files Changed 4 +23 -30
4 changed files with 23 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,10 +29,10 @@ export default function BlogPage() {
brandName="The Image Barbershop"
navItems={[
{ name: "Home", id: "/" },
{ name: "Services", id: "services" },
{ name: "Barbers", id: "team" },
{ name: "Testimonials", id: "testimonials" },
{ name: "Book Now", id: "contact" },
{ name: "Services", id: "/#services" },
{ name: "Barbers", id: "/#team" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "Book Now", id: "/#contact" },
]}
/>
</div>
@@ -58,8 +58,8 @@ export default function BlogPage() {
<FooterLogoEmphasis
logoText="The Image Barbershop"
columns={[
{ items: [{ label: "Services", href: "services" }, { label: "Barbers", href: "team" }] },
{ items: [{ label: "Testimonials", href: "testimonials" }, { label: "Book Now", href: "contact" }] },
{ items: [{ label: "Services", href: "/#services" }, { label: "Barbers", href: "/#team" }] },
{ items: [{ label: "Testimonials", href: "/#testimonials" }, { label: "Book Now", href: "/#contact" }] },
{ items: [{ label: "Privacy Policy", href: "/privacy" }, { label: "Terms of Service", href: "/terms" }] }
]}
/>

22
src/app/page.tsx
View File

@@ -42,10 +42,10 @@ export default function SitePage() {
background={{ variant: "grid" }}
mediaItems={[
{ imageSrc: "https://img.b2bpic.net/free-photo/man-getting-his-beard-shaved-with-razor_107420-94764.jpg", imageAlt: "Modern barbershop interior with a barber at work" },
{ imageSrc: "https://img.b2bpic.net/free-photo/barber-shaving-beard-elderly-man_23-2148181976.jpg?_wi=1", imageAlt: "Barber working hairdresser professional barber barber tools" },
{ imageSrc: "https://img.b2bpic.net/free-photo/professional-barber-working-with-client-hairdressing-salon-styling-beard-with-comb_613910-5069.jpg?_wi=1", imageAlt: "classic haircut mens grooming hair styling fade haircut" },
{ imageSrc: "https://img.b2bpic.net/free-photo/professional-hairdresser-modeling-beard-barbershop-close-up-photo_613910-18422.jpg?_wi=1", imageAlt: "beard trim beard care mens beard styling barber services" },
{ imageSrc: "https://img.b2bpic.net/free-photo/front-view-hairy-man-shaving-beard_23-2149615818.jpg?_wi=1", imageAlt: "straight razor shave hot towel shave mens shaving luxury shave" },
{ imageSrc: "https://img.b2bpic.net/free-photo/barber-shaving-beard-elderly-man_23-2148181976.jpg", imageAlt: "Barber working hairdresser professional barber barber tools" },
{ imageSrc: "https://img.b2bpic.net/free-photo/professional-barber-working-with-client-hairdressing-salon-styling-beard-with-comb_613910-5069.jpg", imageAlt: "classic haircut mens grooming hair styling fade haircut" },
{ imageSrc: "https://img.b2bpic.net/free-photo/professional-hairdresser-modeling-beard-barbershop-close-up-photo_613910-18422.jpg", imageAlt: "beard trim beard care mens beard styling barber services" },
{ imageSrc: "https://img.b2bpic.net/free-photo/front-view-hairy-man-shaving-beard_23-2149615818.jpg", imageAlt: "straight razor shave hot towel shave mens shaving luxury shave" },
]}
buttons={[
{ text: "Book Now", href: "contact" },
@@ -63,7 +63,7 @@ export default function SitePage() {
{ title: "Premium Products", description: "We use only the finest grooming products for superior results." },
{ title: "Relaxing Atmosphere", description: "Enjoy a comfortable and inviting space designed for your comfort." },
]}
imageSrc="https://img.b2bpic.net/free-photo/barber-shaving-beard-elderly-man_23-2148181976.jpg?_wi=2"
imageSrc="https://img.b2bpic.net/free-photo/barber-shaving-beard-elderly-man_23-2148181976.jpg"
imageAlt="Barber meticulously styling a client's hair"
mediaAnimation="slide-up"
imagePosition="right"
@@ -77,9 +77,9 @@ export default function SitePage() {
title="Our Signature Services"
description="From classic cuts to modern styles, our barbers are masters of their craft."
features={[
{ title: "Precision Haircuts", description: "Expert cuts tailored to your personal style and preference.", imageSrc: "https://img.b2bpic.net/free-photo/professional-barber-working-with-client-hairdressing-salon-styling-beard-with-comb_613910-5069.jpg?_wi=2", imageAlt: "Close-up of a precision haircut in progress" },
{ title: "Classic Hot Shave", description: "Indulge in a luxurious hot towel shave for ultimate smoothness.", imageSrc: "https://img.b2bpic.net/free-photo/front-view-hairy-man-shaving-beard_23-2149615818.jpg?_wi=2", imageAlt: "Barber applying hot towel during a shave" },
{ title: "Beard Trimming & Styling", description: "Shape and define your beard with our professional grooming services.", imageSrc: "https://img.b2bpic.net/free-photo/professional-hairdresser-modeling-beard-barbershop-close-up-photo_613910-18422.jpg?_wi=2", imageAlt: "Barber trimming a client's beard" },
{ title: "Precision Haircuts", description: "Expert cuts tailored to your personal style and preference.", imageSrc: "https://img.b2bpic.net/free-photo/professional-barber-working-with-client-hairdressing-salon-styling-beard-with-comb_613910-5069.jpg", imageAlt: "Close-up of a precision haircut in progress" },
{ title: "Classic Hot Shave", description: "Indulge in a luxurious hot towel shave for ultimate smoothness.", imageSrc: "https://img.b2bpic.net/free-photo/front-view-hairy-man-shaving-beard_23-2149615818.jpg", imageAlt: "Barber applying hot towel during a shave" },
{ title: "Beard Trimming & Styling", description: "Shape and define your beard with our professional grooming services.", imageSrc: "https://img.b2bpic.net/free-photo/professional-hairdresser-modeling-beard-barbershop-close-up-photo_613910-18422.jpg", imageAlt: "Barber trimming a client's beard" },
]}
gridVariant="three-columns-all-equal-width"
animationType="slide-up"
@@ -93,9 +93,9 @@ export default function SitePage() {
title="Meet Our Talented Barbers"
description="Our team of skilled professionals is dedicated to giving you the perfect look."
members={[
{ id: "1", name: "Marcus \"Razer\" Steel", role: "Master Barber", imageSrc: "https://img.b2bpic.net/free-photo/portrait-pensive-man-with-receive-moustache-beard-trimming-procedure-barbershop_613910-15042.jpg" },
{ id: "2", name: "Jamal \"Smooth\" Brooks", role: "Senior Stylist", imageSrc: "https://img.b2bpic.net/free-photo/professional-barber-working-with-client-hairdressing-salon_613910-5075.jpg" },
{ id: "3", name: "Chloe \"Blade\" Lee", role: "Apprentice Barber", imageSrc: "https://img.b2bpic.net/free-photo/handsome-stylish-bearded-male-with-tattoo-arm-dressed-flannel-shirt-drinks-coffee-barbershop_613910-14697.jpg" },
{ id: "1", name: 'Marcus "Razer" Steel', role: "Master Barber", imageSrc: "https://img.b2bpic.net/free-photo/portrait-pensive-man-with-receive-moustache-beard-trimming-procedure-barbershop_613910-15042.jpg" },
{ id: "2", name: 'Jamal "Smooth" Brooks', role: "Senior Stylist", imageSrc: "https://img.b2bpic.net/free-photo/professional-barber-working-with-client-hairdressing-salon_613910-5075.jpg" },
{ id: "3", name: 'Chloe "Blade" Lee', role: "Apprentice Barber", imageSrc: "https://img.b2bpic.net/free-photo/handsome-stylish-bearded-male-with-tattoo-arm-dressed-flannel-shirt-drinks-coffee-barbershop_613910-14697.jpg" },
]}
gridVariant="three-columns-all-equal-width"
animationType="slide-up"

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

@@ -1,4 +1,4 @@
use client";
"use client";
import { Suspense, use, useCallback } from "react";
import { useRouter } from "next/navigation";
@@ -76,7 +76,6 @@ function ProductPageContent({ params }: ProductPageProps) {
const navItems = [
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" },
];
if (isLoading) {
@@ -98,7 +97,6 @@ function ProductPageContent({ params }: ProductPageProps) {
<NavbarStyleApple
brandName="The Image Barbershop"
navItems={navItems}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
@@ -128,7 +126,6 @@ function ProductPageContent({ params }: ProductPageProps) {
<NavbarStyleApple
brandName="The Image Barbershop"
navItems={navItems}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
@@ -165,7 +162,6 @@ function ProductPageContent({ params }: ProductPageProps) {
<NavbarStyleApple
brandName="The Image Barbershop"
navItems={navItems}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<div id="product-detail-card" data-section="product-detail-card">
@@ -208,8 +204,8 @@ function ProductPageContent({ params }: ProductPageProps) {
<FooterLogoEmphasis
logoText="The Image Barbershop"
columns={[
{ items: [{ label: "Services", href: "services" }, { label: "Barbers", href: "team" }] },
{ items: [{ label: "Testimonials", href: "testimonials" }, { label: "Book Now", href: "contact" }] },
{ items: [{ label: "Services", href: "/#services" }, { label: "Barbers", href: "/#team" }] },
{ items: [{ label: "Testimonials", href: "/#testimonials" }, { label: "Book Now", href: "/#contact" }] },
{ items: [{ label: "Privacy Policy", href: "/privacy" }, { label: "Terms of Service", href: "/terms" }] },
]}
/>

9
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";
@@ -43,7 +43,6 @@ function ShopPageContent() {
const navItems = [
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" },
];
if (isLoading) {
@@ -65,7 +64,6 @@ function ShopPageContent() {
<NavbarStyleApple
brandName="The Image Barbershop"
navItems={navItems}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
@@ -94,7 +92,6 @@ function ShopPageContent() {
<NavbarStyleApple
brandName="The Image Barbershop"
navItems={navItems}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<div id="product-catalog" data-section="product-catalog">
@@ -127,8 +124,8 @@ function ShopPageContent() {
<FooterLogoEmphasis
logoText="The Image Barbershop"
columns={[
{ items: [{ label: "Services", href: "services" }, { label: "Barbers", href: "team" }] },
{ items: [{ label: "Testimonials", href: "testimonials" }, { label: "Book Now", href: "contact" }] },
{ items: [{ label: "Services", href: "/#services" }, { label: "Barbers", href: "/#team" }] },
{ items: [{ label: "Testimonials", href: "/#testimonials" }, { label: "Book Now", href: "/#contact" }] },
{ items: [{ label: "Privacy Policy", href: "/privacy" }, { label: "Terms of Service", href: "/terms" }] },
]}
/>