bender/0347e02b-380c-4d60-9c9d-cc93e397a87f
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_7 into main #8

Merged
bender merged 2 commits from version_7 into main 2026-03-06 05:31:37 +00:00
Conversation 0 Commits 2 Files Changed 2 +37 -56
2 changed files with 37 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/app/layout.tsx
View File

@@ -1,53 +1,28 @@
import type { Metadata } from "next";
import { Halant } from "next/font/google";
import { Inter } from "next/font/google";
import { Open_Sans } from "next/font/google";
import { Geist, Geist_Mono } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const halant = Halant({
variable: "--font-halant", subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
const geist = Geist({
variable: "--font-geist-sans", subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
});
const openSans = Open_Sans({
variable: "--font-open-sans", subsets: ["latin"],
const geistMono = Geist_Mono({
variable: "--font-geist-mono", subsets: ["latin"],
});
export const metadata: Metadata = {
title: "The Famous American Barbershop – Atlas | Gainesville, VA", description: "Classic American barbershop in Gainesville, VA. Professional men's haircuts, fades, beard trims, and grooming services. Visit us at Virginia Gateway Shopping Center.", keywords: "barbershop, haircuts, fades, beard trim, Gainesville Virginia, men's grooming, barber shop", openGraph: {
title: "The Famous American Barbershop – Atlas", description: "Expert men's grooming services in Gainesville, Virginia", siteName: "The Famous American Barbershop – Atlas", type: "website", images: [
{
url: "http://img.b2bpic.net/free-photo/brown-vintage-leather-chairs-stylish-barber-shop_627829-6188.jpg", alt: "The Famous American Barbershop – Atlas"
},
],
},
twitter: {
card: "summary_large_image", title: "The Famous American Barbershop – Atlas", description: "Expert men's grooming services in Gainesville, Virginia", images: [
"http://img.b2bpic.net/free-photo/brown-vintage-leather-chairs-stylish-barber-shop_627829-6188.jpg"
],
},
};
title: "The Famous American Barbershop – Atlas", description: "Classic American barbershop serving Gainesville and surrounding communities. Professional men's grooming in a relaxed, friendly atmosphere."};
export default function RootLayout({
children,
}: Readonly<{
}: {
children: React.ReactNode;
}>) {
}) {
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${halant.variable} ${inter.variable} ${openSans.variable} antialiased`}
>
<Tag />
{children}
<html lang="en">
<body className={`${geist.variable} ${geistMono.variable} antialiased`}>
{children}
<script
dangerouslySetInnerHTML={{
__html: `
@@ -1415,7 +1390,6 @@ export default function RootLayout({
}}
/>
</body>
</ServiceWrapper>
</html>
);
}

43
src/app/page.tsx
View File

@@ -51,13 +51,13 @@ export default function LandingPage() {
]}
slides={[
{
imageSrc: "http://img.b2bpic.net/free-photo/brown-vintage-leather-chairs-stylish-barber-shop_627829-6188.jpg", imageAlt: "Classic barber shop interior"
imageSrc: "https://images.unsplash.com/photo-1585747860715-cd4628902d4a?w=800&q=80", imageAlt: "Classic barber shop interior"
},
{
imageSrc: "http://img.b2bpic.net/free-photo/luxury-armchairs-barber-shop_140725-7720.jpg?_wi=1", imageAlt: "Professional barber chairs"
imageSrc: "https://images.unsplash.com/photo-1592245388900-8d4fc64dbd51?w=800&q=80", imageAlt: "Professional barber chairs"
},
{
imageSrc: "http://img.b2bpic.net/free-photo/attractive-pensive-man-is-waiting-his-turn-get-haircut-busy-barbershop_613910-21489.jpg?_wi=1", imageAlt: "Professional haircut service"
imageSrc: "https://images.unsplash.com/photo-1622286346537-29c879d7cb8d?w=800&q=80", imageAlt: "Professional haircut service"
},
]}
autoplayDelay={4000}
@@ -73,7 +73,7 @@ export default function LandingPage() {
description="The Famous American Barbershop – Atlas"
subdescription="Your neighborhood destination for quality grooming"
icon={Scissors}
imageSrc="http://img.b2bpic.net/free-photo/luxury-armchairs-barber-shop_140725-7720.jpg?_wi=2"
imageSrc="https://images.unsplash.com/photo-1585747860715-cd4628902d4a?w=800&q=80"
imageAlt="Inside The Famous American Barbershop – Atlas"
mediaAnimation="slide-up"
useInvertedBackground={false}
@@ -89,15 +89,15 @@ export default function LandingPage() {
features={[
{
id: 1,
tag: "Classic", title: "Men's Haircuts", subtitle: "Timeless styles and modern fades", description: "Professional haircuts ranging from classic cuts to modern fades, tailored to your preferences by our experienced barbers.", imageSrc: "http://img.b2bpic.net/free-photo/professional-barber-working-with-client-hairdressing-salon-styling-beard-with-comb_613910-5069.jpg", imageAlt: "Professional men's haircut"
tag: "Classic", title: "Men's Haircuts", subtitle: "Timeless styles and modern fades", description: "Professional haircuts ranging from classic cuts to modern fades, tailored to your preferences by our experienced barbers.", imageSrc: "https://images.unsplash.com/photo-1621607505857-44a5e0eed1b0?w=800&q=80", imageAlt: "Professional men's haircut"
},
{
id: 2,
tag: "Precision", title: "Beard Trims & Razor Shaves", subtitle: "Traditional grooming expertise", description: "Expert beard maintenance and smooth razor shaves using traditional techniques for the ultimate grooming experience.", imageSrc: "http://img.b2bpic.net/free-photo/professional-hairdresser-modeling-beard-barbershop-close-up-photo_613910-18422.jpg", imageAlt: "Beard trim and razor shave service"
tag: "Precision", title: "Beard Trims & Razor Shaves", subtitle: "Traditional grooming expertise", description: "Expert beard maintenance and smooth razor shaves using traditional techniques for the ultimate grooming experience.", imageSrc: "https://images.unsplash.com/photo-1599351566329-0e3e0c68b0bb?w=800&q=80", imageAlt: "Beard trim and razor shave service"
},
{
id: 3,
tag: "Detail Work", title: "Line Ups & Skin Fades", subtitle: "Precision edge work", description: "Sharp line ups and clean skin fades with attention to detail. Get that fresh, polished look you deserve.", imageSrc: "http://img.b2bpic.net/free-photo/side-view-confident-groom-with-beard-mustaches-standing-looking-away-while-his-friend-standing-him-helping-dressing-up-shirt-bow-tie-hotel-room-wedding-day_8353-12417.jpg", imageAlt: "Precision line up and fade service"
tag: "Detail Work", title: "Line Ups & Skin Fades", subtitle: "Precision edge work", description: "Sharp line ups and clean skin fades with attention to detail. Get that fresh, polished look you deserve.", imageSrc: "https://images.unsplash.com/photo-1599351566329-0e3e0c68b0bb?w=800&q=80", imageAlt: "Precision line up and fade service"
},
]}
textboxLayout="default"
@@ -114,25 +114,32 @@ export default function LandingPage() {
features={[
{
id: 1,
tag: "Regular", title: "Men's Haircuts", subtitle: "$17", description: "Professional haircut with modern fades & classic cuts. Consultation included"},
tag: "Regular", title: "Men's Haircuts", subtitle: "$17", description: "Professional haircut with modern fades & classic cuts. Consultation included"
},
{
id: 2,
tag: "Youth", title: "Boys Haircuts", subtitle: "$14", description: "Ages under 12. Quick & professional service with kid-friendly atmosphere"},
tag: "Youth", title: "Boys Haircuts", subtitle: "$14", description: "Ages under 12. Quick & professional service with kid-friendly atmosphere"
},
{
id: 3,
tag: "Specialty", title: "Beard Services", subtitle: "$8", description: "Beard trim & shape with precision grooming and expert technique"},
tag: "Specialty", title: "Beard Services", subtitle: "$8", description: "Beard trim & shape with precision grooming and expert technique"
},
{
id: 4,
tag: "Classic", title: "Straight Razor Shave", subtitle: "$16", description: "Traditional technique for close & smooth shave. Relaxing experience"},
tag: "Classic", title: "Straight Razor Shave", subtitle: "$16", description: "Traditional technique for close & smooth shave. Relaxing experience"
},
{
id: 5,
tag: "Specialty", title: "Women's Haircuts", subtitle: "$19", description: "Professional styling with modern techniques and custom cuts"},
tag: "Specialty", title: "Women's Haircuts", subtitle: "$19", description: "Professional styling with modern techniques and custom cuts"
},
{
id: 6,
tag: "Youth", title: "Girls Haircuts", subtitle: "$15", description: "Young girls service, gentle & professional in fun atmosphere"},
tag: "Youth", title: "Girls Haircuts", subtitle: "$15", description: "Young girls service, gentle & professional in fun atmosphere"
},
{
id: 7,
tag: "Quick", title: "Bang Trim", subtitle: "$7", description: "Quick touch-up with precise cutting. Walk-in welcome"},
tag: "Quick", title: "Bang Trim", subtitle: "$7", description: "Quick touch-up with precise cutting. Walk-in welcome"
},
]}
textboxLayout="default"
useInvertedBackground={false}
@@ -155,16 +162,16 @@ export default function LandingPage() {
<ProductCardThree
products={[
{
id: "1", name: "Premium Haircut", price: "Expert Results", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AYWRxrOSTb7MSIUJcLjcDOTIYv/uploaded-1772774046011-sm0yla2b.jpg", imageAlt: "Professional haircut example"
id: "1", name: "Premium Haircut", price: "Expert Results", imageSrc: "https://images.unsplash.com/photo-1599351566329-0e3e0c68b0bb?w=800&q=80", imageAlt: "Professional haircut example"
},
{
id: "2", name: "Precision Fade", price: "Sharp Lines", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AYWRxrOSTb7MSIUJcLjcDOTIYv/uploaded-1772774046011-tje9e1md.jpg", imageAlt: "Precision fade service"
id: "2", name: "Precision Fade", price: "Sharp Lines", imageSrc: "https://images.unsplash.com/photo-1621607505857-44a5e0eed1b0?w=800&q=80", imageAlt: "Precision fade service"
},
{
id: "3", name: "Classic Style", price: "Timeless Look", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AYWRxrOSTb7MSIUJcLjcDOTIYv/uploaded-1772774046011-fax6znhd.jpg", imageAlt: "Classic haircut style"
id: "3", name: "Classic Style", price: "Timeless Look", imageSrc: "https://images.unsplash.com/photo-1599351566329-0e3e0c68b0bb?w=800&q=80", imageAlt: "Classic haircut style"
},
{
id: "4", name: "Welcoming Atmosphere", price: "Community Focused", imageSrc: "http://img.b2bpic.net/free-photo/young-bearded-man-washing-head-by-hairdresser-while-sitting-chair-barbershop-barber-soul_627829-6316.jpg", imageAlt: "Inside The Famous American Barbershop – Atlas"
id: "4", name: "Welcoming Atmosphere", price: "Community Focused", imageSrc: "https://images.unsplash.com/photo-1585747860715-cd4628902d4a?w=800&q=80", imageAlt: "Inside The Famous American Barbershop – Atlas"
},
]}
title="Gallery"