Merge version_2 into main

Merge version_2 into main

src/app/page.tsx

@@ -29,21 +29,13 @@ export default function LandingPage() {
       <NavbarStyleApple
       navItems={[
         {
-          name: "Home",
+          name: "Home",          id: "hero"},
-          id: "hero",
-        },
         {
-          name: "Services",
+          name: "Services",          id: "services"},
-          id: "services",
-        },
         {
-          name: "Testimonials",
+          name: "Testimonials",          id: "testimonials"},
-          id: "testimonials",
-        },
         {
-          name: "Contact",
+          name: "Contact",          id: "contact"},
-          id: "contact",
-        },
       ]}
       brandName="Welding Master Miami"
     />
@@ -52,51 +44,28 @@ export default function LandingPage() {
   <div id="hero" data-section="hero">
       <HeroBillboardRotatedCarousel
       background={{
-        variant: "rotated-rays-static",
+        variant: "rotated-rays-static"}}
-      }}
       title="Mastery in Metal. Miami's Welding Authority."
       description="Precision welding, structural fabrication, and custom industrial solutions. We bring expertise to every beam, pipe, and project in South Florida."
       buttons={[
         {
-          text: "View Our Services",
+          text: "View Our Services",          href: "#services"},
-          href: "#services",
-        },
         {
-          text: "Request a Quote",
+          text: "Request a Quote",          href: "#contact"},
-          href: "#contact",
-        },
       ]}
       carouselItems={[
         {
-          id: "1",
+          id: "1",          imageSrc: "http://img.b2bpic.net/free-photo/man-is-working-metal-factory-he-is-welding-piece-rail-using-special-tools_613910-3861.jpg",          imageAlt: "Industrial Welding"},
-          imageSrc: "http://img.b2bpic.net/free-photo/man-is-working-metal-factory-he-is-welding-piece-rail-using-special-tools_613910-3861.jpg",
-          imageAlt: "Industrial Welding",
-        },
         {
-          id: "2",
+          id: "2",          imageSrc: "http://img.b2bpic.net/free-photo/process-creating-new-metal-parts-busy-workshop-made-by-worker_613910-17216.jpg",          imageAlt: "Structural Fabrication"},
-          imageSrc: "http://img.b2bpic.net/free-photo/process-creating-new-metal-parts-busy-workshop-made-by-worker_613910-17216.jpg",
-          imageAlt: "Structural Fabrication",
-        },
         {
-          id: "3",
+          id: "3",          imageSrc: "http://img.b2bpic.net/free-photo/welder-working-with-steel_1385-3136.jpg",          imageAlt: "On-site Welding"},
-          imageSrc: "http://img.b2bpic.net/free-photo/welder-working-with-steel_1385-3136.jpg",
-          imageAlt: "On-site Welding",
-        },
         {
-          id: "4",
+          id: "4",          imageSrc: "http://img.b2bpic.net/free-photo/burning-coal_23-2147643498.jpg",          imageAlt: "Custom Metalwork"},
-          imageSrc: "http://img.b2bpic.net/free-photo/burning-coal_23-2147643498.jpg",
-          imageAlt: "Custom Metalwork",
-        },
         {
-          id: "5",
+          id: "5",          imageSrc: "http://img.b2bpic.net/free-photo/closeup-shot-welding-helmet-near-hummer_181624-36530.jpg",          imageAlt: "Precision Fusion"},
-          imageSrc: "http://img.b2bpic.net/free-photo/closeup-shot-welding-helmet-near-hummer_181624-36530.jpg",
-          imageAlt: "Precision Fusion",
-        },
         {
-          id: "6",
+          id: "6",          imageSrc: "http://img.b2bpic.net/free-photo/woman-measuring-wood-medium-shot_23-2148966864.jpg",          imageAlt: "Industrial Quality"},
-          imageSrc: "http://img.b2bpic.net/free-photo/woman-measuring-wood-medium-shot_23-2148966864.jpg",
-          imageAlt: "Industrial Quality",
-        },
       ]}
     />
   </div>
