Merge version_1 into main #2

Merged
bender merged 2 commits from version_1 into main 2026-03-10 22:59:13 +00:00
2 changed files with 37 additions and 46 deletions

View File

@@ -19,7 +19,7 @@ export default function LandingPage() {
borderRadius="pill"
contentWidth="smallMedium"
sizing="mediumLarge"
background="aurora"
background="circleGradient"
cardStyle="layered-gradient"
primaryButtonStyle="radial-glow"
secondaryButtonStyle="solid"
@@ -46,9 +46,9 @@ export default function LandingPage() {
tag="Premium Salon Experience"
tagIcon={Sparkles}
tagAnimation="slide-up"
background={{ variant: "aurora" }}
background={{ variant: "sparkles-gradient" }}
mediaItems={[
{ imageSrc: "http://img.b2bpic.net/free-photo/hairdresser-taking-care-her-client_23-2149319759.jpg?_wi=1", imageAlt: "Professional haircut service" },
{ imageSrc: "http://img.b2bpic.net/free-photo/hairdresser-taking-care-her-client_23-2149319759.jpg", imageAlt: "Professional haircut service" },
{ imageSrc: "http://img.b2bpic.net/free-photo/blonde-girl-getting-her-hair-dyeing_23-2148108810.jpg", imageAlt: "Hair coloring treatment" },
{ imageSrc: "http://img.b2bpic.net/free-photo/hairdresser-taking-care-her-client_23-2149319778.jpg", imageAlt: "Hair styling service" }
]}
@@ -73,28 +73,28 @@ export default function LandingPage() {
title: "Professional Haircuts", description: "Expert precision cutting tailored to your face shape and personal style preferences for a perfect look.", icon: Scissors,
mediaItems: [
{ imageSrc: "http://img.b2bpic.net/free-photo/woman-having-hair-treatment-latino-hair-salon_23-2150555174.jpg", imageAlt: "Professional haircut service" },
{ imageSrc: "http://img.b2bpic.net/free-photo/hairdresser-taking-care-client-s-hair-indoors_23-2148940876.jpg?_wi=1", imageAlt: "Expert styling" }
{ imageSrc: "http://img.b2bpic.net/free-photo/hairdresser-taking-care-client-s-hair-indoors_23-2148940876.jpg", imageAlt: "Expert styling" }
]
},
{
title: "Hair Coloring", description: "Beautiful, vibrant color treatments using premium brands with expert application and color consultation.", icon: Palette,
mediaItems: [
{ imageSrc: "http://img.b2bpic.net/free-photo/concentrated-stylist-trimming-hair-ends_23-2147769818.jpg?_wi=1", imageAlt: "Hair coloring service" },
{ imageSrc: "http://img.b2bpic.net/free-photo/woman-getting-treatment-hairdresser-shop_23-2149229776.jpg?_wi=1", imageAlt: "Color treatment application" }
{ imageSrc: "http://img.b2bpic.net/free-photo/concentrated-stylist-trimming-hair-ends_23-2147769818.jpg", imageAlt: "Hair coloring service" },
{ imageSrc: "http://img.b2bpic.net/free-photo/woman-getting-treatment-hairdresser-shop_23-2149229776.jpg", imageAlt: "Color treatment application" }
]
},
{
title: "Hair Styling", description: "Professional styling for any occasion including blowouts, updos, and contemporary styling techniques.", icon: Wind,
mediaItems: [
{ imageSrc: "http://img.b2bpic.net/free-photo/hairdresser-taking-care-client-s-hair-indoors_23-2148940876.jpg?_wi=2", imageAlt: "Professional styling" },
{ imageSrc: "http://img.b2bpic.net/free-photo/hairdresser-taking-care-her-client_23-2149319759.jpg?_wi=2", imageAlt: "Style consultation" }
{ imageSrc: "http://img.b2bpic.net/free-photo/hairdresser-taking-care-client-s-hair-indoors_23-2148940876.jpg", imageAlt: "Professional styling" },
{ imageSrc: "http://img.b2bpic.net/free-photo/hairdresser-taking-care-her-client_23-2149319759.jpg", imageAlt: "Style consultation" }
]
},
{
title: "Hair Treatments", description: "Nourishing treatments including keratin therapy, deep conditioning, and scalp care for healthy, lustrous hair.", icon: Droplet,
mediaItems: [
{ imageSrc: "http://img.b2bpic.net/free-photo/woman-getting-treatment-hairdresser-shop_23-2149229776.jpg?_wi=2", imageAlt: "Hair treatment service" },
{ imageSrc: "http://img.b2bpic.net/free-photo/concentrated-stylist-trimming-hair-ends_23-2147769818.jpg?_wi=2", imageAlt: "Treatment application" }
{ imageSrc: "http://img.b2bpic.net/free-photo/woman-getting-treatment-hairdresser-shop_23-2149229776.jpg", imageAlt: "Hair treatment service" },
{ imageSrc: "http://img.b2bpic.net/free-photo/concentrated-stylist-trimming-hair-ends_23-2147769818.jpg", imageAlt: "Treatment application" }
]
}
]}

View File

@@ -1,51 +1,42 @@
"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;
fontSize?: number;
fontFamily?: string;
fontWeight?: number | string;
fill?: 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 = '',
fontSize = 48,
fontFamily = 'system-ui, -apple-system, sans-serif',
fontWeight = 700,
fill = 'currentColor',
}) => {
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 ${text.length * fontSize * 0.6} ${fontSize * 1.5}`}
className={className}
xmlns="http://www.w3.org/2000/svg"
>
<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%"
textAnchor="middle"
dominantBaseline="middle"
fontSize={fontSize}
fontFamily={fontFamily}
fontWeight={fontWeight}
fill={fill}
>
{logoText}
{text}
</text>
</svg>
);
});
SvgTextLogo.displayName = "SvgTextLogo";
};
export default SvgTextLogo;