bender/fc0e96de-8404-42f2-ae62-594ab3c60c48
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_4 into main #6

Merged
bender merged 6 commits from version_4 into main 2026-04-21 00:58:00 +00:00
Conversation 0 Commits 6 Files Changed 6 +9 -28
6 changed files with 9 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/app/about/page.tsx
View File

@@ -33,7 +33,6 @@ export default function AboutPage() {
]}
brandName="Gentlemens HQ"
button={{ text: "Book Now", href: "https://app.squareup.com/appointments/buyer/widget/5ll7uiams0fu51/L5ATHJ9JYCH5N" }}
topBarButton={{ text: "Home", href: "/" }}
/>
</div>
@@ -42,22 +41,9 @@ export default function AboutPage() {
tag="Our Story"
title="Over 15 Years of Craftsmanship"
titleClassName="text-3xl"
description="Founded on the principles of community, family, and precision, Gentlemens HQ has been a staple in Alpharetta since our doors first opened. We believe that a haircut is more than just a service—it's a ritual of care and connection."
description="["Founded on the principles of community, family, and precision, Gentlemens HQ has been a staple in Alpharetta since our doors first opened. We believe that a haircut is more than just a service—it's a ritual of care and connection."]"
imageSrc="http://img.b2bpic.net/free-photo/barber-cutting-hair-client_23-2148733221.jpg"
imagePosition="left"
textboxLayout="split-description"
useInvertedBackground={false}
bulletPoints={[
{
title: "Family Owned & Operated", description: "Rooted in tradition, our shop is a true family endeavor serving our local community with heart.", icon: Users
},
{
title: "Alpharetta Roots", description: "Deeply connected to our home, we're proud to serve the gentlemen of Alpharetta, GA for over a decade and a half.", icon: MapPin
},
{
title: "Professional Expertise", description: "Our team of master barbers and stylists brings a wealth of experience and precision to every chair.", icon: Scissors
}
]}
/>
</div>
@@ -74,4 +60,4 @@ export default function AboutPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

3
src/app/contact-booking/page.tsx
View File

@@ -32,7 +32,6 @@ export default function ContactBookingPage() {
]}
brandName="Gentlemens HQ"
button={{ text: "Book Now", href: "https://app.squareup.com/appointments/buyer/widget/5ll7uiams0fu51/L5ATHJ9JYCH5N" }}
topBarButton={{ text: "Home", href: "/" }}
/>
</div>
@@ -60,4 +59,4 @@ export default function ContactBookingPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

5
src/app/contact/page.tsx
View File

@@ -7,7 +7,7 @@ import ContactText from '@/components/sections/contact/ContactText';
import FooterBase from '@/components/sections/footer/FooterBase';
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
export default function LandingPage() {
export default function ContactPage() {
return (
<ThemeProvider
defaultButtonVariant="text-shift"
@@ -33,7 +33,6 @@ export default function LandingPage() {
]}
brandName="Gentlemens HQ"
button={{ text: "Book Now", href: "https://app.squareup.com/appointments/buyer/widget/5ll7uiams0fu51/L5ATHJ9JYCH5N" }}
topBarButton={{ text: "Home", href: "/" }}
/>
</div>
@@ -73,4 +72,4 @@ export default function LandingPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

5
src/app/gallery/page.tsx
View File

@@ -32,7 +32,6 @@ export default function GalleryPage() {
]}
brandName="Gentlemens HQ"
button={{ text: "Book Now", href: "https://app.squareup.com/appointments/buyer/widget/5ll7uiams0fu51/L5ATHJ9JYCH5N" }}
topBarButton={{ text: "Home", href: "/" }}
/>
</div>
@@ -50,7 +49,7 @@ export default function GalleryPage() {
{ id: "3", title: "Sharp Fades", author: "Signature Look", description: "Clean, modern fade styles.", tags: ["Fade", "Style"], imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-man-getting-haircut_23-2148224304.jpg" },
{ id: "4", title: "Beard Trims", author: "Grooming", description: "Expert beard shaping and maintenance.", tags: ["Beard", "Grooming"], imageSrc: "http://img.b2bpic.net/free-photo/bearded-man-getting-beard-trim-barbershop_23-2148506385.jpg" },
{ id: "5", title: "Women's Styling", author: "Salon Services", description: "Professional styling for women.", tags: ["Women's", "Style"], imageSrc: "http://img.b2bpic.net/free-photo/crop-hairdresser-washing-hair-blonde_23-2147769799.jpg" },
{ id: "6", title: "Kids Haircuts", author: "Family Friendly", description: "Specialized cuts for the little ones.", tags: ["Kids", "Friendly"], imageSrc: "http://img.b2bpic.net/free-photo/little-boy-getting-haircut-barbershop_23-2148506399.jpg" },
{ id: "6", title: "Kids Haircuts", author: "Family Friendly", description: "Specialized cuts for the little ones.", tags: ["Kids", "Friendly"], imageSrc: "http://img.b2bpic.net/little-boy-getting-haircut-barbershop_23-2148506399.jpg" },
]}
/>
</div>
@@ -68,4 +67,4 @@ export default function GalleryPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

3
src/app/page.tsx
View File

@@ -35,7 +35,6 @@ export default function LandingPage() {
]}
brandName="Gentlemens HQ"
button={{ text: "Book Now", href: "https://app.squareup.com/appointments/buyer/widget/5ll7uiams0fu51/L5ATHJ9JYCH5N" }}
topBarButton={{ text: "Home", href: "/" }}
/>
</div>
@@ -97,4 +96,4 @@ export default function LandingPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

3
src/app/services/page.tsx
View File

@@ -31,7 +31,6 @@ export default function ServicesPage() {
]}
brandName="Gentlemens HQ"
button={{ text: "Book Now", href: "https://app.squareup.com/appointments/buyer/widget/5ll7uiams0fu51/L5ATHJ9JYCH5N" }}
topBarButton={{ text: "Home", href: "/" }}
/>
<FeatureCardTwelve
animationType="slide-up"
@@ -61,4 +60,4 @@ export default function ServicesPage() {
</ReactLenis>
</ThemeProvider>
);
}
}