Update src/app/page.tsx

Merge version_15 into main

src/app/layout.tsx

@@ -19,9 +19,11 @@ export const metadata: Metadata = {
   },
 };
 
+
+
+
 const montserrat = Montserrat({
-  variable: "--font-montserrat",
-  subsets: ["latin"],
+  variable: "--font-montserrat",  subsets: ["latin"],
 });
 
 export default function RootLayout({

src/app/page.tsx

@@ -3,13 +3,13 @@
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import ContactCenter from '@/components/sections/contact/ContactCenter';
-import FeatureCardThree from '@/components/sections/feature/featureCardThree/FeatureCardThree';
+import FeatureCardTwelve from '@/components/sections/feature/FeatureCardTwelve';
 import FooterCard from '@/components/sections/footer/FooterCard';
 import HeroBillboardRotatedCarousel from '@/components/sections/hero/HeroBillboardRotatedCarousel';
 import MetricCardFourteen from '@/components/sections/metrics/MetricCardFourteen';
 import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
-import TimelineProcessFlow from '@/components/cardStack/layouts/timelines/TimelineProcessFlow';
-import { Target } from 'lucide-react';
+import TestimonialAboutCard from '@/components/sections/about/TestimonialAboutCard';
+import { Recycle } from 'lucide-react';
 
 export default function LandingPage() {
   return (
@@ -20,9 +20,9 @@ export default function LandingPage() {
         contentWidth="mediumLarge"
         sizing="mediumLargeSizeLargeTitles"
         background="grid"
-        cardStyle="gradient-radial"
+        cardStyle="glass-elevated"
         primaryButtonStyle="diagonal-gradient"
-        secondaryButtonStyle="solid"
+        secondaryButtonStyle="glass"
         headingFontWeight="extrabold"
     >
       <ReactLenis root>
@@ -59,36 +59,31 @@ export default function LandingPage() {
   </div>
 
   <div id="about" data-section="about">
-      <TimelineProcessFlow 
-        title="About Debris Free Oceans"
-        description="We are a team of ocean advocates committed to a 5Rs approach to restore marine health and stop plastic flow. Our timeline follows a central wave path through the deep sea, connecting our mission and strategy nodes."
-        tag="Mission & Strategy"
-        tagIcon={Target}
-        textboxLayout="split-description"
-        animationType="blur-reveal"
-        items={[
-          { content: "Debris Free Oceans is a grassroots organization dedicated to keeping our oceans clean. We partner with local communities and schools to raise awareness.", media: "", reverse: false },
-          { content: "The 5Rs Strategy (Refuse, Reduce, Reuse, Repurpose, Recycle) serves as our blueprint for sustainable daily living and corporate change.", media: "", reverse: true },
-          { content: "We execute beach cleanups, educational workshops, and advocate for policy changes to ensure our oceans remain pristine.", media: "", reverse: false },
-          { content: "Our ultimate goal is a healthy, self-sustaining blue planet, completely free from the harmful impact of modern plastic waste.", media: "", reverse: true }
-        ]}
-        className="bg-gradient-to-b from-teal-500 to-slate-950"
+      <TestimonialAboutCard
+        tag="Our Mission"
+        title="Turning Off The Waste Tap"
+        description="We are a Miami-based non-profit organization dedicated to advancing a zero-waste economy. Our goal is to shift cultural paradigms away from disposable living toward a circular future."
+        subdescription="Through community, education, and advocacy, we tackle the root causes of ocean plastic pollution, protecting the delicate ecosystems that define our blue planet."
+        icon={Recycle}
+        videoSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BtwXXwXAFgkLcj8UK8yqk5jXxb/vibrant-coral-reef-in-midwater-soft-ligh-1775511262201-ae7e40af.mp4"
+        mediaAnimation="blur-reveal"
+        className="py-24 bg-background-accent"
+        useInvertedBackground={false}
       />
   </div>
 
   <div id="features" data-section="features">
-      <FeatureCardThree
-      animationType="slide-up"
+      <FeatureCardTwelve
+      animationType="blur-reveal"
       textboxLayout="split"
-      gridVariant="three-columns-all-equal-width"
-      useInvertedBackground={false}
+      title="Our Core Strategy: The 5Rs"
+      description='We move beyond just "cleaning up" by integrating a circular approach to waste'
       features={[
-        { title: "Refuse & Reduce", description: "Say no to single-use plastics and minimize waste at the source.", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BtwXXwXAFgkLcj8UK8yqk5jXxb/vibrant-coral-reef-in-midwater-soft-ligh-1775511262201-ae7e40af.png" },
-        { title: "Reuse & Repurpose", description: "Extend the life of materials through creative reuse and repurposing.", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BtwXXwXAFgkLcj8UK8yqk5jXxb/school-of-fish-swimming-through-midwater-1775511261257-73e530b0.png" },
-        { title: "Final Goal", description: "A clean, thriving ocean ecosystem free from plastic debris.", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BtwXXwXAFgkLcj8UK8yqk5jXxb/bubbles-drifting-past-futuristic-ocean-u-1775511260463-ae02a6e5.png" },
+        { id: "1", label: "Reduce", title: "Consumption Shift", items: ["Inspiring a shift away from single-use consumption to stop waste before it starts.", "Consumer awareness initiatives"] },
+        { id: "2", label: "Reuse & Repurpose", title: "Circularity", items: ["Material upcycling projects", "Community repair workshops", "Resource recovery networks"] },
+        { id: "3", label: "The Goal", title: "Restoration", items: ["Ecosystem cleaning efforts", "Policy advocacy for ocean health", "Zero-waste infrastructure"] },
       ]}
-      title="Our Core Strategy"
-      description="Guided by the 5Rs, we empower communities to take actionable steps toward a sustainable future."
+      useInvertedBackground={false}
     />
   </div>
 
@@ -126,4 +121,4 @@ export default function LandingPage() {
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}