Merge version_9 into main

Update src/app/page.tsx
2026-03-09 02:26:18 +00:00 · 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
3 changed files with 57 additions and 51 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';
@@ -15,23 +15,22 @@ import { Award, CheckCircle, HelpCircle, Rocket, Sparkles, Zap, Users, TrendingU
 export default function LandingPage() {
  return (
    <ThemeProvider
-      defaultButtonVariant="icon-arrow"
+      defaultButtonVariant="hover-magnetic"
      defaultTextAnimation="entrance-slide"
-      borderRadius="soft"
+      borderRadius="rounded"
      contentWidth="mediumLarge"
      sizing="largeSizeMediumTitles"
-      background="grid"
-      cardStyle="gradient-mesh"
-      primaryButtonStyle="primary-glow"
-      secondaryButtonStyle="glass"
-      headingFontWeight="extrabold"
+      background="none"
+      cardStyle="solid"
+      primaryButtonStyle="flat"
+      secondaryButtonStyle="solid"
+      headingFontWeight="semibold"
    >
      <div id="nav" data-section="nav">
        <NavbarStyleFullscreen
          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" }
@@ -91,7 +90,7 @@ export default function LandingPage() {
          tagIcon={Zap}
          tagAnimation="slide-up"
          textboxLayout="default"
-          useInvertedBackground={true}
+          useInvertedBackground={false}
          features={[
            {
              id: 1,
@@ -142,14 +141,14 @@ export default function LandingPage() {
        <TestimonialCardSix
          testimonials={[
            {
-              id: "1",              testimonial: "Axis finally gave me clarity on what actually matters. Tracking my growth across all four dimensions has been transformative—I can see exactly where I'm thriving and where I need support. It's like having a personal life coach in my pocket.",              name: "Sarah Mitchell",              handle: "Executive Coach",              imageSrc: "http://img.b2bpic.net/free-photo/close-up-good-looking-smiling-friendly-female-trainee-ready-tackle-assignments-smiling-broadly-feeling-lucky-day-work-self-assured-encouraged-achieve-success-goal-white-wall_176420-35567.jpg"
+              id: "1",              name: "Sarah Mitchell",              handle: "Executive Coach",              testimonial: "Axis finally gave me clarity on what actually matters. Tracking my growth across all four dimensions has been transformative—I can see exactly where I'm thriving and where I need support. It's like having a personal life coach in my pocket.",              imageSrc: "http://img.b2bpic.net/free-photo/close-up-good-looking-smiling-friendly-female-trainee-ready-tackle-assignments-smiling-broadly-feeling-lucky-day-work-self-assured-encouraged-achieve-success-goal-white-wall_176420-35567.jpg"
            }
          ]}
          animationType="slide-up"
          title="What Our Users Say"
          description="Real stories from real people transforming their lives"
          textboxLayout="default"
-          useInvertedBackground={true}
+          useInvertedBackground={false}
        />
      </div>

@@ -167,6 +166,8 @@ export default function LandingPage() {
          mediaAnimation="slide-up"
          mediaPosition="left"
          faqsAnimation="slide-up"
+          animationType="smooth"
+          showCard={true}
          faqs={[
            {
              id: "1",              title: "What makes Axis different from other self-improvement apps?",              content: "Axis provides a unified system for tracking growth across four key life dimensions—mind, body, spirit, and vocation—rather than forcing you to juggle multiple specialized apps. Our holistic approach reveals how balance (or imbalance) in one area affects others, and our data-driven insights help you make meaningful progress."
@@ -191,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={true}
+          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>

@@ -213,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" }
              ]
--- a/src/app/styles/variables.css
+++ b/src/app/styles/variables.css
@@ -11,14 +11,14 @@
  --background-accent: #ffffff; */

  --background: #ffffff;
-  --card: #f5f5f5;
+  --card: #ffffff;
  --foreground: #000000;
  --primary-cta: #000000;
  --primary-cta-text: #f7f6f7;
-  --secondary-cta: #ffffff;
+  --secondary-cta: #f5f5f5;
  --secondary-cta-text: #250c0d;
-  --accent: #808080;
-  --background-accent: #e8e8e8;
+  --accent: #000000;
+  --background-accent: #f5f5f5;

  /* text sizing - set by ThemeProvider */
  /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
Author	SHA1	Message	Date
bender	0d28ab9b3b	Merge version_9 into main Merge version_9 into main	2026-03-09 02:26:18 +00:00
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
bender	b1422b0c41	Update src/app/page.tsx	2026-03-09 00:40:23 +00:00
bender	b1cc36f152	Merge version_3 into main Merge version_3 into main	2026-03-08 17:16:56 +00:00
bender	8d20b31ccb	Update src/app/styles/variables.css	2026-03-08 17:16:51 +00:00
bender	46021a49c9	Update src/app/page.tsx	2026-03-08 17:16:50 +00:00
bender	f19ecaecbc	Merge version_2 into main Merge version_2 into main	2026-03-08 17:11:54 +00:00
bender	ae5f021d08	Merge version_2 into main Merge version_2 into main	2026-03-08 17:10:46 +00:00