Merge version_1 into main #1

Merged
bender merged 2 commits from version_1 into main 2026-03-12 12:45:45 +00:00
2 changed files with 32 additions and 41 deletions

View File

@@ -49,7 +49,7 @@ export default function LandingPage() {
description="Luxurious skincare formulated with rare botanicals and cutting-edge science. Transform your skin, embrace your glow."
tag="Premium Skincare"
imageSrc="http://img.b2bpic.net/free-photo/natural-shea-butter-beauty-treatment_23-2148963324.jpg"
imageAlt="luxury skincare product elegant beauty"
imageAlt="Luxury skincare products on elegant background"
showBlur={true}
showDimOverlay={true}
buttons={[
@@ -76,7 +76,7 @@ export default function LandingPage() {
}
]}
imageSrc="http://img.b2bpic.net/free-photo/ecofriendly-beauty-product_23-2150669139.jpg"
imageAlt="natural skincare ingredients botanical extract"
imageAlt="Luxury skincare ingredients"
textboxLayout="default"
useInvertedBackground={false}
mediaAnimation="slide-up"
@@ -115,13 +115,13 @@ export default function LandingPage() {
tag="Shop Now"
products={[
{
id: "1", name: "Golden Hour Serum", price: "$78", imageSrc: "http://img.b2bpic.net/free-photo/natural-jojoba-oil-composition_23-2149047770.jpg", imageAlt: "luxury facial serum premium bottle gold", initialQuantity: 1
id: "1", name: "Golden Hour Serum", price: "$78", imageSrc: "http://img.b2bpic.net/free-photo/natural-jojoba-oil-composition_23-2149047770.jpg", imageAlt: "Golden Hour Serum bottle", initialQuantity: 1
},
{
id: "2", name: "Velvet Renewal Cream", price: "$95", imageSrc: "http://img.b2bpic.net/free-photo/view-male-beauty-products-with-rock-stone-display_23-2150435231.jpg", imageAlt: "luxury face cream jar premium packaging", initialQuantity: 1
id: "2", name: "Velvet Renewal Cream", price: "$95", imageSrc: "http://img.b2bpic.net/free-photo/view-male-beauty-products-with-rock-stone-display_23-2150435231.jpg", imageAlt: "Velvet Renewal Cream jar", initialQuantity: 1
},
{
id: "3", name: "Luminous Mask Treatment", price: "$65", imageSrc: "http://img.b2bpic.net/free-photo/face-beauty-mask-self-care-home_23-2148752547.jpg", imageAlt: "luxury face mask premium skincare", initialQuantity: 1
id: "3", name: "Luminous Mask Treatment", price: "$65", imageSrc: "http://img.b2bpic.net/free-photo/face-beauty-mask-self-care-home_23-2148752547.jpg", imageAlt: "Luminous Mask Treatment", initialQuantity: 1
}
]}
gridVariant="three-columns-all-equal-width"

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;
fontWeight?: number | string;
letterSpacing?: number;
dominantBaseline?: 'auto' | 'middle' | 'hanging' | 'mathematical';
}
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,
fontWeight = 700,
letterSpacing = 0,
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 ${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%"
fontSize={fontSize}
fontWeight={fontWeight}
textAnchor="middle"
dominantBaseline={dominantBaseline}
letterSpacing={letterSpacing}
className="fill-current"
>
{logoText}
{text}
</text>
</svg>
);
});
SvgTextLogo.displayName = "SvgTextLogo";
};
export default SvgTextLogo;