Merge version_3 into main

Update src/app/page.tsx
2025-12-29 01:27:30 +00:00 · 2025-12-29 01:27:25 +00:00 · 2025-12-29 01:22:11 +00:00 · 2025-12-29 01:22:07 +00:00 · 2025-12-29 01:22:06 +00:00 · 2025-12-29 01:22:05 +00:00
3 changed files with 72 additions and 169 deletions
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -4,13 +4,13 @@
  /* Base units */
  /* --vw is set by ThemeProvider */
-  --background: #fff5f8;;
+  --background: #ffffff;;
-  --card: #ffebf0;;
+  --card: #fcfcfc;;
-  --foreground: #3d2930;;
+  --foreground: #000000e6;;
-  --primary-cta: #e890a8;;
+  --primary-cta: #1a1a1a;;
  --secondary-cta: #ffffff;;
-  --accent: #f5ccd5;;
+  --accent: #bebebe;;
-  --background-accent: #f0b8c4;;
+  --background-accent: #c4c4c4;;
  /* text sizing - set by ThemeProvider */
  /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,11 +1,11 @@
 import type { Metadata } from "next";
-import { Source_Sans_3 } from "next/font/google";
+import { Inter } from "next/font/google";
 import "./globals.css";
 import { ServiceWrapper } from "@/components/ServiceWrapper";
 import Tag from "@/tag/Tag";
