Merge version_1 into main #2

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

View File

@@ -51,7 +51,7 @@ export default function LandingPage() {
{ text: "Explore Our Blends", href: "blends" },
{ text: "Our Story", href: "about" }
]}
buttonAnimation="entrance-slide"
buttonAnimation="slide-up"
/>
</div>
@@ -63,7 +63,7 @@ export default function LandingPage() {
description="Founded in 2019 by Aryan Mehta, a former software engineer"
subdescription="From Shimla garage to 500+ daily cups across India"
icon={Heart}
imageSrc="http://img.b2bpic.net/free-photo/cup-coffee-with-old-grinder_1204-105.jpg?_wi=1"
imageSrc="http://img.b2bpic.net/free-photo/cup-coffee-with-old-grinder_1204-105.jpg"
imageAlt="Cozy premium café interior with warm lighting"
mediaAnimation="blur-reveal"
useInvertedBackground={false}
@@ -106,15 +106,15 @@ export default function LandingPage() {
features={[
{
id: "1", title: "Premium Coffee Machines", tags: ["Italian Espresso", "Precision Brewing"],
imageSrc: "http://img.b2bpic.net/free-photo/cup-coffee-with-old-grinder_1204-105.jpg?_wi=2", imageAlt: "Premium espresso machine"
imageSrc: "http://img.b2bpic.net/free-photo/cup-coffee-with-old-grinder_1204-105.jpg", imageAlt: "Premium espresso machine"
},
{
id: "2", title: "Freshly Baked Sides", tags: ["Artisan Pastries", "Daily Baked"],
imageSrc: "http://img.b2bpic.net/free-photo/cup-coffee-with-old-grinder_1204-105.jpg?_wi=3", imageAlt: "Freshly baked pastries and sides"
imageSrc: "http://img.b2bpic.net/free-photo/cup-coffee-with-old-grinder_1204-105.jpg", imageAlt: "Freshly baked pastries and sides"
},
{
id: "3", title: "Cozy Seating for 40 Guests", tags: ["Intimate Space", "Perfect Ambiance"],
imageSrc: "http://img.b2bpic.net/free-photo/cup-coffee-with-old-grinder_1204-105.jpg?_wi=4", imageAlt: "Warm and cozy café seating area"
imageSrc: "http://img.b2bpic.net/free-photo/cup-coffee-with-old-grinder_1204-105.jpg", imageAlt: "Warm and cozy café seating area"
}
]}
animationType="slide-up"

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;
fontSize?: number;
fontFamily?: string;
fontWeight?: number | string;
fill?: string;
className?: 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,
fontSize = 48,
fontFamily = 'Arial, sans-serif',
fontWeight = 'bold',
fill = '#000000',
className = '',
}) => {
return (
<svg
ref={svgRef}
viewBox={viewBox}
className={cls("w-full", className)}
style={{ aspectRatio: aspectRatio }}
preserveAspectRatio="none"
role="img"
aria-label={`${logoText} logo`}
width="auto"
height={fontSize * 1.2}
viewBox={`0 0 ${text.length * fontSize * 0.6} ${fontSize * 1.2}`}
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"
}}
y={fontSize}
fontSize={fontSize}
fontFamily={fontFamily}
fontWeight={fontWeight}
fill={fill}
dominantBaseline="hanging"
>
{logoText}
{text}
</text>
</svg>
);
});
};
SvgTextLogo.displayName = "SvgTextLogo";
export default SvgTextLogo;
export default SvgTextLogo;