@@ -108,41 +77,17 @@ export default function LandingPage() {
       useInvertedBackground={true}
       features={[
         {
-          id: "f1",
+          id: "f1",          title: "Structural Steel",          author: "Fabrication",          description: "High-strength structural welding for large-scale construction projects across Miami.",          tags: [
-          title: "Structural Steel",
+            "Construction",            "Steel"],
-          author: "Fabrication",
+          imageSrc: "http://img.b2bpic.net/free-photo/triple-x-architecture-design-building_122409-15.jpg",          imageAlt: "Structural Steel"},
-          description: "High-strength structural welding for large-scale construction projects across Miami.",
-          tags: [
-            "Construction",
-            "Steel",
-          ],
-          imageSrc: "http://img.b2bpic.net/free-photo/triple-x-architecture-design-building_122409-15.jpg",
-          imageAlt: "Structural Steel",
-        },
         {
-          id: "f2",
+          id: "f2",          title: "Precision Pipework",          author: "Systems",          description: "Expert welding for complex piping systems in industrial, commercial, and residential facilities.",          tags: [
-          title: "Precision Pipework",
+            "Piping",            "Industrial"],
-          author: "Systems",
+          imageSrc: "http://img.b2bpic.net/free-photo/man-working-with-argon-welding-machine-garage_158595-8159.jpg",          imageAlt: "Pipe Welding"},
-          description: "Expert welding for complex piping systems in industrial, commercial, and residential facilities.",
-          tags: [
-            "Piping",
-            "Industrial",
-          ],
-          imageSrc: "http://img.b2bpic.net/free-photo/man-working-with-argon-welding-machine-garage_158595-8159.jpg",
-          imageAlt: "Pipe Welding",
-        },
         {
-          id: "f3",
+          id: "f3",          title: "On-Site Repair",          author: "Mobile",          description: "Immediate mobile welding solutions to minimize downtime for your critical equipment.",          tags: [
-          title: "On-Site Repair",
+            "Repair",            "Mobile"],
-          author: "Mobile",
+          imageSrc: "http://img.b2bpic.net/free-photo/master-working-with-high-temperature-atelier_114579-12193.jpg",          imageAlt: "On-site Repair"},
-          description: "Immediate mobile welding solutions to minimize downtime for your critical equipment.",
-          tags: [
-            "Repair",
-            "Mobile",
-          ],
-          imageSrc: "http://img.b2bpic.net/free-photo/master-working-with-high-temperature-atelier_114579-12193.jpg",
-          imageAlt: "On-site Repair",
-        },
       ]}
       title="Built to Last"
       description="Excellence in every weld, delivered with professional integrity."
