Merge version_16 into main

Update src/app/page.tsx
2025-12-25 11:04:35 +00:00 · 2025-12-25 11:04:30 +00:00 · 2025-12-25 11:04:30 +00:00 · 2025-12-25 11:03:05 +00:00 · 2025-12-25 11:03:00 +00:00 · 2025-12-25 10:55:44 +00:00
3 changed files with 139 additions and 151 deletions
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -4,13 +4,13 @@
  /* Base units */
  /* --vw is set by ThemeProvider */
-  --background: #0a0a0a;
+  --background: #000000;
-  --card: #1a1a1a;
+  --card: #1b1b1b;
-  --foreground: #fffef5e6;
+  --foreground: #ffffff;
-  --primary-cta: #facc15;
+  --primary-cta: #ffcc00;
-  --secondary-cta: #1a1a1a;
+  --secondary-cta: #151515;
-  --accent: #737373;
+  --accent: #303030;
-  --background-accent: #737373;
+  --background-accent: #303030;
  /* 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,60 +1,36 @@
 import type { Metadata } from "next";
-import { Inter } from "next/font/google";
+import localFont from "next/font/local";
 import "./globals.css";
 import { ServiceWrapper } from "@/components/ServiceWrapper";
 import Tag from "@/tag/Tag";
-const inter = Inter({
+const geistSans = localFont({
-  variable: "--font-inter",
+  src: "./fonts/GeistVF.woff2",
-  subsets: ["latin"],
+  variable: "--font-geist-sans",
  weight: "100 900",
 });
 const geistMono = localFont({
  src: "./fonts/GeistMonoVF.woff2",
  variable: "--font-geist-mono",
  weight: "100 900",
 });
 export const metadata: Metadata = {
-  title: "Star Wars Fans Community - Explore the Galaxy",
+  title: "Star Wars - Join the Galactic Saga",
-  description: "Join millions of Star Wars fans worldwide. Discover exclusive content, connect with the community, and celebrate the epic saga.",
+  description: "Explore the galaxy far, far away with millions of fans. Discover movies, characters, collectibles and more from the Star Wars universe.",
-  keywords: "Star Wars, fans, community, movies, series, Jedi, galaxy",
+  keywords: ["star wars", "movies", "collectibles", "lightsaber", "millennium falcon", "yoda", "force"]
  metadataBase: new URL("https://starwarsfans.com"),
  alternates: {
    canonical: "https://starwarsfans.com"
  },
  openGraph: {
    title: "Star Wars Fans Community",
    description: "Join the Force. Connect with Star Wars fans, explore content, and celebrate the greatest saga.",
    siteName: "STAR WARS",
    type: "website",
    images: [
      {
        url: "https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766502905270-5whkj6nu.jpg",
        alt: "Star Wars galaxy"
      }
    ]
  },
  twitter: {
    card: "summary_large_image",
    title: "Star Wars Fans Community",
    description: "Join millions of fans exploring the galaxy's greatest saga",
    images: ["https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766502905270-5whkj6nu.jpg"]
  },
  robots: {
    index: true,
    follow: true
  }
 };
 export default function RootLayout({
  children,
-}: Readonly<{
+}: {
  children: React.ReactNode;
-}>) {
+}) {
  return (
-    <html lang="en" suppressHydrationWarning>
+    <html lang="en">
-      <ServiceWrapper>
+      <body
-        <body
+        className={`${geistSans.variable} ${geistMono.variable} antialiased`}
-          className={inter.variable}
+      >
-        >
+        {children}
-          <Tag />
+      
          {children}
        <script
          dangerouslySetInnerHTML={{
            __html: `
@@ -1273,7 +1249,6 @@ export default function RootLayout({
          }}
        />
      </body>
      </ServiceWrapper>
    </html>
  );
 }
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,14 +1,13 @@
 "use client";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import HeroBillboard from "@/components/sections/hero/HeroBillboard";
+import HeroBillboardCarouselSplit from "@/components/sections/hero/HeroBillboardCarouselSplit";
-import MetricCardOne from "@/components/sections/metrics/MetricCardOne";
+import MetricCardThree from "@/components/sections/metrics/MetricCardThree";
-import SplitAbout from "@/components/sections/about/SplitAbout";
+import ParallaxAbout from "@/components/sections/about/ParallaxAbout";
-import ContactCenter from "@/components/sections/contact/ContactCenter";
+import ContactSplitForm from "@/components/sections/contact/ContactSplitForm";
-import FooterBaseSocial from "@/components/sections/footer/FooterBaseSocial";
+import ProductCardTwo from "@/components/sections/product/ProductCardTwo";
-import PlainBackground from "@/components/background/PlainBackground";
+import FooterSocial from "@/components/sections/footer/FooterSocial";
-import CircleGradientBackground from "@/components/background/CircleGradientBackground";
+import { Youtube, Twitter, Linkedin, Film, Users, Calendar } from "lucide-react";
 import { TrendingUp, Users, Zap, Star, Twitter, Linkedin, Globe } from "lucide-react";
 export default function StarWarsPage() {
  return (
@@ -24,140 +23,154 @@ export default function StarWarsPage() {
      secondaryButtonStyle="glass"
      headingFontWeight="extrabold"
    >
      <PlainBackground />
      <div id="hero" data-section="hero">
-        <HeroBillboard
+        <HeroBillboardCarouselSplit
-          title="STAR WARS"
+          title="STAR WARS: Join millions of fans exploring the galaxy's greatest saga"
-          description="Join millions of fans exploring the galaxy's greatest saga. Discover exclusive content, connect with the community, and celebrate the Force."
+          mediaItems={[
-          tag="Welcome to the Galaxy"
+            { imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766502905270-5whkj6nu.jpg", imageAlt: "Star Wars galaxy 1" },
-          buttons={[
+            { imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766502905270-5whkj6nu.jpg", imageAlt: "Star Wars galaxy 2" },
-            { text: "Enter the Galaxy", href: "community" },
+            { imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766502905270-5whkj6nu.jpg", imageAlt: "Star Wars galaxy 3" },
-            { text: "Join Community", href: "about" }
+            { imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766502905270-5whkj6nu.jpg", imageAlt: "Star Wars galaxy 4" },
            { imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766502905270-5whkj6nu.jpg", imageAlt: "Star Wars galaxy 5" },
            { imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766502905270-5whkj6nu.jpg", imageAlt: "Star Wars galaxy 6" }
          ]}
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766502905270-5whkj6nu.jpg"
+          buttons={[{ text: "Join the Force", href: "contact" }]}
          imageAlt="Star Wars galaxy"
          frameStyle="card"
        />
      </div>
      <div id="metrics" data-section="metrics">
-        <MetricCardOne
+        <MetricCardThree
          title="Our Galactic Impact"
-          description="Witness the scale of the Star Wars universe and its influence across generations"
+          description="Experience the epic saga spanning decades of storytelling"
          gridVariant="four-items-2x2-equal-grid"
          animationType="slide-up"
          textboxLayout="default"
          useInvertedBackground="noInvert"
          metrics={[
-            {
+            { id: "1", icon: Calendar, title: "Years", value: "40+" },
-              id: "1",
+            { id: "2", icon: Film, title: "Films", value: "11" },
-              value: "40+",
+            { id: "3", icon: Users, title: "Fans", value: "100M+" }
              title: "Years",
              description: "Of Star Wars storytelling",
              icon: TrendingUp
            },
            {
              id: "2",
              value: "11",
              title: "Films",
              description: "Complete Skywalker saga",
              icon: Star
            },
            {
              id: "3",
              value: "100M+",
              title: "Fans",
              description: "Worldwide united by Force",
              icon: Users
            },
            {
              id: "4",
              value: "∞",
              title: "Stories",
              description: "In expanding galaxy",
              icon: Zap
            }
          ]}
          gridVariant="uniform-all-items-equal"
          textboxLayout="default"
          animationType="slide-up"
          useInvertedBackground="noInvert"
        />
      </div>
-      <CircleGradientBackground diagonal="primary" />
+      <div id="products" data-section="products">
-
+        <ProductCardTwo
-      <div id="about" data-section="about">
+          title="Featured Products"
-        <SplitAbout
+          description="Explore our premium Star Wars collection with top-rated items"
-          title="About the Universe"
+          tag="Best Sellers"
-          description="Experience the epic saga spanning decades of storytelling across multiple eras and universes"
+          products={[
          textboxLayout="default"
          useInvertedBackground="noInvert"
          imagePosition="right"
          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766502905270-5whkj6nu.jpg"
          imageAlt="Star Wars universe"
          bulletPoints={[
            {
-              title: "The Saga",
+              id: "1",
-              description: "From Episode I through IX, experience the epic story of the Skywalker family and the eternal battle between light and dark sides of the Force."
+              brand: "Lucasfilm Collectibles",
              name: "Premium Lightsaber Replica",
              price: "$199.99",
              rating: 5,
              reviewCount: "2.3k",
              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766502905270-5whkj6nu.jpg",
              imageAlt: "Premium Lightsaber Replica",
              starColor: "#ff0000"
            },
            {
-              title: "Expanded Universe",
+              id: "2",
-              description: "Venture into incredible stories beyond the main saga. Explore the Old Republic, High Republic era, and countless tales of heroes and villains."
+              brand: "Star Wars Universe",
              name: "Millennium Falcon Model Kit",
              price: "$149.99",
              rating: 4,
              reviewCount: "1.8k",
              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766502905270-5whkj6nu.jpg",
              imageAlt: "Millennium Falcon Model Kit",
              starColor: "#ff0000"
            },
            {
-              title: "Iconic Characters",
+              id: "3",
-              description: "Meet legendary heroes like Luke Skywalker, Princess Leia, Han Solo, and Darth Vader who define the Star Wars legacy."
+              brand: "Force Masters",
              name: "Yoda Statue Figurine",
              price: "$89.99",
              rating: 5,
              reviewCount: "3.1k",
              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766502905270-5whkj6nu.jpg",
              imageAlt: "Yoda Statue Figurine",
              starColor: "#ff0000"
            },
            {
              id: "4",
              brand: "Imperial Design",
              name: "Death Star Lamp",
              price: "$129.99",
              rating: 4,
              reviewCount: "956",
              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766502905270-5whkj6nu.jpg",
              imageAlt: "Death Star Lamp",
              starColor: "#ff0000"
            }
          ]}
          gridVariant="uniform-all-items-equal"
          textboxLayout="default"
          animationType="slide-up"
          useInvertedBackground="noInvert"
        />
      </div>
      <div id="about" data-section="about">
        <ParallaxAbout
          title="Elevate Your Experience"
          description="From Episode I through IX, experience the story of the Skywalker family and the eternal battle between light and dark sides of the Force."
          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766502905270-5whkj6nu.jpg"
          imageAlt="Star Wars background"
          buttons={[{ text: "Discover More", href: "#" }]}
        />
      </div>
      <div id="contact" data-section="contact">
-        <ContactCenter
+        <ContactSplitForm
-          tag="Newsletter"
+          title="Get in Touch with the Force"
-          title="Join the Force"
+          description="Subscribe to our newsletter for exclusive Star Wars content, updates, and announcements from the galaxy far, far away."
-          description="Subscribe for exclusive Star Wars news, community updates, and behind-the-scenes content."
+          inputs={[
            { name: "name", type: "text", placeholder: "Your Name", required: true },
            { name: "email", type: "email", placeholder: "Your Email", required: true }
          ]}
          textarea={{
            name: "message",
            placeholder: "Tell us about your favorite Star Wars moment...",
            rows: 4,
            required: true
          }}
          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766502905270-5whkj6nu.jpg"
          imageAlt="Star Wars Contact"
          mediaPosition="right"
          buttonText="Send Message"
          useInvertedBackground="noInvert"
          inputPlaceholder="Your email address"
          buttonText="Subscribe"
          onSubmit={(email) => console.log("Subscribed:", email)}
        />
      </div>
      <div id="footer" data-section="footer">
-        <FooterBaseSocial
+        <FooterSocial
          logoText="STAR WARS"
          description="Join millions of Star Wars fans worldwide. Discover exclusive content, connect with the community, and celebrate the epic saga."
          columns={[
            {
              title: "Explore",
              items: [
-                { label: "Movies", href: "#movies" },
+                { label: "Movies", href: "#" },
-                { label: "Series", href: "#series" },
+                { label: "Series", href: "#" },
-                { label: "Characters", href: "#characters" }
+                { label: "Characters", href: "#" }
              ]
            },
            {
              title: "Community",
              items: [
-                { label: "Forums", href: "#forums" },
+                { label: "Forums", href: "#" },
-                { label: "Events", href: "#events" },
+                { label: "Events", href: "#" },
-                { label: "Merch", href: "#merch" }
+                { label: "Merch", href: "#" }
              ]
            },
            {
              title: "More",
              items: [
                { label: "About Us", href: "about" },
                { label: "Blog", href: "#blog" },
                { label: "Contact", href: "contact" }
              ]
            }
          ]}
          socialLinks={[
            { icon: Youtube, href: "https://youtube.com", ariaLabel: "YouTube" },
            { icon: Twitter, href: "https://twitter.com", ariaLabel: "Twitter" },
-            { icon: Linkedin, href: "https://linkedin.com", ariaLabel: "LinkedIn" },
+            { icon: Linkedin, href: "https://linkedin.com", ariaLabel: "LinkedIn" }
            { icon: Globe, href: "https://example.com", ariaLabel: "Website" }
          ]}
-          copyrightText="© 2025 Star Wars Community. All rights reserved."
+          copyrightText="© 2024 STAR WARS. All rights reserved."
        />
      </div>
    </ThemeProvider>
Author	SHA1	Message	Date
mulika-local	64fbd89bac	Merge version_16 into main Merge version_16 into main	2025-12-25 11:04:35 +00:00
mulika-local	b651eb3f64	Update src/app/page.tsx	2025-12-25 11:04:30 +00:00
mulika-local	a8de81609c	Update src/app/layout.tsx	2025-12-25 11:04:30 +00:00
mulika-local	43be85cf34	Merge version_16 into main Merge version_16 into main	2025-12-25 11:03:05 +00:00
mulika-local	3cb3c6d307	Update src/app/page.tsx	2025-12-25 11:03:00 +00:00
mulika-local	3f4db2cb8c	Merge version_15 into main Merge version_15 into main	2025-12-25 10:55:44 +00:00
mulika-local	217d450e59	Update src/app/page.tsx	2025-12-25 10:55:39 +00:00
mulika-local	18db534079	Update src/app/layout.tsx	2025-12-25 10:55:38 +00:00
mulika-local	cc1045064d	Update src/app/globals.css	2025-12-25 10:55:37 +00:00
mulika-local	9cec354fa8	Merge version_14 into main Merge version_14 into main	2025-12-24 15:49:26 +00:00
mulika-local	ec5746d6bf	Update src/app/page.tsx	2025-12-24 15:49:21 +00:00
mulika-local	62ca7ff914	Update src/app/layout.tsx	2025-12-24 15:49:20 +00:00
mulika-local	6c5a6a3915	Merge version_13 into main Merge version_13 into main	2025-12-24 15:31:07 +00:00
mulika-local	7043ece654	Update src/app/page.tsx	2025-12-24 15:31:02 +00:00
mulika-local	e5a6147b6b	Merge version_12 into main Merge version_12 into main	2025-12-24 15:22:35 +00:00
mulika-local	52c3296f23	Update src/app/page.tsx	2025-12-24 15:22:30 +00:00
mulika-local	59b7f15d44	Update src/app/layout.tsx	2025-12-24 15:22:29 +00:00
mulika-local	4d4ff6e0a0	Merge version_12 into main Merge version_12 into main	2025-12-24 15:20:49 +00:00
mulika-local	7c4b71906f	Update src/app/page.tsx	2025-12-24 15:20:44 +00:00
mulika-local	8b75654bed	Update src/app/layout.tsx	2025-12-24 15:20:43 +00:00
mulika-local	7c01095ca9	Merge version_11 into main Merge version_11 into main	2025-12-24 14:49:56 +00:00
mulika-local	f612df2540	Update src/app/page.tsx	2025-12-24 14:49:51 +00:00
mulika-local	72d3a51aeb	Merge version_10 into main Merge version_10 into main	2025-12-24 14:35:41 +00:00
mulika-local	5ab6170a07	Update src/app/page.tsx	2025-12-24 14:35:36 +00:00
mulika-local	e57d3c3e94	Merge version_10 into main Merge version_10 into main	2025-12-24 14:34:04 +00:00
mulika-local	7c48b023c1	Update src/app/page.tsx	2025-12-24 14:33:59 +00:00
mulika-local	9689368fe7	Update src/app/layout.tsx	2025-12-24 14:33:58 +00:00
mulika-local	1070bf740e	Merge version_10 into main Merge version_10 into main	2025-12-24 14:32:37 +00:00
mulika-local	5881a07395	Update src/app/page.tsx	2025-12-24 14:32:32 +00:00
mulika-local	09b2c3a2bc	Update src/app/layout.tsx	2025-12-24 14:32:31 +00:00
mulika-local	39df172d16	Update src/app/globals.css	2025-12-24 14:32:30 +00:00
mulika-local	556648f05e	Merge version_9 into main Merge version_9 into main	2025-12-24 13:24:21 +00:00
mulika-local	119591fcfe	Update src/app/page.tsx	2025-12-24 13:24:17 +00:00
mulika-local	06dc06936b	Update src/app/layout.tsx	2025-12-24 13:24:16 +00:00
mulika-local	f92f3e51f4	Merge version_9 into main Merge version_9 into main	2025-12-24 13:22:51 +00:00
mulika-local	a2f9422712	Update src/app/page.tsx	2025-12-24 13:22:46 +00:00
mulika-local	c2a6462166	Update src/app/layout.tsx	2025-12-24 13:22:45 +00:00
mulika-local	476ada74d9	Merge version_8 into main Merge version_8 into main	2025-12-24 13:10:01 +00:00
mulika-local	66098b02e2	Update src/app/page.tsx	2025-12-24 13:09:56 +00:00
mulika-local	0190e9d3e0	Merge version_8 into main Merge version_8 into main	2025-12-24 13:08:32 +00:00
mulika-local	16303d418a	Update src/app/page.tsx	2025-12-24 13:08:28 +00:00
mulika-local	55b314aaa2	Merge version_8 into main Merge version_8 into main	2025-12-24 13:07:08 +00:00
mulika-local	fa104c1f0a	Update src/app/page.tsx	2025-12-24 13:07:03 +00:00
mulika-local	d50e44645a	Merge version_7 into main Merge version_7 into main	2025-12-24 13:03:38 +00:00
mulika-local	06abe78f58	Merge version_5 into main Merge version_5 into main	2025-12-24 12:48:47 +00:00
mulika-local	9be88da2b1	Merge version_5 into main Merge version_5 into main	2025-12-24 12:47:18 +00:00
mulika-local	9610eb709a	Merge version_5 into main Merge version_5 into main	2025-12-24 12:45:18 +00:00
mulika-local	68f4a67133	Merge version_4 into main Merge version_4 into main	2025-12-24 12:41:24 +00:00
mulika-local	ea228313f7	Merge version_3 into main Merge version_3 into main	2025-12-24 12:23:44 +00:00
mulika-local	af56b4ac15	Merge version_2 into main Merge version_2 into main	2025-12-24 12:13:12 +00:00