Merge version_4 into main

Merge version_4 into main

src/app/about/page.tsx

@@ -4,7 +4,6 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import FeatureCardSix from '@/components/sections/feature/FeatureCardSix';
 import FooterBase from '@/components/sections/footer/FooterBase';
-import MetricCardSeven from '@/components/sections/metrics/MetricCardSeven';
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
 
 export default function LandingPage() {
@@ -25,30 +24,12 @@ export default function LandingPage() {
         <div id="nav" data-section="nav">
           <NavbarLayoutFloatingOverlay
             navItems={[
-        {
+              { name: "Home", id: "/" },
-          name: "Home",
+              { name: "About", id: "/about" },
-          id: "/",
+              { name: "Services", id: "/services" },
-        },
+              { name: "Projects", id: "/projects" },
-        {
+              { name: "Safety", id: "/safety" },
-          name: "About",
+              { name: "Contact", id: "/contact" },
-          id: "/about",
-        },
-        {
-          name: "Services",
-          id: "/services",
-        },
-        {
-          name: "Projects",
-          id: "/projects",
-        },
-        {
-          name: "Safety",
-          id: "/safety",
-        },
-        {
-          name: "Contact",
-          id: "/contact",
-        },
             ]}
             brandName="Jasso Framing LLC"
           />
@@ -60,100 +41,13 @@ export default function LandingPage() {
             useInvertedBackground={false}
             title="Our History"
             description="Founded on precision and trust, we have grown into Texas' leading framing partner."
-      features={[
+            features={[]}
-        {
-          title: "Our Legacy",
-          description: "20 years of building communities.",
-          imageSrc: "http://img.b2bpic.net/free-photo/close-up-building-construction_23-2148139971.jpg",
-        },
-        {
-          title: "Our Mission",
-          description: "Providing structural excellence.",
-          imageSrc: "http://img.b2bpic.net/free-photo/view-modern-construction-site_23-2151317321.jpg",
-        },
-      ]}
-    />
-  </div>
-
-  <div id="metric" data-section="metric">
-      <MetricCardSeven
-      animationType="slide-up"
-      textboxLayout="default"
-      useInvertedBackground={false}
-      title="Leadership Stats"
-      description="Driven by a team of construction veterans."
-      metrics={[
-        {
-          id: "l1",
-          value: "50+",
-          title: "Expert Staff",
-          items: [
-            "Foremen",
-            "Engineers",
-            "Carpenters",
-          ],
-        },
-        {
-          id: "l2",
-          value: "100%",
-          title: "Compliance",
-          items: [
-            "Safety",
-            "Standards",
-            "Quality",
-          ],
-        },
-      ]}
           />
         </div>
 
         <div id="footer" data-section="footer">
           <FooterBase
-      columns={[
+            columns={[]}
-        {
-          title: "Company",
-          items: [
-            {
-              label: "About Us",
-              href: "/about",
-            },
-            {
-              label: "Services",
-              href: "/services",
-            },
-            {
-              label: "Careers",
-              href: "/careers",
-            },
-          ],
-        },
-        {
-          title: "Projects",
-          items: [
-            {
-              label: "Portfolio",
-              href: "/projects",
-            },
-            {
-              label: "Safety",
-              href: "/safety",
-            },
-          ],
-        },
-        {
-          title: "Support",
-          items: [
-            {
-              label: "Contact",
-              href: "/contact",
-            },
-            {
-              label: "Request Bid",
-              href: "/contact",
-            },
-          ],
-        },
-      ]}
             logoText="Jasso Framing LLC"
           />
         </div>

src/app/contact/page.tsx

@@ -3,7 +3,6 @@
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import ContactCenter from '@/components/sections/contact/ContactCenter';
-import FeatureCardSix from '@/components/sections/feature/FeatureCardSix';
 import FooterBase from '@/components/sections/footer/FooterBase';
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
 
@@ -25,30 +24,12 @@ export default function LandingPage() {
   <div id="nav" data-section="nav">
       <NavbarLayoutFloatingOverlay
       navItems={[
-        {
+        { name: "Home", id: "/" },
-          name: "Home",
+        { name: "About", id: "/about" },
-          id: "/",
+        { name: "Services", id: "/services" },
-        },
+        { name: "Projects", id: "/projects" },
-        {
+        { name: "Safety", id: "/safety" },
-          name: "About",
+        { name: "Contact", id: "/contact" },
-          id: "/about",
-        },
-        {
-          name: "Services",
-          id: "/services",
-        },
-        {
-          name: "Projects",
-          id: "/projects",
-        },
-        {
-          name: "Safety",
-          id: "/safety",
-        },
-        {
-          name: "Contact",
-          id: "/contact",
-        },
       ]}
       brandName="Jasso Framing LLC"
     />
@@ -57,83 +38,17 @@ export default function LandingPage() {
   <div id="contact" data-section="contact">
       <ContactCenter
       useInvertedBackground={false}
-      background={{
+      background={{ variant: "plain" }}
-        variant: "plain",
-      }}
       title="Reach Our Office"
       description="We look forward to partnering with you."
       tag="Contact Info"
-    />
+      buttonText="Get Free Estimate"
-  </div>
-
-  <div id="feature" data-section="feature">
-      <FeatureCardSix
-      textboxLayout="default"
-      useInvertedBackground={false}
-      title="Partnership Process"
-      description="How to get started."
-      features={[
-        {
-          title: "Consultation",
-          description: "Initial project assessment.",
-          imageSrc: "http://img.b2bpic.net/free-photo/startup-worker-uses-laptop-open-space-reviewing-project-data-documents-workstation-executive-assistant-working-marketing-strategy-business-development-ai-developer_482257-65810.jpg",
-        },
-        {
-          title: "Bid Submission",
-          description: "Transparent project pricing.",
-          imageSrc: "http://img.b2bpic.net/free-photo/electrician-is-studying-construction-drawing-with-coffee-his-hand_169016-12017.jpg",
-        },
-      ]}
     />
   </div>
 
   <div id="footer" data-section="footer">
       <FooterBase
-      columns={[
+      columns={[]}
-        {
-          title: "Company",
-          items: [
-            {
-              label: "About Us",
-              href: "/about",
-            },
-            {
-              label: "Services",
-              href: "/services",
-            },
-            {
-              label: "Careers",
-              href: "/careers",
-            },
-          ],
-        },
-        {
-          title: "Projects",
-          items: [
-            {
-              label: "Portfolio",
-              href: "/projects",
-            },
-            {
-              label: "Safety",
-              href: "/safety",
-            },
-          ],
-        },
-        {
-          title: "Support",
-          items: [
-            {
-              label: "Contact",
-              href: "/contact",
-            },
-            {
-              label: "Request Bid",
-              href: "/contact",
-            },
-          ],
-        },
-      ]}
       logoText="Jasso Framing LLC"
     />
   </div>

src/app/page.tsx

@@ -2,172 +2,32 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import ContactCenter from '@/components/sections/contact/ContactCenter';
-import FeatureCardSix from '@/components/sections/feature/FeatureCardSix';
-import FooterBase from '@/components/sections/footer/FooterBase';
-import HeroSplitTestimonial from '@/components/sections/hero/HeroSplitTestimonial';
-import MetricCardSeven from '@/components/sections/metrics/MetricCardSeven';
-import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
-import ProductCardThree from '@/components/sections/product/ProductCardThree';
 import TestimonialCardSix from '@/components/sections/testimonial/TestimonialCardSix';
+import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
 
 export default function LandingPage() {
   return (
     <ThemeProvider
         defaultButtonVariant="bounce-effect"
-        defaultTextAnimation="background-highlight"
+        defaultTextAnimation="entrance-slide"
         borderRadius="rounded"
-        contentWidth="mediumLarge"
+        contentWidth="medium"
-        sizing="mediumLargeSizeMediumTitles"
+        sizing="medium"
-        background="noise"
+        background="circleGradient"
-        cardStyle="subtle-shadow"
+        cardStyle="glass-elevated"
-        primaryButtonStyle="primary-glow"
+        primaryButtonStyle="gradient"
-        secondaryButtonStyle="layered"
+        secondaryButtonStyle="glass"
-        headingFontWeight="medium"
+        headingFontWeight="normal"
     >
       <ReactLenis root>
         <div id="nav" data-section="nav">
           <NavbarLayoutFloatingOverlay
             navItems={[
-        {
+              { name: "Home", id: "/" },
-          name: "Home",          id: "/"},
+              { name: "About", id: "/about" },
-        {
+              { name: "Contact", id: "/contact" },
-          name: "About",          id: "/about"},
-        {
-          name: "Services",          id: "/services"},
-        {
-          name: "Projects",          id: "/projects"},
-        {
-          name: "Safety",          id: "/safety"},
-        {
-          name: "Contact",          id: "/contact"},
             ]}
-      brandName="Jasso Framing LLC"
+            brandName="Company"
-    />
-  </div>
-
-  <div id="hero" data-section="hero">
-      <HeroSplitTestimonial
-      background={{
-        variant: "gradient-bars"}}
-      title="Build on Quality. Driven By Precision. "
-      description="Expert framing and structural wood solutions for large-scale multifamily and commercial projects across Texas and beyond."
-      testimonials={[
-        {
-          name: "Mike Anderson",          handle: "GC, Texas Builders",          testimonial: "Jasso Framing always hits their schedule and the quality is unmatched.",          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/laptop-digitally-generated-paper-logistics-working_1134-928.jpg"},
-        {
-          name: "Sarah Miller",          handle: "Developer, Austin Living",          testimonial: "Their coordination and professionalism on our apartment communities is stellar.",          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/portrait-bearded-man-sitting-front-laptop-workplace_23-2148187164.jpg"},
-        {
-          name: "David Chen",          handle: "Structural Lead",          testimonial: "Precise, efficient, and safety-first. Highly recommend for large projects.",          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/male-worker-construction-wearing-protection-gear_23-2148784062.jpg"},
-        {
-          name: "Elena Rodriguez",          handle: "Project Manager",          testimonial: "The best framing partner we've had on our commercial developments.",          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/man-with-helmet-working-logistic_23-2148886820.jpg"},
-        {
-          name: "Mark D.",          handle: "Site Supervisor",          testimonial: "Incredible attention to detail on every framing sequence.",          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/front-view-smiley-man-with-safety-helmet-vest_23-2148269280.jpg"},
-      ]}
-      buttons={[
-        {
-          text: "View Projects",          href: "/projects"},
-        {
-          text: "Get Free Estimate",          href: "/contact"},
-      ]}
-      imageSrc="http://img.b2bpic.net/free-photo/new-house-construction-site_23-2151933435.jpg"
-      mediaAnimation="blur-reveal"
-      avatars={[
-        {
-          src: "http://img.b2bpic.net/free-photo/close-up-portrait-smiling-construction-worker_23-2148233742.jpg",          alt: "Construction Manager"},
-        {
-          src: "http://img.b2bpic.net/free-photo/happy-builder-hardhat_1398-1726.jpg",          alt: "Site Foreman"},
-        {
-          src: "http://img.b2bpic.net/free-photo/portrait-confident-experienced-carpenter_329181-15660.jpg",          alt: "Lead Carpenter"},
-        {
-          src: "http://img.b2bpic.net/free-photo/smiley-architect-looking-camera_23-2148242902.jpg",          alt: "Architect"},
-        {
-          src: "http://img.b2bpic.net/free-photo/mature-woman-architect-hardhat_1303-19290.jpg",          alt: "Project Manager"},
-      ]}
-      avatarText="Trusted by 500+ Industry Professionals"
-      marqueeItems={[
-        {
-          type: "text",          text: "Multifamily Experts"},
-        {
-          type: "text",          text: "Texas-Wide Operations"},
-        {
-          type: "text",          text: "20+ Years Experience"},
-        {
-          type: "text",          text: "Safety First"},
-        {
-          type: "text",          text: "Structural Integrity"},
-      ]}
-    />
-  </div>
-
-  <div id="metrics" data-section="metrics">
-      <MetricCardSeven
-      animationType="slide-up"
-      textboxLayout="split"
-      useInvertedBackground={false}
-      metrics={[
-        {
-          id: "m1",          value: "1 M+",          title: "SQFT Framed",          items: [
-            "Multifamily",            "Commercial",            "Residential"],
-        },
-        {
-          id: "m2",          value: "20+",          title: "Years Experience",          items: [
-            "Expertise",            "Reliability",            "Craft"],
-        },
-        {
-          id: "m3",          value: "50+",          title: "Projects Completed",          items: [
-            "Large Scale",            "Commercial",            "Multifamily"],
-        },
-      ]}
-      title="Our Impact in Numbers"
-      description="We bring years of structural expertise to every site."
-    />
-  </div>
-
-  <div id="features" data-section="features">
-      <FeatureCardSix
-      textboxLayout="default"
-      useInvertedBackground={false}
-      features={[
-        {
-          title: "Multifamily Framing",          description: "High-efficiency framing for large apartment communities.",          imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-architect-wearing-helmet_23-2148815563.jpg"},
-        {
-          title: "Exterior Sheathing",          description: "Professional installation for maximum building envelope protection.",          imageSrc: "http://img.b2bpic.net/free-photo/worker-construction-site-wearing-medical-mask_23-2148784069.jpg"},
-        {
-          title: "Floor Decking",          description: "Engineered floor decking for sturdy, structural stability.",          imageSrc: "http://img.b2bpic.net/free-photo/person-doing-home-covid-test_23-2149173542.jpg"},
-      ]}
-      title="Framing Excellence"
-      description="Our core services meet the highest standards of structural integrity."
-    />
-  </div>
-
-  <div id="portfolio" data-section="portfolio">
-      <ProductCardThree
-      animationType="slide-up"
-      textboxLayout="default"
-      gridVariant="asymmetric-60-wide-40-narrow"
-      useInvertedBackground={false}
-      products={[
-        {
-          id: "p1",          name: "Austin Multifamily Complex",          price: "1.2M SQFT",          imageSrc: "http://img.b2bpic.net/free-photo/tall-office-modern-buildings_23-2148836835.jpg"},
-        {
-          id: "p2",          name: "Dallas Commercial Support",          price: "800k SQFT",          imageSrc: "http://img.b2bpic.net/free-photo/scene-construction-site-with-equipment_23-2151317359.jpg"},
-        {
-          id: "p3",          name: "Texas Roof Truss Build",          price: "500k SQFT",          imageSrc: "http://img.b2bpic.net/free-photo/full-shot-roofers-working-with-helmets_23-2149343708.jpg"},
-        {
-          id: "p4",          name: "Modern Pop-Out Framing",          price: "200k SQFT",          imageSrc: "http://img.b2bpic.net/free-photo/structure-tokyo-tower_1150-11154.jpg"},
-        {
-          id: "p5",          name: "Wall Panel System Install",          price: "600k SQFT",          imageSrc: "http://img.b2bpic.net/free-photo/modern-operational-plant-equipment-with-some-bags-chemicals-heavy-industry-machinery-metalworking-workshop-concept_645730-450.jpg"},
-        {
-          id: "p6",          name: "Structural Decking Project",          price: "400k SQFT",          imageSrc: "http://img.b2bpic.net/free-photo/younger-older-carpenter-measuring-wooden-planks_329181-15704.jpg"},
-      ]}
-      title="Featured Projects"
-      description="A look at our recent commercial and multifamily framing developments."
           />
         </div>
 
@@ -175,66 +35,10 @@ export default function LandingPage() {
           <TestimonialCardSix
             animationType="slide-up"
             textboxLayout="split"
+            title="What our clients say"
+            description="Trusted by professionals everywhere."
+            testimonials={[]}
             useInvertedBackground={false}
-      testimonials={[
-        {
-          id: "t1",          name: "Mike A.",          handle: "GC",          testimonial: "Elite work every time.",          imageSrc: "http://img.b2bpic.net/free-photo/man-showing-architectural-plans-with-copy-space_23-2148243013.jpg"},
-        {
-          id: "t2",          name: "Sarah M.",          handle: "Dev",          testimonial: "Professional coordination.",          imageSrc: "http://img.b2bpic.net/free-photo/seriously-engineer-girl-is-looking-camera-by-raising-up-pen-white-background_176474-116387.jpg"},
-        {
-          id: "t3",          name: "David C.",          handle: "Eng",          testimonial: "Structural perfection.",          imageSrc: "http://img.b2bpic.net/free-photo/woman-working-as-engineer_23-2151657936.jpg"},
-        {
-          id: "t4",          name: "Elena R.",          handle: "PM",          testimonial: "Safe and reliable.",          imageSrc: "http://img.b2bpic.net/free-photo/worker-construction-site-holding-helmet_23-2148784058.jpg"},
-        {
-          id: "t5",          name: "Mark D.",          handle: "GC",          testimonial: "Framing mastery achieved.",          imageSrc: "http://img.b2bpic.net/free-photo/front-view-smiley-man-with-hands-hips_23-2148269369.jpg"},
-      ]}
-      title="Trusted Partners"
-      description="See why developers and contractors choose Jasso Framing."
-    />
-  </div>
-
-  <div id="contact-section" data-section="contact-section">
-      <ContactCenter
-      useInvertedBackground={false}
-      background={{
-        variant: "rotated-rays-animated-grid"}}
-      title="Ready to Start Your Project?"
-      description="Submit a request for bid today and we will contact you immediately."
-      tag="Get in Touch"
-    />
-  </div>
-
-  <div id="footer" data-section="footer">
-      <FooterBase
-      columns={[
-        {
-          title: "Company",          items: [
-            {
-              label: "About Us",              href: "/about"},
-            {
-              label: "Services",              href: "/services"},
-            {
-              label: "Careers",              href: "/careers"},
-          ],
-        },
-        {
-          title: "Projects",          items: [
-            {
-              label: "Portfolio",              href: "/projects"},
-            {
-              label: "Safety",              href: "/safety"},
-          ],
-        },
-        {
-          title: "Support",          items: [
-            {
-              label: "Contact",              href: "/contact"},
-            {
-              label: "Request Bid",              href: "/contact"},
-          ],
-        },
-      ]}
-      logoText="Jasso Framing LLC"
           />
         </div>
       </ReactLenis>

src/app/projects/page.tsx

@@ -2,12 +2,11 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import FeatureCardSix from '@/components/sections/feature/FeatureCardSix';
-import FooterBase from '@/components/sections/footer/FooterBase';
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
-import ProductCardThree from '@/components/sections/product/ProductCardThree';
+import CardStack from '@/components/cardStack/CardStack';
+import FooterBase from '@/components/sections/footer/FooterBase';
 
-export default function LandingPage() {
+export default function ProjectsPage() {
   return (
     <ThemeProvider
         defaultButtonVariant="bounce-effect"
@@ -25,127 +24,45 @@ export default function LandingPage() {
         <div id="nav" data-section="nav">
           <NavbarLayoutFloatingOverlay
             navItems={[
-        {
+              { name: "Home", id: "/" },
-          name: "Home",
+              { name: "About", id: "/about" },
-          id: "/",
+              { name: "Services", id: "/services" },
-        },
+              { name: "Projects", id: "/projects" },
-        {
+              { name: "Safety", id: "/safety" },
-          name: "About",
+              { name: "Contact", id: "/contact" },
-          id: "/about",
-        },
-        {
-          name: "Services",
-          id: "/services",
-        },
-        {
-          name: "Projects",
-          id: "/projects",
-        },
-        {
-          name: "Safety",
-          id: "/safety",
-        },
-        {
-          name: "Contact",
-          id: "/contact",
-        },
             ]}
             brandName="Jasso Framing LLC"
           />
         </div>
 
-  <div id="product" data-section="product">
+        <div id="portfolio" data-section="portfolio">
-      <ProductCardThree
+          <CardStack
             animationType="slide-up"
             textboxLayout="default"
-      gridVariant="uniform-all-items-equal"
-      useInvertedBackground={false}
             title="Completed Work"
-      description="A glimpse of our portfolio."
+            description="Our project gallery showcasing structural precision and expertise."
-      products={[
+            gridVariant="four-items-2x2-equal-grid"
-        {
+            className="py-16"
-          id: "a1",
+          >
-          name: "Austin Heights",
+            {[
-          price: "Large Scale",
+                { name: "Austin Heights", title: "Structural Build", img: "http://img.b2bpic.net/free-photo/modern-country-houses-construction_1385-20.jpg" },
-          imageSrc: "http://img.b2bpic.net/free-photo/modern-country-houses-construction_1385-20.jpg",
+                { name: "Dallas Commercial", title: "Framing Project", img: "http://img.b2bpic.net/free-photo/modern-country-houses-construction_1385-20.jpg" },
-        },
+                { name: "San Antonio Residential", title: "Multi-Unit Framing", img: "http://img.b2bpic.net/free-photo/modern-country-houses-construction_1385-20.jpg" },
-        {
+                { name: "Houston Heights", title: "Commercial Structural", img: "http://img.b2bpic.net/free-photo/modern-country-houses-construction_1385-20.jpg" }
-          id: "a2",
+            ].map((item, i) => (
-          name: "Dallas Commercial",
+              <div key={i} className="p-4 border border-zinc-200 rounded-lg flex flex-col items-center text-center hover:shadow-lg transition-shadow duration-300">
-          price: "High Density",
+                <img src={item.img} alt={item.name} className="w-full h-48 object-cover rounded mb-4" />
-          imageSrc: "http://img.b2bpic.net/free-photo/horizontal-shot-construction-site-with-scaffolding-clear-blue-sky_181624-27944.jpg",
+                <h3 className="text-lg font-bold">{item.name}</h3>
-        },
+                <p className="text-sm text-zinc-600">{item.title}</p>
-      ]}
-    />
               </div>
-
+            ))}
-  <div id="feature" data-section="feature">
+          </CardStack>
-      <FeatureCardSix
-      textboxLayout="default"
-      useInvertedBackground={false}
-      title="Quality Benchmarks"
-      description="We exceed industry expectations."
-      features={[
-        {
-          title: "Precision Framing",
-          description: "Engineered for durability.",
-          imageSrc: "http://img.b2bpic.net/free-photo/low-view-wooden-house-construction_23-2148748793.jpg",
-        },
-        {
-          title: "Timely Delivery",
-          description: "Always hitting our targets.",
-          imageSrc: "http://img.b2bpic.net/free-photo/idea-adult-man-protective-helmet-plaid-shirt-with-tablet-his-hands-thinking-looking-side-standing-construction-site_259150-57618.jpg",
-        },
-      ]}
-    />
         </div>
 
         <div id="footer" data-section="footer">
           <FooterBase
             columns={[
-        {
+                { title: "Quick Links", items: [{ label: "Home", href: "/" }, { label: "Projects", href: "/projects" }] }
-          title: "Company",
-          items: [
-            {
-              label: "About Us",
-              href: "/about",
-            },
-            {
-              label: "Services",
-              href: "/services",
-            },
-            {
-              label: "Careers",
-              href: "/careers",
-            },
-          ],
-        },
-        {
-          title: "Projects",
-          items: [
-            {
-              label: "Portfolio",
-              href: "/projects",
-            },
-            {
-              label: "Safety",
-              href: "/safety",
-            },
-          ],
-        },
-        {
-          title: "Support",
-          items: [
-            {
-              label: "Contact",
-              href: "/contact",
-            },
-            {
-              label: "Request Bid",
-              href: "/contact",
-            },
-          ],
-        },
             ]}
             logoText="Jasso Framing LLC"
           />

src/app/safety/page.tsx

@@ -2,9 +2,7 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import FeatureCardSix from '@/components/sections/feature/FeatureCardSix';
 import FooterBase from '@/components/sections/footer/FooterBase';
-import MetricCardSeven from '@/components/sections/metrics/MetricCardSeven';
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
 
 export default function LandingPage() {
@@ -25,135 +23,20 @@ export default function LandingPage() {
   <div id="nav" data-section="nav">
       <NavbarLayoutFloatingOverlay
       navItems={[
-        {
+        { name: "Home", id: "/" },
-          name: "Home",
+        { name: "About", id: "/about" },
-          id: "/",
+        { name: "Services", id: "/services" },
-        },
+        { name: "Projects", id: "/projects" },
-        {
+        { name: "Safety", id: "/safety" },
-          name: "About",
+        { name: "Contact", id: "/contact" },
-          id: "/about",
-        },
-        {
-          name: "Services",
-          id: "/services",
-        },
-        {
-          name: "Projects",
-          id: "/projects",
-        },
-        {
-          name: "Safety",
-          id: "/safety",
-        },
-        {
-          name: "Contact",
-          id: "/contact",
-        },
       ]}
       brandName="Jasso Framing LLC"
     />
   </div>
 
-  <div id="feature" data-section="feature">
-      <FeatureCardSix
-      textboxLayout="default"
-      useInvertedBackground={false}
-      title="Safety Protocols"
-      description="Zero incidents is our goal."
-      features={[
-        {
-          title: "Daily Briefings",
-          description: "Safety first every morning.",
-          imageSrc: "http://img.b2bpic.net/free-photo/outdoor-construction-worker-wearing-protection-gear_23-2148784050.jpg",
-        },
-        {
-          title: "Site Inspection",
-          description: "Rigorous compliance checks.",
-          imageSrc: "http://img.b2bpic.net/free-photo/young-man-civil-engineer-safety-hat_185193-110838.jpg",
-        },
-      ]}
-    />
-  </div>
-
-  <div id="metric" data-section="metric">
-      <MetricCardSeven
-      animationType="slide-up"
-      textboxLayout="default"
-      useInvertedBackground={false}
-      title="Safety Scorecard"
-      description="We are proud of our safe workplace."
-      metrics={[
-        {
-          id: "sf1",
-          value: "0",
-          title: "Major Incidents",
-          items: [
-            "Safe",
-            "Reliable",
-            "Compliant",
-          ],
-        },
-        {
-          id: "sf2",
-          value: "100%",
-          title: "OSHA Certified",
-          items: [
-            "Training",
-            "Equipment",
-            "Standards",
-          ],
-        },
-      ]}
-    />
-  </div>
-
   <div id="footer" data-section="footer">
       <FooterBase
-      columns={[
+      columns={[]}
-        {
-          title: "Company",
-          items: [
-            {
-              label: "About Us",
-              href: "/about",
-            },
-            {
-              label: "Services",
-              href: "/services",
-            },
-            {
-              label: "Careers",
-              href: "/careers",
-            },
-          ],
-        },
-        {
-          title: "Projects",
-          items: [
-            {
-              label: "Portfolio",
-              href: "/projects",
-            },
-            {
-              label: "Safety",
-              href: "/safety",
-            },
-          ],
-        },
-        {
-          title: "Support",
-          items: [
-            {
-              label: "Contact",
-              href: "/contact",
-            },
-            {
-              label: "Request Bid",
-              href: "/contact",
-            },
-          ],
-        },
-      ]}
       logoText="Jasso Framing LLC"
     />
   </div>

src/app/services/page.tsx

@@ -2,9 +2,7 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import FeatureCardSix from '@/components/sections/feature/FeatureCardSix';
 import FooterBase from '@/components/sections/footer/FooterBase';
-import MetricCardSeven from '@/components/sections/metrics/MetricCardSeven';
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
 
 export default function LandingPage() {
@@ -25,137 +23,20 @@ export default function LandingPage() {
   <div id="nav" data-section="nav">
       <NavbarLayoutFloatingOverlay
       navItems={[
-        {
+        { name: "Home", id: "/" },
-          name: "Home",
+        { name: "About", id: "/about" },
-          id: "/",
+        { name: "Services", id: "/services" },
-        },
+        { name: "Projects", id: "/projects" },
-        {
+        { name: "Safety", id: "/safety" },
-          name: "About",
+        { name: "Contact", id: "/contact" },
-          id: "/about",
-        },
-        {
-          name: "Services",
-          id: "/services",
-        },
-        {
-          name: "Projects",
-          id: "/projects",
-        },
-        {
-          name: "Safety",
-          id: "/safety",
-        },
-        {
-          name: "Contact",
-          id: "/contact",
-        },
       ]}
       brandName="Jasso Framing LLC"
     />
   </div>
 
-  <div id="feature" data-section="feature">
-      <FeatureCardSix
-      textboxLayout="default"
-      useInvertedBackground={false}
-      title="Our Services"
-      description="From framing to sheathing, we do it all."
-      features={[
-        {
-          title: "Rough Carpentry",
-          description: "The skeleton of modern structures.",
-          imageSrc: "http://img.b2bpic.net/free-photo/carpentry-concept-with-man-working-with-saw_23-2147773340.jpg",
-        },
-        {
-          title: "Safety Consulting",
-          description: "Site safety protocols and management.",
-          imageSrc: "http://img.b2bpic.net/free-photo/side-view-female-construction-worker-with-helmet-electric-drill_23-2148813391.jpg",
-        },
-      ]}
-    />
-  </div>
-
-  <div id="metric" data-section="metric">
-      <MetricCardSeven
-      animationType="slide-up"
-      textboxLayout="default"
-      useInvertedBackground={false}
-      title="Service Reach"
-      description="Serving the entire state of Texas."
-      metrics={[
-        {
-          id: "s1",
-          value: "5",
-          title: "Main Hubs",
-          items: [
-            "Dallas",
-            "Austin",
-            "Houston",
-            "SA",
-            "FtW",
-          ],
-        },
-        {
-          id: "s2",
-          value: "24/7",
-          title: "Availability",
-          items: [
-            "Support",
-            "Scheduling",
-            "Logistics",
-          ],
-        },
-      ]}
-    />
-  </div>
-
   <div id="footer" data-section="footer">
       <FooterBase
-      columns={[
+      columns={[]}
-        {
-          title: "Company",
-          items: [
-            {
-              label: "About Us",
-              href: "/about",
-            },
-            {
-              label: "Services",
-              href: "/services",
-            },
-            {
-              label: "Careers",
-              href: "/careers",
-            },
-          ],
-        },
-        {
-          title: "Projects",
-          items: [
-            {
-              label: "Portfolio",
-              href: "/projects",
-            },
-            {
-              label: "Safety",
-              href: "/safety",
-            },
-          ],
-        },
-        {
-          title: "Support",
-          items: [
-            {
-              label: "Contact",
-              href: "/contact",
-            },
-            {
-              label: "Request Bid",
-              href: "/contact",
-            },
-          ],
-        },
-      ]}
       logoText="Jasso Framing LLC"
     />
   </div>