Update src/app/page.tsx

Merge version_2 into main

src/app/about/page.tsx

@@ -2,12 +2,13 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
+import SplitAbout from '@/components/sections/about/SplitAbout';
+import ContactSplitForm from '@/components/sections/contact/ContactSplitForm';
 import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
-import TestimonialCardThirteen from '@/components/sections/testimonial/TestimonialCardThirteen';
+import { Target, Users, BookOpen } from "lucide-react";
-import TextAbout from '@/components/sections/about/TextAbout';
 
-export default function LandingPage() {
+export default function AboutPage() {
   return (
     <ThemeProvider
         defaultButtonVariant="hover-magnetic"
@@ -22,144 +23,72 @@ export default function LandingPage() {
         headingFontWeight="light"
     >
       <ReactLenis root>
-  <div id="nav" data-section="nav">
+        <NavbarLayoutFloatingOverlay
-      <NavbarLayoutFloatingOverlay
+            navItems={[
-      navItems={[
+                { name: "Home", id: "/" },
-        {
+                { name: "Learn", id: "/learn" },
-          name: "Home",
+                { name: "About", id: "/about" },
-          id: "/",
+            ]}
-        },
+            brandName="FinLearn"
-        {
+        />
-          name: "Learn",
-          id: "/learn",
-        },
-        {
-          name: "About",
-          id: "/about",
-        },
-      ]}
-      brandName="FinLearn"
-    />
-  </div>
 
-  <div id="about-section" data-section="about-section">
+        <div id="about-content" data-section="about">
-      <TextAbout
+            <SplitAbout
-      useInvertedBackground={false}
+                useInvertedBackground={false}
-      title="Empowering Financial Independence"
+                textboxLayout="split"
-      buttons={[
+                title="Our Mission to Financial Literacy"
-        {
+                description="At FinLearn, we believe that understanding finance is a fundamental right. We are dedicated to simplifying complex investment landscapes for everyone."
-          text: "Start Learning",
+                bulletPoints={[
-          href: "/learn",
+                    { title: "Expert Insight", description: "Curated analysis from seasoned veterans.", icon: Target },
-        },
+                    { title: "Community Focused", description: "Growing together with 10,000+ investors.", icon: Users },
-      ]}
+                    { title: "Educational Excellence", description: "High-quality learning modules for every stage.", icon: BookOpen },
-    />
+                ]}
-  </div>
+                imageSrc="http://img.b2bpic.net/free-photo/close-up-digital-tablet-with-bar-graph_1098-3523.jpg?_wi=2"
+                mediaAnimation="slide-up"
+            />
+        </div>
 
-  <div id="testimonials-section" data-section="testimonials-section">
+        <div id="contact" data-section="contact">
-      <TestimonialCardThirteen
+            <ContactSplitForm
-      animationType="slide-up"
+                useInvertedBackground={false}
-      textboxLayout="default"
+                title="Contact Us"
-      useInvertedBackground={false}
+                description="Have questions about our mission?"
-      testimonials={[
+                inputs={[
-        {
+                    { name: "name", type: "text", placeholder: "Name", required: true },
-          id: "1",
+                    { name: "email", type: "email", placeholder: "Email", required: true },
-          name: "Elise M.",
+                ]}
-          handle: "@elisem",
+                textarea={{ name: "message", placeholder: "How can we help?", rows: 4, required: true }}
-          testimonial: "FinLearn changed how I view my savings. Simple, actionable advice.",
+            />
-          rating: 5,
+        </div>
-          imageSrc: "http://img.b2bpic.net/free-photo/smiling-middle-aged-man-using-tablet-street-cafe_1262-19056.jpg",
-        },
-        {
-          id: "2",
-          name: "David T.",
-          handle: "@davidt",
-          testimonial: "The blog content is consistently brilliant. I feel much more informed now.",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/confident-businessman-smiling_107420-84734.jpg",
-        },
-        {
-          id: "3",
-          name: "Clara S.",
-          handle: "@claras",
-          testimonial: "Comprehensive, clear, and perfectly paced for beginners.",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/serious-beautiful-middle-aged-business-woman_1262-3072.jpg",
-        },
-        {
-          id: "4",
-          name: "James P.",
-          handle: "@jamesp",
-          testimonial: "Exactly what I needed to get started with basic investments.",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/portrait-smiley-modern-male_23-2148514900.jpg",
-        },
-        {
-          id: "5",
-          name: "Elena R.",
-          handle: "@elenar",
-          testimonial: "Structured and reliable info in a sea of finance noise. Great work.",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/content-beautiful-businesswoman-standing-window_1262-1778.jpg",
-        },
-      ]}
-      showRating={true}
-      title="Trusted by Students"
-      description="See why learners and investors choose FinLearn for their educational journey."
-    />
-  </div>
 
-  <div id="footer" data-section="footer">
+        <div id="footer" data-section="footer">
-      <FooterBaseReveal
+            <FooterBaseReveal
-      logoText="FinLearn"
+                logoText="FinLearn"
-      columns={[
+                columns={[
-        {
+                    {
-          title: "Platform",
+                        title: "Platform",                        items: [
-          items: [
+                            { label: "Home", href: "/" },
-            {
+                            { label: "Learn", href: "/learn" },
-              label: "Home",
+                            { label: "About", href: "/about" },
-              href: "/",
+                        ],
-            },
+                    },
-            {
+                    {
-              label: "Learn",
+                        title: "Resources",                        items: [
-              href: "/learn",
+                            { label: "Market Blog", href: "/blog" },
-            },
+                            { label: "Guides", href: "/guides" },
-            {
+                        ],
-              label: "About",
+                    },
-              href: "/about",
+                    {
-            },
+                        title: "Legal",                        items: [
-          ],
+                            { label: "Privacy Policy", href: "/privacy" },
-        },
+                            { label: "Terms of Service", href: "/terms" },
-        {
+                        ],
-          title: "Resources",
+                    },
-          items: [
+                ]}
-            {
+                copyrightText="© 2024 FinLearn Education. All rights reserved."
-              label: "Market Blog",
+            />
-              href: "#",
+        </div>
-            },
-            {
-              label: "Guides",
-              href: "#",
-            },
-          ],
-        },
-        {
-          title: "Legal",
-          items: [
-            {
-              label: "Privacy Policy",
-              href: "#",
-            },
-            {
-              label: "Terms of Service",
-              href: "#",
-            },
-          ],
-        },
-      ]}
-      copyrightText="© 2024 FinLearn Education. All rights reserved."
-    />
-  </div>
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}

src/app/learn/page.tsx

@@ -2,11 +2,9 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import BlogCardTwo from '@/components/sections/blog/BlogCardTwo';
-import FeatureBorderGlow from '@/components/sections/feature/featureBorderGlow/FeatureBorderGlow';
-import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
-import { DollarSign, PieChart, ShieldCheck } from "lucide-react";
+import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
+import BlogCardOne from '@/components/sections/blog/BlogCardOne';
 
 export default function LearnPage() {
   return (
@@ -34,41 +32,20 @@ export default function LearnPage() {
           />
         </div>
 
-        <div id="learn-modules" data-section="learn-modules">
+        <div id="blog" data-section="blog">
-          <FeatureBorderGlow
+          <BlogCardOne
             animationType="slide-up"
             textboxLayout="default"
             useInvertedBackground={false}
-            features={[
+            title="Educational Resources & Weekly Analysis"
-              {
+            description="Stay informed with our latest financial analysis posts and structured learning modules."
-                icon: DollarSign,
-                title: "Foundations",                description: "Master budgeting and basic financial health."},
-              {
-                icon: PieChart,
-                title: "Investments 101",                description: "Understanding stocks, bonds, and asset allocation."},
-              {
-                icon: ShieldCheck,
-                title: "Risk Management",                description: "Protecting your assets and planning for long-term security."},
-            ]}
-            title="Educational Tracks"
-            description="Progressive learning paths designed to take you from beginner to confident investor."
-          />
-        </div>
-
-        <div id="blog-section" data-section="blog-section">
-          <BlogCardTwo
-            animationType="slide-up"
-            textboxLayout="default"
-            useInvertedBackground={false}
-            title="Recent Insights"
-            description="Latest updates and deep-dive analysis into the evolving world of finance."
             blogs={[
               {
-                id: "1",                category: "Market Trends",                title: "The Impact of Interest Rate Shifts",                excerpt: "How current monetary policies are affecting long-term retail investments.",                imageSrc: "http://img.b2bpic.net/free-photo/note-book-laptop-glasses-mouse-vintage-compass-coffee-cup-pen-graph-paper-document-office-desk-table_1423-161.jpg",                authorName: "Jane Doe",                authorAvatar: "http://img.b2bpic.net/free-photo/business-woman-with-crossed-arms-smiling_23-2148095677.jpg",                date: "Oct 24, 2024"},
+                id: "1",                category: "Analysis",                title: "Weekly Market Pulse: Q3 Trends",                excerpt: "An in-depth look at the latest movements in global markets and what they mean for retail investors.",                imageSrc: "http://img.b2bpic.net/free-photo/close-up-digital-tablet-with-bar-graph_1098-3523.jpg?_wi=1",                authorName: "Sarah Chen",                authorAvatar: "http://img.b2bpic.net/free-photo/portrait-beautiful-businesswoman_329181-11722.jpg",                date: "Oct 24, 2024"
+              },
               {
-                id: "2",                category: "Wealth Management",                title: "Diversification Basics",                excerpt: "Building a resilient portfolio in volatile market conditions.",                imageSrc: "http://img.b2bpic.net/free-photo/minimalistic-home-desk-design_23-2148991426.jpg",                authorName: "John Smith",                authorAvatar: "http://img.b2bpic.net/free-photo/portrait-happy-businessman-standing-front-business-center_1150-3039.jpg",                date: "Oct 21, 2024"},
+                id: "2",                category: "Education",                title: "Foundations of Personal Finance",                excerpt: "A beginner's guide to managing personal cash flow and establishing a sustainable savings plan.",                imageSrc: "http://img.b2bpic.net/free-vector/project-management-research-lab-investments-bank-account-icons-set_126523-293.jpg?_wi=1",                authorName: "Mark D.",                authorAvatar: "http://img.b2bpic.net/free-photo/closeup-handsome-middle-aged-business-leader_1262-4822.jpg",                date: "Oct 20, 2024"
-              {
+              }
-                id: "3",                category: "Economy",                title: "Global Market Outlook 2025",                excerpt: "Predicting the major economic forces for the upcoming fiscal year.",                imageSrc: "http://img.b2bpic.net/free-photo/business-person-looking-finance-graphs_23-2150461349.jpg",                authorName: "Alex Reed",                authorAvatar: "http://img.b2bpic.net/free-photo/smiling-businessman-standing-airport-terminal_107420-85070.jpg",                date: "Oct 18, 2024"},
             ]}
           />
         </div>
@@ -77,25 +54,9 @@ export default function LearnPage() {
           <FooterBaseReveal
             logoText="FinLearn"
             columns={[
-              {
+              { title: "Platform", items: [{ label: "Home", href: "/" }, { label: "Learn", href: "/learn" }, { label: "About", href: "/about" }] },
-                title: "Platform",                items: [
+              { title: "Resources", items: [{ label: "Market Blog", href: "#" }, { label: "Guides", href: "#" }] },
-                  { label: "Home", href: "/" },
+              { title: "Legal", items: [{ label: "Privacy Policy", href: "#" }, { label: "Terms of Service", href: "#" }] },
-                  { label: "Learn", href: "/learn" },
-                  { label: "About", href: "/about" },
-                ],
-              },
-              {
-                title: "Resources",                items: [
-                  { label: "Market Blog", href: "#" },
-                  { label: "Guides", href: "#" },
-                ],
-              },
-              {
-                title: "Legal",                items: [
-                  { label: "Privacy Policy", href: "#" },
-                  { label: "Terms of Service", href: "#" },
-                ],
-              },
             ]}
             copyrightText="© 2024 FinLearn Education. All rights reserved."
           />
@@ -103,4 +64,4 @@ export default function LearnPage() {
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}

src/app/page.tsx

@@ -30,17 +30,11 @@ export default function LandingPage() {
       <NavbarLayoutFloatingOverlay
       navItems={[
         {
-          name: "Home",
+          name: "Home",          id: "/"},
-          id: "/",
-        },
         {
-          name: "Learn",
+          name: "Learn",          id: "/learn"},
-          id: "/learn",
-        },
         {
-          name: "About",
+          name: "About",          id: "/about"},
-          id: "/about",
-        },
       ]}
       brandName="FinLearn"
     />
@@ -50,97 +44,51 @@ export default function LandingPage() {
       <HeroBillboardTestimonial
       useInvertedBackground={false}
       background={{
-        variant: "gradient-bars",
+        variant: "gradient-bars"}}
-      }}
       title="Master Your Financial Future"
       description="Weekly market insights, expert analysis, and comprehensive educational resources to navigate the complexities of personal finance."
       testimonials={[
         {
-          name: "Alex Rivet",
+          name: "Alex Rivet",          handle: "@alexr",          testimonial: "The weekly analysis is incredibly insightful and helped me clarify my investment strategy.",          rating: 5,
-          handle: "@alexr",
+          imageSrc: "http://img.b2bpic.net/free-photo/close-up-digital-tablet-with-bar-graph_1098-3523.jpg?_wi=1",          imageAlt: "modern finance dashboard interface"},
-          testimonial: "The weekly analysis is incredibly insightful and helped me clarify my investment strategy.",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/close-up-digital-tablet-with-bar-graph_1098-3523.jpg?_wi=1",
-          imageAlt: "modern finance dashboard interface",
-        },
         {
-          name: "Sarah Chen",
+          name: "Sarah Chen",          handle: "@schen",          testimonial: "Excellent educational content. It breaks down complex financial terms into simple concepts.",          rating: 5,
-          handle: "@schen",
+          imageSrc: "http://img.b2bpic.net/free-vector/project-management-research-lab-investments-bank-account-icons-set_126523-293.jpg?_wi=2",          imageAlt: "modern finance dashboard interface"},
-          testimonial: "Excellent educational content. It breaks down complex financial terms into simple concepts.",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-vector/project-management-research-lab-investments-bank-account-icons-set_126523-293.jpg",
-          imageAlt: "modern finance dashboard interface",
-        },
         {
-          name: "Mark D.",
+          name: "Mark D.",          handle: "@markd",          testimonial: "Finally, a finance platform that puts clarity and knowledge first. Truly impressive.",          rating: 5,
-          handle: "@markd",
+          imageSrc: "http://img.b2bpic.net/free-vector/magnifying-glass-with-profit-chart-line-flat-style_78370-10774.jpg",          imageAlt: "modern finance dashboard interface"},
-          testimonial: "Finally, a finance platform that puts clarity and knowledge first. Truly impressive.",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-vector/magnifying-glass-with-profit-chart-line-flat-style_78370-10774.jpg",
-          imageAlt: "modern finance dashboard interface",
-        },
         {
-          name: "Jessica L.",
+          name: "Jessica L.",          handle: "@jessl",          testimonial: "My go-to source for financial literacy. The modules are structured perfectly.",          rating: 5,
-          handle: "@jessl",
+          imageSrc: "http://img.b2bpic.net/free-vector/businessman-with-financial-elements_23-2147673919.jpg",          imageAlt: "modern finance dashboard interface"},
-          testimonial: "My go-to source for financial literacy. The modules are structured perfectly.",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-vector/businessman-with-financial-elements_23-2147673919.jpg",
-          imageAlt: "modern finance dashboard interface",
-        },
         {
-          name: "Brian K.",
+          name: "Brian K.",          handle: "@briank",          testimonial: "Consistently high-quality analysis every single week. Highly recommend.",          rating: 5,
-          handle: "@briank",
+          imageSrc: "http://img.b2bpic.net/free-photo/note-book-laptop-glasses-mouse-vintage-compass-coffee-cup-pen-graph-paper-document-office-desk-table_1423-161.jpg?_wi=1",          imageAlt: "modern finance dashboard interface"},
-          testimonial: "Consistently high-quality analysis every single week. Highly recommend.",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/note-book-laptop-glasses-mouse-vintage-compass-coffee-cup-pen-graph-paper-document-office-desk-table_1423-161.jpg?_wi=1",
-          imageAlt: "modern finance dashboard interface",
-        },
       ]}
       imageSrc="http://img.b2bpic.net/free-photo/close-up-digital-tablet-with-bar-graph_1098-3523.jpg?_wi=2"
       avatars={[
         {
-          src: "http://img.b2bpic.net/free-photo/portrait-beautiful-businesswoman_329181-11722.jpg",
+          src: "http://img.b2bpic.net/free-photo/portrait-beautiful-businesswoman_329181-11722.jpg",          alt: "Portrait of beautiful businesswoman"},
-          alt: "Portrait of beautiful businesswoman",
-        },
         {
-          src: "http://img.b2bpic.net/free-photo/businesswoman-glasses-portrait_1262-1461.jpg",
+          src: "http://img.b2bpic.net/free-photo/businesswoman-glasses-portrait_1262-1461.jpg",          alt: "Businesswoman in Glasses Portrait"},
-          alt: "Businesswoman in Glasses Portrait",
-        },
         {
-          src: "http://img.b2bpic.net/free-photo/closeup-handsome-middle-aged-business-leader_1262-4822.jpg",
+          src: "http://img.b2bpic.net/free-photo/closeup-handsome-middle-aged-business-leader_1262-4822.jpg",          alt: "Closeup of Handsome Middle-aged Business Leader"},
-          alt: "Closeup of Handsome Middle-aged Business Leader",
-        },
         {
-          src: "http://img.b2bpic.net/free-photo/businessman-smiling-camera_107420-95907.jpg",
+          src: "http://img.b2bpic.net/free-photo/businessman-smiling-camera_107420-95907.jpg",          alt: "Businessman smiling at camera"},
-          alt: "Businessman smiling at camera",
-        },
         {
-          src: "http://img.b2bpic.net/free-photo/smiling-successful-middle-aged-business-leader_1262-5690.jpg",
+          src: "http://img.b2bpic.net/free-photo/smiling-successful-middle-aged-business-leader_1262-5690.jpg",          alt: "Smiling Successful Middle-aged Business Leader"},
-          alt: "Smiling Successful Middle-aged Business Leader",
-        },
       ]}
       avatarText="Trusted by 10,000+ investors"
       marqueeItems={[
         {
-          type: "text",
+          type: "text",          text: "Market Analysis"},
-          text: "Market Analysis",
-        },
         {
-          type: "text",
+          type: "text",          text: "Wealth Strategy"},
-          text: "Wealth Strategy",
-        },
         {
-          type: "text",
+          type: "text",          text: "Financial Literacy"},
-          text: "Financial Literacy",
-        },
         {
-          type: "text",
+          type: "text",          text: "Risk Management"},
-          text: "Risk Management",
-        },
         {
-          type: "text",
+          type: "text",          text: "Personal Budgeting"},
-          text: "Personal Budgeting",
-        },
       ]}
     />
   </div>
