bender/b794bcf3-53a8-4bf5-ba39-325dacbdeb01
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-03-25 02:36:23 +00:00
Conversation 0 Commits 3 Files Changed 2 +17 -16
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/app/page.tsx
View File

@@ -12,7 +12,7 @@ import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarS
import PricingCardNine from '@/components/sections/pricing/PricingCardNine';
import TeamCardTwo from '@/components/sections/team/TeamCardTwo';
import TestimonialCardSixteen from '@/components/sections/testimonial/TestimonialCardSixteen';
import { Facebook, Feather, Instagram, Leaf, Scissors, Sun, Twitter } from "lucide-react";
import { Brush, Facebook, Feather, Instagram, Leaf, RefreshCcw, Scissors, Sun, Twitter } from "lucide-react";
export default function LandingPage() {
return (
@@ -130,7 +130,7 @@ export default function LandingPage() {
title: "Average Rating",
},
]}
imageSrc="https://pixabay.com/get/g7ba4d4ac14cbc520a61eb42288cbb173101459c61863c92fb248a91124aa7e0cbc0433e25865198b25ebf02b7391e1ffd4bdc4bad79404cacd8d7f873870f2d1_1280.jpg?_wi=1"
imageSrc="https://pixabay.com/get/g7ba4d4ac14cbc520a61eb42288cbb173101459c61863c92fb248a91124aa7e0cbc0433e25865198b25ebf02b7391e1ffd4bdc4bad79404cacd8d7f873870f2d1_1280.jpg"
imageAlt="Barber meticulously cutting a client's hair"
mediaAnimation="opacity"
metricsAnimation="slide-up"
@@ -148,7 +148,7 @@ export default function LandingPage() {
title: "Precision Haircuts",
description: "Expertly crafted haircuts tailored to your head shape, hair type, and personal style. Includes a wash and style.",
media: {
imageSrc: "https://pixabay.com/get/gf236828270bdc94a1e0d88785188ad900a50eba4e09b76a84c3a3204c718ed9735efddb72c6b90d14abca97594ea05a7e40813497b7b71bdfb504573ddb3fa66_1280.jpg?_wi=1",
imageSrc: "https://pixabay.com/get/gf236828270bdc94a1e0d88785188ad900a50eba4e09b76a84c3a3204c718ed9735efddb72c6b90d14abca97594ea05a7e40813497b7b71bdfb504573ddb3fa66_1280.jpg",
imageAlt: "Barber giving a precision haircut",
},
items: [
@@ -168,7 +168,7 @@ export default function LandingPage() {
title: "Classic Hot Lather Shave",
description: "Indulge in the timeless tradition of a hot lather shave. Relax as our barbers provide a smooth, close shave using premium products.",
media: {
imageSrc: "https://pixabay.com/get/g3019e74e06470b3efd6f291738dc28c6fbf8bf38e4effc4a77c642fe3aa1b9ae6381466924e4e1bcc4732c8da58c9d64fe81632d7e6c290fec62b0fcea79e26b_1280.jpg?_wi=1",
imageSrc: "https://pixabay.com/get/g3019e74e06470b3efd6f291738dc28c6fbf8bf38e4effc4a77c642fe3aa1b9ae6381466924e4e1bcc4732c8da58c9d64fe81632d7e6c290fec62b0fcea79e26b_1280.jpg",
imageAlt: "Close-up of barber performing a hot lather shave",
},
items: [
@@ -188,7 +188,7 @@ export default function LandingPage() {
title: "Beard Trim & Grooming",
description: "Maintain your beard with a professional trim, shape-up, and conditioning. Our barbers will sculpt your beard to perfection.",
media: {
imageSrc: "https://pixabay.com/get/g759f0c9165895704161cedcbf914df4c58c1970994bd7114388239f70ec3ed3afc709855042238e7dc092f471176a13a46d8c88208094b4a442a60158ada8904_1280.jpg?_wi=1",
imageSrc: "https://pixabay.com/get/g759f0c9165895704161cedcbf914df4c58c1970994bd7114388239f70ec3ed3afc709855042238e7dc092f471176a13a46d8c88208094b4a442a60158ada8904_1280.jpg",
imageAlt: "Barber trimming a client's beard",
},
items: [
@@ -221,7 +221,7 @@ export default function LandingPage() {
name: "Ethan Cole",
role: "Master Barber & Founder",
description: "With over 15 years of experience, Ethan is a true artisan of hair and beard care. His passion for classic techniques combined with modern flair ensures every client leaves feeling refreshed and confident.",
imageSrc: "https://pixabay.com/get/ga88f5de255dc8e08e42d3fc17e260a35b6b73f36bf949ddb72d829f798594df0a1f6e7865c04a0e13fd9fc61c21f988f6e62130c7d9c4e8516eeb943f8518eb5_1280.jpg?_wi=1",
imageSrc: "https://pixabay.com/get/ga88f5de255dc8e08e42d3fc17e260a35b6b73f36bf949ddb72d829f798594df0a1f6e7865c04a0e13fd9fc61c21f988f6e62130c7d9c4e8516eeb943f8518eb5_1280.jpg",
imageAlt: "Ethan Cole, Master Barber",
socialLinks: [
{
@@ -239,7 +239,7 @@ export default function LandingPage() {
name: "Sophia Lee",
role: "Senior Stylist",
description: "Sophia brings a fresh, contemporary approach to grooming. Specializing in fades, intricate designs, and modern styling, she keeps our clients ahead of the curve with her innovative techniques.",
imageSrc: "https://pixabay.com/get/gea595336187800bab9af6dcaabf1d39c4201a799652b291d8452c3fa857a4d5fcc40a796de70f4b79d2789934fc519a11241a5e748c79a4f78e6f57d1795fe9c_1280.jpg?_wi=1",
imageSrc: "https://pixabay.com/get/gea595336187800bab9af6dcaabf1d39c4201a799652b291d8452c3fa857a4d5fcc40a796de70f4b79d2789934fc519a11241a5e748c79a4f78e6f57d1795fe9c_1280.jpg",
imageAlt: "Sophia Lee, Senior Stylist",
socialLinks: [
{
@@ -257,7 +257,7 @@ export default function LandingPage() {
name: "Marcus \"The Blade\" Brown",
role: "Grooming Specialist",
description: "Known for his meticulous beard trims and impeccable shaves, Marcus ensures every detail is perfect. His steady hand and friendly demeanor make every visit a relaxing and enjoyable experience.",
imageSrc: "https://pixabay.com/get/g24198b7d0eefa0430eada8565ad52980ca046d9fc7416f6af65c0686209e6a4572975fc5cecf25238e69849628010e58e1320aa6f9f867744a859af91a8a0d81_1280.jpg?_wi=1",
imageSrc: "https://pixabay.com/get/g24198b7d0eefa0430eada8565ad52980ca046d9fc7416f6af65c0686209e6a4572975fc5cecf25238e69849628010e58e1320aa6f9f867744a859af91a8a0d81_1280.jpg",
imageAlt: "Marcus Brown, Grooming Specialist",
socialLinks: [
{
@@ -360,7 +360,7 @@ export default function LandingPage() {
role: "Regular Client",
company: "Local Business Owner",
rating: 5,
imageSrc: "https://pixabay.com/get/g1c8e3312d4ff3ca82e9730ed595424f3f058b9ff83d187a08654122e972863275db2f0be8a7dd272a32b87ec8c34bfc5c0d51fa26d64982f33462291f58a22c9_1280.jpg?_wi=1",
imageSrc: "https://pixabay.com/get/g1c8e3312d4ff3ca82e9730ed595424f3f058b9ff83d187a08654122e972863275db2f0be8a7dd272a32b87ec8c34bfc5c0d51fa26d64982f33462291f58a22c9_1280.jpg",
videoAriaLabel: "Mark S. testimonial",
},
{
@@ -396,7 +396,7 @@ export default function LandingPage() {
role: "New Client",
company: "Tech Professional",
rating: 5,
imageSrc: "https://pixabay.com/get/g1c8e3312d4ff3ca82e9730ed595424f3f058b9ff83d187a08654122e972863275db2f0be8a7dd272a32b87ec8c34bfc5c0d51fa26d64982f33462291f58a22c9_1280.jpg?_wi=2",
imageSrc: "https://pixabay.com/get/g1c8e3312d4ff3ca82e9730ed595424f3f058b9ff83d187a08654122e972863275db2f0be8a7dd272a32b87ec8c34bfc5c0d51fa26d64982f33462291f58a22c9_1280.jpg",
videoAriaLabel: "Alex R. testimonial",
},
]}
@@ -481,7 +481,7 @@ export default function LandingPage() {
rows: 4,
required: false,
}}
imageSrc="https://pixabay.com/get/g3a9d6dfc653ff67b5b3453e0974e7c9453ffac7fe30a4c4b201ee7898e7d0a79162a01d855b0cb1fb3f689a16f1c25e997b00b5ffc5d9c514a8be1d0c3b77adc_1280.jpg?_wi=1"
imageSrc="https://pixabay.com/get/g3a9d6dfc653ff67b5b3453e0974e7c9453ffac7fe30a4c4b201ee7898e7d0a79162a01d855b0cb1fb3f689a16f1c25e997b00b5ffc5d9c514a8be1d0c3b77adc_1280.jpg"
imageAlt="Empty barber chair with tools, ready for a client"
mediaAnimation="slide-up"
mediaPosition="right"

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

@@ -6,7 +6,7 @@ import ContactCTA from '@/components/sections/contact/ContactCTA';
import FeatureCardOne from '@/components/sections/feature/FeatureCardOne';
import FooterBase from '@/components/sections/footer/FooterBase';
import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
import { CalendarCheck } from "lucide-react";
import { CalendarCheck, ScissorsSquare } from "lucide-react";
export default function LandingPage() {
return (
@@ -61,6 +61,7 @@ export default function LandingPage() {
<div id="services-offerings" data-section="services-offerings">
<FeatureCardOne
animationType="slide-up"
textboxLayout="default"
gridVariant="four-items-2x2-equal-grid"
useInvertedBackground={false}
@@ -68,7 +69,7 @@ export default function LandingPage() {
{
title: "Precision Haircuts",
description: "Our skilled barbers provide modern and classic cuts tailored to your personal style and preferences.",
imageSrc: "https://pixabay.com/get/gf236828270bdc94a1e0d88785188ad900a50eba4e09b76a84c3a3204c718ed9735efddb72c6b90d14abca97594ea05a7e40813497b7b71bdfb504573ddb3fa66_1280.jpg?_wi=2",
imageSrc: "https://pixabay.com/get/gf236828270bdc94a1e0d88785188ad900a50eba4e09b76a84c3a3204c718ed9735efddb72c6b90d14abca97594ea05a7e40813497b7b71bdfb504573ddb3fa66_1280.jpg",
imageAlt: "barber giving fresh haircut",
button: {
text: "Book Haircut",
@@ -78,7 +79,7 @@ export default function LandingPage() {
{
title: "Classic Hot Lather Shave",
description: "Indulge in a traditional hot towel shave for a smooth, refreshing, and incredibly close finish.",
imageSrc: "https://pixabay.com/get/g3019e74e06470b3efd6f291738dc28c6fbf8bf38e4effc4a77c642fe3aa1b9ae6381466924e4e1bcc4732c8da58c9d64fe81632d7e6c290fec62b0fcea79e26b_1280.jpg?_wi=2",
imageSrc: "https://pixabay.com/get/g3019e74e06470b3efd6f291738dc28c6fbf8bf38e4effc4a77c642fe3aa1b9ae6381466924e4e1bcc4732c8da58c9d64fe81632d7e6c290fec62b0fcea79e26b_1280.jpg",
imageAlt: "traditional hot lather shave barber",
button: {
text: "Book Shave",
@@ -88,7 +89,7 @@ export default function LandingPage() {
{
title: "Expert Beard Trims",
description: "Shape, trim, and style your beard to perfection, enhancing your facial features with precision.",
imageSrc: "https://pixabay.com/get/g759f0c9165895704161cedcbf914df4c58c1970994bd7114388239f70ec3ed3afc709855042238e7dc092f471176a13a46d8c88208094b4a442a60158ada8904_1280.jpg?_wi=2",
imageSrc: "https://pixabay.com/get/g759f0c9165895704161cedcbf914df4c58c1970994bd7114388239f70ec3ed3afc709855042238e7dc092f471176a13a46d8c88208094b4a442a60158ada8904_1280.jpg",
imageAlt: "barber trimming beard close up",
button: {
text: "Book Beard Trim",
@@ -98,7 +99,7 @@ export default function LandingPage() {
{
title: "Modern Styling & Treatments",
description: "From contemporary styling to invigorating hair treatments, we ensure your hair looks and feels its best.",
imageSrc: "https://pixabay.com/get/g7ba4d4ac14cbc520a61eb42288cbb173101459c61863c92fb248a91124aa7e0cbc0433e25865198b25ebf02b7391e1ffd4bdc4bad79404cacd8d7f873870f2d1_1280.jpg?_wi=2",
imageSrc: "https://pixabay.com/get/g7ba4d4ac14cbc520a61eb42288cbb173101459c61863c92fb248a91124aa7e0cbc0433e25865198b25ebf02b7391e1ffd4bdc4bad79404cacd8d7f873870f2d1_1280.jpg",
imageAlt: "barber working on client hair",
button: {
text: "Explore Styling",