bender/b69ec85f-4772-48a8-bbda-38bcc10df951
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #2

Merged
bender merged 2 commits from version_1 into main 2026-03-11 09:57:56 +00:00
Conversation 0 Commits 2 Files Changed 2 +37 -53
2 changed files with 37 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/app/page.tsx
View File

@@ -10,7 +10,7 @@ import FeatureCardNine from '@/components/sections/feature/FeatureCardNine';
import ContactSplitForm from '@/components/sections/contact/ContactSplitForm';
import MetricCardOne from '@/components/sections/metrics/MetricCardOne';
import FooterBase from '@/components/sections/footer/FooterBase';
import { Award, Calendar, Clock, Heart, MapPin, Phone, Star, Users } from 'lucide-react';
import { Award, Calendar, Clock, Heart, MapPin, Phone, Star, Users, CheckCircle, Camera } from 'lucide-react';
export default function LandingPage() {
return (
@@ -54,9 +54,10 @@ export default function LandingPage() {
]}
mediaItems={[
{ imageSrc: "http://img.b2bpic.net/free-photo/table-stylist-studio_23-2147784015.jpg", imageAlt: "Modern salon interior with professional styling stations" },
{ imageSrc: "http://img.b2bpic.net/free-photo/hairdresser-customer-talking-hair-salon_329181-1940.jpg?_wi=1", imageAlt: "Bright and welcoming salon reception area" },
{ imageSrc: "http://img.b2bpic.net/free-photo/hairdresser-customer-talking-hair-salon_329181-1940.jpg", imageAlt: "Bright and welcoming salon reception area" },
{ imageSrc: "http://img.b2bpic.net/free-photo/woman-getting-treatment-hairdresser-shop_23-2149230955.jpg", imageAlt: "Professional stylists providing hair services" }
]}
mediaAnimation="none"
/>
</div>
@@ -68,9 +69,9 @@ export default function LandingPage() {
tagIcon={Star}
testimonials={[
{ id: "1", name: "Sarah Mitchell", role: "Local Resident", testimonial: "The stylists are talented, friendly, and listen carefully to what you want. Best salon in Santa Ana!", imageSrc: "http://img.b2bpic.net/free-photo/young-beautiful-woman-outdoor_624325-50.jpg", imageAlt: "Sarah Mitchell - satisfied customer" },
{ id: "2", name: "Maria Gonzalez", role: "Regular Client", testimonial: "My haircut and color turned out better than expected. The attention to detail is incredible.", imageSrc: "http://img.b2bpic.net/free-photo/portrait-beautiful-blond-woman-with-trendy-hairstyle_23-2149430874.jpg?_wi=1", imageAlt: "Maria Gonzalez - happy client" },
{ id: "3", name: "James Rodriguez", role: "Business Owner", testimonial: "Professional service every single time. The staff makes you feel comfortable and valued.", imageSrc: "http://img.b2bpic.net/free-photo/handsome-young-bearded-man-smiling-looking-away-while-professional-barber-giving-him-haircut-copyspace_7502-5640.jpg?_wi=1", imageAlt: "James Rodriguez - satisfied customer" },
{ id: "4", name: "Jessica Chen", role: "Frequent Visitor", testimonial: "I've been coming here for 3 years. Quality, reliability, and genuine care for their clients.", imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-charming-pretty-woman-with-blond-wavy-hair-smiling-with-closed-eyes_291650-1074.jpg?_wi=1", imageAlt: "Jessica Chen - loyal client" },
{ id: "2", name: "Maria Gonzalez", role: "Regular Client", testimonial: "My haircut and color turned out better than expected. The attention to detail is incredible.", imageSrc: "http://img.b2bpic.net/free-photo/portrait-beautiful-blond-woman-with-trendy-hairstyle_23-2149430874.jpg", imageAlt: "Maria Gonzalez - happy client" },
{ id: "3", name: "James Rodriguez", role: "Business Owner", testimonial: "Professional service every single time. The staff makes you feel comfortable and valued.", imageSrc: "http://img.b2bpic.net/free-photo/handsome-young-bearded-man-smiling-looking-away-while-professional-barber-giving-him-haircut-copyspace_7502-5640.jpg", imageAlt: "James Rodriguez - satisfied customer" },
{ id: "4", name: "Jessica Chen", role: "Frequent Visitor", testimonial: "I've been coming here for 3 years. Quality, reliability, and genuine care for their clients.", imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-charming-pretty-woman-with-blond-wavy-hair-smiling-with-closed-eyes_291650-1074.jpg", imageAlt: "Jessica Chen - loyal client" },
{ id: "5", name: "David Kim", role: "First-Time Client", testimonial: "Exceeded all expectations. Highly recommend California Beauty Salon to anyone!", imageSrc: "http://img.b2bpic.net/free-photo/cheerful-young-man-posing-isolated-grey_171337-10591.jpg", imageAlt: "David Kim - new customer" },
{ id: "6", name: "Patricia Torres", role: "Monthly Regular", testimonial: "The relaxing environment and expert styling make this my favorite salon. Worth every penny!", imageSrc: "http://img.b2bpic.net/free-photo/smiling-model-closeup-by-modern-stairs-branding-portrait_169016-69492.jpg", imageAlt: "Patricia Torres - regular customer" }
]}
@@ -86,14 +87,14 @@ export default function LandingPage() {
title="Our Services"
description="Expert hair and beauty services tailored to your needs. Professional stylists ready to help you look your best."
tag="Quality Assured"
tagIcon={Star}
tagIcon={CheckCircle}
products={[
{ id: "1", name: "Haircuts", price: "Professional cuts for all styles", imageSrc: "http://img.b2bpic.net/free-photo/young-handsome-redhead-model-man-flannel-shirt-gray-background_613910-5186.jpg?_wi=1", imageAlt: "Professional men's and women's haircuts" },
{ id: "2", name: "Hair Coloring", price: "Expert color treatments", imageSrc: "http://img.b2bpic.net/free-photo/woman-getting-her-hair-washed-beauty-salon_23-2149167387.jpg?_wi=1", imageAlt: "Professional hair coloring services" },
{ id: "3", name: "Hair Styling", price: "Custom styling for any occasion", imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-attractive-european-woman-with-curly-hair-posing-black-wall-smiling_291650-1543.jpg?_wi=1", imageAlt: "Professional hair styling services" },
{ id: "4", name: "Men's Grooming", price: "Professional barber services", imageSrc: "http://img.b2bpic.net/free-photo/young-handsome-redhead-model-man-flannel-shirt-gray-background_613910-5186.jpg?_wi=2", imageAlt: "Men's haircut and grooming" },
{ id: "5", name: "Women's Styling", price: "Cuts and styling for women", imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-attractive-european-woman-with-curly-hair-posing-black-wall-smiling_291650-1543.jpg?_wi=2", imageAlt: "Women's hair styling services" },
{ id: "6", name: "Hair Treatment", price: "Nourishing treatments and conditioning", imageSrc: "http://img.b2bpic.net/free-photo/woman-getting-her-hair-washed-beauty-salon_23-2149167387.jpg?_wi=2", imageAlt: "Hair treatment and conditioning services" }
{ id: "1", name: "Haircuts", price: "Professional cuts for all styles", imageSrc: "http://img.b2bpic.net/free-photo/young-handsome-redhead-model-man-flannel-shirt-gray-background_613910-5186.jpg", imageAlt: "Professional men's and women's haircuts" },
{ id: "2", name: "Hair Coloring", price: "Expert color treatments", imageSrc: "http://img.b2bpic.net/free-photo/woman-getting-her-hair-washed-beauty-salon_23-2149167387.jpg", imageAlt: "Professional hair coloring services" },
{ id: "3", name: "Hair Styling", price: "Custom styling for any occasion", imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-attractive-european-woman-with-curly-hair-posing-black-wall-smiling_291650-1543.jpg", imageAlt: "Professional hair styling services" },
{ id: "4", name: "Men's Grooming", price: "Professional barber services", imageSrc: "http://img.b2bpic.net/free-photo/young-handsome-redhead-model-man-flannel-shirt-gray-background_613910-5186.jpg", imageAlt: "Men's haircut and grooming" },
{ id: "5", name: "Women's Styling", price: "Cuts and styling for women", imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-attractive-european-woman-with-curly-hair-posing-black-wall-smiling_291650-1543.jpg", imageAlt: "Women's hair styling services" },
{ id: "6", name: "Hair Treatment", price: "Nourishing treatments and conditioning", imageSrc: "http://img.b2bpic.net/free-photo/woman-getting-her-hair-washed-beauty-salon_23-2149167387.jpg", imageAlt: "Hair treatment and conditioning services" }
]}
gridVariant="three-columns-all-equal-width"
animationType="slide-up"
@@ -124,11 +125,11 @@ export default function LandingPage() {
title="Gallery of Our Work"
description="See the transformations we create every day. Our portfolio showcases the quality and expertise of California Beauty Salon."
tag="Professional Results"
tagIcon={Clock}
tagIcon={Camera}
features={[
{ id: 1, title: "Precision Haircuts", description: "Expert cutting techniques for clean, stylish results. From classic to modern styles, we deliver exactly what you envision.", phoneOne: { imageSrc: "http://img.b2bpic.net/free-photo/young-handsome-redhead-model-man-flannel-shirt-gray-background_613910-5186.jpg?_wi=3" }, phoneTwo: { imageSrc: "http://img.b2bpic.net/free-photo/hairdresser-customer-talking-hair-salon_329181-1940.jpg?_wi=2" } },
{ id: 2, title: "Color Transformations", description: "Professional coloring with premium products. We specialize in balayage, highlights, and full color transformations.", phoneOne: { imageSrc: "http://img.b2bpic.net/free-photo/woman-getting-her-hair-washed-beauty-salon_23-2149167387.jpg?_wi=3" }, phoneTwo: { imageSrc: "http://img.b2bpic.net/free-photo/portrait-beautiful-blond-woman-with-trendy-hairstyle_23-2149430874.jpg?_wi=2" } },
{ id: 3, title: "Elegant Styling", description: "Custom styling for every occasion. Weddings, events, or daily looks - we create the perfect hairstyle for you.", phoneOne: { imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-attractive-european-woman-with-curly-hair-posing-black-wall-smiling_291650-1543.jpg?_wi=3" }, phoneTwo: { imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-charming-pretty-woman-with-blond-wavy-hair-smiling-with-closed-eyes_291650-1074.jpg?_wi=2" } }
{ id: 1, title: "Precision Haircuts", description: "Expert cutting techniques for clean, stylish results. From classic to modern styles, we deliver exactly what you envision.", phoneOne: { imageSrc: "http://img.b2bpic.net/free-photo/young-handsome-redhead-model-man-flannel-shirt-gray-background_613910-5186.jpg" }, phoneTwo: { imageSrc: "http://img.b2bpic.net/free-photo/hairdresser-customer-talking-hair-salon_329181-1940.jpg" } },
{ id: 2, title: "Color Transformations", description: "Professional coloring with premium products. We specialize in balayage, highlights, and full color transformations.", phoneOne: { imageSrc: "http://img.b2bpic.net/free-photo/woman-getting-her-hair-washed-beauty-salon_23-2149167387.jpg" }, phoneTwo: { imageSrc: "http://img.b2bpic.net/free-photo/portrait-beautiful-blond-woman-with-trendy-hairstyle_23-2149430874.jpg" } },
{ id: 3, title: "Elegant Styling", description: "Custom styling for every occasion. Weddings, events, or daily looks - we create the perfect hairstyle for you.", phoneOne: { imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-attractive-european-woman-with-curly-hair-posing-black-wall-smiling_291650-1543.jpg" }, phoneTwo: { imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-charming-pretty-woman-with-blond-wavy-hair-smiling-with-closed-eyes_291650-1074.jpg" } }
]}
showStepNumbers={true}
textboxLayout="default"
@@ -150,7 +151,7 @@ export default function LandingPage() {
]}
textarea={{ name: "message", placeholder: "Preferred date and time, or any special requests...", rows: 4, required: false }}
useInvertedBackground={true}
imageSrc="http://img.b2bpic.net/free-photo/handsome-young-bearded-man-smiling-looking-away-while-professional-barber-giving-him-haircut-copyspace_7502-5640.jpg?_wi=2"
imageSrc="http://img.b2bpic.net/free-photo/handsome-young-bearded-man-smiling-looking-away-while-professional-barber-giving-him-haircut-copyspace_7502-5640.jpg"
imageAlt="Happy client with professional salon styling"
mediaAnimation="slide-up"
mediaPosition="right"

55
src/components/shared/SvgTextLogo/SvgTextLogo.tsx
View File

@@ -1,51 +1,34 @@
"use client";
import { memo } from "react";
import useSvgTextLogo from "./useSvgTextLogo";
import { cls } from "@/lib/utils";
import React from 'react';
interface SvgTextLogoProps {
logoText: string;
adjustHeightFactor?: number;
verticalAlign?: "top" | "center";
text: string;
className?: string;
textClassName?: string;
}
const SvgTextLogo = memo<SvgTextLogoProps>(function SvgTextLogo({
logoText,
adjustHeightFactor,
verticalAlign = "top",
className = "",
}) {
const { svgRef, textRef, viewBox, aspectRatio } = useSvgTextLogo(logoText, false, adjustHeightFactor);
const SvgTextLogo: React.FC<SvgTextLogoProps> = ({
text,
className = '',
textClassName = '',
}) => {
return (
<svg
ref={svgRef}
viewBox={viewBox}
className={cls("w-full", className)}
style={{ aspectRatio: aspectRatio }}
preserveAspectRatio="none"
role="img"
aria-label={`${logoText} logo`}
className={className}
viewBox={`0 0 ${text.length * 40} 60`}
xmlns="http://www.w3.org/2000/svg"
preserveAspectRatio="xMidYMid meet"
>
<text
ref={textRef}
x="0"
y={verticalAlign === "center" ? "50%" : "0"}
className="font-bold fill-current"
style={{
fontSize: "20px",
letterSpacing: "-0.02em",
dominantBaseline: verticalAlign === "center" ? "middle" : "text-before-edge"
}}
x="50%"
y="50%"
dominantBaseline="middle"
textAnchor="middle"
className={textClassName}
>
{logoText}
{text}
</text>
</svg>
);
});
SvgTextLogo.displayName = "SvgTextLogo";
};
export default SvgTextLogo;