bender/d69e6b81-423f-431e-a5bc-8419a83a873e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #2

Merged
bender merged 3 commits from version_1 into main 2026-02-22 05:55:11 +00:00
Conversation 0 Commits 3 Files Changed 3 +15 -19
3 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/app/page.tsx
View File

@@ -68,9 +68,9 @@ export default function LandingPage() {
{
id: "01", title: "Precision Haircuts", description: "Expert cuts tailored to your style and preference, ensuring a sharp and refined look.", imageSrc: "https://img.b2bpic.net/free-photo/close-up-barber-combing-moustache-client_23-2147778838.jpg"},
{
id: "02", title: "Traditional Hot Shaves", description: "Indulge in a luxurious hot lather shave, leaving your skin smooth and refreshed.", imageSrc: "https://img.b2bpic.net/free-photo/professional-hairdresser-modeling-beard-barbershop-close-up-photo_613910-18422.jpg?_wi=1"},
id: "02", title: "Traditional Hot Shaves", description: "Indulge in a luxurious hot lather shave, leaving your skin smooth and refreshed.", imageSrc: "https://img.b2bpic.net/free-photo/professional-hairdresser-modeling-beard-barbershop-close-up-photo_613910-18422.jpg"},
{
id: "03", title: "Beard Trimming & Styling", description: "Shape and style your beard to perfection 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"},
id: "03", title: "Beard Trimming & Styling", description: "Shape and style your beard to perfection with our professional grooming services.", imageSrc: "https://img.b2bpic.net/free-photo/professional-hairdresser-modeling-beard-barbershop-close-up-photo_613910-18422.jpg"},
{
id: "04", title: "Kid's Haircuts", description: "Stylish and comfortable haircuts for the younger gentlemen in a friendly atmosphere.", imageSrc: "https://img.b2bpic.net/free-photo/children-hairdresser-with-scissors-is-cutting-little-boy-against-dark-background-contented-cute-preschooler-boy-getting-haircut_613910-19719.jpg"},
]}
@@ -114,9 +114,9 @@ export default function LandingPage() {
tag="Team"
members={[
{
id: "1", name: "Marcus Black", role: "Master Barber", imageSrc: "https://img.b2bpic.net/free-photo/positive-bearded-black-male-with-tattoo-cross-arms-dressed-white-shirt_613910-15917.jpg?_wi=1", imageAlt: "Portrait of Marcus Black"},
id: "1", name: "Marcus Black", role: "Master Barber", imageSrc: "https://img.b2bpic.net/free-photo/positive-bearded-black-male-with-tattoo-cross-arms-dressed-white-shirt_613910-15917.jpg", imageAlt: "Portrait of Marcus Black"},
{
id: "2", name: "Sarah Grey", role: "Senior Stylist", imageSrc: "https://img.b2bpic.net/free-photo/positive-bearded-black-male-with-tattoo-cross-arms-dressed-white-shirt_613910-15917.jpg?_wi=2", imageAlt: "Portrait of Sarah Grey"},
id: "2", name: "Sarah Grey", role: "Senior Stylist", imageSrc: "https://img.b2bpic.net/free-photo/positive-bearded-black-male-with-tattoo-cross-arms-dressed-white-shirt_613910-15917.jpg", imageAlt: "Portrait of Sarah Grey"},
{
id: "3", name: "David Lee", role: "Apprentice Barber", imageSrc: "https://img.b2bpic.net/free-photo/young-bearded-man-getting-haircut-by-hairdresser-while-sitting-chair-barbershop-barber-soul_627829-6351.jpg", imageAlt: "Portrait of David Lee"},
]}
@@ -133,17 +133,13 @@ export default function LandingPage() {
tag="Reviews"
testimonials={[
{
id: "1", title: "Best haircut I've ever had!", quote: '"Top Notch Barber Shop truly lives up to its name. Marcus gave me the best haircut of my life. The attention to detail is unmatched, and the atmosphere is fantastic. I won\'t go anywhere else!"',
name: "John D.", role: "Satisfied Customer", imageSrc: "https://img.b2bpic.net/free-photo/smiling-businessman-standing-airport_107420-85035.jpg", imageAlt: "John D. avatar"},
id: "1", title: "Best haircut I've ever had!", quote: "\"Top Notch Barber Shop truly lives up to its name. Marcus gave me the best haircut of my life. The attention to detail is unmatched, and the atmosphere is fantastic. I won't go anywhere else!\"", name: "John D.", role: "Satisfied Customer", imageSrc: "https://img.b2bpic.net/free-photo/smiling-businessman-standing-airport_107420-85035.jpg", imageAlt: "John D. avatar"},
{
id: "2", title: "Relaxing and professional shave.", quote: '"I came in for a hot shave and it was incredibly relaxing and precise. Sarah is a true artist with the straight razor. Highly recommend for anyone looking for a premium grooming experience."',
name: "Michael R.", role: "Regular Client", imageSrc: "https://img.b2bpic.net/free-photo/smiley-woman-posing-her-home_23-2148708980.jpg", imageAlt: "Michael R. avatar"},
id: "2", title: "Relaxing and professional shave.", quote: "\"I came in for a hot shave and it was incredibly relaxing and precise. Sarah is a true artist with the straight razor. Highly recommend for anyone looking for a premium grooming experience.\"", name: "Michael R.", role: "Regular Client", imageSrc: "https://img.b2bpic.net/free-photo/smiley-woman-posing-her-home_23-2148708980.jpg", imageAlt: "Michael R. avatar"},
{
id: "3", title: "Great with kids, always a perfect cut.", quote: '"My son loves getting his hair cut at Top Notch. David is so patient and always gives him a stylish, modern look. It\'s tough to find a barber who is good with kids, but they\'re fantastic here!"',
name: "Emily T.", role: "Happy Parent", imageSrc: "https://img.b2bpic.net/free-photo/woman-talking-video-call-decorated-kitchen-home_482257-16862.jpg", imageAlt: "Emily T. avatar"},
id: "3", title: "Great with kids, always a perfect cut.", quote: "\"My son loves getting his hair cut at Top Notch. David is so patient and always gives him a stylish, modern look. It's tough to find a barber who is good with kids, but they're fantastic here!\"", name: "Emily T.", role: "Happy Parent", imageSrc: "https://img.b2bpic.net/free-photo/woman-talking-video-call-decorated-kitchen-home_482257-16862.jpg", imageAlt: "Emily T. avatar"},
{
id: "4", title: "Impeccable service and friendly staff.", quote: '"Every visit to Top Notch is a pleasure. The staff are always friendly and professional, and they consistently deliver impeccable results. It\'s more than just a haircut; it\'s an experience."',
name: "Chris L.", role: "Loyal Customer", imageSrc: "https://img.b2bpic.net/free-photo/senior-man-looking-camera-dental-office-wainting-consultation-elderly-male-smiling-webcam-s_482257-4047.jpg", imageAlt: "Chris L. avatar"},
id: "4", title: "Impeccable service and friendly staff.", quote: "\"Every visit to Top Notch is a pleasure. The staff are always friendly and professional, and they consistently deliver impeccable results. It's more than just a haircut; it's an experience.\"", name: "Chris L.", role: "Loyal Customer", imageSrc: "https://img.b2bpic.net/free-photo/senior-man-looking-camera-dental-office-wainting-consultation-elderly-male-smiling-webcam-s_482257-4047.jpg", imageAlt: "Chris L. avatar"},
]}
textboxLayout="default"
useInvertedBackground={false}

8
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";
@@ -89,7 +89,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="light"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
brandName="Top Notch Barber Shop"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
@@ -119,7 +119,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="light"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
brandName="Top Notch Barber Shop"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
@@ -156,7 +156,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="light"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
brandName="Top Notch Barber Shop"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}

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

@@ -1,4 +1,4 @@
use client";
"use client";
import { Suspense } from "react";
import ReactLenis from "lenis/react";
@@ -32,7 +32,7 @@ function ShopPageContent() {
headingFontWeight="light"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
brandName="Top Notch Barber Shop"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
@@ -72,7 +72,7 @@ function ShopPageContent() {
headingFontWeight="light"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
brandName="Top Notch Barber Shop"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}