@@ -153,19 +101,13 @@ export default function LandingPage() {
       features={[
         {
           icon: BookOpen,
-          title: "Weekly Analysis",
+          title: "Weekly Analysis",          description: "Stay ahead of market trends with our concise weekly financial breakdown."},
-          description: "Stay ahead of market trends with our concise weekly financial breakdown.",
-        },
         {
           icon: TrendingUp,
-          title: "Learning Modules",
+          title: "Learning Modules",          description: "Deep-dive into investment, savings, and personal wealth management strategies."},
-          description: "Deep-dive into investment, savings, and personal wealth management strategies.",
-        },
         {
           icon: Award,
-          title: "Expert Guidance",
+          title: "Expert Guidance",          description: "Access curated advice and structured content from seasoned financial professionals."},
-          description: "Access curated advice and structured content from seasoned financial professionals.",
-        },
       ]}
       title="Build Your Financial Knowledge"
       description="We provide the tools and resources you need to take control of your financial journey."
@@ -181,15 +123,9 @@ export default function LandingPage() {
       faqsAnimation="slide-up"
       faqs={[
         {
-          id: "1",
+          id: "1",          title: "How do I start?",          content: "Just sign up and jump into any of our foundational modules."},
-          title: "How do I start?",
-          content: "Just sign up and jump into any of our foundational modules.",
-        },
         {
-          id: "2",
+          id: "2",          title: "Is it free?",          content: "We offer several free modules and premium insights for subscribers."},
-          title: "Is it free?",
-          content: "We offer several free modules and premium insights for subscribers.",
-        },
       ]}
     />
   </div>
