Merge version_1 into main #2

Merged
bender merged 2 commits from version_1 into main 2026-03-11 21:51:13 +00:00
2 changed files with 25 additions and 43 deletions

View File

@@ -21,7 +21,7 @@ export default function LandingPage() {
borderRadius="pill"
contentWidth="smallMedium"
sizing="medium"
background="aurora"
background="circleGradient"
cardStyle="subtle-shadow"
primaryButtonStyle="flat"
secondaryButtonStyle="glass"
@@ -47,7 +47,7 @@ export default function LandingPage() {
<HeroCentered
title="Luxury Nails. Cocktails. Good Vibes."
description="Experience one of London's most exciting nail salons on Oxford Street. Beautiful nails, expert artists, and premium drinks while you relax."
background={{ variant: "aurora" }}
background={{ variant: "plain" }}
avatars={[
{ src: "http://img.b2bpic.net/free-photo/young-beautiful-woman-standing-reception_1303-22686.jpg", alt: "Sam, nail artist" },
{ src: "http://img.b2bpic.net/free-photo/lovely-art-composition-with-happy-female-model_23-2147868249.jpg", alt: "Toks, nail artist" },
@@ -75,6 +75,7 @@ export default function LandingPage() {
imageSrc="http://img.b2bpic.net/free-photo/view-pretty-tanned-woman-black-vintage-bikini-lies-green-sun-bed-amazing-villa-sunny-day-resting-enjoying-vacation_343596-2545.jpg"
imageAlt="Luxurious PAINT Nails salon interior"
mediaAnimation="slide-up"
metricsAnimation="slide-up"
useInvertedBackground={false}
ariaLabel="About PAINT Nails section"
/>
@@ -118,8 +119,7 @@ export default function LandingPage() {
title: "Acrylic Extensions", description: "Professional sculpting for dramatic length, strength, and endless design possibilities.", bentoComponent: "map"
},
{
title: "Nail Art", description: "Creative, hand-painted designs tailored to your vision and style.", bentoComponent: "marquee", centerIcon: Palette,
variant: "text", texts: ["Custom Designs", "Artistic Expression", "Seasonal Trends", "Personal Style"]
title: "Nail Art", description: "Creative, hand-painted designs tailored to your vision and style.", bentoComponent: "marquee", centerIcon: Palette, variant: "text", texts: ["Custom Designs", "Artistic Expression", "Seasonal Trends", "Personal Style"]
}
]}
ariaLabel="Services section"
@@ -143,13 +143,13 @@ export default function LandingPage() {
id: "2", name: "Toks", role: "Specialist Nail Technician", imageSrc: "http://img.b2bpic.net/free-photo/lovely-art-composition-with-happy-female-model_23-2147868249.jpg", imageAlt: "Toks, specialist nail technician"
},
{
id: "3", name: "Elena", role: "Nail Design Expert", imageSrc: "http://img.b2bpic.net/free-photo/woman-with-orange-dough-fingers_1208-321.jpg?_wi=1", imageAlt: "Elena, nail design expert"
id: "3", name: "Elena", role: "Nail Design Expert", imageSrc: "http://img.b2bpic.net/free-photo/woman-with-orange-dough-fingers_1208-321.jpg", imageAlt: "Elena, nail design expert"
},
{
id: "4", name: "Sepid", role: "Luxury Nail Technician", imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-woman-posing-cv_23-2149927554.jpg", imageAlt: "Sepid, luxury nail technician"
},
{
id: "5", name: "Afro", role: "Master Nail Artist", imageSrc: "http://img.b2bpic.net/free-photo/woman-with-orange-dough-fingers_1208-321.jpg?_wi=2", imageAlt: "Afro, master nail artist"
id: "5", name: "Afro", role: "Master Nail Artist", imageSrc: "http://img.b2bpic.net/free-photo/woman-with-orange-dough-fingers_1208-321.jpg", imageAlt: "Afro, master nail artist"
}
]}
ariaLabel="Team section"

View File

@@ -1,51 +1,33 @@
"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;
dominantBaseline?: 'auto' | 'text-top' | 'middle' | 'central' | 'text-bottom' | 'ideographic' | 'hanging' | 'mathematical' | 'baseline';
}
const SvgTextLogo = memo<SvgTextLogoProps>(function SvgTextLogo({
logoText,
adjustHeightFactor,
verticalAlign = "top",
className = "",
}) {
const { svgRef, textRef, viewBox, aspectRatio } = useSvgTextLogo(logoText, false, adjustHeightFactor);
export const SvgTextLogo: React.FC<SvgTextLogoProps> = ({
text,
className = '',
dominantBaseline = 'middle',
}) => {
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 200 60"
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={dominantBaseline}
className="fill-current font-bold text-2xl"
>
{logoText}
{text}
</text>
</svg>
);
});
};
SvgTextLogo.displayName = "SvgTextLogo";
export default SvgTextLogo;
export default SvgTextLogo;