Merge version_1 into main #2

Merged
bender merged 2 commits from version_1 into main 2026-03-11 16:25:16 +00:00
2 changed files with 23 additions and 41 deletions

View File

@@ -20,7 +20,7 @@ export default function LandingPage() {
borderRadius="rounded"
contentWidth="small"
sizing="largeSmallSizeLargeTitles"
background="aurora"
background="circleGradient"
cardStyle="gradient-bordered"
primaryButtonStyle="double-inset"
secondaryButtonStyle="solid"
@@ -48,8 +48,8 @@ export default function LandingPage() {
{ text: "Explore Products", href: "products" },
{ text: "Learn More", href: "about" }
]}
background={{ variant: "aurora" }}
imageSrc="http://img.b2bpic.net/free-photo/weed-leaves-oil-still-life_23-2151651056.jpg?_wi=1"
background={{ variant: "sparkles-gradient" }}
imageSrc="http://img.b2bpic.net/free-photo/weed-leaves-oil-still-life_23-2151651056.jpg"
imageAlt="Premium skincare products collection"
mediaAnimation="slide-up"
frameStyle="card"
@@ -174,7 +174,7 @@ export default function LandingPage() {
id: "5", title: "Are your products cruelty-free?", content: "Absolutely! We are 100% cruelty-free and vegan. None of our products are tested on animals, and all our ingredients are ethically sourced from sustainable suppliers."
}
]}
imageSrc="http://img.b2bpic.net/free-photo/weed-leaves-oil-still-life_23-2151651056.jpg?_wi=2"
imageSrc="http://img.b2bpic.net/free-photo/weed-leaves-oil-still-life_23-2151651056.jpg"
imageAlt="Skincare products showcase"
mediaAnimation="opacity"
mediaPosition="left"

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;
textClassName?: string;
}
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 = '',
textClassName = '',
}) => {
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 400 100"
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"
className={textClassName}
>
{logoText}
{text}
</text>
</svg>
);
});
};
SvgTextLogo.displayName = "SvgTextLogo";
export default SvgTextLogo;
export default SvgTextLogo;