Update src/app/layout.tsx

Merge version_6 into main
2026-03-09 02:18:57 +00:00 · 2026-03-09 02:12:07 +00:00 · 2026-03-09 02:12:04 +00:00 · 2026-03-09 00:40:27 +00:00 · 2026-03-09 00:40:23 +00:00 · 2026-03-08 17:16:56 +00:00
3 changed files with 83 additions and 84 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,48 +1,40 @@
 import type { Metadata } from "next";
-import { Mulish } from "next/font/google";
-import { Inter } from "next/font/google";
-import "./globals.css";
-import { ServiceWrapper } from "@/components/ServiceWrapper";
-import Tag from "@/tag/Tag";
+import "./styles/variables.css";
+import "./styles/base.css";
+import { DM_Sans } from "next/font/google";

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

 export const metadata: Metadata = {
-  title: "Axis | Map Your Personal Growth",  description: "Track your mind, body, spirit, and vocation in one unified system. Transform scattered self-improvement into structured, measurable progress with Axis.",  keywords: "personal growth, habit tracking, life balance, wellness, productivity, self-improvement, goal setting, progress tracking",  openGraph: {
-    title: "Axis | Map Your Personal Growth",    description: "Track your mind, body, spirit, and vocation in one unified system. Transform scattered self-improvement into structured, measurable progress.",    url: "https://axis.app",    siteName: "Axis",    images: [
-      {
-        url: "http://img.b2bpic.net/free-photo/books-versus-technology-concept_23-2149765859.jpg",        alt: "Axis personal growth tracking platform"},
-    ],
-    type: "website"},
-  twitter: {
-    card: "summary_large_image",    title: "Axis | Map Your Personal Growth",    description: "Track your mind, body, spirit, and vocation in one unified system.",    images: ["http://img.b2bpic.net/free-photo/books-versus-technology-concept_23-2149765859.jpg"],
-  },
-  robots: {
-    index: true,
-    follow: true,
-  },
-};
+  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,
-}: Readonly<{
+}: {
  children: React.ReactNode;
-}>) {
+}) {
  return (
    <html lang="en" suppressHydrationWarning>
-      <ServiceWrapper>
-        <body
-          className={`${mulish.variable} ${inter.variable} antialiased`}
-        >
+      <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={{
            __html: `
@@ -1410,7 +1402,14 @@ export default function RootLayout({
          }}
        />
      </body>
-      </ServiceWrapper>
    </html>
  );
 }
+
+function ServiceWrapper({ children }: { children: React.ReactNode }) {
+  return <>{children}</>;
+}
+
+function Tag() {
+  return null;
+}
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,37 +1,36 @@
 "use client"

 import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
-import HeroBillboard from '@/components/sections/hero/HeroBillboard';
+import HeroBillboardGallery from '@/components/sections/hero/HeroBillboardGallery';
 import MetricSplitMediaAbout from '@/components/sections/about/MetricSplitMediaAbout';
 import FeatureCardSix from '@/components/sections/feature/FeatureCardSix';
-import MetricCardSeven from '@/components/sections/metrics/MetricCardSeven';
-import TestimonialCardFifteen from '@/components/sections/testimonial/TestimonialCardFifteen';
+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 FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import { Award, CheckCircle, HelpCircle, Rocket, Sparkles, Zap } from 'lucide-react';
+import { Award, CheckCircle, HelpCircle, Rocket, Sparkles, Zap, Users, TrendingUp, Heart } from 'lucide-react';

 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" }
@@ -42,7 +41,7 @@ export default function LandingPage() {
      </div>

      <div id="hero" data-section="hero">
-        <HeroBillboard
+        <HeroBillboardGallery
          title="Map Your Growth"
          description="Track your mind, body, spirit, and vocation in one unified system. Axis transforms scattered self-improvement into structured, measurable progress."
          background={{ variant: "plain" }}
@@ -54,8 +53,11 @@ export default function LandingPage() {
            { text: "Join Beta", href: "https://example.com/beta" }
          ]}
          buttonAnimation="slide-up"
-          imageSrc="http://img.b2bpic.net/free-photo/books-versus-technology-concept_23-2149765859.jpg"
-          imageAlt="Axis app dashboard showing growth tracking interface"
+          mediaItems={[
+            {
+              imageSrc: "http://img.b2bpic.net/free-photo/books-versus-technology-concept_23-2149765859.jpg",              imageAlt: "Axis app dashboard showing growth tracking interface"
+            }
+          ]}
          mediaAnimation="slide-up"
          ariaLabel="Axis personal growth platform hero section"
        />
@@ -88,26 +90,30 @@ export default function LandingPage() {
          tagIcon={Zap}
          tagAnimation="slide-up"
          textboxLayout="default"
-          useInvertedBackground={true}
+          useInvertedBackground={false}
          features={[
            {
              id: 1,
-              title: "Initial Assessment",              description: "Complete a thoughtful evaluation of your current state across mind, body, spirit, and vocation. Understand where you stand today.",              imageSrc: "http://img.b2bpic.net/free-photo/woman-working-late-project_23-2149006067.jpg"},
+              title: "Initial Assessment",              description: "Complete a thoughtful evaluation of your current state across mind, body, spirit, and vocation. Understand where you stand today.",              imageSrc: "http://img.b2bpic.net/free-photo/woman-working-late-project_23-2149006067.jpg"
+            },
            {
              id: 2,
-              title: "Daily Habits",              description: "Receive personalized habit recommendations tailored to your growth goals. Track daily actions with simple, intuitive check-ins.",              imageSrc: "http://img.b2bpic.net/free-vector/calendar-template-design_742173-15324.jpg"},
+              title: "Daily Habits",              description: "Receive personalized habit recommendations tailored to your growth goals. Track daily actions with simple, intuitive check-ins.",              imageSrc: "http://img.b2bpic.net/free-vector/calendar-template-design_742173-15324.jpg"
+            },
            {
              id: 3,
-              title: "Progress Visualization",              description: "Watch your growth unfold with powerful dashboards and charts. See which areas are thriving and where you need support.",              imageSrc: "http://img.b2bpic.net/free-vector/dashboard-user-panel-gradient-template_23-2148376261.jpg"},
+              title: "Progress Visualization",              description: "Watch your growth unfold with powerful dashboards and charts. See which areas are thriving and where you need support.",              imageSrc: "http://img.b2bpic.net/free-vector/dashboard-user-panel-gradient-template_23-2148376261.jpg"
+            },
            {
              id: 4,
-              title: "Balance Insights",              description: "Achieve true life balance as Axis reveals patterns and suggests micro-adjustments. Maintain momentum across all four dimensions.",              imageSrc: "http://img.b2bpic.net/free-vector/vitamin-food-infographic_23-2148498084.jpg"}
+              title: "Balance Insights",              description: "Achieve true life balance as Axis reveals patterns and suggests micro-adjustments. Maintain momentum across all four dimensions.",              imageSrc: "http://img.b2bpic.net/free-vector/vitamin-food-infographic_23-2148498084.jpg"
+            }
          ]}
        />
      </div>

      <div id="metrics" data-section="metrics">
-        <MetricCardSeven
+        <MetricCardOne
          title="Trusted by Growth-Minded Professionals"
          description="Join thousands who've transformed their lives through intentional progress"
          tag="Impact"
@@ -116,40 +122,33 @@ export default function LandingPage() {
          textboxLayout="default"
          useInvertedBackground={false}
          animationType="slide-up"
+          gridVariant="uniform-all-items-equal"
          metrics={[
            {
-              id: "1",              value: "10K+",              title: "Active Users",              items: [
-                "Ambitious professionals aged 25–40",                "Wellness coaches and mentors",                "Personal development enthusiasts"
-              ]
+              id: "1",              value: "10K+",              title: "Active Users",              description: "Ambitious professionals aged 25–40, wellness coaches and mentors, personal development enthusiasts",              icon: Users
            },
            {
-              id: "2",              value: "500K+",              title: "Habits Tracked",              items: [
-                "Daily habit completion",                "Consistent growth momentum",                "Real transformation stories"
-              ]
+              id: "2",              value: "500K+",              title: "Habits Tracked",              description: "Daily habit completion, consistent growth momentum, real transformation stories",              icon: TrendingUp
            },
            {
-              id: "3",              value: "98%",              title: "User Satisfaction",              items: [
-                "Intuitive interface design",                "Measurable progress insights",                "Life-changing impact"
-              ]
+              id: "3",              value: "98%",              title: "User Satisfaction",              description: "Intuitive interface design, measurable progress insights, life-changing impact",              icon: Heart
            }
          ]}
        />
      </div>

      <div id="testimonials" data-section="testimonials">
-        <TestimonialCardFifteen
-          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."
-          rating={5}
-          author="Sarah Mitchell, Executive Coach"
-          avatars={[
-            { src: "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", alt: "Sarah Mitchell" },
-            { src: "http://img.b2bpic.net/free-photo/portrait-elegant-bearded-man-dressed-wool-jacket-bow-tie_613910-15696.jpg", alt: "James Chen" },
-            { src: "http://img.b2bpic.net/free-photo/medium-shot-woman-work-portrait_23-2149304144.jpg", alt: "Emma Rodriguez" },
-            { src: "http://img.b2bpic.net/free-photo/professional-woman-stylish-suit-office-with-tablet-device_23-2150167751.jpg", alt: "David Park" }
+        <TestimonialCardSix
+          testimonials={[
+            {
+              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"
+            }
          ]}
-          ratingAnimation="slide-up"
-          avatarsAnimation="slide-up"
-          useInvertedBackground={true}
+          animationType="slide-up"
+          title="What Our Users Say"
+          description="Real stories from real people transforming their lives"
+          textboxLayout="default"
+          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."
@@ -203,7 +204,7 @@ export default function LandingPage() {
          ]}
          buttonAnimation="slide-up"
          background={{ variant: "plain" }}
-          useInvertedBackground={true}
+          useInvertedBackground={false}
        />
      </div>

@@ -213,7 +214,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" }
              ]
@@ -240,4 +240,4 @@ export default function LandingPage() {
      </div>
    </ThemeProvider>
  );
-}
+}
--- a/src/app/styles/variables.css
+++ b/src/app/styles/variables.css
@@ -10,15 +10,15 @@
  --accent: #ffffff;
  --background-accent: #ffffff; */

-  --background: #f7f6f7;
+  --background: #ffffff;
  --card: #ffffff;
-  --foreground: #250c0d;
-  --primary-cta: #b82b40;
+  --foreground: #000000;
+  --primary-cta: #000000;
  --primary-cta-text: #f7f6f7;
-  --secondary-cta: #ffffff;
+  --secondary-cta: #f5f5f5;
  --secondary-cta-text: #250c0d;
-  --accent: #b90941;
-  --background-accent: #e8a8b6;
+  --accent: #000000;
+  --background-accent: #f5f5f5;

  /* text sizing - set by ThemeProvider */
  /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
Author	SHA1	Message	Date
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	c0fea05b90	Update src/app/page.tsx	2026-03-08 17:11:50 +00:00
bender	2ace99759b	Update src/app/layout.tsx	2026-03-08 17:11:49 +00:00
bender	ae5f021d08	Merge version_2 into main Merge version_2 into main	2026-03-08 17:10:46 +00:00
bender	037c1920cf	Update src/app/styles/variables.css	2026-03-08 17:10:42 +00:00
bender	a85acdcb58	Update src/app/page.tsx	2026-03-08 17:10:41 +00:00
bender	ee74b93718	Update src/app/layout.tsx	2026-03-08 17:10:41 +00:00
bender	4483407d82	Merge version_1 into main Merge version_1 into main	2026-03-08 16:30:52 +00:00