Merge version_2 into main

Merge version_2 into main

src/app/page.tsx

@@ -2,12 +2,13 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import ContactText from '@/components/sections/contact/ContactText';
-import FeatureCardEight from '@/components/sections/feature/FeatureCardEight';
-import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
+import { Phone, Mail, ArrowRight } from "lucide-react";
+import ContactFaq from '@/components/sections/contact/ContactFaq';
+import FeatureCardTwentyFour from '@/components/sections/feature/FeatureCardTwentyFour';
+import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
 import HeroCarouselLogo from '@/components/sections/hero/heroCarouselLogo/HeroCarouselLogo';
 import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
-import TestimonialCardTwelve from '@/components/sections/testimonial/TestimonialCardTwelve';
+import TestimonialCardFive from '@/components/sections/testimonial/TestimonialCardFive';
 import TextSplitAbout from '@/components/sections/about/TextSplitAbout';
 
 export default function LandingPage() {
@@ -47,9 +48,6 @@ export default function LandingPage() {
         { imageSrc: "http://img.b2bpic.net/free-photo/serious-young-woman-sitting-outdoor-cafe_1262-1599.jpg?_wi=1", imageAlt: "Luxury custom deck" },
         { imageSrc: "http://img.b2bpic.net/free-photo/table-set-dinning-table_1339-3437.jpg?_wi=1", imageAlt: "Custom sunroom design" },
         { imageSrc: "http://img.b2bpic.net/free-photo/full-length-portrait-pleased-young-lady-purple-shoes-standing-with-glass-juice-beside-stairs_197531-4728.jpg?_wi=1", imageAlt: "High quality deck stairs" },
-        { imageSrc: "http://img.b2bpic.net/free-photo/serious-young-woman-sitting-outdoor-cafe_1262-1599.jpg?_wi=2", imageAlt: "Luxury custom deck" },
-        { imageSrc: "http://img.b2bpic.net/free-photo/table-set-dinning-table_1339-3437.jpg?_wi=2", imageAlt: "Custom sunroom design" },
-        { imageSrc: "http://img.b2bpic.net/free-photo/full-length-portrait-pleased-young-lady-purple-shoes-standing-with-glass-juice-beside-stairs_197531-4728.jpg?_wi=2", imageAlt: "High quality deck stairs" },
       ]}
     />
   </div>
