Update src/app/services/page.tsx

Merge version_2 into main

src/app/contact/page.tsx

@@ -17,8 +17,7 @@ export default function ContactPage() {
 
   const footerColumns = [
     {
-      title: "Services",
+      title: "Services",      items: [
-      items: [
         { label: "Bathroom Remodeling", href: "/services" },
         { label: "Kitchen Remodeling", href: "/services" },
         { label: "Whole Home Renovations", href: "/services" },
@@ -27,8 +26,7 @@ export default function ContactPage() {
       ],
     },
     {
-      title: "Company",
+      title: "Company",      items: [
-      items: [
         { label: "About Us", href: "/about" },
         { label: "Our Process", href: "/" },
         { label: "Project Gallery", href: "/gallery" },
@@ -37,8 +35,7 @@ export default function ContactPage() {
       ],
     },
     {
-      title: "Contact",
+      title: "Contact",      items: [
-      items: [
         { label: "Phone: (360) 513-7022", href: "tel:3605137022" },
         { label: "Address: 821 NE 162nd Ave, Vancouver, WA 98684", href: "#" },
         { label: "Mon-Fri: 6:00 AM - 9:00 PM", href: "#" },
@@ -46,8 +43,7 @@ export default function ContactPage() {
       ],
     },
     {
-      title: "Service Areas",
+      title: "Service Areas",      items: [
-      items: [
         { label: "Vancouver, WA", href: "#" },
         { label: "Camas, WA", href: "#" },
         { label: "Battle Ground, WA", href: "#" },
@@ -76,9 +72,7 @@ export default function ContactPage() {
           brandName="Haagen"
           navItems={navItems}
           button={{
-            text: "Get Free Estimate",
+            text: "Get Free Estimate",            href: "/contact"}}
-            href: "/contact",
-          }}
           animateOnLoad={true}
         />
       </div>
@@ -88,18 +82,13 @@ export default function ContactPage() {
           text="Ready to transform your home? Get your free estimate today and experience the Haagen difference—expert craftsmanship combined with exceptional communication."
           animationType="entrance-slide"
           background={{
-            variant: "radial-gradient",
+            variant: "radial-gradient"}}
-          }}
           useInvertedBackground={false}
           buttons={[
             {
-              text: "Get Free Estimate",
+              text: "Get Free Estimate",              href: "/contact"},
-              href: "/contact",
-            },
             {
-              text: "Call Now (360) 513-7022",
+              text: "Call Now (360) 513-7022",              href: "tel:3605137022"},
-              href: "tel:3605137022",
-            },
           ]}
         />
       </div>

src/app/gallery/page.tsx

@@ -20,8 +20,7 @@ export default function GalleryPage() {
 
   const footerColumns = [
     {
-      title: "Services",
+      title: "Services",      items: [
-      items: [
         { label: "Bathroom Remodeling", href: "/services" },
         { label: "Kitchen Remodeling", href: "/services" },
         { label: "Whole Home Renovations", href: "/services" },
@@ -30,8 +29,7 @@ export default function GalleryPage() {
       ],
     },
     {
-      title: "Company",
+      title: "Company",      items: [
-      items: [
         { label: "About Us", href: "/about" },
         { label: "Our Process", href: "/" },
         { label: "Project Gallery", href: "/gallery" },
@@ -40,20 +38,16 @@ export default function GalleryPage() {
       ],
     },
     {
-      title: "Contact",
+      title: "Contact",      items: [
-      items: [
         { label: "Phone: (360) 513-7022", href: "tel:3605137022" },
         {
-          label: "Address: 821 NE 162nd Ave, Vancouver, WA 98684",
+          label: "Address: 821 NE 162nd Ave, Vancouver, WA 98684",          href: "#"},
-          href: "#",
-        },
         { label: "Mon-Fri: 6:00 AM - 9:00 PM", href: "#" },
         { label: "Saturday-Sunday: Closed", href: "#" },
       ],
     },
     {
-      title: "Service Areas",
+      title: "Service Areas",      items: [
-      items: [
         { label: "Vancouver, WA", href: "#" },
         { label: "Camas, WA", href: "#" },
         { label: "Battle Ground, WA", href: "#" },
@@ -95,77 +89,35 @@ export default function GalleryPage() {
           tagAnimation="slide-up"
           features={[
             {
-              id: "project-1",
+              id: "project-1",              title: "Luxury Bathroom Remodel",              descriptions: [
-              title: "Luxury Bathroom Remodel",
+                "Complete bathroom transformation with marble tiles and spa shower",                "Custom vanity with heated floors and glass enclosure",                "Project completed in 8 weeks with daily client communication"],
-              descriptions: [
-                "Complete bathroom transformation with marble tiles and spa shower",
-                "Custom vanity with heated floors and glass enclosure",
-                "Project completed in 8 weeks with daily client communication",
-              ],
               imageSrc:
-                "http://img.b2bpic.net/free-photo/modern-bathroom-with-blue-tile-glass-shower_23-2151995356.jpg?_wi=5",
+                "http://img.b2bpic.net/free-photo/modern-bathroom-with-blue-tile-glass-shower_23-2151995356.jpg?_wi=5",              imageAlt: "Luxury bathroom remodel with marble tiles"},
-              imageAlt: "Luxury bathroom remodel with marble tiles",
-            },
             {
-              id: "project-2",
+              id: "project-2",              title: "Modern Kitchen Renovation",              descriptions: [
-              title: "Modern Kitchen Renovation",
+                "Open concept kitchen with white cabinetry and quartz counters",                "Professional-grade appliances and custom backsplash",                "Enhanced workflow and entertainment space for family"],
-              descriptions: [
-                "Open concept kitchen with white cabinetry and quartz counters",
-                "Professional-grade appliances and custom backsplash",
-                "Enhanced workflow and entertainment space for family",
-              ],
               imageSrc:
-                "http://img.b2bpic.net/free-photo/open-kitchen-drawer-with-dishes-inside-everyday-organization_169016-71087.jpg?_wi=5",
+                "http://img.b2bpic.net/free-photo/open-kitchen-drawer-with-dishes-inside-everyday-organization_169016-71087.jpg?_wi=5",              imageAlt: "Modern kitchen with white cabinets"},
-              imageAlt: "Modern kitchen with white cabinets",
-            },
             {
-              id: "project-3",
+              id: "project-3",              title: "Whole Home Renovation",              descriptions: [
-              title: "Whole Home Renovation",
+                "Multi-room renovation including kitchen, bathrooms, and flooring",                "Complete interior transformation with fresh design aesthetic",                "Project completed on schedule with exceptional attention to detail"],
-              descriptions: [
-                "Multi-room renovation including kitchen, bathrooms, and flooring",
-                "Complete interior transformation with fresh design aesthetic",
-                "Project completed on schedule with exceptional attention to detail",
-              ],
               imageSrc:
-                "http://img.b2bpic.net/free-photo/tiler-working-renovation-apartment_23-2149278642.jpg?_wi=5",
+                "http://img.b2bpic.net/free-photo/tiler-working-renovation-apartment_23-2149278642.jpg?_wi=5",              imageAlt: "Whole home renovation project"},
-              imageAlt: "Whole home renovation project",
-            },
             {
-              id: "project-4",
+              id: "project-4",              title: "Master Bath Ensuite",              descriptions: [
-              title: "Master Bath Ensuite",
+                "Spa-inspired ensuite with double vanity and walk-in shower",                "Heated floors, radiant ceiling, and premium fixtures",                "Luxury finishes creating the perfect retreat space"],
-              descriptions: [
-                "Spa-inspired ensuite with double vanity and walk-in shower",
-                "Heated floors, radiant ceiling, and premium fixtures",
-                "Luxury finishes creating the perfect retreat space",
-              ],
               imageSrc:
-                "http://img.b2bpic.net/free-photo/modern-bathroom-with-blue-tile-glass-shower_23-2151995356.jpg?_wi=6",
+                "http://img.b2bpic.net/free-photo/modern-bathroom-with-blue-tile-glass-shower_23-2151995356.jpg?_wi=6",              imageAlt: "Luxury master bathroom ensuite"},
-              imageAlt: "Luxury master bathroom ensuite",
-            },
             {
-              id: "project-5",
+              id: "project-5",              title: "Guest Bathroom Remodel",              descriptions: [
-              title: "Guest Bathroom Remodel",
+                "Contemporary guest bath with sleek finishes and storage",                "Custom tile work and modern fixtures throughout",                "Professional design creating elegant and functional space"],
-              descriptions: [
-                "Contemporary guest bath with sleek finishes and storage",
-                "Custom tile work and modern fixtures throughout",
-                "Professional design creating elegant and functional space",
-              ],
               imageSrc:
-                "http://img.b2bpic.net/free-photo/open-kitchen-drawer-with-dishes-inside-everyday-organization_169016-71087.jpg?_wi=6",
+                "http://img.b2bpic.net/free-photo/open-kitchen-drawer-with-dishes-inside-everyday-organization_169016-71087.jpg?_wi=6",              imageAlt: "Guest bathroom renovation"},
-              imageAlt: "Guest bathroom renovation",
-            },
             {
-              id: "project-6",
+              id: "project-6",              title: "Kitchen & Dining Remodel",              descriptions: [
-              title: "Kitchen & Dining Remodel",
+                "Expanded kitchen with island and updated appliances",                "Seamless connection to dining and living areas",                "Transformation creating flow and gathering space"],
-              descriptions: [
-                "Expanded kitchen with island and updated appliances",
-                "Seamless connection to dining and living areas",
-                "Transformation creating flow and gathering space",
-              ],
               imageSrc:
-                "http://img.b2bpic.net/free-photo/tiler-working-renovation-apartment_23-2149278642.jpg?_wi=6",
+                "http://img.b2bpic.net/free-photo/tiler-working-renovation-apartment_23-2149278642.jpg?_wi=6",              imageAlt: "Kitchen and dining area renovation"},
-              imageAlt: "Kitchen and dining area renovation",
-            },
           ]}
           gridVariant="bento-grid"
           animationType="slide-up"
@@ -186,25 +138,9 @@ export default function GalleryPage() {
           tagIcon={Award}
           tagAnimation="slide-up"
           names={[
-            "Home Depot",
+            "Home Depot",            "Lowe's",            "Kohler",            "Tile Shop",            "Sherwin Williams",            "Benjamin Moore",            "Andersen Windows",            "Armstrong Flooring"]}
-            "Lowe's",
-            "Kohler",
-            "Tile Shop",
-            "Sherwin Williams",
-            "Benjamin Moore",
-            "Andersen Windows",
-            "Armstrong Flooring",
-          ]}
           logos={[
-            "http://img.b2bpic.net/free-vector/set-labour-day-badges-flat-style_23-2147797798.jpg",
+            "http://img.b2bpic.net/free-vector/set-labour-day-badges-flat-style_23-2147797798.jpg",            "http://img.b2bpic.net/free-vector/flat-design-labor-day-badge-collection_23-2148600233.jpg",            "http://img.b2bpic.net/free-vector/gradient-modern-plumbing-logo_742173-6831.jpg",            "http://img.b2bpic.net/free-vector/geometrical-abstract-logos_1025-425.jpg",            "http://img.b2bpic.net/free-vector/pack-six-labor-day-badges-flat-design_23-2147655483.jpg",            "http://img.b2bpic.net/free-vector/gradient-paint-gun-logo-template_23-2149990493.jpg",            "http://img.b2bpic.net/free-vector/standard-stamp-design-collection_23-2149812642.jpg",            "http://img.b2bpic.net/free-vector/furniture-logo-concept_23-2148628554.jpg"]}
-            "http://img.b2bpic.net/free-vector/flat-design-labor-day-badge-collection_23-2148600233.jpg",
-            "http://img.b2bpic.net/free-vector/gradient-modern-plumbing-logo_742173-6831.jpg",
-            "http://img.b2bpic.net/free-vector/geometrical-abstract-logos_1025-425.jpg",
-            "http://img.b2bpic.net/free-vector/pack-six-labor-day-badges-flat-design_23-2147655483.jpg",
-            "http://img.b2bpic.net/free-vector/gradient-paint-gun-logo-template_23-2149990493.jpg",
-            "http://img.b2bpic.net/free-vector/standard-stamp-design-collection_23-2149812642.jpg",
-            "http://img.b2bpic.net/free-vector/furniture-logo-concept_23-2148628554.jpg",
-          ]}
           textboxLayout="default"
           useInvertedBackground={false}
           showCard={true}

src/app/services/page.tsx

@@ -27,8 +27,7 @@ export default function ServicesPage() {
 
   const footerColumns = [
     {
-      title: "Services",
+      title: "Services",      items: [
-      items: [
         { label: "Bathroom Remodeling", href: "/services" },
         { label: "Kitchen Remodeling", href: "/services" },
         { label: "Whole Home Renovations", href: "/services" },
@@ -37,8 +36,7 @@ export default function ServicesPage() {
       ],
     },
     {
-      title: "Company",
+      title: "Company",      items: [
-      items: [
         { label: "About Us", href: "/about" },
         { label: "Our Process", href: "/" },
         { label: "Project Gallery", href: "/gallery" },
@@ -47,20 +45,16 @@ export default function ServicesPage() {
       ],
     },
     {
-      title: "Contact",
+      title: "Contact",      items: [
-      items: [
         { label: "Phone: (360) 513-7022", href: "tel:3605137022" },
         {
-          label: "Address: 821 NE 162nd Ave, Vancouver, WA 98684",
+          label: "Address: 821 NE 162nd Ave, Vancouver, WA 98684",          href: "#"},
-          href: "#",
-        },
         { label: "Mon-Fri: 6:00 AM - 9:00 PM", href: "#" },
         { label: "Saturday-Sunday: Closed", href: "#" },
       ],
     },
     {
-      title: "Service Areas",
+      title: "Service Areas",      items: [
-      items: [
         { label: "Vancouver, WA", href: "#" },
         { label: "Camas, WA", href: "#" },
         { label: "Battle Ground, WA", href: "#" },
@@ -102,77 +96,35 @@ export default function ServicesPage() {
           tagAnimation="slide-up"
           features={[
             {
-              id: "bathroom-remodel",
+              id: "bathroom-remodel",              title: "Bathroom Remodeling",              descriptions: [
-              title: "Bathroom Remodeling",
+                "Complete bathroom transformations from concept to completion",                "Luxury tile shower installations with premium finishes",                "Modern vanities, fixtures, and spa-like amenities"],
-              descriptions: [
-                "Complete bathroom transformations from concept to completion",
-                "Luxury tile shower installations with premium finishes",
-                "Modern vanities, fixtures, and spa-like amenities",
-              ],
               imageSrc:
-                "http://img.b2bpic.net/free-photo/modern-bathroom-with-blue-tile-glass-shower_23-2151995356.jpg?_wi=3",
+                "http://img.b2bpic.net/free-photo/modern-bathroom-with-blue-tile-glass-shower_23-2151995356.jpg?_wi=3",              imageAlt: "beautiful bathroom renovation modern design"},
-              imageAlt: "beautiful bathroom renovation modern design",
-            },
             {
-              id: "kitchen-remodel",
+              id: "kitchen-remodel",              title: "Kitchen Remodeling",              descriptions: [
-              title: "Kitchen Remodeling",
+                "Custom kitchen designs that blend style and function",                "High-end cabinetry, countertops, and backsplash installations",                "Professional appliance integration and layouts"],
-              descriptions: [
-                "Custom kitchen designs that blend style and function",
-                "High-end cabinetry, countertops, and backsplash installations",
-                "Professional appliance integration and layouts",
-              ],
               imageSrc:
-                "http://img.b2bpic.net/free-photo/open-kitchen-drawer-with-dishes-inside-everyday-organization_169016-71087.jpg?_wi=3",
+                "http://img.b2bpic.net/free-photo/open-kitchen-drawer-with-dishes-inside-everyday-organization_169016-71087.jpg?_wi=3",              imageAlt: "luxury kitchen remodeling white cabinets"},
-              imageAlt: "luxury kitchen remodeling white cabinets",
-            },
             {
-              id: "whole-home",
+              id: "whole-home",              title: "Whole Home Renovations",              descriptions: [
-              title: "Whole Home Renovations",
+                "Comprehensive home remodeling projects with detailed planning",                "Multi-room coordination with seamless execution",                "Complete transformation from concept to move-in ready"],
-              descriptions: [
-                "Comprehensive home remodeling projects with detailed planning",
-                "Multi-room coordination with seamless execution",
-                "Complete transformation from concept to move-in ready",
-              ],
               imageSrc:
-                "http://img.b2bpic.net/free-photo/tiler-working-renovation-apartment_23-2149278642.jpg?_wi=3",
+                "http://img.b2bpic.net/free-photo/tiler-working-renovation-apartment_23-2149278642.jpg?_wi=3",              imageAlt: "whole home renovation before after"},
-              imageAlt: "whole home renovation before after",
-            },
             {
-              id: "tile-flooring",
+              id: "tile-flooring",              title: "Tile & Flooring",              descriptions: [
-              title: "Tile & Flooring",
+                "Expert tile installation for showers, bathrooms, and kitchens",                "Luxury flooring options including hardwood and custom tiles",                "Meticulous attention to detail in every installation"],
-              descriptions: [
-                "Expert tile installation for showers, bathrooms, and kitchens",
-                "Luxury flooring options including hardwood and custom tiles",
-                "Meticulous attention to detail in every installation",
-              ],
               imageSrc:
-                "http://img.b2bpic.net/free-photo/modern-bathroom-with-blue-tile-glass-shower_23-2151995356.jpg?_wi=4",
+                "http://img.b2bpic.net/free-photo/modern-bathroom-with-blue-tile-glass-shower_23-2151995356.jpg?_wi=4",              imageAlt: "Professional tile and flooring installation"},
-              imageAlt: "Professional tile and flooring installation",
-            },
             {
-              id: "water-damage",
+              id: "water-damage",              title: "Water Damage Restoration",              descriptions: [
-              title: "Water Damage Restoration",
+                "Emergency water damage assessment and restoration",                "Complete water mitigation and repair services",                "Prevention strategies to protect your home"],
-              descriptions: [
-                "Emergency water damage assessment and restoration",
-                "Complete water mitigation and repair services",
-                "Prevention strategies to protect your home",
-              ],
               imageSrc:
-                "http://img.b2bpic.net/free-photo/tiler-working-renovation-apartment_23-2149278642.jpg?_wi=4",
+                "http://img.b2bpic.net/free-photo/tiler-working-renovation-apartment_23-2149278642.jpg?_wi=4",              imageAlt: "Water damage restoration services"},
-              imageAlt: "Water damage restoration services",
-            },
             {
-              id: "drywall-repair",
+              id: "drywall-repair",              title: "Drywall & Interior Repair",              descriptions: [
-              title: "Drywall & Interior Repair",
+                "Professional drywall repair and finishing",                "Custom wall solutions and texture options",                "Paint and final finishes for pristine results"],
-              descriptions: [
-                "Professional drywall repair and finishing",
-                "Custom wall solutions and texture options",
-                "Paint and final finishes for pristine results",
-              ],
               imageSrc:
-                "http://img.b2bpic.net/free-photo/open-kitchen-drawer-with-dishes-inside-everyday-organization_169016-71087.jpg?_wi=4",
+                "http://img.b2bpic.net/free-photo/open-kitchen-drawer-with-dishes-inside-everyday-organization_169016-71087.jpg?_wi=4",              imageAlt: "Drywall repair and interior finishing"},
-              imageAlt: "Drywall repair and interior finishing",
-            },
           ]}
           gridVariant="two-columns-alternating-heights"
           animationType="slide-up"
@@ -204,42 +156,22 @@ export default function ServicesPage() {
           tagAnimation="slide-up"
           metrics={[
             {
-              id: "1",
+              id: "1",              value: "1",              title: "Consultation",              description: "Initial meeting to understand your vision and needs",              icon: MessageSquare,
-              value: "1",
-              title: "Consultation",
-              description: "Initial meeting to understand your vision and needs",
-              icon: MessageSquare,
             },
             {
-              id: "2",
+              id: "2",              value: "2",              title: "Detailed Estimate",              description:
-              value: "2",
+                "Comprehensive quote with transparent pricing breakdown",              icon: FileText,
-              title: "Detailed Estimate",
-              description:
-                "Comprehensive quote with transparent pricing breakdown",
-              icon: FileText,
             },
             {
-              id: "3",
+              id: "3",              value: "3",              title: "Project Planning",              description:
-              value: "3",
+                "Detailed timeline with daily communication protocols",              icon: Calendar,
-              title: "Project Planning",
-              description:
-                "Detailed timeline with daily communication protocols",
-              icon: Calendar,
             },
             {
-              id: "4",
+              id: "4",              value: "4",              title: "Construction",              description:
-              value: "4",
+                "Expert execution with constant updates and quality checks",              icon: Hammer,
-              title: "Construction",
-              description:
-                "Expert execution with constant updates and quality checks",
-              icon: Hammer,
             },
             {
-              id: "5",
+              id: "5",              value: "5",              title: "Final Walkthrough",              description: "Complete inspection ensuring every detail is perfect",              icon: CheckCircle,
-              value: "5",
-              title: "Final Walkthrough",
-              description: "Complete inspection ensuring every detail is perfect",
-              icon: CheckCircle,
             },
           ]}
           gridVariant="uniform-all-items-equal"