Update src/app/page.tsx

Merge version_8 into main
2026-03-09 02:26:14 +00:00 · 2026-03-09 02:21:51 +00:00 · 2026-03-09 02:21:47 +00:00 · 2026-03-09 02:19:01 +00:00 · 2026-03-09 02:18:57 +00:00 · 2026-03-09 02:12:07 +00:00
2 changed files with 40 additions and 36 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,14 +1,15 @@
 import type { Metadata } from "next";
-import { Inter } from "next/font/google";
 import "./styles/variables.css";
 import "./styles/base.css";
+import { DM_Sans } from "next/font/google";

-const inter = Inter({
-  variable: "--font-inter",  subsets: ["latin"],
+const dmSans = DM_Sans({
+  variable: "--font-dm-sans",  subsets: ["latin"],
 });

 export const metadata: Metadata = {
-  title: "Axis - Personal Growth Platform",  description: "Map your growth across mind, body, spirit, and vocation. Track your progress and achieve true life balance."};
+  title: "Axis - Personal Growth Platform",  description: "Track your mind, body, spirit, and vocation in one unified system. Transform scattered self-improvement into structured, measurable progress."
+};

 export default function RootLayout({
  children,
@@ -17,29 +18,23 @@ export default function RootLayout({
 }) {
  return (
    <html lang="en" suppressHydrationWarning>
-      <body className={`${inter.variable}`}>
-        {children}
-        <script
-          id="lenis-script"
-          dangerouslySetInnerHTML={{
-            __html: `
-              const html = document.documentElement;
-              const body = document.body;
-              let lenis;
-              const initLenis = () => {
-                import('https://cdn.jsdelivr.net/gh/darkroomengineering/lenis@latest/bundled/lenis.js').then(() => {
-                  lenis = new window.Lenis();
-                  function raf(time) {
-                    lenis.raf(time);
-                    requestAnimationFrame(raf);
-                  }
-                  requestAnimationFrame(raf);
-                });
-              };
-              initLenis();
-            `,
-          }}
-        />
+      <body className={`${dmSans.variable} antialiased`}>
+        <ServiceWrapper>
+          <Tag />
+          {children}
+        </ServiceWrapper>
+        <script>
+          {`
+            (function() {
+              try {
+                const theme = localStorage.getItem('theme') || 'light';
+                if (theme === 'dark') {
+                  document.documentElement.classList.add('dark');
+                }
+              } catch (e) {}
+            })();
+          `}
+        </script>
      
        <script
          dangerouslySetInnerHTML={{
@@ -1410,4 +1405,12 @@ export default function RootLayout({
      </body>
    </html>
  );
+}
+
+function ServiceWrapper({ children }: { children: React.ReactNode }) {
+  return <>{children}</>;
+}
+
+function Tag() {
+  return null;
 }
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -7,7 +7,7 @@ import FeatureCardSix from '@/components/sections/feature/FeatureCardSix';
 import MetricCardOne from '@/components/sections/metrics/MetricCardOne';
 import TestimonialCardSix from '@/components/sections/testimonial/TestimonialCardSix';
 import FaqSplitMedia from '@/components/sections/faq/FaqSplitMedia';
-import ContactCTA from '@/components/sections/contact/ContactCTA';
+import ContactSplit from '@/components/sections/contact/ContactSplit';
 import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import { Award, CheckCircle, HelpCircle, Rocket, Sparkles, Zap, Users, TrendingUp, Heart } from 'lucide-react';
@@ -31,7 +31,6 @@ export default function LandingPage() {
          brandName="Axis"
          navItems={[
            { name: "Features", id: "howitworks" },
-            { name: "How It Works", id: "howitworks" },
            { name: "Testimonials", id: "testimonials" },
            { name: "FAQ", id: "faq" },
            { name: "Contact", id: "contact" }
@@ -193,19 +192,22 @@ export default function LandingPage() {
      </div>

      <div id="contact" data-section="contact">
-        <ContactCTA
+        <ContactSplit
          tag="Ready to Begin?"
          tagIcon={Rocket}
          tagAnimation="slide-up"
          title="Start Your Personal Growth Journey Today"
          description="Join thousands of ambitious professionals who are mapping their growth and achieving real balance. Download Axis or join our beta to get early access and exclusive insights."
-          buttons={[
-            { text: "Download Now", href: "https://example.com/download" },
-            { text: "Join the Beta", href: "https://example.com/beta" }
-          ]}
-          buttonAnimation="slide-up"
          background={{ variant: "plain" }}
          useInvertedBackground={false}
+          imageSrc="http://img.b2bpic.net/free-photo/close-up-entrepreneur-or-designer-person-works-laptop-coffee-shop-concentrated_74952-1108.jpg"
+          imageAlt="Person working on growth journey"
+          mediaAnimation="slide-up"
+          mediaPosition="right"
+          inputPlaceholder="Enter your email"
+          buttonText="Get Started"
+          termsText="By signing up, you agree to our Terms of Service and Privacy Policy."
+          onSubmit={(email) => console.log('Signup email:', email)}
        />
      </div>

@@ -215,7 +217,6 @@ export default function LandingPage() {
            {
              title: "Product",              items: [
                { label: "Features", href: "#howitworks" },
-                { label: "How It Works", href: "#howitworks" },
                { label: "Pricing", href: "#" },
                { label: "Download", href: "https://example.com/download" }
              ]
Author	SHA1	Message	Date
bender	7eb017d1f4	Update src/app/page.tsx	2026-03-09 02:26:14 +00:00
bender	794e2c2de1	Merge version_8 into main Merge version_8 into main	2026-03-09 02:21:51 +00:00
bender	f328789529	Update src/app/layout.tsx	2026-03-09 02:21:47 +00:00
bender	bb968cb42f	Merge version_7 into main Merge version_7 into main	2026-03-09 02:19:01 +00:00
bender	89162110a5	Update src/app/layout.tsx	2026-03-09 02:18:57 +00:00
bender	dbe10fd339	Merge version_6 into main Merge version_6 into main	2026-03-09 02:12:07 +00:00
bender	c30e085f05	Update src/app/page.tsx	2026-03-09 02:12:04 +00:00
bender	91b9f8bbe8	Merge version_5 into main Merge version_5 into main	2026-03-09 00:40:27 +00:00