bender/8b212a6c-a0a0-4e90-97d9-21fe3665a7c0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #1

Merged
bender merged 6 commits from version_1 into main 2026-03-12 16:21:21 +00:00
Conversation 0 Commits 6 Files Changed 6 +61 -43
6 changed files with 61 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,7 +114,7 @@ export default function AboutPage() {
"Tony learned barbering the right way—under the mentorship of experienced barbers who believed in taking time with every customer and doing the work right.",
tags: ["Heritage", "Craft"],
imageSrc:
"http://img.b2bpic.net/free-photo/close-up-portrait-tattooed-male-barber-cuts-beard-black-male_613910-8611.jpg",
"http://img.b2bpic.net/free-photo/close-up-portrait-tattooed-male-barber-cuts-beard-black-male_613910-8611.jpg?_wi=4",
imageAlt: "Traditional barber training",
},
{
@@ -125,7 +125,7 @@ export default function AboutPage() {
"For over 20 years, Tony has been a fixture in this neighborhood, cutting hair and building relationships with customers who have been coming back for 15+ years.",
tags: ["Loyalty", "Trust"],
imageSrc:
"http://img.b2bpic.net/free-photo/female-hairdresser-arranging-her-tools_23-2150771258.jpg",
"http://img.b2bpic.net/free-photo/female-hairdresser-arranging-her-tools_23-2150771258.jpg?_wi=6",
imageAlt: "Years of experience",
},
{
@@ -136,7 +136,7 @@ export default function AboutPage() {
"Tony believes in old-school barbering values: take your time, pay attention to detail, treat every customer like family, and never compromise on quality for speed.",
tags: ["Excellence", "Integrity"],
imageSrc:
"http://img.b2bpic.net/free-photo/female-hairdresser-arranging-her-tools_23-2150771258.jpg",
"http://img.b2bpic.net/free-photo/female-hairdresser-arranging-her-tools_23-2150771258.jpg?_wi=7",
imageAlt: "Quality barbering",
},
]}
@@ -154,28 +154,28 @@ export default function AboutPage() {
{
id: "1",
name: "James Wilson",
imageSrc: "http://img.b2bpic.net/free-photo/portrait-man-laughing_23-2148859449.jpg",
imageSrc: "http://img.b2bpic.net/free-photo/portrait-man-laughing_23-2148859449.jpg?_wi=2",
imageAlt: "James Wilson",
},
{
id: "2",
name: "Michael Chen",
imageSrc:
"http://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-ginger-man-stylish-navy-t-shirt-looking-camera-showing-thumb-up-while-posing-blue-studio-background-human-facial-expressions-sincere-emotions_639032-2116.jpg",
"http://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-ginger-man-stylish-navy-t-shirt-looking-camera-showing-thumb-up-while-posing-blue-studio-background-human-facial-expressions-sincere-emotions_639032-2116.jpg?_wi=2",
imageAlt: "Michael Chen",
},
{
id: "3",
name: "David Rodriguez",
imageSrc:
"http://img.b2bpic.net/free-photo/front-view-friends-spending-time-together_23-2148436159.jpg",
"http://img.b2bpic.net/free-photo/front-view-friends-spending-time-together_23-2148436159.jpg?_wi=2",
imageAlt: "David Rodriguez",
},
{
id: "4",
name: "Marcus Thompson",
imageSrc:
"http://img.b2bpic.net/free-photo/fired-businessman-holding-his-belongings-screaming-from-frustration-office_637285-6837.jpg",
"http://img.b2bpic.net/free-photo/fired-businessman-holding-his-belongings-screaming-from-frustration-office_637285-6837.jpg?_wi=2",
imageAlt: "Marcus Thompson",
},
]}

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

