Merge version_1 into main #2

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

View File

@@ -55,16 +55,16 @@ export default function LandingPage() {
buttonAnimation="slide-up"
background={{ variant: "glowing-orb" }}
leftCarouselItems={[
{ imageSrc: "http://img.b2bpic.net/free-photo/man-cutting-grass-with-lawn-mover-back-yard-male-shirt_1157-41448.jpg?_wi=1", imageAlt: "Professional lawn mowing service" },
{ imageSrc: "http://img.b2bpic.net/free-photo/grass-background_1127-3417.jpg?_wi=1", imageAlt: "Beautiful landscape design" },
{ imageSrc: "http://img.b2bpic.net/free-photo/gardening-equipments-gloves-vegetable-crate-table_23-2147844358.jpg?_wi=1", imageAlt: "Irrigation system installation" },
{ imageSrc: "http://img.b2bpic.net/free-photo/senior-municipal-worker-walking-with-leaf-blower-clean-up-city-park-area-front-view-focused_7502-10283.jpg?_wi=1", imageAlt: "Seasonal lawn maintenance" }
{ imageSrc: "http://img.b2bpic.net/free-photo/man-cutting-grass-with-lawn-mover-back-yard-male-shirt_1157-41448.jpg", imageAlt: "Professional lawn mowing service" },
{ imageSrc: "http://img.b2bpic.net/free-photo/grass-background_1127-3417.jpg", imageAlt: "Beautiful landscape design" },
{ imageSrc: "http://img.b2bpic.net/free-photo/gardening-equipments-gloves-vegetable-crate-table_23-2147844358.jpg", imageAlt: "Irrigation system installation" },
{ imageSrc: "http://img.b2bpic.net/free-photo/senior-municipal-worker-walking-with-leaf-blower-clean-up-city-park-area-front-view-focused_7502-10283.jpg", imageAlt: "Seasonal lawn maintenance" }
]}
rightCarouselItems={[
{ imageSrc: "http://img.b2bpic.net/free-photo/grass-background_1127-3417.jpg?_wi=2", imageAlt: "Landscape transformation" },
{ imageSrc: "http://img.b2bpic.net/free-photo/senior-municipal-worker-walking-with-leaf-blower-clean-up-city-park-area-front-view-focused_7502-10283.jpg?_wi=2", imageAlt: "Fall cleanup service" },
{ imageSrc: "http://img.b2bpic.net/free-photo/man-cutting-grass-with-lawn-mover-back-yard-male-shirt_1157-41448.jpg?_wi=2", imageAlt: "Professional maintenance" },
{ imageSrc: "http://img.b2bpic.net/free-photo/gardening-equipments-gloves-vegetable-crate-table_23-2147844358.jpg?_wi=2", imageAlt: "Watering systems" }
{ imageSrc: "http://img.b2bpic.net/free-photo/grass-background_1127-3417.jpg", imageAlt: "Landscape transformation" },
{ imageSrc: "http://img.b2bpic.net/free-photo/senior-municipal-worker-walking-with-leaf-blower-clean-up-city-park-area-front-view-focused_7502-10283.jpg", imageAlt: "Fall cleanup service" },
{ imageSrc: "http://img.b2bpic.net/free-photo/man-cutting-grass-with-lawn-mover-back-yard-male-shirt_1157-41448.jpg", imageAlt: "Professional maintenance" },
{ imageSrc: "http://img.b2bpic.net/free-photo/gardening-equipments-gloves-vegetable-crate-table_23-2147844358.jpg", imageAlt: "Watering systems" }
]}
carouselPosition="right"
/>
@@ -85,6 +85,7 @@ export default function LandingPage() {
imageAlt="GreenCare professional landscaping team"
useInvertedBackground={true}
mediaAnimation="slide-up"
metricsAnimation="slide-up"
/>
</div>
@@ -105,22 +106,22 @@ export default function LandingPage() {
useInvertedBackground={false}
features={[
{
title: "Regular Lawn Maintenance", description: "Weekly or bi-weekly grass cutting, edging, and trimming to keep your lawn looking pristine all season long.", imageSrc: "http://img.b2bpic.net/free-photo/man-cutting-grass-with-lawn-mover-back-yard-male-shirt_1157-41448.jpg?_wi=3", imageAlt: "Lawn maintenance service"
title: "Regular Lawn Maintenance", description: "Weekly or bi-weekly grass cutting, edging, and trimming to keep your lawn looking pristine all season long.", imageSrc: "http://img.b2bpic.net/free-photo/man-cutting-grass-with-lawn-mover-back-yard-male-shirt_1157-41448.jpg", imageAlt: "Lawn maintenance service"
},
{
title: "Landscaping Design", description: "Custom landscape design and installation services that transform your outdoor space into a beautiful oasis.", imageSrc: "http://img.b2bpic.net/free-photo/grass-background_1127-3417.jpg?_wi=3", imageAlt: "Landscape design project"
title: "Landscaping Design", description: "Custom landscape design and installation services that transform your outdoor space into a beautiful oasis.", imageSrc: "http://img.b2bpic.net/free-photo/grass-background_1127-3417.jpg", imageAlt: "Landscape design project"
},
{
title: "Irrigation Systems", description: "Professional irrigation installation and maintenance to ensure your lawn stays hydrated and healthy.", imageSrc: "http://img.b2bpic.net/free-photo/gardening-equipments-gloves-vegetable-crate-table_23-2147844358.jpg?_wi=3", imageAlt: "Irrigation system setup"
title: "Irrigation Systems", description: "Professional irrigation installation and maintenance to ensure your lawn stays hydrated and healthy.", imageSrc: "http://img.b2bpic.net/free-photo/gardening-equipments-gloves-vegetable-crate-table_23-2147844358.jpg", imageAlt: "Irrigation system setup"
},
{
title: "Seasonal Cleanup", description: "Spring and fall seasonal services including leaf removal, mulching, and yard preparation.", imageSrc: "http://img.b2bpic.net/free-photo/senior-municipal-worker-walking-with-leaf-blower-clean-up-city-park-area-front-view-focused_7502-10283.jpg?_wi=3", imageAlt: "Seasonal yard cleanup"
title: "Seasonal Cleanup", description: "Spring and fall seasonal services including leaf removal, mulching, and yard preparation.", imageSrc: "http://img.b2bpic.net/free-photo/senior-municipal-worker-walking-with-leaf-blower-clean-up-city-park-area-front-view-focused_7502-10283.jpg", imageAlt: "Seasonal yard cleanup"
},
{
title: "Weed Control", description: "Effective weed prevention and removal treatments using eco-friendly solutions that protect your lawn.", imageSrc: "http://img.b2bpic.net/free-photo/man-cutting-grass-with-lawn-mover-back-yard-male-shirt_1157-41448.jpg?_wi=4", imageAlt: "Weed control service"
title: "Weed Control", description: "Effective weed prevention and removal treatments using eco-friendly solutions that protect your lawn.", imageSrc: "http://img.b2bpic.net/free-photo/man-cutting-grass-with-lawn-mover-back-yard-male-shirt_1157-41448.jpg", imageAlt: "Weed control service"
},
{
title: "Lawn Aeration", description: "Professional aeration services to improve soil health, promote root growth, and enhance lawn vitality.", imageSrc: "http://img.b2bpic.net/free-photo/grass-background_1127-3417.jpg?_wi=4", imageAlt: "Lawn aeration treatment"
title: "Lawn Aeration", description: "Professional aeration services to improve soil health, promote root growth, and enhance lawn vitality.", imageSrc: "http://img.b2bpic.net/free-photo/grass-background_1127-3417.jpg", imageAlt: "Lawn aeration treatment"
}
]}
/>

View File

@@ -1,51 +1,54 @@
"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;
letterSpacing?: 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 = '',
fontSize = 48,
letterSpacing = 2,
}) => {
const width = text.length * (fontSize * 0.6);
const height = fontSize * 1.5;
return (
<svg
ref={svgRef}
viewBox={viewBox}
className={cls("w-full", className)}
style={{ aspectRatio: aspectRatio }}
preserveAspectRatio="none"
role="img"
aria-label={`${logoText} logo`}
width={width}
height={height}
viewBox={`0 0 ${width} ${height}`}
className={className}
xmlns="http://www.w3.org/2000/svg"
>
<defs>
<style>
{`
@import url('https://fonts.googleapis.com/css2?family=Inter:wght@400;600;700&display=swap');
.svg-text {
font-family: 'Inter', sans-serif;
font-size: ${fontSize}px;
font-weight: 700;
fill: currentColor;
letter-spacing: ${letterSpacing}px;
}
`}
</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={width / 2}
y={height / 2}
textAnchor="middle"
dominantBaseline="middle"
className="svg-text"
>
{logoText}
{text}
</text>
</svg>
);
});
SvgTextLogo.displayName = "SvgTextLogo";
};
export default SvgTextLogo;