bender/a9a2a99f-642c-400c-a42c-b0bdc80b144c
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main

Browse Source 
Merge version_1 into main
This commit was merged in pull request #2.
This commit is contained in:
bender
2026-03-12 13:46:53 +00:00
parent f7e1d93280 d593ecd184
commit aadeca0add
2 changed files with 50 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/app/page.tsx
View File

@@ -8,7 +8,7 @@ import FeatureCardTwentyFive from '@/components/sections/feature/FeatureCardTwen
import TestimonialCardSix from '@/components/sections/testimonial/TestimonialCardSix';
import ContactText from '@/components/sections/contact/ContactText';
import FooterMedia from '@/components/sections/footer/FooterMedia';
import { Croissant, Gem, Palette, Flame, Heart, Sparkles, MapPin } from 'lucide-react';
import { Croissant, Gem, Palette, Flame, Heart, Sparkles, MapPin, Star, Award } from 'lucide-react';
export default function LandingPage() {
return (
@@ -18,7 +18,7 @@ export default function LandingPage() {
borderRadius="rounded"
contentWidth="smallMedium"
sizing="mediumLarge"
background="floatingGradient"
background="circleGradient"
cardStyle="solid"
primaryButtonStyle="flat"
secondaryButtonStyle="layered"
@@ -43,13 +43,13 @@ export default function LandingPage() {
<HeroLogoBillboardSplit
logoText="MARHABA"
description="The art of the daily indulgence. Boksburg's finest artisanal treats—5-star craftsmanship with a local heart. Uncompromising service. Accessible opulence."
background={{ variant: "floatingGradient" }}
background={{ variant: "plain" }}
buttons={[
{ text: "Experience the Taste", href: "#collection" },
{ text: "Find the Bakery", href: "#contact" }
]}
layoutOrder="default"
imageSrc="http://img.b2bpic.net/free-photo/high-angle-desserts-slate-with-cocoa-powder-sieve_23-2148689861.jpg?_wi=1"
imageSrc="http://img.b2bpic.net/free-photo/high-angle-desserts-slate-with-cocoa-powder-sieve_23-2148689861.jpg"
imageAlt="Golden-dusted pastry with steam rising in cinematic lighting"
frameStyle="card"
mediaAnimation="slide-up"
@@ -74,7 +74,7 @@ export default function LandingPage() {
title: "The Destination", description: "Come for a treat. Stay for the experience. Return because you must.", icon: MapPin
}
]}
imageSrc="http://img.b2bpic.net/free-photo/handful-flour-with-egg-rustic-kitchen-against-background-men-s-hands-knead-dough-ingredients-cooking-flour-products-dough-bread-muffins-pie-pizza-dough-copy-space_639032-469.jpg?_wi=1"
imageSrc="http://img.b2bpic.net/free-photo/handful-flour-with-egg-rustic-kitchen-against-background-men-s-hands-knead-dough-ingredients-cooking-flour-products-dough-bread-muffins-pie-pizza-dough-copy-space_639032-469.jpg"
imageAlt="Warm, artisanal bakery interior with professional craftsmanship"
mediaAnimation="slide-up"
imagePosition="right"
@@ -94,10 +94,10 @@ export default function LandingPage() {
title: "Croissants", description: "Buttery layers of pure indulgence. Each crisp shell holds the secrets of Parisian tradition.", icon: Croissant,
mediaItems: [
{
imageSrc: "http://img.b2bpic.net/free-photo/bakery_23-2148011818.jpg?_wi=1", imageAlt: "Golden buttery croissants in artisanal display"
imageSrc: "http://img.b2bpic.net/free-photo/bakery_23-2148011818.jpg", imageAlt: "Golden buttery croissants in artisanal display"
},
{
imageSrc: "http://img.b2bpic.net/free-photo/whisk-filled-with-melted-chocolate-close-up_23-2148379683.jpg?_wi=1", imageAlt: "Luxury chocolate eclair with elegant presentation"
imageSrc: "http://img.b2bpic.net/free-photo/whisk-filled-with-melted-chocolate-close-up_23-2148379683.jpg", imageAlt: "Luxury chocolate eclair with elegant presentation"
}
]
},
@@ -105,10 +105,10 @@ export default function LandingPage() {
title: "Éclairs", description: "Elegance in every bite. Silky cream filling enveloped in glossy chocolate perfection.", icon: Gem,
mediaItems: [
{
imageSrc: "http://img.b2bpic.net/free-photo/whisk-filled-with-melted-chocolate-close-up_23-2148379683.jpg?_wi=2", imageAlt: "Chocolate eclair macro photography"
imageSrc: "http://img.b2bpic.net/free-photo/whisk-filled-with-melted-chocolate-close-up_23-2148379683.jpg", imageAlt: "Chocolate eclair macro photography"
},
{
imageSrc: "http://img.b2bpic.net/free-photo/bakery_23-2148011818.jpg?_wi=2", imageAlt: "Assorted pastry collection display"
imageSrc: "http://img.b2bpic.net/free-photo/bakery_23-2148011818.jpg", imageAlt: "Assorted pastry collection display"
}
]
},
@@ -119,7 +119,7 @@ export default function LandingPage() {
imageSrc: "http://img.b2bpic.net/free-photo/homemade-delicious-rustic-summer-berry-tartles_114579-14959.jpg", imageAlt: "Colorful fruit tarts artisanal display"
},
{
imageSrc: "http://img.b2bpic.net/free-photo/bakery_23-2148011818.jpg?_wi=3", imageAlt: "Premium pastry collection flatlay"
imageSrc: "http://img.b2bpic.net/free-photo/bakery_23-2148011818.jpg", imageAlt: "Premium pastry collection flatlay"
}
]
},
@@ -127,10 +127,10 @@ export default function LandingPage() {
title: "Bread Selection", description: "The foundation of excellence. Sourdough, focaccia, and artisan loaves baked fresh daily.", icon: Flame,
mediaItems: [
{
imageSrc: "http://img.b2bpic.net/free-photo/high-angle-desserts-slate-with-cocoa-powder-sieve_23-2148689861.jpg?_wi=2", imageAlt: "Fresh artisanal bread with steam rising"
imageSrc: "http://img.b2bpic.net/free-photo/high-angle-desserts-slate-with-cocoa-powder-sieve_23-2148689861.jpg", imageAlt: "Fresh artisanal bread with steam rising"
},
{
imageSrc: "http://img.b2bpic.net/free-photo/handful-flour-with-egg-rustic-kitchen-against-background-men-s-hands-knead-dough-ingredients-cooking-flour-products-dough-bread-muffins-pie-pizza-dough-copy-space_639032-469.jpg?_wi=2", imageAlt: "Bakery interior with fresh bread display"
imageSrc: "http://img.b2bpic.net/free-photo/handful-flour-with-egg-rustic-kitchen-against-background-men-s-hands-knead-dough-ingredients-cooking-flour-products-dough-bread-muffins-pie-pizza-dough-copy-space_639032-469.jpg", imageAlt: "Bakery interior with fresh bread display"
}
]
}
@@ -162,10 +162,10 @@ export default function LandingPage() {
id: "4", name: "David Williams", handle: "First-Time Visitor", testimonial: "Walked in as a stranger, walked out as part of the family. Great service isn't a luxury—it's Marhaba's standard. I'm hooked.", imageSrc: "http://img.b2bpic.net/free-photo/black-businessman-happy-expression_1194-2733.jpg", imageAlt: "David Williams"
},
{
id: "5", name: "Lisa Mandela", handle: "Weekly Enthusiast", testimonial: "The fruit tarts are seasonal art. Each visit is different, yet each is perfect. Marhaba has redefined what accessible luxury means to me."
id: "5", name: "Lisa Mandela", handle: "Weekly Enthusiast", testimonial: "The fruit tarts are seasonal art. Each visit is different, yet each is perfect. Marhaba has redefined what accessible luxury means to me.", icon: Star
},
{
id: "6", name: "James Okonkwo", handle: "Business Owner", testimonial: "I bring clients to Marhaba for important meetings. The ambiance, the treats, the service—everything says 'premium.' Yet the prices stay humble. Brilliant strategy."
id: "6", name: "James Okonkwo", handle: "Business Owner", testimonial: "I bring clients to Marhaba for important meetings. The ambiance, the treats, the service—everything says 'premium.' Yet the prices stay humble. Brilliant strategy.", icon: Award
}
]}
/>

73
src/components/shared/SvgTextLogo/SvgTextLogo.tsx
View File

@@ -1,51 +1,50 @@
"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;
fill?: string;
stroke?: string;
strokeWidth?: number;
}
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 = '',
fill = 'currentColor',
stroke = 'none',
strokeWidth = 0,
}) => {
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 500 100"
className={`w-full h-auto ${className}`}
xmlns="http://www.w3.org/2000/svg"
preserveAspectRatio="xMidYMid meet"
>
<defs>
<style>{`
.svg-text-logo-text {
font-size: 48px;
font-weight: bold;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
}
`}</style>
</defs>
<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="250"
y="60"
textAnchor="middle"
dominantBaseline="middle"
fill={fill}
stroke={stroke}
strokeWidth={strokeWidth}
className="svg-text-logo-text"
>
{logoText}
{text}
</text>
</svg>
);
});
};
SvgTextLogo.displayName = "SvgTextLogo";
export default SvgTextLogo;
export default SvgTextLogo;