Merge version_1 into main #2

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

View File

@@ -5,6 +5,7 @@ import NavbarLayoutFloatingOverlay from "@/components/navbar/NavbarLayoutFloatin
import ContactCenter from "@/components/sections/contact/ContactCenter";
import Link from "next/link";
import FooterBaseReveal from "@/components/sections/footer/FooterBaseReveal";
import { Phone } from "lucide-react";
export default function ContactPage() {
const navItems = [
@@ -17,8 +18,7 @@ export default function ContactPage() {
const footerColumns = [
{
title: "Service",
items: [
title: "Service", items: [
{ label: "Emergency Plumbing", href: "/services" },
{ label: "Drain Cleaning", href: "/services" },
{ label: "Water Heater", href: "/services" },
@@ -27,8 +27,7 @@ export default function ContactPage() {
],
},
{
title: "Company",
items: [
title: "Company", items: [
{ label: "About Us", href: "/about" },
{ label: "Service Area", href: "/service-area" },
{ label: "Reviews", href: "/reviews" },
@@ -37,8 +36,7 @@ export default function ContactPage() {
],
},
{
title: "Contact",
items: [
title: "Contact", items: [
{ label: "(478) 746-3201", href: "tel:(478)746-3201" },
{ label: "2678 Roff Ave, Macon, GA 31204", href: "#" },
{ label: "Open Until 4 PM", href: "#" },
@@ -65,9 +63,7 @@ export default function ContactPage() {
brandName="Greene Plumbing"
navItems={navItems}
button={{
text: "Call Now",
href: "tel:(478)746-3201",
}}
text: "Call Now", href: "tel:(478)746-3201"}}
/>
</div>
@@ -77,10 +73,9 @@ export default function ContactPage() {
tag="Get Help Now"
title="Ready to Schedule Your Plumbing Service?"
description="Contact Greene Plumbing & Heating Co today for fast, reliable service. Call, fill out our form, or visit us. We're here to help with all your plumbing needs."
tagIcon="Phone"
tagIcon={Phone}
background={{
variant: "radial-gradient",
}}
variant: "radial-gradient"}}
useInvertedBackground={false}
inputPlaceholder="Enter your email or phone"
buttonText="Request Service"

View File

@@ -1,51 +1,41 @@
"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;
fontWeight?: 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);
export const SvgTextLogo: React.FC<SvgTextLogoProps> = ({
text,
fontSize = 24,
fontWeight = 700,
fill = '#000000',
className = '',
}) => {
return (
<svg
ref={svgRef}
viewBox={viewBox}
className={cls("w-full", className)}
style={{ aspectRatio: aspectRatio }}
preserveAspectRatio="none"
role="img"
aria-label={`${logoText} logo`}
width={fontSize * text.length * 0.6}
height={fontSize * 1.2}
viewBox={`0 0 ${fontSize * text.length * 0.6} ${fontSize * 1.2}`}
xmlns="http://www.w3.org/2000/svg"
className={className}
>
<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%"
fontSize={fontSize}
fontWeight={fontWeight}
fill={fill}
textAnchor="middle"
dominantBaseline="middle"
>
{logoText}
{text}
</text>
</svg>
);
});
};
SvgTextLogo.displayName = "SvgTextLogo";
export default SvgTextLogo;
export default SvgTextLogo;