Merge version_1 into main #2
@@ -49,7 +49,7 @@ export default function LandingPage() {
|
||||
{ text: "Learn More", href: "#about" }
|
||||
]}
|
||||
layoutOrder="default"
|
||||
imageSrc="http://img.b2bpic.net/free-photo/flower-pots-shelves_1150-9992.jpg?_wi=1"
|
||||
imageSrc="http://img.b2bpic.net/free-photo/flower-pots-shelves_1150-9992.jpg"
|
||||
imageAlt="Bright and welcoming Wellness By Nature store interior"
|
||||
mediaAnimation="slide-up"
|
||||
frameStyle="card"
|
||||
@@ -205,7 +205,7 @@ export default function LandingPage() {
|
||||
]}
|
||||
textarea={{ name: "message", placeholder: "Tell us about your wellness questions or product interests...", rows: 5, required: true }}
|
||||
useInvertedBackground={false}
|
||||
imageSrc="http://img.b2bpic.net/free-photo/flower-pots-shelves_1150-9992.jpg?_wi=2"
|
||||
imageSrc="http://img.b2bpic.net/free-photo/flower-pots-shelves_1150-9992.jpg"
|
||||
imageAlt="Wellness By Nature store"
|
||||
mediaAnimation="opacity"
|
||||
mediaPosition="right"
|
||||
@@ -215,7 +215,7 @@ export default function LandingPage() {
|
||||
|
||||
<div id="footer" data-section="footer">
|
||||
<FooterMedia
|
||||
imageSrc="http://img.b2bpic.net/free-photo/flower-pots-shelves_1150-9992.jpg?_wi=3"
|
||||
imageSrc="http://img.b2bpic.net/free-photo/flower-pots-shelves_1150-9992.jpg"
|
||||
imageAlt="Wellness By Nature store"
|
||||
logoText="Wellness By Nature"
|
||||
copyrightText="© 2025 Wellness By Nature. Serving Houghton, Michigan with natural health solutions."
|
||||
|
||||
@@ -1,51 +1,62 @@
|
||||
"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 = 48,
|
||||
fontWeight = 700,
|
||||
letterSpacing = 0,
|
||||
fill = 'currentColor',
|
||||
}) => {
|
||||
const svgRef = React.useRef<SVGSVGElement>(null);
|
||||
const textRef = React.useRef<SVGTextElement>(null);
|
||||
const [viewBox, setViewBox] = React.useState('0 0 1000 100');
|
||||
|
||||
React.useEffect(() => {
|
||||
if (textRef.current && svgRef.current) {
|
||||
try {
|
||||
const bbox = textRef.current.getBBox();
|
||||
const padding = 20;
|
||||
const newViewBox = `${bbox.x - padding} ${bbox.y - padding} ${bbox.width + padding * 2} ${bbox.height + padding * 2}`;
|
||||
setViewBox(newViewBox);
|
||||
} catch (e) {
|
||||
console.error('Error calculating SVG viewBox:', e);
|
||||
}
|
||||
}
|
||||
}, [text]);
|
||||
|
||||
return (
|
||||
<svg
|
||||
ref={svgRef}
|
||||
viewBox={viewBox}
|
||||
className={cls("w-full", className)}
|
||||
style={{ aspectRatio: aspectRatio }}
|
||||
preserveAspectRatio="none"
|
||||
role="img"
|
||||
aria-label={`${logoText} logo`}
|
||||
className={`w-full h-auto ${className}`}
|
||||
preserveAspectRatio="xMidYMid meet"
|
||||
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"
|
||||
}}
|
||||
y="0"
|
||||
fontSize={fontSize}
|
||||
fontWeight={fontWeight}
|
||||
fill={fill}
|
||||
letterSpacing={letterSpacing}
|
||||
dominantBaseline="hanging"
|
||||
textAnchor="start"
|
||||
>
|
||||
{logoText}
|
||||
{text}
|
||||
</text>
|
||||
</svg>
|
||||
);
|
||||
});
|
||||
|
||||
SvgTextLogo.displayName = "SvgTextLogo";
|
||||
};
|
||||
|
||||
export default SvgTextLogo;
|
||||
|
||||
Reference in New Issue
Block a user