bender/207cf671-4ab0-4bb2-8eb0-00405c8da124
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #2

Merged
bender merged 2 commits from version_1 into main 2026-03-11 17:25:46 +00:00
Conversation 0 Commits 2 Files Changed 2 +28 -44
2 changed files with 28 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/page.tsx
View File

@@ -77,15 +77,15 @@ export default function LandingPage() {
features={[
{
id: 1,
title: "Address", description: "Retail Park, Horspath Driftway, Headington, Oxford OX3 7JN", imageSrc: "http://img.b2bpic.net/free-photo/attractive-young-woman-with-tattoo-glasses-visiting-local-market-fresh-vegetables_613910-17212.jpg?_wi=1", imageAlt: "ALDI Oxford store entrance"
title: "Address", description: "Retail Park, Horspath Driftway, Headington, Oxford OX3 7JN", imageSrc: "http://img.b2bpic.net/free-photo/attractive-young-woman-with-tattoo-glasses-visiting-local-market-fresh-vegetables_613910-17212.jpg", imageAlt: "ALDI Oxford store entrance"
},
{
id: 2,
title: "Hours", description: "Open now · Closes 10 PM. Visit us during peak or quiet hours based on your preference.", imageSrc: "http://img.b2bpic.net/free-photo/attractive-young-woman-with-tattoo-glasses-visiting-local-market-fresh-vegetables_613910-17212.jpg?_wi=2", imageAlt: "Store operating hours"
title: "Hours", description: "Open now · Closes 10 PM. Visit us during peak or quiet hours based on your preference.", imageSrc: "http://img.b2bpic.net/free-photo/attractive-young-woman-with-tattoo-glasses-visiting-local-market-fresh-vegetables_613910-17212.jpg", imageAlt: "Store operating hours"
},
{
id: 3,
title: "Contact", description: "Phone: 0800 042 0800. Call us for store-specific inquiries or special requests.", imageSrc: "http://img.b2bpic.net/free-photo/attractive-young-woman-with-tattoo-glasses-visiting-local-market-fresh-vegetables_613910-17212.jpg?_wi=3", imageAlt: "Customer service contact"
title: "Contact", description: "Phone: 0800 042 0800. Call us for store-specific inquiries or special requests.", imageSrc: "http://img.b2bpic.net/free-photo/attractive-young-woman-with-tattoo-glasses-visiting-local-market-fresh-vegetables_613910-17212.jpg", imageAlt: "Customer service contact"
}
]}
textboxLayout="default"
@@ -146,8 +146,8 @@ export default function LandingPage() {
reviewCount: "2.1k", imageSrc: "http://img.b2bpic.net/free-photo/yellow-green-yellow-peppers-crate_23-2147916093.jpg", imageAlt: "Weekly special offers"
}
]}
gridVariant="three-columns-all-equal-width"
animationType="slide-up"
gridVariant="three-columns-all-equal-width"
buttons={[
{ text: "Explore All Products", href: "#" }
]}
@@ -175,7 +175,6 @@ export default function LandingPage() {
id: "4", title: "Fast Self-Checkout", subtitle: "Quick and convenient checkout experience", category: "Speed", value: "✓ Fast Service"
}
]}
gridVariant="two-columns-alternating-heights"
animationType="slide-up"
/>
</div>
@@ -189,13 +188,13 @@ export default function LandingPage() {
useInvertedBackground={false}
blogs={[
{
id: "1", category: "Morning", title: "Quiet Hours", excerpt: "8 AM - 11 AM: Perfect for a peaceful shopping experience with minimal crowds.", imageSrc: "http://img.b2bpic.net/free-photo/attractive-young-woman-with-tattoo-glasses-visiting-local-market-fresh-vegetables_613910-17212.jpg?_wi=4", imageAlt: "Quiet morning shopping", authorName: "ALDI Oxford", authorAvatar: "http://img.b2bpic.net/free-photo/attractive-young-woman-with-tattoo-glasses-visiting-local-market-fresh-vegetables_613910-17212.jpg", date: "Best Time"
id: "1", category: "Morning", title: "Quiet Hours", excerpt: "8 AM - 11 AM: Perfect for a peaceful shopping experience with minimal crowds.", imageSrc: "http://img.b2bpic.net/free-photo/attractive-young-woman-with-tattoo-glasses-visiting-local-market-fresh-vegetables_613910-17212.jpg", imageAlt: "Quiet morning shopping", authorName: "ALDI Oxford", authorAvatar: "http://img.b2bpic.net/free-photo/attractive-young-woman-with-tattoo-glasses-visiting-local-market-fresh-vegetables_613910-17212.jpg", date: "Best Time"
},
{
id: "2", category: "Afternoon", title: "Moderate Traffic", excerpt: "11 AM - 4 PM: Steady flow with good selection and reasonable wait times.", imageSrc: "http://img.b2bpic.net/free-photo/attractive-young-woman-with-tattoo-glasses-visiting-local-market-fresh-vegetables_613910-17212.jpg?_wi=5", imageAlt: "Afternoon shopping", authorName: "ALDI Oxford", authorAvatar: "http://img.b2bpic.net/free-photo/attractive-young-woman-with-tattoo-glasses-visiting-local-market-fresh-vegetables_613910-17212.jpg", date: "Moderate"
id: "2", category: "Afternoon", title: "Moderate Traffic", excerpt: "11 AM - 4 PM: Steady flow with good selection and reasonable wait times.", imageSrc: "http://img.b2bpic.net/free-photo/attractive-young-woman-with-tattoo-glasses-visiting-local-market-fresh-vegetables_613910-17212.jpg", imageAlt: "Afternoon shopping", authorName: "ALDI Oxford", authorAvatar: "http://img.b2bpic.net/free-photo/attractive-young-woman-with-tattoo-glasses-visiting-local-market-fresh-vegetables_613910-17212.jpg", date: "Moderate"
},
{
id: "3", category: "Evening", title: "Peak Hours", excerpt: "4 PM - 10 PM: Busier periods. Come early for shorter queues and full selections.", imageSrc: "http://img.b2bpic.net/free-photo/attractive-young-woman-with-tattoo-glasses-visiting-local-market-fresh-vegetables_613910-17212.jpg?_wi=6", imageAlt: "Evening shopping", authorName: "ALDI Oxford", authorAvatar: "http://img.b2bpic.net/free-photo/attractive-young-woman-with-tattoo-glasses-visiting-local-market-fresh-vegetables_613910-17212.jpg", date: "Peak Time"
id: "3", category: "Evening", title: "Peak Hours", excerpt: "4 PM - 10 PM: Busier periods. Come early for shorter queues and full selections.", imageSrc: "http://img.b2bpic.net/free-photo/attractive-young-woman-with-tattoo-glasses-visiting-local-market-fresh-vegetables_613910-17212.jpg", imageAlt: "Evening shopping", authorName: "ALDI Oxford", authorAvatar: "http://img.b2bpic.net/free-photo/attractive-young-woman-with-tattoo-glasses-visiting-local-market-fresh-vegetables_613910-17212.jpg", date: "Peak Time"
}
]}
animationType="slide-up"

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

@@ -1,51 +1,36 @@
"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;
dominantBaseline?: 'auto' | 'text-bottom' | 'middle' | 'central' | 'hanging' | 'inherit';
}
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 = '',
textClassName = '',
dominantBaseline = 'middle',
}) => {
return (
<svg
ref={svgRef}
viewBox={viewBox}
className={cls("w-full", className)}
style={{ aspectRatio: aspectRatio }}
preserveAspectRatio="none"
role="img"
aria-label={`${logoText} logo`}
className={className}
viewBox="0 0 300 100"
xmlns="http://www.w3.org/2000/svg"
aria-label={text}
>
<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={dominantBaseline}
className={textClassName}
>
{logoText}
{text}
</text>
</svg>
);
});
SvgTextLogo.displayName = "SvgTextLogo";
};
export default SvgTextLogo;