Merge version_2 into main

Update src/app/contact/page.tsx
2026-04-08 15:48:10 +00:00 · 2026-04-08 15:48:07 +00:00 · 2026-04-08 15:47:45 +00:00 · 2026-04-08 15:47:42 +00:00 · 2026-04-08 15:47:41 +00:00 · 2026-04-08 15:47:41 +00:00
3 changed files with 57 additions and 196 deletions
--- a/src/app/contact/page.tsx
+++ b/src/app/contact/page.tsx
@@ -2,12 +2,11 @@

 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import ContactCTA from '@/components/sections/contact/ContactCTA';
-import FooterCard from '@/components/sections/footer/FooterCard';
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
-import ProductCardOne from '@/components/sections/product/ProductCardOne';
+import ContactSplit from '@/components/sections/contact/ContactSplit';
+import FooterCard from '@/components/sections/footer/FooterCard';

-export default function LandingPage() {
+export default function ContactPage() {
  return (
    <ThemeProvider
        defaultButtonVariant="shift-hover"
@@ -22,84 +21,38 @@ export default function LandingPage() {
        headingFontWeight="semibold"
    >
      <ReactLenis root>
-  <div id="nav" data-section="nav">
-      <NavbarLayoutFloatingOverlay
-      navItems={[
-        {
-          name: "Home",
-          id: "/",
-        },
-        {
-          name: "Services",
-          id: "/services",
-        },
-        {
-          name: "About",
-          id: "/about",
-        },
-        {
-          name: "Contact",
-          id: "/contact",
-        },
-      ]}
-      brandName="ClearView"
-      button={{
-        text: "Book Now",
-        href: "/contact",
-      }}
-    />
-  </div>
+        <div id="nav" data-section="nav">
+          <NavbarLayoutFloatingOverlay
+            navItems={[
+              { name: "Home", id: "/" },
+              { name: "Services", id: "/services" },
+              { name: "About", id: "/about" },
+              { name: "Contact", id: "/contact" },
+            ]}
+            brandName="ClearView"
+            button={{ text: "Book Now", href: "/contact" }}
+          />
+        </div>

-  <div id="contact-content" data-section="contact-content">
-      <ContactCTA
-      useInvertedBackground={false}
-      background={{
-        variant: "plain",
-      }}
-      tag="Get in Touch"
-      title="Ready for Crystal Clear Views?"
-      description="Request your free, no-obligation quote today. We serve the entire metro area."
-      buttons={[
-        {
-          text: "Contact Us",
-          href: "tel:5550199",
-        },
-      ]}
-    />
-  </div>
+        <div id="contact" data-section="contact">
+          <ContactSplit
+            tag="Get in Touch"
+            title="Request a Free Quote"
+            description="Ready for crystal clear windows? Fill out the form below and we'll get back to you within 24 hours with a custom estimate."
+            background={{ variant: "plain" }}
+            useInvertedBackground={false}
+            buttonText="Submit Request"
+            inputPlaceholder="Enter your email address"
+          />
+        </div>

-  <div id="product" data-section="product">
-      <ProductCardOne
-      animationType="slide-up"
-      textboxLayout="default"
-      gridVariant="uniform-all-items-equal"
-      useInvertedBackground={false}
-      title="Get a Precise Estimate"
-      description="Choose your service category and send us your details."
-      products={[
-        {
-          id: "e1",
-          name: "Standard Quote",
-          price: "Request",
-          imageSrc: "http://img.b2bpic.net/free-photo/architecture-shadows-day-city_23-2149451188.jpg?_wi=6",
-        },
-        {
-          id: "e2",
-          name: "Commercial Quote",
-          price: "Request",
-          imageSrc: "http://img.b2bpic.net/free-photo/beautiful-architecture-office-business-building-with-glass-window-shape_74190-6432.jpg?_wi=6",
-        },
-      ]}
-    />
-  </div>
-
-  <div id="footer" data-section="footer">
-      <FooterCard
-      logoText="ClearView"
-      copyrightText="© 2025 ClearView Cleaning. All rights reserved."
-    />
-  </div>
+        <div id="footer" data-section="footer">
+          <FooterCard
+            logoText="ClearView"
+            copyrightText="© 2025 ClearView Cleaning. All rights reserved."
+          />
+        </div>
      </ReactLenis>
    </ThemeProvider>
  );
-}
+}
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -28,28 +28,14 @@ export default function LandingPage() {
  <div id="nav" data-section="nav">
      <NavbarLayoutFloatingOverlay
      navItems={[
-        {
-          name: "Home",
-          id: "/",
-        },
-        {
-          name: "Services",
-          id: "/services",
-        },
-        {
-          name: "About",
-          id: "/about",
-        },
-        {
-          name: "Contact",
-          id: "/contact",
-        },
+        { name: "Home", id: "/" },
+        { name: "Services", id: "/services" },
+        { name: "About", id: "/about" },
+        { name: "Contact", id: "/contact" },
      ]}
      brandName="ClearView"
      button={{
-        text: "Book Now",
-        href: "/contact",
-      }}
+        text: "Book Now",        href: "/contact"}}
    />
  </div>