@@ -155,45 +100,15 @@ export default function LandingPage() {
       useInvertedBackground={false}
       testimonials={[
         {
-          id: "t1",
+          id: "t1",          title: "Excellent Structural Work",          quote: "Welding Master Miami handled our structural steel project with incredible professionalism. Delivered ahead of schedule.",          name: "Carlos Mendez",          role: "Site Manager",          imageSrc: "http://img.b2bpic.net/free-photo/close-up-engineer-architect-shaking-hands_23-2148233782.jpg?_wi=1"},
-          title: "Excellent Structural Work",
-          quote: "Welding Master Miami handled our structural steel project with incredible professionalism. Delivered ahead of schedule.",
-          name: "Carlos Mendez",
-          role: "Site Manager",
-          imageSrc: "http://img.b2bpic.net/free-photo/close-up-engineer-architect-shaking-hands_23-2148233782.jpg?_wi=1",
-        },
         {
-          id: "t2",
+          id: "t2",          title: "Reliable & Precise",          quote: "Their precision in pipework is unmatched in the city. Very happy with the results.",          name: "Elena Rodriguez",          role: "Project Lead",          imageSrc: "http://img.b2bpic.net/free-photo/front-view-worker-construction-wearing-protection-gear_23-2148784061.jpg?_wi=1"},
-          title: "Reliable & Precise",
-          quote: "Their precision in pipework is unmatched in the city. Very happy with the results.",
-          name: "Elena Rodriguez",
-          role: "Project Lead",
-          imageSrc: "http://img.b2bpic.net/free-photo/front-view-worker-construction-wearing-protection-gear_23-2148784061.jpg?_wi=1",
-        },
         {
-          id: "t3",
+          id: "t3",          title: "Critical Support",          quote: "We needed urgent on-site repair and they were there within hours. Exceptional service.",          name: "David Thompson",          role: "Operations Director",          imageSrc: "http://img.b2bpic.net/free-photo/male-engineer-sitting-workplace-with-architectural-plan-table_23-2147842993.jpg?_wi=1"},
-          title: "Critical Support",
-          quote: "We needed urgent on-site repair and they were there within hours. Exceptional service.",
-          name: "David Thompson",
-          role: "Operations Director",
-          imageSrc: "http://img.b2bpic.net/free-photo/male-engineer-sitting-workplace-with-architectural-plan-table_23-2147842993.jpg?_wi=1",
-        },
         {
-          id: "t4",
+          id: "t4",          title: "Great Partner",          quote: "Professional, clean, and highly effective. Highly recommend for any industrial project.",          name: "Sarah Jenkins",          role: "Commercial Developer",          imageSrc: "http://img.b2bpic.net/free-photo/relaxing-fume-banking-adult-absence_1134-936.jpg?_wi=1"},
-          title: "Great Partner",
-          quote: "Professional, clean, and highly effective. Highly recommend for any industrial project.",
-          name: "Sarah Jenkins",
-          role: "Commercial Developer",
-          imageSrc: "http://img.b2bpic.net/free-photo/relaxing-fume-banking-adult-absence_1134-936.jpg?_wi=1",
-        },
         {
-          id: "t5",
+          id: "t5",          title: "Safety First",          quote: "They strictly follow all safety protocols, making them the easiest choice for our facility upgrades.",          name: "Michael Chen",          role: "Plant Owner",          imageSrc: "http://img.b2bpic.net/free-photo/portrait-beautiful-woman-holding-tablet_23-2148352795.jpg?_wi=1"},
-          title: "Safety First",
-          quote: "They strictly follow all safety protocols, making them the easiest choice for our facility upgrades.",
-          name: "Michael Chen",
-          role: "Plant Owner",
-          imageSrc: "http://img.b2bpic.net/free-photo/portrait-beautiful-woman-holding-tablet_23-2148352795.jpg?_wi=1",
-        },
       ]}
       title="Trusted by Miami Builders"
       description="Our clients rely on our precision, reliability, and commitment to the highest safety standards."
@@ -210,40 +125,15 @@ export default function LandingPage() {
       description="Meet the certified professionals behind Miami's most reliable welding service."
       members={[
         {
-          id: "m1",
+          id: "m1",          name: "Marcus Vane",          role: "Master Welder",          description: "20+ years of structural expertise in high-rise construction.",          imageSrc: "http://img.b2bpic.net/free-photo/close-up-engineer-architect-shaking-hands_23-2148233782.jpg?_wi=2"},
-          name: "Marcus Vane",
-          role: "Master Welder",
-          description: "20+ years of structural expertise in high-rise construction.",
-          imageSrc: "http://img.b2bpic.net/free-photo/close-up-engineer-architect-shaking-hands_23-2148233782.jpg?_wi=2",
-        },
         {
-          id: "m2",
+          id: "m2",          name: "Elena Torres",          role: "Lead Fabricator",          description: "Specialist in custom metal design and pipe fabrication.",          imageSrc: "http://img.b2bpic.net/free-photo/front-view-worker-construction-wearing-protection-gear_23-2148784061.jpg?_wi=2"},
-          name: "Elena Torres",
-          role: "Lead Fabricator",
-          description: "Specialist in custom metal design and pipe fabrication.",
-          imageSrc: "http://img.b2bpic.net/free-photo/front-view-worker-construction-wearing-protection-gear_23-2148784061.jpg?_wi=2",
-        },
         {
-          id: "m3",
+          id: "m3",          name: "James O'Neal",          role: "Mobile Operations",          description: "Expert in rapid field repairs and emergency response.",          imageSrc: "http://img.b2bpic.net/free-photo/male-engineer-sitting-workplace-with-architectural-plan-table_23-2147842993.jpg?_wi=2"},
-          name: "James O'Neal",
-          role: "Mobile Operations",
-          description: "Expert in rapid field repairs and emergency response.",
-          imageSrc: "http://img.b2bpic.net/free-photo/male-engineer-sitting-workplace-with-architectural-plan-table_23-2147842993.jpg?_wi=2",
-        },
         {
-          id: "m4",
+          id: "m4",          name: "Sarah Lopez",          role: "Quality Control",          description: "Ensures all projects meet strict AWS and safety standards.",          imageSrc: "http://img.b2bpic.net/free-photo/relaxing-fume-banking-adult-absence_1134-936.jpg?_wi=2"},
-          name: "Sarah Lopez",
-          role: "Quality Control",
-          description: "Ensures all projects meet strict AWS and safety standards.",
-          imageSrc: "http://img.b2bpic.net/free-photo/relaxing-fume-banking-adult-absence_1134-936.jpg?_wi=2",
-        },
         {
-          id: "m5",
+          id: "m5",          name: "Kevin Chen",          role: "Safety Director",          description: "Dedicated to workplace safety and compliance excellence.",          imageSrc: "http://img.b2bpic.net/free-photo/portrait-beautiful-woman-holding-tablet_23-2148352795.jpg?_wi=2"},
-          name: "Kevin Chen",
-          role: "Safety Director",
-          description: "Dedicated to workplace safety and compliance excellence.",
-          imageSrc: "http://img.b2bpic.net/free-photo/portrait-beautiful-woman-holding-tablet_23-2148352795.jpg?_wi=2",
-        },
       ]}
     />
   </div>
