Merge version_1 into main #2

Merged
bender merged 2 commits from version_1 into main 2026-03-11 16:04:25 +00:00
2 changed files with 31 additions and 48 deletions

View File

@@ -54,27 +54,26 @@ export default function LandingPage() {
background={{ variant: "plain" }}
carouselItems={[
{
id: "1", imageSrc: "http://img.b2bpic.net/free-photo/construction-worker-assembling-furniture_329181-11785.jpg?_wi=1", imageAlt: "Professional plumber at work"
id: "1", imageSrc: "http://img.b2bpic.net/free-photo/construction-worker-assembling-furniture_329181-11785.jpg", imageAlt: "Professional plumber at work"
},
{
id: "2", imageSrc: "http://img.b2bpic.net/free-photo/expressive-young-man-posing-studio_176474-38487.jpg?_wi=1", imageAlt: "Emergency plumbing service"
id: "2", imageSrc: "http://img.b2bpic.net/free-photo/expressive-young-man-posing-studio_176474-38487.jpg", imageAlt: "Emergency plumbing service"
},
{
id: "3", imageSrc: "http://img.b2bpic.net/free-photo/man-rinsing-dish-rack-with-pullout-sprayer-by-sink-flow-control_169016-69395.jpg?_wi=1", imageAlt: "Installation service"
id: "3", imageSrc: "http://img.b2bpic.net/free-photo/man-rinsing-dish-rack-with-pullout-sprayer-by-sink-flow-control_169016-69395.jpg", imageAlt: "Installation service"
},
{
id: "4", imageSrc: "http://img.b2bpic.net/free-photo/shock-wave-therapy-device-with-male-doctor-hands-rubber-gloves_169016-40119.jpg?_wi=1", imageAlt: "Maintenance service"
id: "4", imageSrc: "http://img.b2bpic.net/free-photo/shock-wave-therapy-device-with-male-doctor-hands-rubber-gloves_169016-40119.jpg", imageAlt: "Maintenance service"
},
{
id: "5", imageSrc: "http://img.b2bpic.net/free-photo/two-smiling-builders-work-clothes-happily-looking-camera-spending-time-workshop-with-variety-tools-background_574295-1638.jpg?_wi=1", imageAlt: "Professional team"
id: "5", imageSrc: "http://img.b2bpic.net/free-photo/two-smiling-builders-work-clothes-happily-looking-camera-spending-time-workshop-with-variety-tools-background_574295-1638.jpg", imageAlt: "Professional team"
},
{
id: "6", imageSrc: "http://img.b2bpic.net/free-photo/construction-worker-assembling-furniture_329181-11785.jpg?_wi=2", imageAlt: "Quality workmanship"
id: "6", imageSrc: "http://img.b2bpic.net/free-photo/construction-worker-assembling-furniture_329181-11785.jpg", imageAlt: "Quality workmanship"
}
]}
autoPlay={true}
autoPlayInterval={5000}
useInvertedBackground={false}
/>
</div>
@@ -87,7 +86,7 @@ export default function LandingPage() {
tagAnimation="slide-up"
buttons={[{ text: "Learn More", href: "#services" }]}
buttonAnimation="slide-up"
imageSrc="http://img.b2bpic.net/free-photo/two-smiling-builders-work-clothes-happily-looking-camera-spending-time-workshop-with-variety-tools-background_574295-1638.jpg?_wi=2"
imageSrc="http://img.b2bpic.net/free-photo/two-smiling-builders-work-clothes-happily-looking-camera-spending-time-workshop-with-variety-tools-background_574295-1638.jpg"
imageAlt="JMS Plumbing professional team"
useInvertedBackground={true}
/>
@@ -103,7 +102,7 @@ export default function LandingPage() {
features={[
{
id: "1", title: "Emergency Repairs", description: "24/7 emergency plumbing service for burst pipes, leaks, clogs, and other urgent issues. We respond quickly to minimize damage.", media: {
imageSrc: "http://img.b2bpic.net/free-photo/expressive-young-man-posing-studio_176474-38487.jpg?_wi=2", imageAlt: "Emergency plumbing repair"
imageSrc: "http://img.b2bpic.net/free-photo/expressive-young-man-posing-studio_176474-38487.jpg", imageAlt: "Emergency plumbing repair"
},
items: [
{ icon: AlertCircle, text: "24/7 rapid response" },
@@ -114,7 +113,7 @@ export default function LandingPage() {
},
{
id: "2", title: "Installation & Upgrades", description: "Professional installation of new fixtures, water heaters, and plumbing systems. We handle all your upgrade needs with precision.", media: {
imageSrc: "http://img.b2bpic.net/free-photo/man-rinsing-dish-rack-with-pullout-sprayer-by-sink-flow-control_169016-69395.jpg?_wi=2", imageAlt: "Installation service"
imageSrc: "http://img.b2bpic.net/free-photo/man-rinsing-dish-rack-with-pullout-sprayer-by-sink-flow-control_169016-69395.jpg", imageAlt: "Installation service"
},
items: [
{ icon: Hammer, text: "Expert installation" },
@@ -125,7 +124,7 @@ export default function LandingPage() {
},
{
id: "3", title: "Maintenance Plans", description: "Preventive maintenance keeps your plumbing system running smoothly. Regular inspections and cleanings prevent costly repairs.", media: {
imageSrc: "http://img.b2bpic.net/free-photo/shock-wave-therapy-device-with-male-doctor-hands-rubber-gloves_169016-40119.jpg?_wi=2", imageAlt: "Maintenance service"
imageSrc: "http://img.b2bpic.net/free-photo/shock-wave-therapy-device-with-male-doctor-hands-rubber-gloves_169016-40119.jpg", imageAlt: "Maintenance service"
},
items: [
{ icon: Calendar, text: "Scheduled inspections" },

View File

@@ -1,51 +1,35 @@
"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;
fillColor?: string;
dominantBaseline?: "auto" | "text-bottom" | "alphabetic" | "ideographic" | "middle" | "hanging" | "mathematical";
}
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 = "", fillColor = "currentColor", dominantBaseline = "middle"}) => {
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 100"
className={`w-full h-auto ${className}`}
xmlns="http://www.w3.org/2000/svg"
>
<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="48"
fontWeight="bold"
fill={fillColor}
className="font-sans"
>
{logoText}
{text}
</text>
</svg>
);
});
};
SvgTextLogo.displayName = "SvgTextLogo";
export default SvgTextLogo;
export default SvgTextLogo;