Merge version_3 into main

Update src/app/page.tsx
2026-03-05 01:34:15 +00:00 · 2026-03-05 01:34:11 +00:00 · 2026-03-05 01:34:10 +00:00 · 2026-03-05 01:30:39 +00:00 · 2026-03-05 01:30:35 +00:00 · 2026-03-05 01:28:58 +00:00
2 changed files with 45 additions and 52 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,58 +1,22 @@
 import type { Metadata } from "next";
-import { Halant } from "next/font/google";
 import { Inter } from "next/font/google";
-import { Inter_Tight } 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";

-const halant = Halant({
-  variable: "--font-halant",  subsets: ["latin"],
-  weight: ["300", "400", "500", "600", "700"],
-});
-
-const inter = Inter({
-  variable: "--font-inter",  subsets: ["latin"],
-});
-
-const interTight = Inter_Tight({
-  variable: "--font-inter-tight",  subsets: ["latin"],
-  weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
-});
+const inter = Inter({ subsets: ["latin"] });

 export const metadata: Metadata = {
-  title: "FemFit - Women's Fitness Programs & Training",  description: "Expert-led fitness programs designed for women. Transform your body with personalized training, nutrition coaching, and supportive community.",  keywords: "women fitness, female training, gym programs, fitness coaching, women's health",  metadataBase: new URL("https://femfit.com"),
-  alternates: {
-    canonical: "https://femfit.com"},
-  openGraph: {
-    title: "FemFit - Empower Your Fitness Journey",    description: "Join thousands of women achieving their fitness goals with expert coaching and community support.",    url: "https://femfit.com",    siteName: "FemFit",    type: "website",    images: [
-      {
-        url: "http://img.b2bpic.net/free-photo/sportswoman-doing-hyperextension-exercise_651396-754.jpg",        alt: "FemFit - Women's Fitness"},
-    ],
-  },
-  twitter: {
-    card: "summary_large_image",    title: "FemFit - Women's Fitness Programs",    description: "Expert training for women. Transform your fitness journey today.",    images: ["http://img.b2bpic.net/free-photo/sportswoman-doing-hyperextension-exercise_651396-754.jpg"],
-  },
-  robots: {
-    index: true,
-    follow: true,
-  },
-};
+  title: "FemFit - Women's Fitness Programs",  description: "Expert-led fitness training programs designed specifically for women"};

 export default function RootLayout({
  children,
-}: Readonly<{
+}: {
  children: React.ReactNode;
-}>) {
+}) {
  return (
-    <html lang="en" suppressHydrationWarning>
-      <ServiceWrapper>
-        <body
-          className={`${halant.variable} ${inter.variable} ${interTight.variable} antialiased`}
-        >
-          <Tag />
-          {children}
-        
+    <html lang="en">
+      <body className={inter.className}>{children}
        <script
          dangerouslySetInnerHTML={{
            __html: `
@@ -1420,7 +1384,6 @@ export default function RootLayout({
          }}
        />
      </body>
-      </ServiceWrapper>
    </html>
  );
 }
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -55,6 +55,16 @@ export default function LandingPage() {
          mediaAnimation="blur-reveal"
          imagePosition="right"
          background={{ variant: "glowing-orb" }}
+          marqueeItems={[
+            { type: "image", src: "http://img.b2bpic.net/free-photo/sportswoman-doing-hyperextension-exercise_651396-754.jpg", alt: "Women training" },
+            { type: "text", text: "Transform Your Body" },
+            { type: "image", src: "http://img.b2bpic.net/free-photo/three-young-women-training-gym_1303-16217.jpg", alt: "Gym training" },
+            { type: "text", text: "Build Strength" },
+            { type: "image", src: "http://img.b2bpic.net/free-photo/suntanned-muscular-female-doing-workouts-chest-exercising-machine_613910-7764.jpg", alt: "Women fitness" },
+            { type: "text", text: "Join Our Community" }
+          ]}
+          marqueeSpeed={30}
+          showMarqueeCard={true}
          testimonials={[
            {
              name: "Sarah Johnson",              handle: "Fitness Enthusiast",              testimonial: "Transformed my body in 3 months. The trainers are amazing!",              rating: 5,
@@ -77,6 +87,11 @@ export default function LandingPage() {
      <div id="about" data-section="about">
        <SplitAbout
          title="Why Choose FemFit?"
+          titleSegments={[
+            { type: "text", content: "Why Choose " },
+            { type: "image", src: "http://img.b2bpic.net/free-photo/positive-confident-businesswoman-wearing-formal-suit-standing-with-arms-folded_74855-10328.jpg", alt: "Woman avatar" },
+            { type: "text", content: "FemFit?" }
+          ]}
          description="We're dedicated to creating a supportive, judgment-free environment where women of all fitness levels can thrive and achieve their goals."
          tag="Our Mission"
          tagIcon={Heart}
@@ -99,7 +114,7 @@ export default function LandingPage() {
          imageAlt="Women in gym"
          mediaAnimation="slide-up"
          imagePosition="right"
-          textboxLayout="default"
+          textboxLayout="inline-image"
          useInvertedBackground={true}
          buttons={[{ text: "Learn More", href: "#" }]}
          buttonAnimation="slide-up"
@@ -109,11 +124,16 @@ export default function LandingPage() {
      <div id="features" data-section="features">
        <FeatureCardTwelve
          title="Our Training Programs"
+          titleSegments={[
+            { type: "text", content: "Our " },
+            { type: "image", src: "http://img.b2bpic.net/free-photo/three-young-women-training-gym_1303-16217.jpg", alt: "Training" },
+            { type: "text", content: " Programs" }
+          ]}
          description="Comprehensive fitness solutions designed specifically for women"
          tag="Services"
          tagIcon={Sparkles}
          tagAnimation="slide-up"
-          textboxLayout="default"
+          textboxLayout="inline-image"
          useInvertedBackground={false}
          features={[
            {
@@ -129,20 +149,25 @@ export default function LandingPage() {
              buttons: [{ text: "Explore", href: "contact" }]
            }
          ]}
-          animationType="slide-up"
+          animationType="scale-rotate"
        />
      </div>

      <div id="pricing" data-section="pricing">
        <PricingCardEight
          title="Membership Plans"
+          titleSegments={[
+            { type: "text", content: "Your " },
+            { type: "image", src: "http://img.b2bpic.net/free-photo/suntanned-muscular-female-doing-workouts-chest-exercising-machine_613910-7764.jpg", alt: "Membership" },
+            { type: "text", content: " Plans" }
+          ]}
          description="Choose the perfect plan to start your transformation today"
          tag="Pricing"
          tagIcon={DollarSign}
          tagAnimation="slide-up"
-          textboxLayout="default"
+          textboxLayout="inline-image"
          useInvertedBackground={true}
-          animationType="slide-up"
+          animationType="scale-rotate"
          plans={[
            {
              id: "starter",              badge: "Beginner",              badgeIcon: Zap,
@@ -166,13 +191,18 @@ export default function LandingPage() {
      <div id="testimonials" data-section="testimonials">
        <TestimonialCardTwo
          title="Success Stories from Our Community"
+          titleSegments={[
+            { type: "text", content: "" },
+            { type: "image", src: "http://img.b2bpic.net/free-photo/positive-confident-businesswoman-wearing-formal-suit-standing-with-arms-folded_74855-10328.jpg", alt: "Success" },
+            { type: "text", content: " Success Stories" }
+          ]}
          description="Real women achieving real results with FemFit"
          tag="Testimonials"
          tagIcon={Heart}
          tagAnimation="slide-up"
-          textboxLayout="default"
+          textboxLayout="inline-image"
          useInvertedBackground={false}
-          animationType="slide-up"
+          animationType="depth-3d"
          testimonials={[
            {
              id: "1",              name: "Sarah Thompson",              role: "Designer, NYC",              testimonial: "I lost 15 pounds and gained so much confidence. The trainers truly care about your progress.",              imageSrc: "http://img.b2bpic.net/free-photo/positive-confident-businesswoman-wearing-formal-suit-standing-with-arms-folded_74855-10328.jpg?_wi=4",              imageAlt: "Sarah Thompson"
Author	SHA1	Message	Date
bender	35fc4d0f97	Merge version_3 into main Merge version_3 into main	2026-03-05 01:34:15 +00:00
bender	d9ee73f68e	Update src/app/page.tsx	2026-03-05 01:34:11 +00:00
bender	9bd32aa311	Update src/app/layout.tsx	2026-03-05 01:34:10 +00:00
bender	a7b1d82986	Merge version_2 into main Merge version_2 into main	2026-03-05 01:30:39 +00:00
bender	f0ec4965d7	Update src/app/page.tsx	2026-03-05 01:30:35 +00:00
bender	0cc6b67a4d	Merge version_1 into main Merge version_1 into main	2026-03-05 01:28:58 +00:00
bender	85d8a5d6c3	Merge version_1 into main Merge version_1 into main	2026-03-05 01:23:50 +00:00