Merge version_1 into main #2

Merged
bender merged 2 commits from version_1 into main 2026-03-11 07:19:48 +00:00
2 changed files with 46 additions and 47 deletions

View File

@@ -83,19 +83,19 @@ export default function LandingPage() {
gridVariant="three-columns-all-equal-width"
products={[
{
id: "1", name: "Hair Styling", price: "₹300+", imageSrc: "http://img.b2bpic.net/free-photo/woman-taking-care-girl-salon_23-2147769838.jpg?_wi=1", imageAlt: "Professional hair styling service"
id: "1", name: "Hair Styling", price: "₹300+", imageSrc: "http://img.b2bpic.net/free-photo/woman-taking-care-girl-salon_23-2147769838.jpg", imageAlt: "Professional hair styling service"
},
{
id: "2", name: "Hair Highlighting", price: "₹1,500+", imageSrc: "http://img.b2bpic.net/free-photo/woman-mixing-hair-dye-bowl_23-2149167378.jpg", imageAlt: "Hair highlighting treatment"
},
{
id: "3", name: "Facial Treatments", price: "₹400+", imageSrc: "http://img.b2bpic.net/free-photo/young-woman-using-face-treatment-her-client_23-2149037150.jpg?_wi=1", imageAlt: "Professional facial treatment"
id: "3", name: "Facial Treatments", price: "₹400+", imageSrc: "http://img.b2bpic.net/free-photo/young-woman-using-face-treatment-her-client_23-2149037150.jpg", imageAlt: "Professional facial treatment"
},
{
id: "4", name: "Skin Care", price: "₹500+", imageSrc: "http://img.b2bpic.net/free-photo/girl-receiving-facial-treatment-beauty-salon_23-2148194173.jpg?_wi=1", imageAlt: "Advanced skin care service"
id: "4", name: "Skin Care", price: "₹500+", imageSrc: "http://img.b2bpic.net/free-photo/girl-receiving-facial-treatment-beauty-salon_23-2148194173.jpg", imageAlt: "Advanced skin care service"
},
{
id: "5", name: "Bridal Makeup", price: "₹2,000+", imageSrc: "http://img.b2bpic.net/free-photo/wedding-elegance-celebration-closeup-lace_1304-992.jpg?_wi=1", imageAlt: "Professional bridal makeup service"
id: "5", name: "Bridal Makeup", price: "₹2,000+", imageSrc: "http://img.b2bpic.net/free-photo/wedding-elegance-celebration-closeup-lace_1304-992.jpg", imageAlt: "Professional bridal makeup service"
},
{
id: "6", name: "Hair Smoothening", price: "₹1,200+", imageSrc: "http://img.b2bpic.net/free-photo/hairdresser-with-protective-face-mask-treating-woman-s-hair-salon-virus-epidemic_637285-9033.jpg", imageAlt: "Hair smoothening treatment"
@@ -117,10 +117,10 @@ export default function LandingPage() {
title: "Affordable Prices", description: "Premium quality services at prices that fit your budget. No hidden charges, transparent pricing.", icon: DollarSign,
mediaItems: [
{
imageSrc: "http://img.b2bpic.net/free-photo/young-hotel-maid-putting-bath-accessories-bathroom_171337-12730.jpg?_wi=1", imageAlt: "Clean, professional salon interior"
imageSrc: "http://img.b2bpic.net/free-photo/young-hotel-maid-putting-bath-accessories-bathroom_171337-12730.jpg", imageAlt: "Clean, professional salon interior"
},
{
imageSrc: "http://img.b2bpic.net/free-photo/looking-arrogant-successful-positive-proud-pointing-self_1194-632375.jpg?_wi=1", imageAlt: "Satisfied customer"
imageSrc: "http://img.b2bpic.net/free-photo/looking-arrogant-successful-positive-proud-pointing-self_1194-632375.jpg", imageAlt: "Satisfied customer"
}
]
},
@@ -128,10 +128,10 @@ export default function LandingPage() {
title: "Experienced Staff", description: "Highly trained beauticians with years of expertise in all beauty treatments and services.", icon: Users,
mediaItems: [
{
imageSrc: "http://img.b2bpic.net/free-photo/woman-taking-care-girl-salon_23-2147769838.jpg?_wi=2", imageAlt: "Professional hair styling"
imageSrc: "http://img.b2bpic.net/free-photo/woman-taking-care-girl-salon_23-2147769838.jpg", imageAlt: "Professional hair styling"
},
{
imageSrc: "http://img.b2bpic.net/free-photo/young-woman-using-face-treatment-her-client_23-2149037150.jpg?_wi=2", imageAlt: "Expert facial treatment"
imageSrc: "http://img.b2bpic.net/free-photo/young-woman-using-face-treatment-her-client_23-2149037150.jpg", imageAlt: "Expert facial treatment"
}
]
},
@@ -139,10 +139,10 @@ export default function LandingPage() {
title: "Hygienic & Clean", description: "Strict hygiene standards, sterilized equipment, and premium products for your safety and satisfaction.", icon: Shield,
mediaItems: [
{
imageSrc: "http://img.b2bpic.net/free-photo/young-hotel-maid-putting-bath-accessories-bathroom_171337-12730.jpg?_wi=2", imageAlt: "Modern hygienic salon"
imageSrc: "http://img.b2bpic.net/free-photo/young-hotel-maid-putting-bath-accessories-bathroom_171337-12730.jpg", imageAlt: "Modern hygienic salon"
},
{
imageSrc: "http://img.b2bpic.net/free-photo/girl-receiving-facial-treatment-beauty-salon_23-2148194173.jpg?_wi=2", imageAlt: "Professional skincare service"
imageSrc: "http://img.b2bpic.net/free-photo/girl-receiving-facial-treatment-beauty-salon_23-2148194173.jpg", imageAlt: "Professional skincare service"
}
]
},
@@ -153,7 +153,7 @@ export default function LandingPage() {
imageSrc: "http://img.b2bpic.net/free-photo/professional-artist-applying-lipstick-model_23-2148398691.jpg", imageAlt: "Beautiful makeup results"
},
{
imageSrc: "http://img.b2bpic.net/free-photo/wedding-elegance-celebration-closeup-lace_1304-992.jpg?_wi=2", imageAlt: "Professional bridal beauty"
imageSrc: "http://img.b2bpic.net/free-photo/wedding-elegance-celebration-closeup-lace_1304-992.jpg", imageAlt: "Professional bridal beauty"
}
]
}
@@ -171,7 +171,7 @@ export default function LandingPage() {
animationType="slide-up"
testimonials={[
{
id: "1", name: "Priya Singh", role: "Regular Customer", testimonial: "Very nice services! The facial treatments give great results. Staff is super friendly and the salon is very clean. Highly recommended!", imageSrc: "http://img.b2bpic.net/free-photo/looking-arrogant-successful-positive-proud-pointing-self_1194-632375.jpg?_wi=2", imageAlt: "Priya Singh"
id: "1", name: "Priya Singh", role: "Regular Customer", testimonial: "Very nice services! The facial treatments give great results. Staff is super friendly and the salon is very clean. Highly recommended!", imageSrc: "http://img.b2bpic.net/free-photo/looking-arrogant-successful-positive-proud-pointing-self_1194-632375.jpg", imageAlt: "Priya Singh"
},
{
id: "2", name: "Anjali Sharma", role: "Bridal Customer", testimonial: "You can get the best beauty services within budget. My bridal makeup was perfect! Everyone at the wedding was asking about my makeup artist.", imageSrc: "http://img.b2bpic.net/free-photo/happy-overjoyed-woman-rejoicing-her-success_74855-3513.jpg", imageAlt: "Anjali Sharma"

View File

@@ -1,51 +1,50 @@
"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;
fontSize?: number;
fontWeight?: number | string;
letterSpacing?: number;
}
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 = '',
fontSize = 24,
fontWeight = 700,
letterSpacing = 0,
}) => {
const svgWidth = text.length * (fontSize * 0.6);
const svgHeight = fontSize * 1.5;
const textX = 10;
const textY = fontSize;
return (
<svg
ref={svgRef}
viewBox={viewBox}
className={cls("w-full", className)}
style={{ aspectRatio: aspectRatio }}
preserveAspectRatio="none"
role="img"
aria-label={`${logoText} logo`}
viewBox={`0 0 ${svgWidth} ${svgHeight}`}
width={svgWidth}
height={svgHeight}
className={className}
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={textX}
y={textY}
fontSize={fontSize}
fontWeight={fontWeight}
letterSpacing={letterSpacing}
className={textClassName}
dominantBaseline="hanging"
textAnchor="start"
>
{logoText}
{text}
</text>
</svg>
);
});
SvgTextLogo.displayName = "SvgTextLogo";
};
export default SvgTextLogo;