From 7b2236dfdb9f75d93d3a76e7e3110b7db7494229 Mon Sep 17 00:00:00 2001 From: bender Date: Thu, 12 Mar 2026 16:22:52 +0000 Subject: [PATCH 1/6] Update src/app/about/page.tsx --- src/app/about/page.tsx | 89 ++++++++++++------------------------------ 1 file changed, 24 insertions(+), 65 deletions(-) diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx index 0ab7201..1b58dfb 100644 --- a/src/app/about/page.tsx +++ b/src/app/about/page.tsx @@ -20,8 +20,7 @@ export default function AboutPage() { const footerColumns = [ { - title: "Navigation", - items: [ + title: "Navigation", items: [ { label: "Home", href: "/" }, { label: "About", href: "/about" }, { label: "Services", href: "/services" }, @@ -29,8 +28,7 @@ export default function AboutPage() { ], }, { - title: "Services", - items: [ + title: "Services", items: [ { label: "Men's Haircut", href: "/services" }, { label: "Classic Scissor Cut", href: "/services" }, { label: "Beard Trim", href: "/services" }, @@ -38,8 +36,7 @@ export default function AboutPage() { ], }, { - title: "Information", - items: [ + title: "Information", items: [ { label: "Walk-Ins Welcome", href: "#" }, { label: "Cash Only", href: "#" }, { label: "No Appointment Needed", href: "#" }, @@ -47,8 +44,7 @@ export default function AboutPage() { ], }, { - title: "Connect", - items: [ + title: "Connect", items: [ { label: "Contact", href: "/contact" }, { label: "Visit Us", href: "/contact" }, { label: "Follow Us", href: "#" }, @@ -83,10 +79,7 @@ export default function AboutPage() { heading={[ { type: "text", content: "Meet Tony: Over 20 Years of" }, { - type: "image", - src: "http://img.b2bpic.net/free-photo/front-view-plus-size-man-working-as-hairstylist_23-2150754692.jpg", - alt: "Tony the barber", - }, + type: "image", src: "http://img.b2bpic.net/free-photo/front-view-plus-size-man-working-as-hairstylist_23-2150754692.jpg", alt: "Tony the barber"}, { type: "text", content: "Dedication to Classic Barbering" }, ]} useInvertedBackground={false} @@ -94,7 +87,7 @@ export default function AboutPage() { { text: "Walk In Today", href: "/contact" }, { text: "View Services", href: "/" }, ]} - buttonAnimation="entrance-slide" + buttonAnimation="none" /> @@ -102,43 +95,25 @@ export default function AboutPage() { @@ -148,36 +123,20 @@ export default function AboutPage() { cardTitle="Trusted by the community for over two decades of consistent, quality haircuts and genuine care" cardTag="Customer Stories" cardTagIcon={Star} - cardAnimation="entrance-slide" + cardAnimation="none" useInvertedBackground={false} testimonials={[ { - id: "1", - name: "James Wilson", - imageSrc: "http://img.b2bpic.net/free-photo/portrait-man-laughing_23-2148859449.jpg?_wi=2", - imageAlt: "James Wilson", - }, + id: "1", name: "James Wilson", imageSrc: "http://img.b2bpic.net/free-photo/portrait-man-laughing_23-2148859449.jpg", 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?_wi=2", - imageAlt: "Michael Chen", - }, + 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", imageAlt: "Michael Chen"}, { - id: "3", - name: "David Rodriguez", - imageSrc: - "http://img.b2bpic.net/free-photo/front-view-friends-spending-time-together_23-2148436159.jpg?_wi=2", - imageAlt: "David Rodriguez", - }, + id: "3", name: "David Rodriguez", imageSrc: + "http://img.b2bpic.net/free-photo/front-view-friends-spending-time-together_23-2148436159.jpg", 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?_wi=2", - imageAlt: "Marcus Thompson", - }, + id: "4", name: "Marcus Thompson", imageSrc: + "http://img.b2bpic.net/free-photo/fired-businessman-holding-his-belongings-screaming-from-frustration-office_637285-6837.jpg", imageAlt: "Marcus Thompson"}, ]} /> -- 2.49.1 From a8ba69600a1f06fe4799f6686eb35cbd99aa5170 Mon Sep 17 00:00:00 2001 From: bender Date: Thu, 12 Mar 2026 16:22:53 +0000 Subject: [PATCH 2/6] Update src/app/contact/page.tsx --- src/app/contact/page.tsx | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/src/app/contact/page.tsx b/src/app/contact/page.tsx index bb058b0..cf69d61 100644 --- a/src/app/contact/page.tsx +++ b/src/app/contact/page.tsx @@ -9,17 +9,16 @@ import { MapPin } from "lucide-react"; export default function ContactPage() { const navItems = [ - { name: "Home", id: "home" }, - { name: "About", id: "about" }, - { name: "Services", id: "services" }, - { name: "Pricing", id: "pricing" }, - { name: "Contact", id: "contact" }, + { name: "Home", id: "/" }, + { name: "About", id: "/about" }, + { name: "Services", id: "/services" }, + { name: "Pricing", id: "/pricing" }, + { name: "Contact", id: "/contact" }, ]; const footerColumns = [ { - title: "Navigation", - items: [ + title: "Navigation", items: [ { label: "Home", href: "/" }, { label: "About", href: "/about" }, { label: "Services", href: "/services" }, @@ -27,8 +26,7 @@ export default function ContactPage() { ], }, { - title: "Services", - items: [ + title: "Services", items: [ { label: "Men's Haircut", href: "/services" }, { label: "Classic Scissor Cut", href: "/services" }, { label: "Beard Trim", href: "/services" }, @@ -36,8 +34,7 @@ export default function ContactPage() { ], }, { - title: "Information", - items: [ + title: "Information", items: [ { label: "Walk-Ins Welcome", href: "#" }, { label: "Cash Only", href: "#" }, { label: "No Appointment Needed", href: "#" }, @@ -45,8 +42,7 @@ export default function ContactPage() { ], }, { - title: "Connect", - items: [ + title: "Connect", items: [ { label: "Contact", href: "/contact" }, { label: "Visit Us", href: "/contact" }, { label: "Follow Us", href: "#" }, @@ -84,14 +80,14 @@ 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?_wi=7" + imageSrc="http://img.b2bpic.net/free-photo/close-up-portrait-tattooed-male-barber-cuts-beard-black-male_613910-8611.jpg" imageAlt="Armour Barber Shop storefront" - mediaAnimation="entrance-slide" + mediaAnimation="none" mediaPosition="right" inputPlaceholder="Your email" buttonText="Get Updates" termsText="Join our mailing list for updates and special offers." - tagAnimation="entrance-slide" + tagAnimation="none" /> -- 2.49.1 From 8906215b02879f84045558e28dde9d2098346677 Mon Sep 17 00:00:00 2001 From: bender Date: Thu, 12 Mar 2026 16:22:53 +0000 Subject: [PATCH 3/6] Update src/app/page.tsx --- src/app/page.tsx | 207 ++++++++++++++--------------------------------- 1 file changed, 59 insertions(+), 148 deletions(-) diff --git a/src/app/page.tsx b/src/app/page.tsx index e34b6e7..e8a9933 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -24,8 +24,7 @@ export default function HomePage() { const footerColumns = [ { - title: "Navigation", - items: [ + title: "Navigation", items: [ { label: "Home", href: "/" }, { label: "About", href: "/about" }, { label: "Services", href: "/services" }, @@ -33,8 +32,7 @@ export default function HomePage() { ], }, { - title: "Services", - items: [ + title: "Services", items: [ { label: "Men's Haircut", href: "/services" }, { label: "Classic Scissor Cut", href: "/services" }, { label: "Beard Trim", href: "/services" }, @@ -42,8 +40,7 @@ export default function HomePage() { ], }, { - title: "Information", - items: [ + title: "Information", items: [ { label: "Walk-Ins Welcome", href: "#" }, { label: "Cash Only", href: "#" }, { label: "No Appointment Needed", href: "#" }, @@ -51,8 +48,7 @@ export default function HomePage() { ], }, { - title: "Connect", - items: [ + title: "Connect", items: [ { label: "Contact", href: "/contact" }, { label: "Visit Us", href: "/contact" }, { label: "Follow Us", href: "#" }, @@ -89,27 +85,21 @@ export default function HomePage() { background={{ variant: "plain" }} tag="Since 2005" tagIcon={Scissors} - tagAnimation="entrance-slide" + tagAnimation="none" buttons={[ { text: "Walk In Today", href: "/contact" }, { text: "Learn More", href: "/about" }, ]} - buttonAnimation="entrance-slide" + buttonAnimation="none" mediaItems={[ { - 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/close-up-portrait-tattooed-male-barber-cuts-beard-black-male_613910-8611.jpg", imageAlt: "vintage barber shop interior traditional"}, { - imageSrc: "http://img.b2bpic.net/free-photo/female-hairdresser-arranging-her-tools_23-2150771258.jpg?_wi=1", - imageAlt: "traditional scissors hair cut classic", - }, + imageSrc: "http://img.b2bpic.net/free-photo/female-hairdresser-arranging-her-tools_23-2150771258.jpg", imageAlt: "traditional scissors hair cut classic"}, { - imageSrc: "http://img.b2bpic.net/free-photo/front-view-plus-size-man-working-as-hairstylist_23-2150754692.jpg", - imageAlt: "experienced barber man cutting hair professional", - }, + imageSrc: "http://img.b2bpic.net/free-photo/front-view-plus-size-man-working-as-hairstylist_23-2150754692.jpg", imageAlt: "experienced barber man cutting hair professional"}, ]} - mediaAnimation="entrance-slide" + mediaAnimation="none" /> @@ -118,15 +108,12 @@ export default function HomePage() { heading={[ { type: "text", content: "Tony's Story: Over 20 Years of" }, { - type: "image", - src: "http://img.b2bpic.net/free-photo/front-view-plus-size-man-working-as-hairstylist_23-2150754692.jpg", - alt: "Tony the barber", - }, + type: "image", src: "http://img.b2bpic.net/free-photo/front-view-plus-size-man-working-as-hairstylist_23-2150754692.jpg", alt: "Tony the barber"}, { type: "text", content: "Classic Barbering Excellence" }, ]} useInvertedBackground={false} buttons={[{ text: "Meet Tony", href: "/about" }]} - buttonAnimation="entrance-slide" + buttonAnimation="none" /> @@ -134,54 +121,30 @@ export default function HomePage() { @@ -190,39 +153,21 @@ export default function HomePage() { @@ -233,36 +178,20 @@ export default function HomePage() { cardTitle="Join thousands of satisfied customers who trust Armour Barber Shop for quality haircuts and genuine hospitality" cardTag="Customer Reviews" cardTagIcon={Star} - cardAnimation="entrance-slide" + cardAnimation="none" useInvertedBackground={false} testimonials={[ { - id: "1", - name: "James Wilson", - imageSrc: "http://img.b2bpic.net/free-photo/portrait-man-laughing_23-2148859449.jpg?_wi=1", - imageAlt: "James Wilson", - }, + id: "1", name: "James Wilson", imageSrc: "http://img.b2bpic.net/free-photo/portrait-man-laughing_23-2148859449.jpg", 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?_wi=1", - imageAlt: "Michael Chen", - }, + 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", imageAlt: "Michael Chen"}, { - id: "3", - name: "David Rodriguez", - imageSrc: - "http://img.b2bpic.net/free-photo/front-view-friends-spending-time-together_23-2148436159.jpg?_wi=1", - imageAlt: "David Rodriguez", - }, + id: "3", name: "David Rodriguez", imageSrc: + "http://img.b2bpic.net/free-photo/front-view-friends-spending-time-together_23-2148436159.jpg", 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?_wi=1", - imageAlt: "Marcus Thompson", - }, + id: "4", name: "Marcus Thompson", imageSrc: + "http://img.b2bpic.net/free-photo/fired-businessman-holding-his-belongings-screaming-from-frustration-office_637285-6837.jpg", imageAlt: "Marcus Thompson"}, ]} /> @@ -272,51 +201,33 @@ export default function HomePage() { title="Frequently Asked Questions" 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?_wi=2" + tagAnimation="none" + imageSrc="http://img.b2bpic.net/free-photo/close-up-portrait-tattooed-male-barber-cuts-beard-black-male_613910-8611.jpg" imageAlt="Armour Barber Shop" - mediaAnimation="entrance-slide" + mediaAnimation="none" mediaPosition="left" textboxLayout="default" useInvertedBackground={false} - faqsAnimation="entrance-slide" + faqsAnimation="none" faqs={[ { - id: "1", - title: "Do you take appointments?", - content: - "No, we are walk-in only. We love seeing customers on a first-come, first-served basis. This keeps the experience relaxed and authentic to our old-school barbershop style.", - }, + id: "1", title: "Do you take appointments?", content: + "No, we are walk-in only. We love seeing customers on a first-come, first-served basis. This keeps the experience relaxed and authentic to our old-school barbershop style."}, { - id: "2", - title: "How long have you been in business?", - content: - "Armour Barber Shop has been serving the community for over 20 years under Tony's expert care and attention. Many of our customers have been coming for 15-20 years!", - }, + id: "2", title: "How long have you been in business?", content: + "Armour Barber Shop has been serving the community for over 20 years under Tony's expert care and attention. Many of our customers have been coming for 15-20 years!"}, { - id: "3", - title: "What payment methods do you accept?", - content: - "We accept cash only. This keeps things simple and traditional, just like everything else at Armour.", - }, + id: "3", title: "What payment methods do you accept?", content: + "We accept cash only. This keeps things simple and traditional, just like everything else at Armour."}, { - id: "4", - title: "What makes your haircuts different?", - content: - "We focus on quality traditional barbering. Tony takes his time with every cut, paying meticulous attention to detail. No rushed services—just great haircuts at affordable prices.", - }, + id: "4", title: "What makes your haircuts different?", content: + "We focus on quality traditional barbering. Tony takes his time with every cut, paying meticulous attention to detail. No rushed services—just great haircuts at affordable prices."}, { - id: "5", - title: "Do you offer beard trims?", - content: - "Yes! We offer professional beard trimming and shaping services. Tony takes as much care with beard work as he does with haircuts.", - }, + id: "5", title: "Do you offer beard trims?", content: + "Yes! We offer professional beard trimming and shaping services. Tony takes as much care with beard work as he does with haircuts."}, { - id: "6", - title: "How long is a typical visit?", - 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!", - }, + id: "6", title: "How long is a typical visit?", 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!"}, ]} /> @@ -329,14 +240,14 @@ 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?_wi=3" + imageSrc="http://img.b2bpic.net/free-photo/close-up-portrait-tattooed-male-barber-cuts-beard-black-male_613910-8611.jpg" imageAlt="Armour Barber Shop storefront" - mediaAnimation="entrance-slide" + mediaAnimation="none" mediaPosition="right" inputPlaceholder="Your email" buttonText="Get Updates" termsText="Join our mailing list for updates and special offers." - tagAnimation="entrance-slide" + tagAnimation="none" /> -- 2.49.1 From 7258c119413f05fe3b11f319351accc302146179 Mon Sep 17 00:00:00 2001 From: bender Date: Thu, 12 Mar 2026 16:22:53 +0000 Subject: [PATCH 4/6] Update src/app/pricing/page.tsx --- src/app/pricing/page.tsx | 155 ++++++++++----------------------------- 1 file changed, 39 insertions(+), 116 deletions(-) diff --git a/src/app/pricing/page.tsx b/src/app/pricing/page.tsx index 648038f..b47519b 100644 --- a/src/app/pricing/page.tsx +++ b/src/app/pricing/page.tsx @@ -35,9 +35,7 @@ export default function PricingPage() { { name: "Contact", id: "/contact" }, ]} button={{ - text: "Book Visit", - href: "/contact", - }} + text: "Book Visit", href: "/contact"}} /> @@ -46,49 +44,27 @@ export default function PricingPage() { @@ -99,34 +75,18 @@ export default function PricingPage() { @@ -139,17 +99,16 @@ export default function PricingPage() { title="Armour Barber Shop" description="Walk-ins welcome. No appointment needed. Cash only. A friendly neighborhood barber with over 20 years of experience." background={{ - variant: "plain", - }} + variant: "plain"}} useInvertedBackground={false} - imageSrc="http://img.b2bpic.net/free-photo/close-up-portrait-tattooed-male-barber-cuts-beard-black-male_613910-8611.jpg?_wi=6" + imageSrc="http://img.b2bpic.net/free-photo/close-up-portrait-tattooed-male-barber-cuts-beard-black-male_613910-8611.jpg" imageAlt="Armour Barber Shop storefront" - mediaAnimation="entrance-slide" + mediaAnimation="none" mediaPosition="right" inputPlaceholder="Your email" buttonText="Get Updates" termsText="Join our mailing list for updates and special offers." - tagAnimation="entrance-slide" + tagAnimation="none" /> @@ -158,87 +117,51 @@ export default function PricingPage() { Date: Thu, 12 Mar 2026 16:22:54 +0000 Subject: [PATCH 5/6] Update src/app/services/page.tsx --- src/app/services/page.tsx | 186 +++++++++----------------------------- 1 file changed, 45 insertions(+), 141 deletions(-) diff --git a/src/app/services/page.tsx b/src/app/services/page.tsx index d6628f8..2476b6f 100644 --- a/src/app/services/page.tsx +++ b/src/app/services/page.tsx @@ -35,9 +35,7 @@ export default function ServicesPage() { { name: "Contact", id: "/contact" }, ]} button={{ - text: "Book Visit", - href: "/contact", - }} + text: "Book Visit", href: "/contact"}} /> @@ -46,43 +44,19 @@ export default function ServicesPage() { @@ -132,45 +90,27 @@ export default function ServicesPage() { @@ -181,87 +121,51 @@ export default function ServicesPage() { Date: Thu, 12 Mar 2026 16:22:54 +0000 Subject: [PATCH 6/6] Update src/components/shared/SvgTextLogo/SvgTextLogo.tsx --- .../shared/SvgTextLogo/SvgTextLogo.tsx | 65 +++++++------------ 1 file changed, 23 insertions(+), 42 deletions(-) diff --git a/src/components/shared/SvgTextLogo/SvgTextLogo.tsx b/src/components/shared/SvgTextLogo/SvgTextLogo.tsx index f214190..a675298 100644 --- a/src/components/shared/SvgTextLogo/SvgTextLogo.tsx +++ b/src/components/shared/SvgTextLogo/SvgTextLogo.tsx @@ -1,50 +1,31 @@ -"use client"; +import React, { SVGProps } from "react"; -import { memo } from "react"; -import useSvgTextLogo from "./useSvgTextLogo"; -import { cls } from "@/lib/utils"; - -interface SvgTextLogoProps { - logoText: string; - adjustHeightFactor?: number; - verticalAlign?: "top" | "center"; +export interface SvgTextLogoProps extends SVGProps { + text: string; className?: string; } -const SvgTextLogo = memo(function SvgTextLogo({ - logoText, - adjustHeightFactor, - verticalAlign = "top", - className = "", -}) { - const { svgRef, textRef, viewBox, aspectRatio } = useSvgTextLogo(logoText, false, adjustHeightFactor); - - return ( - - ( + ({ text, className = "", ...props }, ref) => { + return ( + - {logoText} - - - ); -}); + + {text} + + + ); + } +); SvgTextLogo.displayName = "SvgTextLogo"; -- 2.49.1