@@ -58,35 +44,15 @@ export default function LandingPage() {
      title="Crystal Clear Results, Every Time"
      description="Professional residential and commercial window cleaning services. Experience the streak-free guarantee with our expert team."
      buttons={[
-        {
-          text: "Get a Free Quote",
-          href: "/contact",
-        },
+        { text: "Get a Free Quote", href: "/contact" },
      ]}
      imageSrc="http://img.b2bpic.net/free-photo/decorated-front-door-with-plant_23-2150562176.jpg"
      imageAlt="Professional window cleaner"
      showDimOverlay={true}
      avatars={[
-        {
-          src: "http://img.b2bpic.net/free-photo/vertical-shot-young-musician-woman-learns-how-play-ukulele-sits-sofa-with-crossed-legs_1258-204931.jpg",
-          alt: "Customer 1",
-        },
-        {
-          src: "http://img.b2bpic.net/free-photo/successful-time-young-handsome-man-white-shirt-black-jacket-expressing-positivity-talking-phone-leadership-great-career-manager-cheerful-mood_197531-2121.jpg",
-          alt: "Customer 2",
-        },
-        {
-          src: "http://img.b2bpic.net/free-photo/excited-cheerful-blond-girl-rejoicing-camera-with-copy-space-text-promotional-content-near-yellow-background_574295-2365.jpg",
-          alt: "Customer 3",
-        },
-        {
-          src: "http://img.b2bpic.net/free-photo/vertical-shot-young-musician-woman-learns-how-play-ukulele-sits-sofa-with-crossed-legs_1258-204931.jpg",
-          alt: "Customer 4",
-        },
-        {
-          src: "http://img.b2bpic.net/free-photo/successful-time-young-handsome-man-white-shirt-black-jacket-expressing-positivity-talking-phone-leadership-great-career-manager-cheerful-mood_197531-2121.jpg",
-          alt: "Customer 5",
-        },
+        { src: "http://img.b2bpic.net/free-photo/vertical-shot-young-musician-woman-learns-how-play-ukulele-sits-sofa-with-crossed-legs_1258-204931.jpg", alt: "Customer 1" },
+        { src: "http://img.b2bpic.net/free-photo/successful-time-young-handsome-man-white-shirt-black-jacket-expressing-positivity-talking-phone-leadership-great-career-manager-cheerful-mood_197531-2121.jpg", alt: "Customer 2" },
+        { src: "http://img.b2bpic.net/free-photo/excited-cheerful-blond-girl-rejoicing-camera-with-copy-space-text-promotional-content-near-yellow-background_574295-2365.jpg", alt: "Customer 3" },
      ]}
      avatarText="Trusted by 500+ local homeowners"
    />
@@ -99,24 +65,9 @@ export default function LandingPage() {
      gridVariant="three-columns-all-equal-width"
      useInvertedBackground={false}
      features={[
-        {
-          title: "Insured & Certified",
-          description: "Fully bonded and insured professionals, so you can have peace of mind.",
-          imageSrc: "http://img.b2bpic.net/free-photo/architecture-shadows-day-city_23-2149451188.jpg?_wi=1",
-          imageAlt: "Certified cleaner",
-        },
-        {
-          title: "Streak-Free Guarantee",
-          description: "Our specialized equipment ensures a flawless finish on every window, every time.",
-          imageSrc: "http://img.b2bpic.net/free-photo/beautiful-architecture-office-business-building-with-glass-window-shape_74190-6432.jpg?_wi=1",
-          imageAlt: "Clean windows",
-        },
-        {
-          title: "Eco-Friendly Solutions",
-          description: "We use non-toxic, sustainable cleaning products that are safe for your pets and plants.",
-          imageSrc: "http://img.b2bpic.net/free-photo/man-with-white-helmet-near-solar-panel_1157-29991.jpg?_wi=1",
-          imageAlt: "Eco friendly",
-        },
+        { title: "Insured & Certified", description: "Fully bonded and insured professionals, so you can have peace of mind.", imageSrc: "http://img.b2bpic.net/free-photo/architecture-shadows-day-city_23-2149451188.jpg?_wi=1", imageAlt: "Certified cleaner" },
+        { title: "Streak-Free Guarantee", description: "Our specialized equipment ensures a flawless finish on every window, every time.", imageSrc: "http://img.b2bpic.net/free-photo/beautiful-architecture-office-business-building-with-glass-window-shape_74190-6432.jpg?_wi=1", imageAlt: "Clean windows" },
+        { title: "Eco-Friendly Solutions", description: "We use non-toxic, sustainable cleaning products that are safe for your pets and plants.", imageSrc: "http://img.b2bpic.net/free-photo/man-with-white-helmet-near-solar-panel_1157-29991.jpg?_wi=1", imageAlt: "Eco friendly" },
      ]}
      title="Why Choose ClearView?"
      description="Experience superior window cleaning with our professional, eco-friendly standards."
@@ -127,31 +78,8 @@ export default function LandingPage() {
      <TestimonialCardTwelve
      useInvertedBackground={false}
      testimonials={[
-        {
-          id: "1",
-          name: "Sarah Miller",
-          imageSrc: "http://img.b2bpic.net/free-photo/vertical-shot-young-musician-woman-learns-how-play-ukulele-sits-sofa-with-crossed-legs_1258-204931.jpg?_wi=1",
-        },
-        {
-          id: "2",
-          name: "David Johnson",
-          imageSrc: "http://img.b2bpic.net/free-photo/successful-time-young-handsome-man-white-shirt-black-jacket-expressing-positivity-talking-phone-leadership-great-career-manager-cheerful-mood_197531-2121.jpg?_wi=1",
-        },
-        {
-          id: "3",
-          name: "Rebecca Smith",
-          imageSrc: "http://img.b2bpic.net/free-photo/excited-cheerful-blond-girl-rejoicing-camera-with-copy-space-text-promotional-content-near-yellow-background_574295-2365.jpg",
-        },
-        {
-          id: "4",
-          name: "Mark Wilson",
-          imageSrc: "http://img.b2bpic.net/free-photo/vertical-shot-young-musician-woman-learns-how-play-ukulele-sits-sofa-with-crossed-legs_1258-204931.jpg?_wi=2",
-        },
-        {
-          id: "5",
-          name: "Elena Martinez",
-          imageSrc: "http://img.b2bpic.net/free-photo/successful-time-young-handsome-man-white-shirt-black-jacket-expressing-positivity-talking-phone-leadership-great-career-manager-cheerful-mood_197531-2121.jpg?_wi=2",
-        },
+        { id: "1", name: "Sarah Miller", imageSrc: "http://img.b2bpic.net/free-photo/vertical-shot-young-musician-woman-learns-how-play-ukulele-sits-sofa-with-crossed-legs_1258-204931.jpg?_wi=1" },
+        { id: "2", name: "David Johnson", imageSrc: "http://img.b2bpic.net/free-photo/successful-time-young-handsome-man-white-shirt-black-jacket-expressing-positivity-talking-phone-leadership-great-career-manager-cheerful-mood_197531-2121.jpg?_wi=1" },
      ]}
      cardTitle="Client Success Stories"
      cardTag="Trusted by Homeowners"
@@ -167,16 +95,8 @@ export default function LandingPage() {
      description="Everything you need to know about our window cleaning services."
      faqsAnimation="slide-up"
      faqs={[
-        {
-          id: "1",
-          title: "How often should I have my windows cleaned?",
-          content: "For most residential homes, twice a year is sufficient to maintain clarity and longevity.",
-        },
-        {
-          id: "2",
-          title: "Do you clean window screens and frames?",
-          content: "Yes, our standard service includes dusting of frames and washing of screens for a complete look.",
-        },
+        { id: "1", title: "How often should I have my windows cleaned?", content: "For most residential homes, twice a year is sufficient to maintain clarity and longevity." },
+        { id: "2", title: "Do you clean window screens and frames?", content: "Yes, our standard service includes dusting of frames and washing of screens for a complete look." },
      ]}
    />
  </div>
@@ -189,20 +109,8 @@ export default function LandingPage() {
      title="By The Numbers"
      description="Delivering excellence one pane at a time."
      metrics={[
-        {
-          id: "m1",
-          value: "15+",
-          title: "Years Experience",
-          description: "Serving the local community since 2010.",
-          imageSrc: "http://img.b2bpic.net/free-photo/architecture-shadows-day-city_23-2149451188.jpg?_wi=2",
-        },
-        {
-          id: "m2",
-          value: "2000+",
-          title: "Projects Completed",
-          description: "Residential and commercial satisfaction.",
-          imageSrc: "http://img.b2bpic.net/free-photo/beautiful-architecture-office-business-building-with-glass-window-shape_74190-6432.jpg?_wi=2",
-        },
+        { id: "m1", value: "15+", title: "Years Experience", description: "Serving the local community since 2010.", imageSrc: "http://img.b2bpic.net/free-photo/architecture-shadows-day-city_23-2149451188.jpg?_wi=2" },
+        { id: "m2", value: "2000+", title: "Projects Completed", description: "Residential and commercial satisfaction.", imageSrc: "http://img.b2bpic.net/free-photo/beautiful-architecture-office-business-building-with-glass-window-shape_74190-6432.jpg?_wi=2" },
      ]}
    />
  </div>
@@ -216,4 +124,4 @@ export default function LandingPage() {
      </ReactLenis>
    </ThemeProvider>
  );
-}
+}
--- a/src/app/styles/variables.css
+++ b/src/app/styles/variables.css
@@ -10,15 +10,15 @@
  --accent: #ffffff;
  --background-accent: #ffffff; */

-  --background: #ffffff;
-  --card: #f9f9f9;
-  --foreground: #000612e6;
+  --background: #f5faff;
+  --card: #f1f8ff;
+  --foreground: #001122;
  --primary-cta: #15479c;
  --primary-cta-text: #ffffff;
  --secondary-cta: #ffffff;
  --secondary-cta-text: #000612e6;
-  --accent: #e2e2e2;
-  --background-accent: #c4c4c4;
+  --accent: #a8cce8;
+  --background-accent: #7ba3cf;

  /* text sizing - set by ThemeProvider */
  /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
Author	SHA1	Message	Date
bender	23b7b7303f	Merge version_2 into main Merge version_2 into main	2026-04-08 15:48:10 +00:00
bender	67d638b0c9	Update src/app/contact/page.tsx	2026-04-08 15:48:07 +00:00
bender	aea97d7531	Merge version_2 into main Merge version_2 into main	2026-04-08 15:47:45 +00:00
bender	8c6dac4596	Update src/app/styles/variables.css	2026-04-08 15:47:42 +00:00
bender	8c20e23fa2	Update src/app/page.tsx	2026-04-08 15:47:41 +00:00
bender	6311680f12	Update src/app/contact/page.tsx	2026-04-08 15:47:41 +00:00
bender	03ab81697c	Merge version_1 into main Merge version_1 into main	2026-04-08 15:46:15 +00:00