Merge version_1 into main #2

Merged
bender merged 2 commits from version_1 into main 2026-03-11 13:55:42 +00:00
2 changed files with 43 additions and 48 deletions

View File

@@ -18,7 +18,7 @@ export default function LandingPage() {
borderRadius="rounded"
contentWidth="small"
sizing="mediumLargeSizeMediumTitles"
background="grid"
background="circleGradient"
cardStyle="gradient-bordered"
primaryButtonStyle="primary-glow"
secondaryButtonStyle="radial-glow"
@@ -54,30 +54,30 @@ export default function LandingPage() {
background={{ variant: "radial-gradient" }}
leftCarouselItems={[
{
imageSrc: "http://img.b2bpic.net/free-photo/outdoor-swimming-pool-with-umbrella-chair-lounge-around-there-leisure-travel_74190-7878.jpg?_wi=1", imageAlt: "Luxor Piscine completed pool installation"
imageSrc: "http://img.b2bpic.net/free-photo/outdoor-swimming-pool-with-umbrella-chair-lounge-around-there-leisure-travel_74190-7878.jpg", imageAlt: "Luxor Piscine completed pool installation"
},
{
imageSrc: "http://img.b2bpic.net/free-photo/family-choosing-car-car-showroom_1303-17420.jpg?_wi=1", imageAlt: "Professional pool design consultation"
imageSrc: "http://img.b2bpic.net/free-photo/family-choosing-car-car-showroom_1303-17420.jpg", imageAlt: "Professional pool design consultation"
},
{
imageSrc: "http://img.b2bpic.net/free-photo/engineer-helmet-standing-by-factory_1157-35561.jpg?_wi=1", imageAlt: "Expert pool installation team at work"
imageSrc: "http://img.b2bpic.net/free-photo/engineer-helmet-standing-by-factory_1157-35561.jpg", imageAlt: "Expert pool installation team at work"
},
{
imageSrc: "http://img.b2bpic.net/free-photo/swimming-pool-ladder-with-grass-background_1203-952.jpg?_wi=1", imageAlt: "Professional pool maintenance service"
imageSrc: "http://img.b2bpic.net/free-photo/swimming-pool-ladder-with-grass-background_1203-952.jpg", imageAlt: "Professional pool maintenance service"
}
]}
rightCarouselItems={[
{
imageSrc: "http://img.b2bpic.net/free-photo/engineer-helmet-standing-by-factory_1157-35561.jpg?_wi=2", imageAlt: "Professional pool construction in progress"
imageSrc: "http://img.b2bpic.net/free-photo/engineer-helmet-standing-by-factory_1157-35561.jpg", imageAlt: "Professional pool construction in progress"
},
{
imageSrc: "http://img.b2bpic.net/free-photo/outdoor-swimming-pool-with-umbrella-chair-lounge-around-there-leisure-travel_74190-7878.jpg?_wi=2", imageAlt: "Beautiful completed swimming pool"
imageSrc: "http://img.b2bpic.net/free-photo/outdoor-swimming-pool-with-umbrella-chair-lounge-around-there-leisure-travel_74190-7878.jpg", imageAlt: "Beautiful completed swimming pool"
},
{
imageSrc: "http://img.b2bpic.net/free-photo/swimming-pool-ladder-with-grass-background_1203-952.jpg?_wi=2", imageAlt: "Expert pool care and maintenance"
imageSrc: "http://img.b2bpic.net/free-photo/swimming-pool-ladder-with-grass-background_1203-952.jpg", imageAlt: "Expert pool care and maintenance"
},
{
imageSrc: "http://img.b2bpic.net/free-photo/family-choosing-car-car-showroom_1303-17420.jpg?_wi=2", imageAlt: "Pool design and planning expertise"
imageSrc: "http://img.b2bpic.net/free-photo/family-choosing-car-car-showroom_1303-17420.jpg", imageAlt: "Pool design and planning expertise"
}
]}
carouselPosition="right"
@@ -125,15 +125,15 @@ export default function LandingPage() {
useInvertedBackground={true}
features={[
{
title: "Pool Design & Installation", description: "Custom-designed pools built to your exact specifications with expert craftsmanship.", imageSrc: "http://img.b2bpic.net/free-photo/family-choosing-car-car-showroom_1303-17420.jpg?_wi=3", imageAlt: "Pool design and installation", buttonIcon: ArrowRight,
title: "Pool Design & Installation", description: "Custom-designed pools built to your exact specifications with expert craftsmanship.", imageSrc: "http://img.b2bpic.net/free-photo/family-choosing-car-car-showroom_1303-17420.jpg", imageAlt: "Pool design and installation", buttonIcon: ArrowRight,
buttonHref: "#contact"
},
{
title: "Full Project Management", description: "We handle every step from initial consultation through final installation and handoff.", imageSrc: "http://img.b2bpic.net/free-photo/engineer-helmet-standing-by-factory_1157-35561.jpg?_wi=3", imageAlt: "Professional pool project management", buttonIcon: ArrowRight,
title: "Full Project Management", description: "We handle every step from initial consultation through final installation and handoff.", imageSrc: "http://img.b2bpic.net/free-photo/engineer-helmet-standing-by-factory_1157-35561.jpg", imageAlt: "Professional pool project management", buttonIcon: ArrowRight,
buttonHref: "#contact"
},
{
title: "Maintenance & Accessories", description: "Keep your pool in perfect condition with our professional maintenance and equipment services.", imageSrc: "http://img.b2bpic.net/free-photo/swimming-pool-ladder-with-grass-background_1203-952.jpg?_wi=3", imageAlt: "Pool maintenance and care", buttonIcon: ArrowRight,
title: "Maintenance & Accessories", description: "Keep your pool in perfect condition with our professional maintenance and equipment services.", imageSrc: "http://img.b2bpic.net/free-photo/swimming-pool-ladder-with-grass-background_1203-952.jpg", imageAlt: "Pool maintenance and care", buttonIcon: ArrowRight,
buttonHref: "#contact"
}
]}
@@ -177,7 +177,7 @@ export default function LandingPage() {
{ text: "Request Quote", href: "#contact-form" }
]}
buttonAnimation="slide-up"
background={{ variant: "grid" }}
background={{ variant: "plain" }}
useInvertedBackground={true}
/>
</div>

View File

@@ -1,51 +1,46 @@
"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?: string | number;
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 = 24,
fontFamily = 'Arial, sans-serif',
fontWeight = 'bold',
fill = '#000000',
className = '',
}) => {
const padding = 10;
const estimatedWidth = text.length * (fontSize * 0.6) + padding * 2;
const estimatedHeight = fontSize + padding * 2;
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 ${estimatedWidth} ${estimatedHeight}`}
xmlns="http://www.w3.org/2000/svg"
className={className}
preserveAspectRatio="xMidYMid meet"
>
<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={padding}
y={fontSize + padding}
fontSize={fontSize}
fontFamily={fontFamily}
fontWeight={fontWeight}
fill={fill}
dominantBaseline="auto"
>
{logoText}
{text}
</text>
</svg>
);
});
SvgTextLogo.displayName = "SvgTextLogo";
};
export default SvgTextLogo;