Merge version_2 into main #2

Merged
bender merged 4 commits from version_2 into main 2026-04-21 19:33:30 +00:00
4 changed files with 72 additions and 56 deletions

View File

@@ -8,7 +8,7 @@ import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis'
export default function AboutPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="hover-magnetic" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<ReactLenis root>
<div id="nav" data-section="nav">
<NavbarStyleApple
@@ -16,20 +16,24 @@ export default function AboutPage() {
{ name: "Home", id: "/" },
{ name: "About", id: "/about" },
{ name: "Contact", id: "/contact" },
{ name: "Services", id: "/services" },
{ name: "Service Areas", id: "/service-areas" }
]}
brandName="Avery's Plumbing"
/>
</div>
<div className="py-24">
<div id="about" data-section="about" className="py-24">
<InlineImageSplitTextAbout
useInvertedBackground={false}
heading={[{ type: "text", content: "About Avery's Plumbing" }]}
/>
</div>
<FooterLogoEmphasis
columns={[]}
logoText="Avery's Plumbing"
/>
<div id="footer" data-section="footer">
<FooterLogoEmphasis
columns={[]}
logoText="Avery's Plumbing"
/>
</div>
</ReactLenis>
</ThemeProvider>
);

View File

@@ -3,12 +3,12 @@
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import ReactLenis from "lenis/react";
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
import ContactCenter from '@/components/sections/contact/ContactCenter';
import ContactText from '@/components/sections/contact/ContactText';
import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
export default function ContactPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="hover-magnetic" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<ReactLenis root>
<div id="nav" data-section="nav">
<NavbarStyleApple
@@ -16,21 +16,25 @@ export default function ContactPage() {
{ name: "Home", id: "/" },
{ name: "About", id: "/about" },
{ name: "Contact", id: "/contact" },
{ name: "Services", id: "/services" },
{ name: "Service Areas", id: "/service-areas" }
]}
brandName="Avery's Plumbing"
/>
</div>
<div className="py-24">
<ContactCenter
tag="Get in touch"
title="Contact Our Team"
description="We are ready to help with any plumbing needs. Fill out the form or call us directly."
<div id="contact" data-section="contact" className="py-24">
<ContactText
text="Contact Our Team"
background={{ variant: "plain" }}
useInvertedBackground={false}
/>
</div>
<FooterLogoEmphasis
columns={[]}
logoText="Avery's Plumbing"
/>
<div id="footer" data-section="footer">
<FooterLogoEmphasis
columns={[]}
logoText="Avery's Plumbing"
/>
</div>
</ReactLenis>
</ThemeProvider>
);

View File

@@ -8,18 +8,20 @@ import { MapPin } from "lucide-react";
export default function ServiceAreasPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="hover-magnetic" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<ReactLenis root>
<NavbarStyleApple
navItems={[
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "Service Areas", id: "/service-areas" },
{ name: "About", id: "/#about" },
{ name: "Contact", id: "/#contact" },
]}
brandName="Avery's Plumbing"
/>
<div id="nav" data-section="nav">
<NavbarStyleApple
navItems={[
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "Service Areas", id: "/service-areas" },
{ name: "About", id: "/about" },
{ name: "Contact", id: "/contact" }
]}
brandName="Avery's Plumbing"
/>
</div>
<div className="pt-32 pb-20 px-8 text-center">
<h1 className="text-4xl font-extrabold mb-6">Our Service Coverage</h1>
<p className="max-w-2xl mx-auto mb-12 text-lg opacity-80">We proudly serve the metro area and surrounding suburbs, ensuring local, fast assistance whenever you need it.</p>
@@ -32,14 +34,16 @@ export default function ServiceAreasPage() {
))}
</div>
</div>
<FooterLogoEmphasis
columns={[
{ items: [{ label: "Home", href: "/" }, { label: "Services", href: "/services" }] },
{ items: [{ label: "Service Areas", href: "/service-areas" }, { label: "Contact", href: "/#contact" }] },
]}
logoText="Avery's Plumbing"
/>
<div id="footer" data-section="footer">
<FooterLogoEmphasis
columns={[
{ items: [{ label: "Home", href: "/" }, { label: "Services", href: "/services" }] },
{ items: [{ label: "Service Areas", href: "/service-areas" }, { label: "Contact", href: "/contact" }] },
]}
logoText="Avery's Plumbing"
/>
</div>
</ReactLenis>
</ThemeProvider>
);
}
}

View File

@@ -9,19 +9,21 @@ import { Wrench, Zap, Droplets, AlertTriangle, Trash2 } from "lucide-react";
export default function ServicesPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="hover-magnetic" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<ReactLenis root>
<NavbarStyleApple
navItems={[
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "Service Areas", id: "/service-areas" },
{ name: "About", id: "/#about" },
{ name: "Contact", id: "/#contact" },
]}
brandName="Avery's Plumbing"
/>
<div className="pt-32">
<div id="nav" data-section="nav">
<NavbarStyleApple
navItems={[
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "Service Areas", id: "/service-areas" },
{ name: "About", id: "/about" },
{ name: "Contact", id: "/contact" },
]}
brandName="Avery's Plumbing"
/>
</div>
<div id="features" data-section="features" className="pt-32">
<FeatureHoverPattern
animationType="slide-up"
textboxLayout="default"
@@ -38,14 +40,16 @@ export default function ServicesPage() {
]}
/>
</div>
<FooterLogoEmphasis
columns={[
{ items: [{ label: "Home", href: "/" }, { label: "Services", href: "/services" }] },
{ items: [{ label: "Service Areas", href: "/service-areas" }, { label: "Contact", href: "/#contact" }] },
]}
logoText="Avery's Plumbing"
/>
<div id="footer" data-section="footer">
<FooterLogoEmphasis
columns={[
{ items: [{ label: "Home", href: "/" }, { label: "Services", href: "/services" }] },
{ items: [{ label: "Service Areas", href: "/service-areas" }, { label: "Contact", href: "/contact" }] },
]}
logoText="Avery's Plumbing"
/>
</div>
</ReactLenis>
</ThemeProvider>
);
}
}