@@ -64,52 +62,58 @@ export default function LandingPage() {
   </div>
 
   <div id="services" data-section="services">
-      <FeatureCardEight
+      <FeatureCardTwentyFour
+      animationType="slide-up"
       textboxLayout="split"
       useInvertedBackground={false}
+      title="Our Premier Services"
+      description="We combine 30 years of expertise with premium materials to build outdoor living spaces that stand the test of time."
       features={[
-        { id: 1, title: "Custom Decking", description: "Tailor-made designs that perfectly fit your landscape and lifestyle.", imageSrc: "http://img.b2bpic.net/free-photo/serious-young-woman-sitting-outdoor-cafe_1262-1599.jpg?_wi=3", imageAlt: "Custom Decking" },
-        { id: 2, title: "Sunrooms", description: "Expand your living space with our premium, all-weather sunrooms.", imageSrc: "http://img.b2bpic.net/free-photo/table-set-dinning-table_1339-3437.jpg?_wi=3", imageAlt: "Sunrooms" },
-        { id: 3, title: "Railings & Stairs", description: "Safe, beautiful, and fully compliant stairways and high-end railing installations.", imageSrc: "http://img.b2bpic.net/free-photo/full-length-portrait-pleased-young-lady-purple-shoes-standing-with-glass-juice-beside-stairs_197531-4728.jpg?_wi=3", imageAlt: "Railings & Stairs" },
+        { id: "1", title: "Custom Decks", author: "Expert Design", description: "Tailor-made structural foundations and custom cedar or composite surfaces.", tags: ["Custom Build", "Structural"], imageSrc: "http://img.b2bpic.net/free-photo/serious-young-woman-sitting-outdoor-cafe_1262-1599.jpg?_wi=3" },
+        { id: "2", title: "Luxury Sunrooms", author: "All-Weather Design", description: "Expand your living space with our premium, all-weather custom sunrooms.", tags: ["Premium", "Year-round"], imageSrc: "http://img.b2bpic.net/free-photo/table-set-dinning-table_1339-3437.jpg?_wi=3" },
+        { id: "3", title: "Railings & Stairs", author: "Safety First", description: "Safe, beautiful, and fully compliant stairways and high-end railing installations.", tags: ["Safety", "Code-Compliant"], imageSrc: "http://img.b2bpic.net/free-photo/full-length-portrait-pleased-young-lady-purple-shoes-standing-with-glass-juice-beside-stairs_197531-4728.jpg?_wi=3" },
       ]}
-      title="Comprehensive Exterior Solutions"
-      description="From structural foundations like screw piles to aesthetic finishes like privacy screens and cedar boards, we do it all with expert precision."
     />
   </div>
 
   <div id="reviews" data-section="reviews">
-      <TestimonialCardTwelve
+      <TestimonialCardFive
+      textboxLayout="default"
       useInvertedBackground={false}
+      title="What Our Clients Say"
+      description="Trusted by homeowners across Calgary for professional workmanship and reliable project management."
       testimonials={[
-        { id: "1", name: "Kim H.", imageSrc: "http://img.b2bpic.net/free-photo/beautiful-african-american-woman-cafe_273609-5350.jpg?_wi=1" },
-        { id: "2", name: "Jodi A.", imageSrc: "http://img.b2bpic.net/free-photo/close-up-confident-male-employee-white-collar-shirt-smiling-camera-standing-self-assured-against-studio-background_1258-26761.jpg" },
-        { id: "3", name: "Charles Macmichael", imageSrc: "http://img.b2bpic.net/free-photo/stylish-woman-wearing-red-blouse-big-hat_273609-13360.jpg" },
-        { id: "4", name: "Pritpal Pal", imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-beautiful-ginger-girl-shows-thumbs-up-smiles-white-teeth-approve-agree-say-yes-recommend-clinic-company-satisfied-with-quality-service-white-background_176420-45534.jpg" },
-        { id: "5", name: "Sarah Jenkins", imageSrc: "http://img.b2bpic.net/free-photo/beautiful-african-american-woman-cafe_273609-5350.jpg?_wi=2" },
+        { id: "1", name: "Kim H.", date: "Oct 2024", title: "Outstanding Deck", quote: "Professional team and incredible attention to detail. Highly recommend!", tag: "Quality", avatarSrc: "http://img.b2bpic.net/free-photo/beautiful-african-american-woman-cafe_273609-5350.jpg?_wi=1" },
+        { id: "2", name: "Jodi A.", date: "Sep 2024", title: "Perfect Sunroom", quote: "They transformed our backyard into a year-round oasis. Truly professional.", tag: "Craftsmanship", avatarSrc: "http://img.b2bpic.net/free-photo/close-up-confident-male-employee-white-collar-shirt-smiling-camera-standing-self-assured-against-studio-background_1258-26761.jpg" },
       ]}
-      cardTitle="What Our Clients Say"
-      cardTag="Trusted by Homeowners"
-      cardAnimation="slide-up"
     />
   </div>
 
   <div id="contact" data-section="contact">
-      <ContactText
+      <ContactFaq
+      animationType="slide-up"
       useInvertedBackground={false}
-      background={{ variant: "canvas-reveal" }}
-      text="Ready to build your dream outdoor space? Let's discuss your project today."
-      buttons={[{ text: "Contact Our Professionals", href: "mailto:info@mountainviewdecks.ca" }]}
+      ctaTitle="Let's Build Together"
+      ctaDescription="Have a project in mind? Our experts are ready to assist you."
+      ctaButton={{ text: "Get a Consultation", href: "#contact" }}
+      ctaIcon={Phone}
+      faqs={[
+        { id: "1", title: "How long does a project take?", content: "Most deck projects are completed within 1-2 weeks depending on scope." },
+        { id: "2", title: "Do you provide custom designs?", content: "Yes, we provide full CAD design services for every custom project." },
+      ]}
     />
   </div>
 
   <div id="footer" data-section="footer">
-      <FooterLogoReveal
-      logoText="Mountain View Sun Decks"
-      leftLink={{ text: "Privacy Policy", href: "#" }}
-      rightLink={{ text: "© 2025 Mountain View Sun Decks", href: "#" }}
+      <FooterBaseReveal
+      columns={[
+        { title: "Navigation", items: [{ label: "About", href: "#about" }, { label: "Services", href: "#services" }] },
+        { title: "Contact", items: [{ label: "Get a Quote", href: "#contact" }, { label: "Support", href: "mailto:info@mountainviewdecks.ca" }] }
+      ]}
+      copyrightText="© 2025 Mountain View Sun Decks. All Rights Reserved."
     />
   </div>
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}