Merge version_2 into main

Merge version_2 into main

src/app/about/page.tsx

@@ -2,124 +2,63 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import FooterSimple from '@/components/sections/footer/FooterSimple';
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
-import SocialProofOne from '@/components/sections/socialProof/SocialProofOne';
+import TextAbout from '@/components/sections/about/TextAbout';
-import TestimonialAboutCard from '@/components/sections/about/TestimonialAboutCard';
+import FooterSimple from '@/components/sections/footer/FooterSimple';
-import { Shield } from "lucide-react";
 
-export default function LandingPage() {
+export default function AboutPage() {
   return (
     <ThemeProvider
-        defaultButtonVariant="hover-magnetic"
+      defaultButtonVariant="hover-magnetic"
-        defaultTextAnimation="entrance-slide"
+      defaultTextAnimation="entrance-slide"
-        borderRadius="pill"
+      borderRadius="pill"
-        contentWidth="small"
+      contentWidth="small"
-        sizing="large"
+      sizing="large"
-        background="grid"
+      background="grid"
-        cardStyle="outline"
+      cardStyle="outline"
-        primaryButtonStyle="gradient"
+      primaryButtonStyle="gradient"
-        secondaryButtonStyle="glass"
+      secondaryButtonStyle="glass"
-        headingFontWeight="normal"
+      headingFontWeight="normal"
     >
       <ReactLenis root>
-  <div id="nav" data-section="nav">
+        <div id="nav" data-section="nav">
-      <NavbarLayoutFloatingOverlay
+          <NavbarLayoutFloatingOverlay
-      navItems={[
+            navItems={[
-        {
+              { name: "Home", id: "/" },
-          name: "Home",
+              { name: "About", id: "/about" },
-          id: "/",
+              { name: "Services", id: "/services" },
-        },
+              { name: "Gallery", id: "/gallery" },
-        {
+              { name: "Reviews", id: "/reviews" },
-          name: "About",
+            ]}
-          id: "/about",
+            brandName="MoeDoesHVAC"
-        },
+          />
-        {
+        </div>
-          name: "Services",
-          id: "/services",
-        },
-        {
-          name: "Gallery",
-          id: "/gallery",
-        },
-        {
-          name: "Reviews",
-          id: "/reviews",
-        },
-      ]}
-      brandName="MoeDoesHVAC"
-    />
-  </div>
 
-  <div id="about" data-section="about">
+        <div id="about-content" data-section="about-content">
-      <TestimonialAboutCard
+          <TextAbout
-      useInvertedBackground={false}
+            title="Our Commitment to Excellence"
-      tag="Mission"
+            useInvertedBackground={false}
-      title="Our Commitment"
+          />
-      description="Elite HVAC for Michigan."
+        </div>
-      subdescription="We believe in precision and trust."
-      icon={Shield}
-      imageSrc="http://img.b2bpic.net/free-photo/mechanic-repairing-car-workshop_329181-11787.jpg?_wi=14"
-      mediaAnimation="slide-up"
-    />
-  </div>
 
-  <div id="socialProof" data-section="socialProof">
+        <div id="footer" data-section="footer">
-      <SocialProofOne
+          <FooterSimple
-      textboxLayout="default"
+            columns={[
-      useInvertedBackground={false}
+              { title: "Services", items: [
-      names={[
+                  { label: "AC Repair", href: "/services" },
-        "Local Heating Union",
+                  { label: "Furnace Installation", href: "/services" },
-        "Michigan HVAC Board",
+                  { label: "Commercial HVAC", href: "/services" },
-        "Certified Energy Partner",
+                ] },
-      ]}
+              { title: "Company", items: [
-      title="Trusted Credentials"
+                  { label: "About Us", href: "/about" },
-      description="Verified excellence."
+                  { label: "Reviews", href: "/reviews" },
-    />
+                  { label: "Contact", href: "/contact" },
-  </div>
+                ] },
-
+            ]}
-  <div id="footer" data-section="footer">
+            bottomLeftText="© 2024 MoeDoesHVAC. All rights reserved."
-      <FooterSimple
+            bottomRightText="Built in Michigan"
-      columns={[
+          />
-        {
+        </div>
-          title: "Services",
-          items: [
-            {
-              label: "AC Repair",
-              href: "/services",
-            },
-            {
-              label: "Furnace Installation",
-              href: "/services",
-            },
-            {
-              label: "Commercial HVAC",
-              href: "/services",
-            },
-          ],
-        },
-        {
-          title: "Company",
-          items: [
-            {
-              label: "About Us",
-              href: "/about",
-            },
-            {
-              label: "Reviews",
-              href: "/reviews",
-            },
-            {
-              label: "Contact",
-              href: "#contact",
-            },
-          ],
-        },
-      ]}
-      bottomLeftText="© 2024 MoeDoesHVAC. All rights reserved."
-      bottomRightText="Built in Michigan"
-    />
-  </div>
       </ReactLenis>
     </ThemeProvider>
   );

src/app/gallery/page.tsx

@@ -2,131 +2,29 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import FooterSimple from '@/components/sections/footer/FooterSimple';
-import HeroBillboardTestimonial from '@/components/sections/hero/HeroBillboardTestimonial';
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
-import SocialProofOne from '@/components/sections/socialProof/SocialProofOne';
+import FooterSimple from '@/components/sections/footer/FooterSimple';
+import FeatureCardTwentyFour from '@/components/sections/feature/FeatureCardTwentyFour';
 
-export default function LandingPage() {
+export default function GalleryPage() {
   return (
-    <ThemeProvider
+    <ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
-        defaultButtonVariant="hover-magnetic"
-        defaultTextAnimation="entrance-slide"
-        borderRadius="pill"
-        contentWidth="small"
-        sizing="large"
-        background="grid"
-        cardStyle="outline"
-        primaryButtonStyle="gradient"
-        secondaryButtonStyle="glass"
-        headingFontWeight="normal"
-    >
       <ReactLenis root>
-  <div id="nav" data-section="nav">
+        <NavbarLayoutFloatingOverlay navItems={[{ name: "Home", id: "/" }, { name: "About", id: "/about" }, { name: "Gallery", id: "/gallery" }, { name: "Reviews", id: "/reviews" }]} brandName="MoeDoesHVAC" />
-      <NavbarLayoutFloatingOverlay
+        <div className="pt-24">
-      navItems={[
+          <FeatureCardTwentyFour
-        {
+            animationType="slide-up"
-          name: "Home",
+            textboxLayout="default"
-          id: "/",
+            useInvertedBackground={false}
-        },
+            title="Our Work"
-        {
+            description="A showcase of our precision installations and repairs."
-          name: "About",
+            features={[
-          id: "/about",
+              { id: "g1", title: "Residential AC", author: "Install", description: "High efficiency system upgrade.", tags: ["AC", "Residential"], imageSrc: "http://img.b2bpic.net/free-photo/mechanic-repairing-car-workshop_329181-11787.jpg?_wi=1" },
-        },
+              { id: "g2", title: "Furnace Setup", author: "Install", description: "Modern gas furnace installation.", tags: ["Furnace", "Heating"], imageSrc: "http://img.b2bpic.net/free-photo/mechanic-repairing-car-workshop_329181-11787.jpg?_wi=2" }
-        {
+            ]}
-          name: "Services",
+          />
-          id: "/services",
+        </div>
-        },
+        <FooterSimple columns={[]} bottomLeftText="© 2024 MoeDoesHVAC" bottomRightText="Built in Michigan" />
-        {
-          name: "Gallery",
-          id: "/gallery",
-        },
-        {
-          name: "Reviews",
-          id: "/reviews",
-        },
-      ]}
-      brandName="MoeDoesHVAC"
-    />
-  </div>
-
-  <div id="hero" data-section="hero">
-      <HeroBillboardTestimonial
-      background={{
-        variant: "plain",
-      }}
-      title="Our Work"
-      description="Precision captured on camera."
-      imageSrc="http://img.b2bpic.net/free-photo/mechanic-repairing-car-workshop_329181-11787.jpg?_wi=17"
-      testimonials={[
-        {
-          name: "John D.",
-          handle: "@user",
-          testimonial: "Great work!",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/confident-smiling-young-woman-standing-kitchen_23-2147916396.jpg?_wi=2",
-          imageAlt: "happy customer portrait",
-        },
-      ]}
-    />
-  </div>
-
-  <div id="socialProof" data-section="socialProof">
-      <SocialProofOne
-      textboxLayout="default"
-      useInvertedBackground={false}
-      names={[
-        "Residential",
-        "Commercial",
-        "Industrial",
-      ]}
-      title="Project Gallery"
-      description="See the precision in action."
-    />
-  </div>
-
-  <div id="footer" data-section="footer">
-      <FooterSimple
-      columns={[
-        {
-          title: "Services",
-          items: [
-            {
-              label: "AC Repair",
-              href: "/services",
-            },
-            {
-              label: "Furnace Installation",
-              href: "/services",
-            },
-            {
-              label: "Commercial HVAC",
-              href: "/services",
-            },
-          ],
-        },
-        {
-          title: "Company",
-          items: [
-            {
-              label: "About Us",
-              href: "/about",
-            },
-            {
-              label: "Reviews",
-              href: "/reviews",
-            },
-            {
-              label: "Contact",
-              href: "#contact",
-            },
-          ],
-        },
-      ]}
-      bottomLeftText="© 2024 MoeDoesHVAC. All rights reserved."
-      bottomRightText="Built in Michigan"
-    />
-  </div>
       </ReactLenis>
     </ThemeProvider>
   );

src/app/page.tsx

@@ -43,7 +43,7 @@ export default function LandingPage() {
       logoText="MOEDOESHVAC"
       description="Precision HVAC. Built different. Serving Michigan with reliable, high-performance heating & cooling solutions."
       buttons={[
-        { text: "Get Free Estimate", href: "#contact" },
+        { text: "Get Free Estimate", href: "/contact" },
         { text: "Call Now", href: "tel:5555555555" },
       ]}
       slides={[
@@ -132,7 +132,7 @@ export default function LandingPage() {
         { title: "Company", items: [
             { label: "About Us", href: "/about" },
             { label: "Reviews", href: "/reviews" },
-            { label: "Contact", href: "#contact" },
+            { label: "Contact", href: "/contact" },
           ] },
       ]}
       bottomLeftText="© 2024 MoeDoesHVAC. All rights reserved."

src/app/reviews/page.tsx

@@ -2,146 +2,30 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import ContactSplitForm from '@/components/sections/contact/ContactSplitForm';
-import FooterSimple from '@/components/sections/footer/FooterSimple';
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
+import FooterSimple from '@/components/sections/footer/FooterSimple';
 import TestimonialCardThirteen from '@/components/sections/testimonial/TestimonialCardThirteen';
 
-export default function LandingPage() {
+export default function ReviewsPage() {
   return (
-    <ThemeProvider
+    <ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
-        defaultButtonVariant="hover-magnetic"
-        defaultTextAnimation="entrance-slide"
-        borderRadius="pill"
-        contentWidth="small"
-        sizing="large"
-        background="grid"
-        cardStyle="outline"
-        primaryButtonStyle="gradient"
-        secondaryButtonStyle="glass"
-        headingFontWeight="normal"
-    >
       <ReactLenis root>
-  <div id="nav" data-section="nav">
+        <NavbarLayoutFloatingOverlay navItems={[{ name: "Home", id: "/" }, { name: "About", id: "/about" }, { name: "Gallery", id: "/gallery" }, { name: "Reviews", id: "/reviews" }]} brandName="MoeDoesHVAC" />
-      <NavbarLayoutFloatingOverlay
+        <div className="pt-24">
-      navItems={[
+          <TestimonialCardThirteen
-        {
+            animationType="slide-up"
-          name: "Home",
+            textboxLayout="default"
-          id: "/",
+            useInvertedBackground={false}
-        },
+            title="Client Testimonials"
-        {
+            description="What our happy customers say about our services."
-          name: "About",
+            showRating={true}
-          id: "/about",
+            testimonials={[
-        },
+              { id: "r1", name: "Alex P.", handle: "@Local", testimonial: "Fantastic service on my furnace!", rating: 5 },
-        {
+              { id: "r2", name: "Jamie R.", handle: "@Customer", testimonial: "Quick, professional, and clean work.", rating: 5 }
-          name: "Services",
+            ]}
-          id: "/services",
+          />
-        },
+        </div>
-        {
+        <FooterSimple columns={[]} bottomLeftText="© 2024 MoeDoesHVAC" bottomRightText="Built in Michigan" />
-          name: "Gallery",
-          id: "/gallery",
-        },
-        {
-          name: "Reviews",
-          id: "/reviews",
-        },
-      ]}
-      brandName="MoeDoesHVAC"
-    />
-  </div>
-
-  <div id="testimonial" data-section="testimonial">
-      <TestimonialCardThirteen
-      animationType="slide-up"
-      textboxLayout="default"
-      useInvertedBackground={false}
-      title="Customer Feedback"
-      description="What our clients are saying."
-      showRating={true}
-      testimonials={[
-        {
-          id: "r1",
-          name: "Jane Doe",
-          handle: "@detroit",
-          testimonial: "Fantastic.",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/mature-woman-smiling_1149-601.jpg?_wi=3",
-        },
-        {
-          id: "r2",
-          name: "Bob Smith",
-          handle: "@mi",
-          testimonial: "Amazing speed.",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/positive-middle-aged-business-leader-window_1262-5388.jpg?_wi=3",
-        },
-      ]}
-    />
-  </div>
-
-  <div id="contact" data-section="contact">
-      <ContactSplitForm
-      useInvertedBackground={false}
-      title="Leave a Review"
-      description="Help us improve."
-      inputs={[
-        {
-          name: "name",
-          type: "text",
-          placeholder: "Name",
-        },
-        {
-          name: "review",
-          type: "text",
-          placeholder: "Write your review",
-        },
-      ]}
-      imageSrc="http://img.b2bpic.net/free-photo/mechanic-repairing-car-workshop_329181-11787.jpg?_wi=18"
-    />
-  </div>
-
-  <div id="footer" data-section="footer">
-      <FooterSimple
-      columns={[
-        {
-          title: "Services",
-          items: [
-            {
-              label: "AC Repair",
-              href: "/services",
-            },
-            {
-              label: "Furnace Installation",
-              href: "/services",
-            },
-            {
-              label: "Commercial HVAC",
-              href: "/services",
-            },
-          ],
-        },
-        {
-          title: "Company",
-          items: [
-            {
-              label: "About Us",
-              href: "/about",
-            },
-            {
-              label: "Reviews",
-              href: "/reviews",
-            },
-            {
-              label: "Contact",
-              href: "#contact",
-            },
-          ],
-        },
-      ]}
-      bottomLeftText="© 2024 MoeDoesHVAC. All rights reserved."
-      bottomRightText="Built in Michigan"
-    />
-  </div>
       </ReactLenis>
     </ThemeProvider>
   );

src/app/services/page.tsx

@@ -2,171 +2,72 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import FeatureCardTwentyFour from '@/components/sections/feature/FeatureCardTwentyFour';
-import FooterSimple from '@/components/sections/footer/FooterSimple';
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
-import PricingCardNine from '@/components/sections/pricing/PricingCardNine';
+import FeatureCardTwentySix from '@/components/sections/feature/FeatureCardTwentySix';
+import FooterSimple from '@/components/sections/footer/FooterSimple';
+import { Zap, Thermometer, Building, Wrench } from "lucide-react";
 
-export default function LandingPage() {
+export default function ServicesPage() {
   return (
     <ThemeProvider
-        defaultButtonVariant="hover-magnetic"
+      defaultButtonVariant="hover-magnetic"
-        defaultTextAnimation="entrance-slide"
+      defaultTextAnimation="entrance-slide"
-        borderRadius="pill"
+      borderRadius="pill"
-        contentWidth="small"
+      contentWidth="small"
-        sizing="large"
+      sizing="large"
-        background="grid"
+      background="grid"
-        cardStyle="outline"
+      cardStyle="outline"
-        primaryButtonStyle="gradient"
+      primaryButtonStyle="gradient"
-        secondaryButtonStyle="glass"
+      secondaryButtonStyle="glass"
-        headingFontWeight="normal"
+      headingFontWeight="normal"
     >
       <ReactLenis root>
-  <div id="nav" data-section="nav">
+        <div id="nav" data-section="nav">
-      <NavbarLayoutFloatingOverlay
+          <NavbarLayoutFloatingOverlay
-      navItems={[
+            navItems={[
-        {
+              { name: "Home", id: "/" },
-          name: "Home",
+              { name: "About", id: "/about" },
-          id: "/",
+              { name: "Services", id: "/services" },
-        },
+              { name: "Gallery", id: "/gallery" },
-        {
+              { name: "Reviews", id: "/reviews" },
-          name: "About",
+            ]}
-          id: "/about",
+            brandName="MoeDoesHVAC"
-        },
+          />
-        {
+        </div>
-          name: "Services",
-          id: "/services",
-        },
-        {
-          name: "Gallery",
-          id: "/gallery",
-        },
-        {
-          name: "Reviews",
-          id: "/reviews",
-        },
-      ]}
-      brandName="MoeDoesHVAC"
-    />
-  </div>
 
-  <div id="feature" data-section="feature">
+        <div id="services-list" data-section="services-list">
-      <FeatureCardTwentyFour
+          <FeatureCardTwentySix
-      animationType="slide-up"
+            title="Our Professional Services"
-      textboxLayout="default"
+            description="Top-tier climate control solutions for your home and business."
-      useInvertedBackground={false}
+            useInvertedBackground={false}
-      title="Professional Services"
+            textboxLayout="default"
-      description="High performance cooling and heating."
+            features={[
-      features={[
+              { title: "AC Repair & Installation", description: "High-efficiency cooling systems to beat the heat.", buttonIcon: Zap },
-        {
+              { title: "Furnace Services", description: "Keep your home cozy all through the Michigan winter.", buttonIcon: Thermometer },
-          id: "s1",
+              { title: "Commercial HVAC", description: "Robust climate solutions for modern business spaces.", buttonIcon: Building },
-          title: "AC Repair",
+              { title: "Preventative Maintenance", description: "Routine check-ups to extend your system's life.", buttonIcon: Wrench },
-          author: "Cooling",
+            ]}
-          description: "Instant comfort solutions.",
+          />
-          tags: [
+        </div>
-            "AC",
-          ],
-          imageSrc: "http://img.b2bpic.net/free-photo/mechanic-repairing-car-workshop_329181-11787.jpg?_wi=15",
-        },
-        {
-          id: "s2",
-          title: "Furnace Work",
-          author: "Heating",
-          description: "Reliable heat for winters.",
-          tags: [
-            "Heat",
-          ],
-          imageSrc: "http://img.b2bpic.net/free-photo/mechanic-repairing-car-workshop_329181-11787.jpg?_wi=16",
-        },
-      ]}
-    />
-  </div>
 
-  <div id="pricing" data-section="pricing">
+        <div id="footer" data-section="footer">
-      <PricingCardNine
+          <FooterSimple
-      animationType="slide-up"
+            columns={[
-      textboxLayout="default"
+              { title: "Services", items: [
-      useInvertedBackground={false}
+                  { label: "AC Repair", href: "/services" },
-      title="Simple Pricing"
+                  { label: "Furnace Installation", href: "/services" },
-      description="Clear costs for every project."
+                  { label: "Commercial HVAC", href: "/services" },
-      plans={[
+                ] },
-        {
+              { title: "Company", items: [
-          id: "p1",
+                  { label: "About Us", href: "/about" },
-          title: "Standard Service",
+                  { label: "Reviews", href: "/reviews" },
-          price: "$150",
+                  { label: "Contact", href: "/contact" },
-          period: "/hr",
+                ] },
-          features: [
+            ]}
-            "Diagnostic",
+            bottomLeftText="© 2024 MoeDoesHVAC. All rights reserved."
-            "Basic repair",
+            bottomRightText="Built in Michigan"
-          ],
+          />
-          button: {
+        </div>
-            text: "Select",
-          },
-          imageSrc: "http://img.b2bpic.net/free-photo/positive-middle-aged-business-leader-window_1262-5388.jpg?_wi=2",
-          imageAlt: "happy customer portrait",
-        },
-        {
-          id: "p2",
-          title: "Full Install",
-          price: "$4,000",
-          period: "/unit",
-          features: [
-            "Equipment",
-            "Labor",
-            "Warranty",
-          ],
-          button: {
-            text: "Select",
-          },
-          imageSrc: "http://img.b2bpic.net/free-photo/young-businesswoman-portrait-office_1262-1506.jpg?_wi=2",
-          imageAlt: "happy customer portrait",
-        },
-      ]}
-    />
-  </div>
-
-  <div id="footer" data-section="footer">
-      <FooterSimple
-      columns={[
-        {
-          title: "Services",
-          items: [
-            {
-              label: "AC Repair",
-              href: "/services",
-            },
-            {
-              label: "Furnace Installation",
-              href: "/services",
-            },
-            {
-              label: "Commercial HVAC",
-              href: "/services",
-            },
-          ],
-        },
-        {
-          title: "Company",
-          items: [
-            {
-              label: "About Us",
-              href: "/about",
-            },
-            {
-              label: "Reviews",
-              href: "/reviews",
-            },
-            {
-              label: "Contact",
-              href: "#contact",
-            },
-          ],
-        },
-      ]}
-      bottomLeftText="© 2024 MoeDoesHVAC. All rights reserved."
-      bottomRightText="Built in Michigan"
-    />
-  </div>
       </ReactLenis>
     </ThemeProvider>
   );