Merge version_1 into main #2

Merged
bender merged 2 commits from version_1 into main 2026-03-11 23:43:18 +00:00
2 changed files with 36 additions and 51 deletions

View File

@@ -19,7 +19,7 @@ export default function LandingPage() {
borderRadius="pill"
contentWidth="mediumLarge"
sizing="medium"
background="floatingGradient"
background="circleGradient"
cardStyle="solid"
primaryButtonStyle="shadow"
secondaryButtonStyle="layered"
@@ -51,18 +51,18 @@ export default function LandingPage() {
{ text: "Request Service", href: "#contact" }
]}
buttonAnimation="slide-up"
background={{ variant: "floatingGradient" }}
background={{ variant: "plain" }}
leftCarouselItems={[
{ imageSrc: "http://img.b2bpic.net/free-photo/cheerful-asian-plumber-overalls-standing-door-with-toolbox_1098-17819.jpg?_wi=1", imageAlt: "Professional plumbing work" },
{ imageSrc: "http://img.b2bpic.net/free-photo/carpenter-working-workshop_53876-30143.jpg?_wi=1", imageAlt: "Professional tools and components" },
{ imageSrc: "http://img.b2bpic.net/free-photo/cheerful-asian-plumber-overalls-standing-door-with-toolbox_1098-17819.jpg?_wi=2", imageAlt: "HVAC installation service" },
{ imageSrc: "http://img.b2bpic.net/free-photo/carpenter-working-workshop_53876-30143.jpg?_wi=2", imageAlt: "Quality craftsmanship detail" }
{ imageSrc: "http://img.b2bpic.net/free-photo/cheerful-asian-plumber-overalls-standing-door-with-toolbox_1098-17819.jpg", imageAlt: "Professional plumbing work" },
{ imageSrc: "http://img.b2bpic.net/free-photo/carpenter-working-workshop_53876-30143.jpg", imageAlt: "Professional tools and components" },
{ imageSrc: "http://img.b2bpic.net/free-photo/cheerful-asian-plumber-overalls-standing-door-with-toolbox_1098-17819.jpg", imageAlt: "HVAC installation service" },
{ imageSrc: "http://img.b2bpic.net/free-photo/carpenter-working-workshop_53876-30143.jpg", imageAlt: "Quality craftsmanship detail" }
]}
rightCarouselItems={[
{ imageSrc: "http://img.b2bpic.net/free-photo/carpenter-working-workshop_53876-30143.jpg?_wi=3", imageAlt: "Premium materials and tools" },
{ imageSrc: "http://img.b2bpic.net/free-photo/cheerful-asian-plumber-overalls-standing-door-with-toolbox_1098-17819.jpg?_wi=3", imageAlt: "Expert technician at work" },
{ imageSrc: "http://img.b2bpic.net/free-photo/carpenter-working-workshop_53876-30143.jpg?_wi=4", imageAlt: "Professional workspace" },
{ imageSrc: "http://img.b2bpic.net/free-photo/cheerful-asian-plumber-overalls-standing-door-with-toolbox_1098-17819.jpg?_wi=4", imageAlt: "Precision workmanship" }
{ imageSrc: "http://img.b2bpic.net/free-photo/carpenter-working-workshop_53876-30143.jpg", imageAlt: "Premium materials and tools" },
{ imageSrc: "http://img.b2bpic.net/free-photo/cheerful-asian-plumber-overalls-standing-door-with-toolbox_1098-17819.jpg", imageAlt: "Expert technician at work" },
{ imageSrc: "http://img.b2bpic.net/free-photo/carpenter-working-workshop_53876-30143.jpg", imageAlt: "Professional workspace" },
{ imageSrc: "http://img.b2bpic.net/free-photo/cheerful-asian-plumber-overalls-standing-door-with-toolbox_1098-17819.jpg", imageAlt: "Precision workmanship" }
]}
carouselPosition="right"
/>
@@ -93,9 +93,9 @@ export default function LandingPage() {
useInvertedBackground={false}
gridVariant="three-columns-all-equal-width"
products={[
{ id: "plumbing-repair", name: "Plumbing Repair & Diagnostics", price: "Professional Assessment", imageSrc: "http://img.b2bpic.net/free-photo/cheerful-asian-plumber-overalls-standing-door-with-toolbox_1098-17819.jpg?_wi=5", imageAlt: "Plumbing repair service" },
{ id: "furnace-installation", name: "Furnace Installation & Repair", price: "Expert Installation", imageSrc: "http://img.b2bpic.net/free-photo/carpenter-working-workshop_53876-30143.jpg?_wi=5", imageAlt: "Furnace installation service" },
{ id: "hvac-maintenance", name: "HVAC System Maintenance", price: "Preventative Service", imageSrc: "http://img.b2bpic.net/free-photo/cheerful-asian-plumber-overalls-standing-door-with-toolbox_1098-17819.jpg?_wi=6", imageAlt: "HVAC maintenance" }
{ id: "plumbing-repair", name: "Plumbing Repair & Diagnostics", price: "Professional Assessment", imageSrc: "http://img.b2bpic.net/free-photo/cheerful-asian-plumber-overalls-standing-door-with-toolbox_1098-17819.jpg", imageAlt: "Plumbing repair service" },
{ id: "furnace-installation", name: "Furnace Installation & Repair", price: "Expert Installation", imageSrc: "http://img.b2bpic.net/free-photo/carpenter-working-workshop_53876-30143.jpg", imageAlt: "Furnace installation service" },
{ id: "hvac-maintenance", name: "HVAC System Maintenance", price: "Preventative Service", imageSrc: "http://img.b2bpic.net/free-photo/cheerful-asian-plumber-overalls-standing-door-with-toolbox_1098-17819.jpg", imageAlt: "HVAC maintenance" }
]}
/>
</div>

View File

@@ -1,51 +1,36 @@
"use client";
import React, { SVGProps } from "react";
import { memo } from "react";
import useSvgTextLogo from "./useSvgTextLogo";
import { cls } from "@/lib/utils";
interface SvgTextLogoProps {
logoText: string;
adjustHeightFactor?: number;
verticalAlign?: "top" | "center";
className?: string;
interface SvgTextLogoProps extends SVGProps<SVGSVGElement> {
text?: string;
fontSize?: number;
fontFamily?: string;
fill?: string;
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 = "Logo", fontSize = 32,
fontFamily = "Arial, sans-serif", fill = "currentColor", dominantBaseline = "middle", ...props
}) => {
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 50"
xmlns="http://www.w3.org/2000/svg"
{...props}
>
<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}
fontSize={fontSize}
fontFamily={fontFamily}
fill={fill}
>
{logoText}
{text}
</text>
</svg>
);
});
SvgTextLogo.displayName = "SvgTextLogo";
};
export default SvgTextLogo;