Merge version_1 into main #8

Merged
bender merged 3 commits from version_1 into main 2026-03-10 18:58:31 +00:00
3 changed files with 78 additions and 63 deletions

View File

@@ -33,7 +33,8 @@ export default function ContactPage() {
{ name: "Contact", id: "contact" },
]}
button={{
text: "Call Now", href: "tel:804-938-0669"}}
text: "Call Now", href: "tel:804-938-0669"
}}
brandName="Earl Boys Services"
/>
</div>
@@ -48,21 +49,25 @@ export default function ContactPage() {
background={{ variant: "plain" }}
mediaItems={[
{
imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-smiley-man-wearing-helmet_23-2149328066.jpg", imageAlt: "Professional handyman ready to help"},
imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-smiley-man-wearing-helmet_23-2149328066.jpg", imageAlt: "Professional handyman ready to help"
},
{
imageSrc: "http://img.b2bpic.net/free-photo/construction-worker-using-hammer-job-site_23-2150530711.jpg", imageAlt: "Expert tradesperson at work"},
imageSrc: "http://img.b2bpic.net/free-photo/construction-worker-using-hammer-job-site_23-2150530711.jpg", imageAlt: "Expert tradesperson at work"
},
{
imageSrc: "http://img.b2bpic.net/free-photo/mid-adult-businessman-giving-presentation-group-industrial-workers-factory_637285-4792.jpg", imageAlt: "Professional team collaboration"},
imageSrc: "http://img.b2bpic.net/free-photo/mid-adult-businessman-giving-presentation-group-industrial-workers-factory_637285-4792.jpg", imageAlt: "Professional team collaboration"
},
]}
mediaAnimation="blur-reveal"
buttons={[
{
text: "Call Now: 804-938-0669", href: "tel:804-938-0669"},
text: "Call Now: 804-938-0669", href: "tel:804-938-0669"
},
{
text: "Send Message", href: "#contact"},
text: "Send Message", href: "#contact"
},
]}
buttonAnimation="slide-up"
useInvertedBackground={false}
/>
</div>
@@ -70,13 +75,17 @@ export default function ContactPage() {
<FeatureCardThree
features={[
{
id: "01", title: "Call Us Directly", description: "Quick response to your service requests. Our team is available to answer questions and schedule appointments at your convenience.", imageSrc: "http://img.b2bpic.net/free-photo/front-view-tools-carpentry-table_23-2148643196.jpg", imageAlt: "Direct phone contact service"},
id: "01", title: "Call Us Directly", description: "Quick response to your service requests. Our team is available to answer questions and schedule appointments at your convenience.", imageSrc: "http://img.b2bpic.net/free-photo/front-view-tools-carpentry-table_23-2148643196.jpg", imageAlt: "Direct phone contact service"
},
{
id: "02", title: "Fast Response Times", description: "We understand your time is valuable. Expect quick callbacks and efficient scheduling. Most requests answered within 2 business hours.", imageSrc: "http://img.b2bpic.net/free-photo/woman-standing-ladder-balance_23-2149366706.jpg", imageAlt: "Fast response professional service"},
id: "02", title: "Fast Response Times", description: "We understand your time is valuable. Expect quick callbacks and efficient scheduling. Most requests answered within 2 business hours.", imageSrc: "http://img.b2bpic.net/free-photo/woman-standing-ladder-balance_23-2149366706.jpg", imageAlt: "Fast response professional service"
},
{
id: "03", title: "Free Estimates", description: "No obligation quotes for your projects. We provide transparent pricing so you know exactly what to expect before work begins.", imageSrc: "http://img.b2bpic.net/free-photo/frustrated-young-husband-wife-doing-paperwork-together-calculating-their-expenses-managing-bills-using-laptop-computer-calculator-modern-kitchen_273609-1677.jpg", imageAlt: "Transparent estimate process"},
id: "03", title: "Free Estimates", description: "No obligation quotes for your projects. We provide transparent pricing so you know exactly what to expect before work begins.", imageSrc: "http://img.b2bpic.net/free-photo/frustrated-young-husband-wife-doing-paperwork-together-calculating-their-expenses-managing-bills-using-laptop-computer-calculator-modern-kitchen_273609-1677.jpg", imageAlt: "Transparent estimate process"
},
{
id: "04", title: "Flexible Scheduling", description: "We work around your schedule. Early morning, evening, or weekend appointments available to minimize disruption to your daily routine.", imageSrc: "http://img.b2bpic.net/free-photo/full-shot-people-garage-sale_23-2150577001.jpg", imageAlt: "Convenient scheduling options"},
id: "04", title: "Flexible Scheduling", description: "We work around your schedule. Early morning, evening, or weekend appointments available to minimize disruption to your daily routine.", imageSrc: "http://img.b2bpic.net/free-photo/full-shot-people-garage-sale_23-2150577001.jpg", imageAlt: "Convenient scheduling options"
},
]}
title="How to Reach Us"
description="Multiple ways to contact Earl Boys Services for your home improvement needs"
@@ -100,9 +109,11 @@ export default function ContactPage() {
description="Don't wait. Contact Earl Boys Services now for fast, professional home repair and improvement solutions. We're ready to serve you."
buttons={[
{
text: "Call: 804-938-0669", href: "tel:804-938-0669"},
text: "Call: 804-938-0669", href: "tel:804-938-0669"
},
{
text: "Request Service", href: "/contact"},
text: "Request Service", href: "/contact"
},
]}
buttonAnimation="slide-up"
background={{ variant: "gradient-bars" }}
@@ -116,45 +127,59 @@ export default function ContactPage() {
{
title: "Services", items: [
{
label: "Plumbing", href: "#"},
label: "Plumbing", href: "#"
},
{
label: "Electrical", href: "#"},
label: "Electrical", href: "#"
},
{
label: "Painting", href: "#"},
label: "Painting", href: "#"
},
{
label: "Flooring", href: "/services/flooring"},
label: "Flooring", href: "/services/flooring"
},
{
label: "Wall Mounting", href: "#"},
label: "Wall Mounting", href: "#"
},
],
},
{
title: "Company", items: [
{
label: "About Us", href: "#"},
label: "About Us", href: "#"
},
{
label: "Our Team", href: "#"},
label: "Our Team", href: "#"
},
{
label: "Reviews", href: "#"},
label: "Reviews", href: "#"
},
{
label: "Contact", href: "/contact"},
label: "Contact", href: "/contact"
},
],
},
{
title: "Contact", items: [
{
label: "Call: 804-938-0669", href: "tel:804-938-0669"},
label: "Call: 804-938-0669", href: "tel:804-938-0669"
},
{
label: "Richmond, VA", href: "#"},
label: "Richmond, VA", href: "#"
},
{
label: "Request Service", href: "/contact"},
label: "Request Service", href: "/contact"
},
],
},
{
title: "Legal", items: [
{
label: "Privacy Policy", href: "#"},
label: "Privacy Policy", href: "#"
},
{
label: "Terms of Service", href: "#"},
label: "Terms of Service", href: "#"
},
],
},
]}

View File

@@ -70,7 +70,6 @@ export default function ElectricalServicesPage() {
}
]}
buttonAnimation="slide-up"
useInvertedBackground={false}
/>
</div>

View File

@@ -1,51 +1,42 @@
"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;
fontSize?: number;
fontWeight?: number | string;
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 = '',
textClassName = '',
fontSize = 32,
fontWeight = 700,
letterSpacing = 0,
}) => {
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 ${text.length * fontSize * 0.6} ${fontSize * 1.5}`}
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"
}}
y={fontSize * 1.1}
fontSize={fontSize}
fontWeight={fontWeight}
letterSpacing={letterSpacing}
fill="currentColor"
dominantBaseline="middle"
className={textClassName}
>
{logoText}
{text}
</text>
</svg>
);
});
SvgTextLogo.displayName = "SvgTextLogo";
};
export default SvgTextLogo;