Merge version_1 into main #2

Merged
bender merged 2 commits from version_1 into main 2026-03-11 19:50:56 +00:00
2 changed files with 38 additions and 45 deletions

View File

@@ -18,7 +18,7 @@ export default function LandingPage() {
borderRadius="rounded"
contentWidth="mediumSmall"
sizing="mediumLargeSizeMediumTitles"
background="blurBottom"
background="circleGradient"
cardStyle="glass-elevated"
primaryButtonStyle="diagonal-gradient"
secondaryButtonStyle="glass"
@@ -42,7 +42,7 @@ export default function LandingPage() {
<HeroCentered
title="Fresh Croissants. Perfect Coffee. Every Morning."
description="Just steps from the station, Eats Bakery & Coffee is your daily stop for fresh pastries, artisan bread, and comforting coffee. Start your day the right way."
background={{ variant: "blurBottom" }}
background={{ variant: "plain" }}
avatars={[
{
src: "http://img.b2bpic.net/free-photo/plate-with-croissants-near-coffee-dairy_23-2147758255.jpg", alt: "Fresh pastries and cappuccino at Eats Bakery & Coffee"
@@ -64,11 +64,11 @@ export default function LandingPage() {
features={[
{
id: "1", title: "Fresh Croissants", tags: ["Signature", "Pur Beurre"],
imageSrc: "http://img.b2bpic.net/free-photo/sandwich-walnuts_23-2147717717.jpg?_wi=1", imageAlt: "Fresh butter croissants"
imageSrc: "http://img.b2bpic.net/free-photo/sandwich-walnuts_23-2147717717.jpg", imageAlt: "Fresh butter croissants"
},
{
id: "2", title: "Great Coffee", tags: ["Artisan", "Cappuccino"],
imageSrc: "http://img.b2bpic.net/free-photo/close-up-coffee-cup-with-heart-shape-latte-art-wood-table_23-2147908344.jpg?_wi=1", imageAlt: "Perfect cappuccino"
imageSrc: "http://img.b2bpic.net/free-photo/close-up-coffee-cup-with-heart-shape-latte-art-wood-table_23-2147908344.jpg", imageAlt: "Perfect cappuccino"
},
{
id: "3", title: "Comfortable Space", tags: ["Spacious", "Welcoming"],
@@ -76,7 +76,7 @@ export default function LandingPage() {
},
{
id: "4", title: "Perfect Location", tags: ["Near Station", "Convenient"],
imageSrc: "http://img.b2bpic.net/free-photo/top-view-homemade-chocolate-wooden-board-grey-surface_114579-55743.jpg?_wi=1", imageAlt: "Pain au chocolat pastry"
imageSrc: "http://img.b2bpic.net/free-photo/top-view-homemade-chocolate-wooden-board-grey-surface_114579-55743.jpg", imageAlt: "Pain au chocolat pastry"
}
]}
animationType="slide-up"
@@ -92,13 +92,13 @@ export default function LandingPage() {
description="Our most loved pastries, breads, and beverages that keep customers coming back."
products={[
{
id: "1", name: "Croissant Pur Beurre", price: "€3.50", imageSrc: "http://img.b2bpic.net/free-photo/sandwich-walnuts_23-2147717717.jpg?_wi=2", imageAlt: "Croissant Pur Beurre"
id: "1", name: "Croissant Pur Beurre", price: "€3.50", imageSrc: "http://img.b2bpic.net/free-photo/sandwich-walnuts_23-2147717717.jpg", imageAlt: "Croissant Pur Beurre"
},
{
id: "2", name: "Pain au Chocolat", price: "€3.75", imageSrc: "http://img.b2bpic.net/free-photo/top-view-homemade-chocolate-wooden-board-grey-surface_114579-55743.jpg?_wi=2", imageAlt: "Pain au Chocolat"
id: "2", name: "Pain au Chocolat", price: "€3.75", imageSrc: "http://img.b2bpic.net/free-photo/top-view-homemade-chocolate-wooden-board-grey-surface_114579-55743.jpg", imageAlt: "Pain au Chocolat"
},
{
id: "3", name: "Cappuccino", price: "€4.50", imageSrc: "http://img.b2bpic.net/free-photo/close-up-coffee-cup-with-heart-shape-latte-art-wood-table_23-2147908344.jpg?_wi=2", imageAlt: "Cappuccino"
id: "3", name: "Cappuccino", price: "€4.50", imageSrc: "http://img.b2bpic.net/free-photo/close-up-coffee-cup-with-heart-shape-latte-art-wood-table_23-2147908344.jpg", imageAlt: "Cappuccino"
}
]}
gridVariant="three-columns-all-equal-width"

View File

@@ -1,51 +1,44 @@
"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?: 'normal' | 'bold' | 'lighter';
fontFamily?: string;
textAnchor?: 'start' | 'middle' | 'end';
dominantBaseline?: 'auto' | 'middle' | 'hanging';
}
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 = 24,
fontWeight = 'bold',
fontFamily = 'Arial, sans-serif',
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"
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="100"
y="50"
fontSize={fontSize}
fontWeight={fontWeight}
fontFamily={fontFamily}
textAnchor={textAnchor}
dominantBaseline={dominantBaseline}
fill="currentColor"
>
{logoText}
{text}
</text>
</svg>
);
});
};
SvgTextLogo.displayName = "SvgTextLogo";
export default SvgTextLogo;
export default SvgTextLogo;