bender/9861baec-ea46-417c-96fb-66e941250d99
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main

Browse Source 
Merge version_1 into main
This commit was merged in pull request #2.
This commit is contained in:
bender
2026-03-12 14:55:25 +00:00
parent de99b214be d99616423d
commit 647ea3678a
2 changed files with 38 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/app/page.tsx
View File

@@ -55,11 +55,11 @@ export default function LandingPage() {
buttonAnimation="slide-up"
mediaItems={[
{ imageSrc: "http://img.b2bpic.net/free-photo/old-woman-filling-registration-forms-front-desk-passing-room-check-preparing-start-retirement-vacation-trip-traveller-asking-receptionist-about-all-inclusive-service-handheld-shot_482257-70827.jpg", imageAlt: "Modern salon interior" },
{ imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-man-getting-haircut_23-2150665444.jpg?_wi=1", imageAlt: "Professional haircut service" },
{ imageSrc: "http://img.b2bpic.net/free-photo/masseur-doing-manual-massage-client-spa-beauty-salon-using-oil_343596-4268.jpg?_wi=1", imageAlt: "Facial beauty treatment" },
{ imageSrc: "http://img.b2bpic.net/free-photo/hairdresser-cut-hair-her-client-hair-salon_1157-27201.jpg?_wi=1", imageAlt: "Hair spa treatment" },
{ imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-man-getting-haircut_23-2150665444.jpg", imageAlt: "Professional haircut service" },
{ imageSrc: "http://img.b2bpic.net/free-photo/masseur-doing-manual-massage-client-spa-beauty-salon-using-oil_343596-4268.jpg", imageAlt: "Facial beauty treatment" },
{ imageSrc: "http://img.b2bpic.net/free-photo/hairdresser-cut-hair-her-client-hair-salon_1157-27201.jpg", imageAlt: "Hair spa treatment" },
{ imageSrc: "http://img.b2bpic.net/free-photo/woman-applying-makeup-reflecting-mirror_23-2148113240.jpg", imageAlt: "Bridal makeup service" },
{ imageSrc: "http://img.b2bpic.net/free-psd/hand-drawn-wedding-celebration-youtube-cover_23-2150737025.jpg?_wi=1", imageAlt: "Bridal makeup portfolio" }
{ imageSrc: "http://img.b2bpic.net/free-psd/hand-drawn-wedding-celebration-youtube-cover_23-2150737025.jpg", imageAlt: "Bridal makeup portfolio" }
]}
background={{ variant: "plain" }}
ariaLabel="Hero section showcasing salon services"
@@ -91,7 +91,7 @@ export default function LandingPage() {
tagAnimation="slide-up"
features={[
{
id: "1", title: "Haircuts & Styling", description: "Professional haircuts and styling for men, women, and children. From trendy cuts to classic styles, our experienced stylists deliver the perfect look.", media: { imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-man-getting-haircut_23-2150665444.jpg?_wi=2", imageAlt: "Haircut service" },
id: "1", title: "Haircuts & Styling", description: "Professional haircuts and styling for men, women, and children. From trendy cuts to classic styles, our experienced stylists deliver the perfect look.", media: { imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-man-getting-haircut_23-2150665444.jpg", imageAlt: "Haircut service" },
items: [
{ icon: Scissors, text: "Expert cutting techniques" },
{ icon: Sparkles, text: "Trendy & classic styles" },
@@ -100,7 +100,7 @@ export default function LandingPage() {
reverse: false
},
{
id: "2", title: "Hair Spa & Treatment", description: "Rejuvenate your hair with our premium hair spa treatments. Nourish, repair, and restore shine to damaged hair with professional care.", media: { imageSrc: "http://img.b2bpic.net/free-photo/hairdresser-cut-hair-her-client-hair-salon_1157-27201.jpg?_wi=2", imageAlt: "Hair spa treatment" },
id: "2", title: "Hair Spa & Treatment", description: "Rejuvenate your hair with our premium hair spa treatments. Nourish, repair, and restore shine to damaged hair with professional care.", media: { imageSrc: "http://img.b2bpic.net/free-photo/hairdresser-cut-hair-her-client-hair-salon_1157-27201.jpg", imageAlt: "Hair spa treatment" },
items: [
{ icon: Droplet, text: "Hydrating treatments" },
{ icon: Zap, text: "Shine restoration" },
@@ -109,7 +109,7 @@ export default function LandingPage() {
reverse: true
},
{
id: "3", title: "Facial & Skincare", description: "Pamper your skin with our customized facial treatments. Our professionals use quality products to rejuvenate and brighten your complexion.", media: { imageSrc: "http://img.b2bpic.net/free-photo/masseur-doing-manual-massage-client-spa-beauty-salon-using-oil_343596-4268.jpg?_wi=2", imageAlt: "Facial treatment" },
id: "3", title: "Facial & Skincare", description: "Pamper your skin with our customized facial treatments. Our professionals use quality products to rejuvenate and brighten your complexion.", media: { imageSrc: "http://img.b2bpic.net/free-photo/masseur-doing-manual-massage-client-spa-beauty-salon-using-oil_343596-4268.jpg", imageAlt: "Facial treatment" },
items: [
{ icon: Shield, text: "Customized treatments" },
{ icon: Smile, text: "Skin rejuvenation" },
@@ -145,7 +145,7 @@ export default function LandingPage() {
buttonAnimation="slide-up"
products={[
{
id: "bridal-1", name: "Bridal Makeup Package", price: "$120", imageSrc: "http://img.b2bpic.net/free-psd/hand-drawn-wedding-celebration-youtube-cover_23-2150737025.jpg?_wi=2", imageAlt: "Bridal makeup look", initialQuantity: 1
id: "bridal-1", name: "Bridal Makeup Package", price: "$120", imageSrc: "http://img.b2bpic.net/free-psd/hand-drawn-wedding-celebration-youtube-cover_23-2150737025.jpg", imageAlt: "Bridal makeup look", initialQuantity: 1
},
{
id: "bridal-2", name: "Traditional Bridal Makeup", price: "$130", imageSrc: "http://img.b2bpic.net/free-photo/young-beautiful-stylish-woman-wedding-dress_285396-7817.jpg", imageAlt: "Traditional bridal makeup", initialQuantity: 1
@@ -243,4 +243,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}

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

@@ -1,51 +1,43 @@
"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;
fontWeight?: number | string;
letterSpacing?: number;
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 = 32,
fontWeight = 700,
letterSpacing = 0,
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.2}`}
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={fontSize * 0.1}
y={fontSize * 0.85}
fontSize={fontSize}
fontWeight={fontWeight}
fill={fill}
letterSpacing={letterSpacing}
fontFamily="inherit"
dominantBaseline="alphabetic"
>
{logoText}
{text}
</text>
</svg>
);
});
};
SvgTextLogo.displayName = "SvgTextLogo";
export default SvgTextLogo;
export default SvgTextLogo;