@@ -252,11 +142,10 @@ export default function LandingPage() {
       <ContactSplit
       useInvertedBackground={true}
       background={{
-        variant: "plain",
+        variant: "plain"}}
-      }}
       tag="Get in touch"
       title="Start Your Project"
-      description="Ready to discuss your welding or fabrication needs? Contact us today for a free consultation and estimate."
+      description="Ready to discuss your welding or fabrication needs? Contact us today for a free consultation and estimate at +1 305-303-7439."
       imageSrc="http://img.b2bpic.net/free-photo/beautiful-shot-abandoned-messy-warehouse_181624-26368.jpg"
       mediaPosition="right"
       inputPlaceholder="Enter your professional email"
@@ -268,29 +157,19 @@ export default function LandingPage() {
       <FooterBase
       columns={[
         {
-          title: "Company",
+          title: "Company",          items: [
-          items: [
             {
-              label: "Services",
+              label: "Services",              href: "#services"},
-              href: "#services",
-            },
             {
-              label: "Contact",
+              label: "Contact",              href: "#contact"},
-              href: "#contact",
-            },
           ],
         },
         {
-          title: "Resources",
+          title: "Resources",          items: [
-          items: [
             {
-              label: "FAQ",
+              label: "FAQ",              href: "#faq"},
-              href: "#faq",
-            },
             {
-              label: "Privacy Policy",
+              label: "Privacy Policy",              href: "#"},
-              href: "#",
-            },
           ],
         },
       ]}
@@ -301,4 +180,4 @@ export default function LandingPage() {
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}

src/app/styles/variables.css

@@ -10,15 +10,15 @@
   --accent: #ffffff;
   --background-accent: #ffffff; */
 
-  --background: #f5f5f5;
+  --background: #ffffff;
-  --card: #ffffff;
+  --card: #f9f9f9;
-  --foreground: #1c1c1c;
+  --foreground: #000612e6;
-  --primary-cta: #1c1c1c;
+  --primary-cta: #15479c;
-  --primary-cta-text: #f5f5f5;
+  --primary-cta-text: #ffffff;
-  --secondary-cta: #ffffff;
+  --secondary-cta: #f9f9f9;
-  --secondary-cta-text: #1c1c1c;
+  --secondary-cta-text: #000612e6;
-  --accent: #e63946;
+  --accent: #e2e2e2;
-  --background-accent: #e8bea8;
+  --background-accent: #c4c4c4;
 
   /* text sizing - set by ThemeProvider */
   /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);