Merge version_1 into main #2
@@ -19,7 +19,7 @@ export default function LandingPage() {
|
||||
borderRadius="rounded"
|
||||
contentWidth="mediumLarge"
|
||||
sizing="mediumLarge"
|
||||
background="blurBottom"
|
||||
background="circleGradient"
|
||||
cardStyle="layered-gradient"
|
||||
primaryButtonStyle="radial-glow"
|
||||
secondaryButtonStyle="glass"
|
||||
@@ -52,13 +52,13 @@ export default function LandingPage() {
|
||||
{ text: "Explore Fragrances", href: "#products" }
|
||||
]}
|
||||
buttonAnimation="slide-up"
|
||||
background={{ variant: "blurBottom" }}
|
||||
background={{ variant: "plain" }}
|
||||
carouselItems={[
|
||||
{ id: "hero-1", imageSrc: "http://img.b2bpic.net/free-photo/front-view-argan-oil-arrangement_23-2148955762.jpg", imageAlt: "luxury skincare bottles arrangement warm lighting" },
|
||||
{ id: "hero-2", imageSrc: "http://img.b2bpic.net/free-photo/rock-salt-soap-dispenser-against-white-background_23-2147940466.jpg?_wi=1", imageAlt: "facial cleanser bottle product isolated white" },
|
||||
{ id: "hero-3", imageSrc: "http://img.b2bpic.net/free-photo/high-angle-view-beauty-creams-flowers-marble_23-2147879025.jpg?_wi=1", imageAlt: "face moisturizer cream jar white background" },
|
||||
{ id: "hero-4", imageSrc: "http://img.b2bpic.net/free-photo/black-olive-oil-bottle-wall-with-shadow-leaves_23-2147853778.jpg?_wi=1", imageAlt: "luxury perfume bottle crystal elegant design" },
|
||||
{ id: "hero-5", imageSrc: "http://img.b2bpic.net/free-photo/minimalist-skin-care-product-presentation_23-2151921114.jpg?_wi=1", imageAlt: "spf sunscreen lotion bottle product photo" },
|
||||
{ id: "hero-2", imageSrc: "http://img.b2bpic.net/free-photo/rock-salt-soap-dispenser-against-white-background_23-2147940466.jpg", imageAlt: "facial cleanser bottle product isolated white" },
|
||||
{ id: "hero-3", imageSrc: "http://img.b2bpic.net/free-photo/high-angle-view-beauty-creams-flowers-marble_23-2147879025.jpg", imageAlt: "face moisturizer cream jar white background" },
|
||||
{ id: "hero-4", imageSrc: "http://img.b2bpic.net/free-photo/black-olive-oil-bottle-wall-with-shadow-leaves_23-2147853778.jpg", imageAlt: "luxury perfume bottle crystal elegant design" },
|
||||
{ id: "hero-5", imageSrc: "http://img.b2bpic.net/free-photo/minimalist-skin-care-product-presentation_23-2151921114.jpg", imageAlt: "spf sunscreen lotion bottle product photo" },
|
||||
{ id: "hero-6", imageSrc: "http://img.b2bpic.net/free-vector/bottle-perfume-business-company-logo_23-2148462313.jpg", imageAlt: "floral perfume bottle flower pattern" }
|
||||
]}
|
||||
autoPlay={true}
|
||||
@@ -83,16 +83,16 @@ export default function LandingPage() {
|
||||
animationType="slide-up"
|
||||
products={[
|
||||
{
|
||||
id: "cleanser", name: "Hydrating Facial Cleanser", price: "$12.99", variant: "Gentle Formula • 8 oz", imageSrc: "http://img.b2bpic.net/free-photo/rock-salt-soap-dispenser-against-white-background_23-2147940466.jpg?_wi=2", imageAlt: "Hydrating facial cleanser", isFavorited: false
|
||||
id: "cleanser", name: "Hydrating Facial Cleanser", price: "$12.99", variant: "Gentle Formula • 8 oz", imageSrc: "http://img.b2bpic.net/free-photo/rock-salt-soap-dispenser-against-white-background_23-2147940466.jpg", imageAlt: "Hydrating facial cleanser", isFavorited: false
|
||||
},
|
||||
{
|
||||
id: "moisturizer", name: "Intensive Daily Moisturizer", price: "$18.99", variant: "Rich Cream • 1.3 oz", imageSrc: "http://img.b2bpic.net/free-photo/high-angle-view-beauty-creams-flowers-marble_23-2147879025.jpg?_wi=2", imageAlt: "Intensive daily moisturizer", isFavorited: false
|
||||
id: "moisturizer", name: "Intensive Daily Moisturizer", price: "$18.99", variant: "Rich Cream • 1.3 oz", imageSrc: "http://img.b2bpic.net/free-photo/high-angle-view-beauty-creams-flowers-marble_23-2147879025.jpg", imageAlt: "Intensive daily moisturizer", isFavorited: false
|
||||
},
|
||||
{
|
||||
id: "sunscreen", name: "Broad Spectrum SPF 50", price: "$14.99", variant: "Daily Protection • 1.7 oz", imageSrc: "http://img.b2bpic.net/free-photo/minimalist-skin-care-product-presentation_23-2151921114.jpg?_wi=2", imageAlt: "Broad spectrum sunscreen", isFavorited: false
|
||||
id: "sunscreen", name: "Broad Spectrum SPF 50", price: "$14.99", variant: "Daily Protection • 1.7 oz", imageSrc: "http://img.b2bpic.net/free-photo/minimalist-skin-care-product-presentation_23-2151921114.jpg", imageAlt: "Broad spectrum sunscreen", isFavorited: false
|
||||
},
|
||||
{
|
||||
id: "perfume-1", name: "Luminous Bloom Fragrance", price: "$65.00", variant: "Eau de Parfum • 1.7 oz", imageSrc: "http://img.b2bpic.net/free-photo/black-olive-oil-bottle-wall-with-shadow-leaves_23-2147853778.jpg?_wi=2", imageAlt: "Luminous bloom perfume", isFavorited: false
|
||||
id: "perfume-1", name: "Luminous Bloom Fragrance", price: "$65.00", variant: "Eau de Parfum • 1.7 oz", imageSrc: "http://img.b2bpic.net/free-photo/black-olive-oil-bottle-wall-with-shadow-leaves_23-2147853778.jpg", imageAlt: "Luminous bloom perfume", isFavorited: false
|
||||
}
|
||||
]}
|
||||
/>
|
||||
|
||||
@@ -1,51 +1,41 @@
|
||||
"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?: string | number;
|
||||
textAnchor?: 'start' | 'middle' | 'end';
|
||||
dominantBaseline?: 'auto' | 'text-bottom' | 'alphabetic' | 'ideographic' | 'middle' | 'central' | 'mathematical' | 'hanging';
|
||||
}
|
||||
|
||||
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 = '',
|
||||
fontSize = 32,
|
||||
fontWeight = 'bold',
|
||||
textAnchor = 'middle',
|
||||
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 100"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
className={className}
|
||||
>
|
||||
<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="100"
|
||||
y="50"
|
||||
fontSize={fontSize}
|
||||
fontWeight={fontWeight}
|
||||
textAnchor={textAnchor}
|
||||
dominantBaseline={dominantBaseline}
|
||||
className="fill-current"
|
||||
>
|
||||
{logoText}
|
||||
{text}
|
||||
</text>
|
||||
</svg>
|
||||
);
|
||||
});
|
||||
};
|
||||
|
||||
SvgTextLogo.displayName = "SvgTextLogo";
|
||||
|
||||
export default SvgTextLogo;
|
||||
export default SvgTextLogo;
|
||||
Reference in New Issue
Block a user