@@ -84,7 +84,7 @@ export default function ContactPage() {
description="Walk-ins welcome. No appointment needed. Cash only. A friendly neighborhood barber with over 20 years of experience."
background={{ variant: "plain" }}
useInvertedBackground={false}
imageSrc="http://img.b2bpic.net/free-photo/close-up-portrait-tattooed-male-barber-cuts-beard-black-male_613910-8611.jpg"
imageSrc="http://img.b2bpic.net/free-photo/close-up-portrait-tattooed-male-barber-cuts-beard-black-male_613910-8611.jpg?_wi=7"
imageAlt="Armour Barber Shop storefront"
mediaAnimation="entrance-slide"
mediaPosition="right"

36
src/app/layout.tsx
View File

@@ -1,28 +1,44 @@
import type { Metadata } from "next";
import { Halant } from "next/font/google";
import { Public_Sans } from "next/font/google";
import { Inter } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Public_Sans } from "next/font/google";
export const metadata: Metadata = {
title: "Webild components 2",
description: "Generated by create next app",
};
const halant = Halant({
variable: "--font-halant",
subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
});
const publicSans = Public_Sans({
variable: "--font-public-sans",
subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
export const metadata: Metadata = {
title: "Armour Barber Shop - Classic Haircuts & Old-School Service",
description: "Classic barbering for over 20 years. Quality haircuts, friendly service, affordable prices. Walk-ins welcome. No appointments needed. Cash only.",
keywords: "barber shop, haircuts, traditional barbering, men's haircuts, beard trim, quality haircuts, affordable, neighborhood barber",
robots: {
index: true,
follow: true,
},
openGraph: {
title: "Armour Barber Shop",
description: "Classic haircuts and old-school service. Over 20 years of barbering excellence.",
type: "website",
siteName: "Armour Barber Shop",
},
};
export default function RootLayout({
children,
}: Readonly<{
@@ -31,7 +47,9 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${publicSans.variable} ${inter.variable} antialiased`}>
<body
className={`${halant.variable} ${publicSans.variable} ${inter.variable} antialiased`}
>
<Tag />
{children}
<script
@@ -43,4 +61,4 @@ export default function RootLayout({
</ServiceWrapper>
</html>
);
}
}

24
src/app/page.tsx
View File

@@ -97,11 +97,11 @@ export default function HomePage() {
buttonAnimation="entrance-slide"
mediaItems={[
{
imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-tattooed-male-barber-cuts-beard-black-male_613910-8611.jpg",
imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-tattooed-male-barber-cuts-beard-black-male_613910-8611.jpg?_wi=1",
imageAlt: "vintage barber shop interior traditional",
},
{
imageSrc: "http://img.b2bpic.net/free-photo/female-hairdresser-arranging-her-tools_23-2150771258.jpg",
imageSrc: "http://img.b2bpic.net/free-photo/female-hairdresser-arranging-her-tools_23-2150771258.jpg?_wi=1",
imageAlt: "traditional scissors hair cut classic",
},
{
@@ -146,7 +146,7 @@ export default function HomePage() {
"Professional haircuts tailored to your style with expert precision and attention to detail.",
tags: ["Popular", "Quality"],
imageSrc:
"http://img.b2bpic.net/free-photo/female-hairdresser-arranging-her-tools_23-2150771258.jpg",
"http://img.b2bpic.net/free-photo/female-hairdresser-arranging-her-tools_23-2150771258.jpg?_wi=2",
imageAlt: "Men's haircut service",
},
{
@@ -157,7 +157,7 @@ export default function HomePage() {
"Old-school scissor-only cuts that showcase true barbering skill and craftsmanship.",
tags: ["Traditional", "Expert"],
imageSrc:
"http://img.b2bpic.net/free-photo/female-hairdresser-arranging-her-tools_23-2150771258.jpg",
"http://img.b2bpic.net/free-photo/female-hairdresser-arranging-her-tools_23-2150771258.jpg?_wi=3",
imageAlt: "Scissor cut service",
},
{
@@ -168,7 +168,7 @@ export default function HomePage() {
"Careful beard trimming and shaping for a clean, well-groomed appearance.",
tags: ["Detail", "Quality"],
imageSrc:
"http://img.b2bpic.net/free-photo/female-hairdresser-arranging-her-tools_23-2150771258.jpg",
"http://img.b2bpic.net/free-photo/female-hairdresser-arranging-her-tools_23-2150771258.jpg?_wi=4",
imageAlt: "Beard trim service",
},
{
@@ -179,7 +179,7 @@ export default function HomePage() {
"Complete traditional barbering experience with the care and attention you deserve.",
tags: ["Authentic", "Trusted"],
imageSrc:
"http://img.b2bpic.net/free-photo/female-hairdresser-arranging-her-tools_23-2150771258.jpg",
"http://img.b2bpic.net/free-photo/female-hairdresser-arranging-her-tools_23-2150771258.jpg?_wi=5",
imageAlt: "Traditional barber service",
},
]}
@@ -239,28 +239,28 @@ export default function HomePage() {
{
id: "1",
name: "James Wilson",
imageSrc: "http://img.b2bpic.net/free-photo/portrait-man-laughing_23-2148859449.jpg",
imageSrc: "http://img.b2bpic.net/free-photo/portrait-man-laughing_23-2148859449.jpg?_wi=1",
imageAlt: "James Wilson",
},
{
id: "2",
name: "Michael Chen",
imageSrc:
"http://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-ginger-man-stylish-navy-t-shirt-looking-camera-showing-thumb-up-while-posing-blue-studio-background-human-facial-expressions-sincere-emotions_639032-2116.jpg",
"http://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-ginger-man-stylish-navy-t-shirt-looking-camera-showing-thumb-up-while-posing-blue-studio-background-human-facial-expressions-sincere-emotions_639032-2116.jpg?_wi=1",
imageAlt: "Michael Chen",
},
{
id: "3",
name: "David Rodriguez",
imageSrc:
"http://img.b2bpic.net/free-photo/front-view-friends-spending-time-together_23-2148436159.jpg",
"http://img.b2bpic.net/free-photo/front-view-friends-spending-time-together_23-2148436159.jpg?_wi=1",
imageAlt: "David Rodriguez",
},
{
id: "4",
name: "Marcus Thompson",
imageSrc:
"http://img.b2bpic.net/free-photo/fired-businessman-holding-his-belongings-screaming-from-frustration-office_637285-6837.jpg",
"http://img.b2bpic.net/free-photo/fired-businessman-holding-his-belongings-screaming-from-frustration-office_637285-6837.jpg?_wi=1",
imageAlt: "Marcus Thompson",
},
]}
@@ -273,7 +273,7 @@ export default function HomePage() {
description="Everything you need to know about visiting Armour Barber Shop"
tag="FAQ"
tagAnimation="entrance-slide"
imageSrc="http://img.b2bpic.net/free-photo/close-up-portrait-tattooed-male-barber-cuts-beard-black-male_613910-8611.jpg"
imageSrc="http://img.b2bpic.net/free-photo/close-up-portrait-tattooed-male-barber-cuts-beard-black-male_613910-8611.jpg?_wi=2"
imageAlt="Armour Barber Shop"
mediaAnimation="entrance-slide"
mediaPosition="left"
@@ -329,7 +329,7 @@ export default function HomePage() {
description="Walk-ins welcome. No appointment needed. Cash only. A friendly neighborhood barber with over 20 years of experience."
background={{ variant: "plain" }}
useInvertedBackground={false}
imageSrc="http://img.b2bpic.net/free-photo/close-up-portrait-tattooed-male-barber-cuts-beard-black-male_613910-8611.jpg"
imageSrc="http://img.b2bpic.net/free-photo/close-up-portrait-tattooed-male-barber-cuts-beard-black-male_613910-8611.jpg?_wi=3"
imageAlt="Armour Barber Shop storefront"
mediaAnimation="entrance-slide"
mediaPosition="right"

10
src/app/pricing/page.tsx
View File

@@ -101,25 +101,25 @@ export default function PricingPage() {
{
id: "1",
name: "James Wilson",
imageSrc: "http://img.b2bpic.net/free-photo/portrait-man-laughing_23-2148859449.jpg",
imageSrc: "http://img.b2bpic.net/free-photo/portrait-man-laughing_23-2148859449.jpg?_wi=4",
imageAlt: "James Wilson",
},
{
id: "2",
name: "Michael Chen",
imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-ginger-man-stylish-navy-t-shirt-looking-camera-showing-thumb-up-while-posing-blue-studio-background-human-facial-expressions-sincere-emotions_639032-2116.jpg",
imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-ginger-man-stylish-navy-t-shirt-looking-camera-showing-thumb-up-while-posing-blue-studio-background-human-facial-expressions-sincere-emotions_639032-2116.jpg?_wi=4",
imageAlt: "Michael Chen",
},
{
id: "3",
name: "David Rodriguez",
imageSrc: "http://img.b2bpic.net/free-photo/front-view-friends-spending-time-together_23-2148436159.jpg",
imageSrc: "http://img.b2bpic.net/free-photo/front-view-friends-spending-time-together_23-2148436159.jpg?_wi=4",
imageAlt: "David Rodriguez",
},
{
id: "4",
name: "Marcus Thompson",
imageSrc: "http://img.b2bpic.net/free-photo/fired-businessman-holding-his-belongings-screaming-from-frustration-office_637285-6837.jpg",
imageSrc: "http://img.b2bpic.net/free-photo/fired-businessman-holding-his-belongings-screaming-from-frustration-office_637285-6837.jpg?_wi=4",
imageAlt: "Marcus Thompson",
},
]}
@@ -142,7 +142,7 @@ export default function PricingPage() {
variant: "plain",
}}
useInvertedBackground={false}
imageSrc="http://img.b2bpic.net/free-photo/close-up-portrait-tattooed-male-barber-cuts-beard-black-male_613910-8611.jpg"
imageSrc="http://img.b2bpic.net/free-photo/close-up-portrait-tattooed-male-barber-cuts-beard-black-male_613910-8611.jpg?_wi=6"
imageAlt="Armour Barber Shop storefront"
mediaAnimation="entrance-slide"
mediaPosition="right"

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

@@ -51,7 +51,7 @@ export default function ServicesPage() {
author: "Classic",
description: "Professional haircuts tailored to your style with expert precision and attention to detail.",
tags: ["Popular", "Quality"],
imageSrc: "http://img.b2bpic.net/free-photo/female-hairdresser-arranging-her-tools_23-2150771258.jpg",
imageSrc: "http://img.b2bpic.net/free-photo/female-hairdresser-arranging-her-tools_23-2150771258.jpg?_wi=8",
imageAlt: "Men's haircut service",
},
{
@@ -60,7 +60,7 @@ export default function ServicesPage() {
author: "Traditional",
description: "Old-school scissor-only cuts that showcase true barbering skill and craftsmanship.",
tags: ["Traditional", "Expert"],
imageSrc: "http://img.b2bpic.net/free-photo/female-hairdresser-arranging-her-tools_23-2150771258.jpg",
imageSrc: "http://img.b2bpic.net/free-photo/female-hairdresser-arranging-her-tools_23-2150771258.jpg?_wi=9",
imageAlt: "Scissor cut service",
},
{
@@ -69,7 +69,7 @@ export default function ServicesPage() {
author: "Meticulous",
description: "Careful beard trimming and shaping for a clean, well-groomed appearance.",
tags: ["Detail", "Quality"],
imageSrc: "http://img.b2bpic.net/free-photo/female-hairdresser-arranging-her-tools_23-2150771258.jpg",
imageSrc: "http://img.b2bpic.net/free-photo/female-hairdresser-arranging-her-tools_23-2150771258.jpg?_wi=10",
imageAlt: "Beard trim service",
},
{
@@ -78,7 +78,7 @@ export default function ServicesPage() {
author: "Professional",
description: "Complete traditional barbering experience with the care and attention you deserve.",
tags: ["Authentic", "Trusted"],
imageSrc: "http://img.b2bpic.net/free-photo/female-hairdresser-arranging-her-tools_23-2150771258.jpg",
imageSrc: "http://img.b2bpic.net/free-photo/female-hairdresser-arranging-her-tools_23-2150771258.jpg?_wi=11",
imageAlt: "Traditional barber service",
},
]}
@@ -97,25 +97,25 @@ export default function ServicesPage() {
{
id: "1",
name: "James Wilson",
imageSrc: "http://img.b2bpic.net/free-photo/portrait-man-laughing_23-2148859449.jpg",
imageSrc: "http://img.b2bpic.net/free-photo/portrait-man-laughing_23-2148859449.jpg?_wi=3",
imageAlt: "James Wilson",
},
{
id: "2",
name: "Michael Chen",
imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-ginger-man-stylish-navy-t-shirt-looking-camera-showing-thumb-up-while-posing-blue-studio-background-human-facial-expressions-sincere-emotions_639032-2116.jpg",
imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-ginger-man-stylish-navy-t-shirt-looking-camera-showing-thumb-up-while-posing-blue-studio-background-human-facial-expressions-sincere-emotions_639032-2116.jpg?_wi=3",
imageAlt: "Michael Chen",
},
{
id: "3",
name: "David Rodriguez",
imageSrc: "http://img.b2bpic.net/free-photo/front-view-friends-spending-time-together_23-2148436159.jpg",
imageSrc: "http://img.b2bpic.net/free-photo/front-view-friends-spending-time-together_23-2148436159.jpg?_wi=3",
imageAlt: "David Rodriguez",
},
{
id: "4",
name: "Marcus Thompson",
imageSrc: "http://img.b2bpic.net/free-photo/fired-businessman-holding-his-belongings-screaming-from-frustration-office_637285-6837.jpg",
imageSrc: "http://img.b2bpic.net/free-photo/fired-businessman-holding-his-belongings-screaming-from-frustration-office_637285-6837.jpg?_wi=3",
imageAlt: "Marcus Thompson",
},
]}
@@ -162,7 +162,7 @@ export default function ServicesPage() {
content: "Most haircuts take 20-30 minutes depending on the style and how busy we are. We treat every customer like family, so expect great conversation too!",
},
]}
imageSrc="http://img.b2bpic.net/free-photo/close-up-portrait-tattooed-male-barber-cuts-beard-black-male_613910-8611.jpg"
imageSrc="http://img.b2bpic.net/free-photo/close-up-portrait-tattooed-male-barber-cuts-beard-black-male_613910-8611.jpg?_wi=5"
imageAlt="Armour Barber Shop"
mediaAnimation="entrance-slide"
mediaPosition="left"