@@ -201,12 +137,7 @@ export default function LandingPage() {
       title="Recognized by Industry Leaders"
       description="Our educational approach is trusted by professionals everywhere."
       names={[
-        "FinTech Weekly",
+        "FinTech Weekly",        "Global Finance Today",        "InvestNow",        "AlphaInsights",        "ModernWealth"]}
-        "Global Finance Today",
-        "InvestNow",
-        "AlphaInsights",
-        "ModernWealth",
-      ]}
     />
   </div>
 
@@ -218,22 +149,14 @@ export default function LandingPage() {
       imageSrc="http://img.b2bpic.net/free-photo/table-financial-manager_1098-18260.jpg"
       inputs={[
         {
-          name: "name",
+          name: "name",          type: "text",          placeholder: "Name",          required: true,
-          type: "text",
-          placeholder: "Name",
-          required: true,
         },
         {
-          name: "email",
+          name: "email",          type: "email",          placeholder: "Email",          required: true,
-          type: "email",
-          placeholder: "Email",
-          required: true,
         },
       ]}
       textarea={{
-        name: "message",
+        name: "message",        placeholder: "Tell us how we can help",        rows: 4,
-        placeholder: "Tell us how we can help",
-        rows: 4,
         required: true,
       }}
     />
@@ -244,46 +167,29 @@ export default function LandingPage() {
       logoText="FinLearn"
       columns={[
         {
-          title: "Platform",
+          title: "Platform",          items: [
-          items: [
             {
-              label: "Home",
+              label: "Home",              href: "/"},
-              href: "/",
-            },
             {
-              label: "Learn",
+              label: "Learn",              href: "/learn"},
-              href: "/learn",
-            },
             {
-              label: "About",
+              label: "About",              href: "/about"},
-              href: "/about",
-            },
           ],
         },
         {
-          title: "Resources",
+          title: "Resources",          items: [
-          items: [
             {
-              label: "Market Blog",
+              label: "Market Blog",              href: "/blog"},
-              href: "#",
-            },
             {
-              label: "Guides",
+              label: "Guides",              href: "/guides"},
-              href: "#",
-            },
           ],
         },
         {
-          title: "Legal",
+          title: "Legal",          items: [
-          items: [
             {
-              label: "Privacy Policy",
+              label: "Privacy Policy",              href: "/privacy"},
-              href: "#",
-            },
             {
-              label: "Terms of Service",
+              label: "Terms of Service",              href: "/terms"},
-              href: "#",
-            },
           ],
         },
       ]}
@@ -293,4 +199,4 @@ export default function LandingPage() {
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}