-const sourceSans3 = Source_Sans_3({
+const inter = Inter({
-  variable: "--font-source-sans-3",
+  variable: "--font-inter",
  subsets: ["latin"],
 });
@@ -50,7 +50,7 @@ export default function RootLayout({
    <html lang="en" suppressHydrationWarning>
      <ServiceWrapper>
        <body
-          className={sourceSans3.variable}
+          className={inter.variable}
        >
          <Tag />
          {children}
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,14 +1,14 @@
-"use client"
+"use client";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
+import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
-import HeroBillboardCarouselSplit from '@/components/sections/hero/HeroBillboardCarouselSplit';
+import HeroSplit from '@/components/sections/hero/HeroSplit';
-import TextAbout from '@/components/sections/about/TextAbout';
+import TagAbout from '@/components/sections/about/TagAbout';
-import ProductCardThree from '@/components/sections/product/ProductCardThree';
+import ProductCardFive from '@/components/sections/product/ProductCardFive';
-import FeatureCardTwelve from '@/components/sections/feature/FeatureCardTwelve';
+import FeatureCardThirteen from '@/components/sections/feature/FeatureCardThirteen';
-import TestimonialCardTwelve from '@/components/sections/testimonial/TestimonialCardTwelve';
+import TestimonialCardTen from '@/components/sections/testimonial/TestimonialCardTen';
-import ContactText from '@/components/sections/contact/ContactText';
+import ContactInline from '@/components/sections/contact/ContactInline';
-import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
+import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
 export default function LandingPage() {
  return (
@@ -25,7 +25,7 @@ export default function LandingPage() {
      headingFontWeight="bold"
    >
      <div id="nav" data-section="nav">
-        <NavbarLayoutFloatingInline
+        <NavbarStyleApple
          brandName="Fashion Line"
          navItems={[
            { name: "Shop", id: "products" },
@@ -33,248 +33,151 @@ export default function LandingPage() {
            { name: "Collections", id: "collections" },
            { name: "Contact", id: "contact" }
          ]}
          button={{
            text: "Shop Now",
            href: "products"
          }}
        />
      </div>
      <div id="hero" data-section="hero">
-        <HeroBillboardCarouselSplit
+        <HeroSplit
          title="Discover Your Style"
          description="Elevate your wardrobe with our curated collections of premium fashion pieces"
          buttons={[
            { text: "Shop Collection", href: "products" },
            { text: "View Latest", href: "collections" }
          ]}
-          mediaItems={[
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766970902462-fq7d1eo0.jpg"
-            {
+          imageAlt="Fashion Collection"
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766970902462-fq7d1eo0.jpg",
+          imagePosition="right"
              imageAlt: "Spring Collection"
            },
            {
              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766970903441-zprtqmcr.jpg",
              imageAlt: "Modern Fashion"
            },
            {
              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766970904295-jr9f1k8s.jpg",
              imageAlt: "Designer Pieces"
            },
            {
              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766970905364-bxf6hnts.jpg",
              imageAlt: "Elegant Styles"
            },
            {
              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766250302553-fgnqh61i.jpg",
              imageAlt: "Casual Wear"
            }
          ]}
        />
      </div>
      <div id="about" data-section="about">
-        <TextAbout
+        <TagAbout
-          title="We believe that fashion is a form of self-expression. Every piece in our collection is carefully curated to empower you to showcase your unique style and personality with confidence."
+          tag="About Us"
          description="We believe that fashion is a form of self-expression. Every piece in our collection is carefully curated to empower you to showcase your unique style and personality with confidence."
          useInvertedBackground="noInvert"
          buttons={[
            { text: "Learn Our Story", href: "#" }
          ]}
        />
      </div>
      <div id="products" data-section="products">
-        <ProductCardThree
+        <ProductCardFive
          title="Shop Our Collection"
          description="Handpicked pieces for every occasion"
          animationType="slide-up"
-          gridVariant="four-items-2x2-equal-grid"
+          gridVariant="uniform-all-items-equal"
          textboxLayout="default"
          useInvertedBackground="noInvert"
          products={[
            {
              id: "1",
-              name: "Classic White Tee",
+              button: { text: "Add to Cart" },
              price: "$39.99",
              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766247954480-jda2xd2t.jpg",
              imageAlt: "Classic White Tee",
-              initialQuantity: 1
+              isFavorited: false
            },
            {
              id: "2",
-              name: "Denim Jeans",
+              button: { text: "Add to Cart" },
              price: "$79.99",
              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766970908834-ezpq8k8z.jpg",
              imageAlt: "Denim Jeans",
-              initialQuantity: 1
+              isFavorited: false
            },
            {
              id: "3",
-              name: "Cozy Sweater",
+              button: { text: "Add to Cart" },
              price: "$69.99",
              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766970909738-qt6a7fn8.jpg",
              imageAlt: "Cozy Sweater",
-              initialQuantity: 1
+              isFavorited: false
            },
            {
              id: "4",
-              name: "Leather Jacket",
+              button: { text: "Add to Cart" },
              price: "$149.99",
              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766970904295-jr9f1k8s.jpg",
              imageAlt: "Leather Jacket",
-              initialQuantity: 1
+              isFavorited: false
            },
            {
              id: "5",
              name: "Evening Dress",
              price: "$129.99",
              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766250302553-fgnqh61i.jpg",
              imageAlt: "Evening Dress",
              initialQuantity: 1
            },
            {
              id: "6",
              name: "Designer Shoes",
              price: "$119.99",
              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766970910612-4yvyxdsm.jpg",
              imageAlt: "Designer Shoes",
              initialQuantity: 1
            }
          ]}
        />
      </div>
      <div id="collections" data-section="collections">
-        <FeatureCardTwelve
+        <FeatureCardThirteen
          title="Shop By Season"
          description="Explore our carefully curated seasonal collections"
          textboxLayout="default"
-          animationType="opacity"
+          animationType="slide-up"
          useInvertedBackground="noInvert"
          gridVariant="uniform-all-items-equal"
          features={[
            {
-              id: "spring",
+              id: "01",
-              label: "Spring",
+              title: "Spring",
-              title: "Fresh and Light Collections",
+              description: "Fresh and Light Collections"
              items: [
                "Pastel colors and soft textures",
                "Breathable fabrics for warm weather",
                "Floral patterns and feminine silhouettes"
              ]
            },
            {
-              id: "summer",
+              id: "02",
-              label: "Summer",
+              title: "Summer",
-              title: "Bright and Vibrant Styles",
+              description: "Bright and Vibrant Styles"
              items: [
                "Bold colors and eye-catching designs",
                "Lightweight and comfortable pieces",
                "Perfect for beach and outdoor adventures"
              ]
            },
            {
-              id: "fall",
+              id: "03",
-              label: "Fall",
+              title: "Fall",
-              title: "Warm and Cozy Pieces",
+              description: "Warm and Cozy Pieces"
              items: [
                "Rich, earthy tones and layering",
                "Textured fabrics and patterns",
                "Perfect for transitional weather"
              ]
            }
          ]}
        />
      </div>
      <div id="testimonials" data-section="testimonials">
-        <TestimonialCardTwelve
+        <TestimonialCardTen
-          cardTitle="Over 5,000 customers love our fashion and quality"
+          title="Customer Love Stories"
-          cardTag="Customer Testimonials"
+          description="See what our customers have to say about our fashion and quality"
          textboxLayout="default"
          useInvertedBackground="noInvert"
          testimonials={[
            {
              id: "1",
              title: "Perfect fit and quality",
              quote: "The quality of the pieces I received exceeded my expectations. Customer service was amazing!",
              name: "Sarah Johnson",
              role: "Fashion Enthusiast",
              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766154635301-vse33sxl.jpg",
              imageAlt: "Sarah Johnson"
            },
            {
              id: "2",
              title: "Amazing customer service",
              quote: "Best shopping experience ever. The team was so helpful and responsive to my questions.",
              name: "Emma Davis",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766183842429-uezzjpov.jpg",
+              role: "Loyal Customer",
              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766971638951-l8t74zbo.jpg",
              imageAlt: "Emma Davis"
            },
            {
              id: "3",
              title: "Style elevated instantly",
              quote: "Every piece from this collection makes me feel confident and stylish. Highly recommend!",
              name: "Lisa Chen",
              role: "Style Blogger",
              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766184309647-aqbmmuiq.jpg",
              imageAlt: "Lisa Chen"
            },
            {
              id: "4",
              name: "Jessica Anderson",
              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766849444575-td00y2fe.jpg",
              imageAlt: "Jessica Anderson"
            },
            {
              id: "5",
              name: "Michelle Lee",
              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766152144682-htnjk2vn.jpg",
              imageAlt: "Michelle Lee"
            },
            {
              id: "6",
              name: "Rachel Taylor",
              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766152149165-8nddns07.jpg",
              imageAlt: "Rachel Taylor"
            }
          ]}
        />
      </div>
      <div id="contact" data-section="contact">
-        <ContactText
+        <ContactInline
-          text="Ready to refresh your wardrobe? Join our community and be the first to know about new collections, exclusive offers, and style tips delivered straight to your inbox."
+          text="Ready to refresh your wardrobe? Join our community and be the first to know about new collections, exclusive offers, and style tips."
          animationType="entrance-slide"
          useInvertedBackground="noInvert"
-          buttons={[
+          inputPlaceholder="Enter your email"
-            { text: "Subscribe Now", href: "#" },
+          buttonText="Subscribe"
            { text: "Get Styling Tips", href: "#" }
          ]}
        />
      </div>
      <div id="footer" data-section="footer">
-        <FooterBaseReveal
+        <FooterLogoReveal
-          copyrightText="© 2025 Fashion Line | All rights reserved"
+          logoText="Fashion Line"
          columns={[
            {
              title: "Shop",
              items: [
                { label: "New Arrivals", href: "#" },
                { label: "Collections", href: "collections" },
                { label: "Sale", href: "#" },
                { label: "Best Sellers", href: "#" }
              ]
            },
            {
              title: "Company",
              items: [
                { label: "About Us", href: "about" },
                { label: "Contact", href: "contact" },
                { label: "Careers", href: "#" },
                { label: "Press", href: "#" }
              ]
            },
            {
              title: "Legal",
              items: [
                { label: "Terms of Service", href: "#" },
                { label: "Privacy Policy", href: "#" },
                { label: "Return Policy", href: "#" },
                { label: "Shipping Info", href: "#" }
              ]
            }
          ]}
        />
      </div>
    </ThemeProvider>
Author	SHA1	Message	Date
development	2e83032b23	Merge version_3 into main Merge version_3 into main	2025-12-29 01:27:30 +00:00
development	2b18598800	Update src/app/page.tsx	2025-12-29 01:27:25 +00:00
development	f11ddc7338	Merge version_2 into main Merge version_2 into main	2025-12-29 01:22:11 +00:00
development	6f6273b486	Update src/app/page.tsx	2025-12-29 01:22:07 +00:00
development	af2667876a	Update src/app/layout.tsx	2025-12-29 01:22:06 +00:00
development	07be2c9c90	Update src/app/globals.css	2025-12-29 01:22:05 +00:00