Merge version_14 into main

Update src/app/page.tsx
2026-06-07 09:55:44 +00:00 · 2026-06-07 09:55:38 +00:00 · 2026-06-07 09:50:06 +00:00 · 2026-06-07 09:50:03 +00:00 · 2026-06-07 09:50:03 +00:00 · 2026-06-07 09:50:02 +00:00
6 changed files with 227 additions and 22 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -7,6 +7,7 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
 import Tag from "@/tag/Tag";
 import { getVisualEditScript } from "@/utils/visual-edit-script";
 import { Nunito_Sans } from "next/font/google";
+import { DM_Sans } from "next/font/google";



@@ -41,8 +42,9 @@ export const metadata: Metadata = {
  },
 };

-const nunitoSans = Nunito_Sans({
-  variable: "--font-nunito-sans",
+
+const dmSans = DM_Sans({
+  variable: "--font-dm-sans",
  subsets: ["latin"],
 });

@@ -54,7 +56,7 @@ export default function RootLayout({
  return (
    <html lang="en" suppressHydrationWarning>
      <ServiceWrapper>
-        <body className={`${nunitoSans.variable} antialiased`}>
+        <body className={`${dmSans.variable} antialiased`}>
          <Tag />
          {children}
          <script
--- a/src/app/login/page.tsx
+++ b/src/app/login/page.tsx
@@ -0,0 +1,99 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import ReactLenis from "lenis/react";
+import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
+import FooterSimple from '@/components/sections/footer/FooterSimple';
+
+export default function LoginPage() {
+  return (
+    <ThemeProvider
+        defaultButtonVariant="bounce-effect"
+        defaultTextAnimation="entrance-slide"
+        borderRadius="pill"
+        contentWidth="mediumSmall"
+        sizing="large"
+        background="noise"
+        cardStyle="soft-shadow"
+        primaryButtonStyle="flat"
+        secondaryButtonStyle="glass"
+        headingFontWeight="bold"
+    >
+      <ReactLenis root>
+        <div id="nav" data-section="nav">
+          <NavbarStyleApple
+            navItems={[
+              { name: "Home", id: "/" },
+              { name: "About", id: "#about" },
+              { name: "Collection", id: "#products" },
+              { name: "Testimonials", id: "#testimonials" },
+              { name: "FAQ", id: "#faq" },
+              { name: "Contact", id: "#contact" },
+              { name: "Sign Up", id: "/signup" },
+              { name: "Login", id: "/login" }
+            ]}
+            brandName="ChicThreads"
+          />
+        </div>
+
+        <div id="login" data-section="login" className="py-24 md:py-32 lg:py-48 flex items-center justify-center">
+          <div className="max-w-md w-full text-center p-8 bg-card rounded-lg shadow-lg">
+            <h1 className="text-4xl font-bold mb-4">Login</h1>
+            <p className="text-lg text-foreground mb-8">
+              Welcome back! Please enter your credentials to log in.
+            </p>
+            {/* Placeholder for a login form */}
+            <div className="space-y-4">
+              <input
+                type="email"
+                placeholder="Email"
+                className="w-full p-3 rounded-md bg-background-accent border border-foreground/10 text-foreground placeholder-foreground/50 focus:outline-none focus:ring-2 focus:ring-primary-cta"
+              />
+              <input
+                type="password"
+                placeholder="Password"
+                className="w-full p-3 rounded-md bg-background-accent border border-foreground/10 text-foreground placeholder-foreground/50 focus:outline-none focus:ring-2 focus:ring-primary-cta"
+              />
+              <button className="w-full py-3 px-6 rounded-md bg-primary-cta text-white font-semibold transition-colors duration-200 hover:bg-primary-cta/90">
+                Login
+              </button>
+              <p className="text-sm text-foreground/70 mt-4">
+                Don't have an account? <a href="/signup" className="text-primary-cta hover:underline">Sign Up</a>
+              </p>
+            </div>
+          </div>
+        </div>
+
+        <div id="footer" data-section="footer">
+          <FooterSimple
+            columns={[
+              {
+                title: "Company",                items: [
+                  { label: "About Us", href: "#about" },
+                  { label: "Our Story", href: "#" },
+                  { label: "Careers", href: "#" },
+                ],
+              },
+              {
+                title: "Shop",                items: [
+                  { label: "Abayas", href: "#products" },
+                  { label: "Handbags", href: "#products" },
+                  { label: "New Arrivals", href: "#products" },
+                ],
+              },
+              {
+                title: "Support",                items: [
+                  { label: "FAQ", href: "#faq" },
+                  { label: "Shipping & Returns", href: "#" },
+                  { label: "Contact Us", href: "#contact" },
+                ],
+              },
+            ]}
+            bottomLeftText="© 2024 ChicThreads. All rights reserved."
+            bottomRightText="Privacy Policy | Terms of Service"
+          />
+        </div>
+      </ReactLenis>
+    </ThemeProvider>
+  );
+}
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -6,7 +6,7 @@ import ContactText from '@/components/sections/contact/ContactText';
 import FaqSplitText from '@/components/sections/faq/FaqSplitText';
 import FeatureCardTwentySix from '@/components/sections/feature/FeatureCardTwentySix';
 import FooterSimple from '@/components/sections/footer/FooterSimple';
-import HeroLogoBillboard from '@/components/sections/hero/HeroLogoBillboard';
+import HeroSplit from '@/components/sections/hero/HeroSplit';
 import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
 import ProductCardFour from '@/components/sections/product/ProductCardFour';
 import SocialProofOne from '@/components/sections/socialProof/SocialProofOne';
@@ -33,7 +33,7 @@ export default function LandingPage() {
      <NavbarStyleApple
      navItems={[
        {
-          name: "Home",          id: "#home"},
+          name: "Home",          id: "/"},
        {
          name: "About",          id: "#about"},
        {
@@ -44,17 +44,21 @@ export default function LandingPage() {
          name: "FAQ",          id: "#faq"},
        {
          name: "Contact",          id: "#contact"},
+        {
+          name: "Sign Up",          id: "/signup"},
+        {
+          name: "Login",          id: "/login"}
      ]}
-      brandName="ChicThreads"
+      brandName=""
    />
  </div>

  <div id="home" data-section="home">
-      <HeroLogoBillboard
+      <HeroSplit
      background={{
        variant: "radial-gradient"}}
-      logoText="ChicThreads"
-      description="Discover a curated collection of elegant abayas, sophisticated handbags, and modern apparel that redefines modest fashion. Elevate your style with timeless pieces."
+      title="Elevate Your Style"
+      description="Discover a curated collection of elegant abayas, sophisticated handbags, and modern apparel that redefines modest fashion. Elevate your style with timeless pieces from ChicThreads."
      buttons={[
        {
          text: "Shop New Arrivals",          href: "#products"},
@@ -62,8 +66,10 @@ export default function LandingPage() {
          text: "Learn More",          href: "#about"},
      ]}
      imageSrc="http://img.b2bpic.net/free-photo/fashionable-young-woman-grey-coat-hat-walking-street-city-centre-smiling-true-emotions-stylish-lifestyle-luxury-clothes-elegant-look_197531-1885.jpg"
-      imageAlt="Elegant woman wearing an abaya and carrying a luxury handbag"
+      imageAlt="Elegant woman wearing an abaya and carrying a luxury handbag, representing ChicThreads style"
      mediaAnimation="opacity"
+      tag="ChicThreads"
+      imagePosition="right"
    />
  </div>

@@ -230,6 +236,15 @@ export default function LandingPage() {
              label: "Contact Us",              href: "#contact"},
          ],
        },
+        {
+          title: "Connect",          items: [
+            { label: "Instagram", href: "https://www.instagram.com/chicthreads" },
+            { label: "Threads", href: "https://www.threads.net/@chicthreads" },
+            { label: "TikTok", href: "https://www.tiktok.com/@chicthreads" },
+            { label: "YouTube", href: "https://www.youtube.com/@chicthreads" },
+            { label: "X", href: "https://twitter.com/chicthreads" }
+          ]
+        }
      ]}
      bottomLeftText="© 2024 ChicThreads. All rights reserved."
      bottomRightText="Privacy Policy | Terms of Service"
@@ -238,4 +253,4 @@ export default function LandingPage() {
      </ReactLenis>
    </ThemeProvider>
  );
-}
+}
--- a/src/app/signup/page.tsx
+++ b/src/app/signup/page.tsx
@@ -0,0 +1,89 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import ReactLenis from "lenis/react";
+import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
+import FooterSimple from '@/components/sections/footer/FooterSimple';
+import EmailSignupForm from '@/components/form/EmailSignupForm';
+
+export default function SignupPage() {
+  return (
+    <ThemeProvider
+        defaultButtonVariant="bounce-effect"
+        defaultTextAnimation="entrance-slide"
+        borderRadius="pill"
+        contentWidth="mediumSmall"
+        sizing="large"
+        background="noise"
+        cardStyle="soft-shadow"
+        primaryButtonStyle="flat"
+        secondaryButtonStyle="glass"
+        headingFontWeight="bold"
+    >
+      <ReactLenis root>
+        <div id="nav" data-section="nav">
+          <NavbarStyleApple
+            navItems={[
+              { name: "Home", id: "/" },
+              { name: "About", id: "#about" },
+              { name: "Collection", id: "#products" },
+              { name: "Testimonials", id: "#testimonials" },
+              { name: "FAQ", id: "#faq" },
+              { name: "Contact", id: "#contact" },
+              { name: "Sign Up", id: "/signup" },
+              { name: "Login", id: "/login" }
+            ]}
+            brandName="ChicThreads"
+          />
+        </div>
+
+        <div id="signup" data-section="signup" className="py-24 md:py-32 lg:py-48 flex items-center justify-center">
+          <div className="max-w-md w-full text-center p-8 bg-card rounded-lg shadow-lg">
+            <h1 className="text-4xl font-bold mb-4">Sign Up</h1>
+            <p className="text-lg text-foreground mb-8">
+              Join ChicThreads today and discover exclusive collections.
+            </p>
+            <EmailSignupForm
+              inputPlaceholder="Your email address"
+              buttonText="Create Account"
+              onSubmit={(email) => alert(`Signing up with ${email}`)}
+            />
+            <p className="text-sm text-foreground/70 mt-4">
+              Already have an account? <a href="/login" className="text-primary-cta hover:underline">Log In</a>
+            </p>
+          </div>
+        </div>
+
+        <div id="footer" data-section="footer">
+          <FooterSimple
+            columns={[
+              {
+                title: "Company",                items: [
+                  { label: "About Us", href: "#about" },
+                  { label: "Our Story", href: "#" },
+                  { label: "Careers", href: "#" },
+                ],
+              },
+              {
+                title: "Shop",                items: [
+                  { label: "Abayas", href: "#products" },
+                  { label: "Handbags", href: "#products" },
+                  { label: "New Arrivals", href: "#products" },
+                ],
+              },
+              {
+                title: "Support",                items: [
+                  { label: "FAQ", href: "#faq" },
+                  { label: "Shipping & Returns", href: "#" },
+                  { label: "Contact Us", href: "#contact" },
+                ],
+              },
+            ]}
+            bottomLeftText="© 2024 ChicThreads. All rights reserved."
+            bottomRightText="Privacy Policy | Terms of Service"
+          />
+        </div>
+      </ReactLenis>
+    </ThemeProvider>
+  );
+}
--- a/src/app/styles/base.css
+++ b/src/app/styles/base.css
@@ -11,7 +11,7 @@ html {
 body {
  background-color: var(--background);
  color: var(--foreground);
-  font-family: var(--font-nunito-sans), sans-serif;
+  font-family: var(--font-dm-sans), sans-serif;
  position: relative;
  min-height: 100vh;
  overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
 h4,
 h5,
 h6 {
-  font-family: var(--font-nunito-sans), sans-serif;
+  font-family: var(--font-dm-sans), sans-serif;
 }
--- a/src/app/styles/variables.css
+++ b/src/app/styles/variables.css
@@ -10,15 +10,15 @@
  --accent: #ffffff;
  --background-accent: #ffffff; */

-  --background: #ffffff;
-  --card: #f9f9f9;
-  --foreground: #000612e6;
-  --primary-cta: #106EFB;
-  --primary-cta-text: #ffffff;
-  --secondary-cta: #f9f9f9;
-  --secondary-cta-text: #000612e6;
-  --accent: #e2e2e2;
-  --background-accent: #106EFB;
+  --background: #030128;
+  --card: #241f48;
+  --foreground: #ffffff;
+  --primary-cta: #ffffff;
+  --primary-cta-text: #040316;
+  --secondary-cta: #221f5a;
+  --secondary-cta-text: #d5d4f6;
+  --accent: #4b3c8f;
+  --background-accent: #bca3fd;

  /* text sizing - set by ThemeProvider */
  /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
Author	SHA1	Message	Date
bender	7bb9f0ce2c	Merge version_14 into main Merge version_14 into main	2026-06-07 09:55:44 +00:00
bender	05617ec775	Update src/app/page.tsx	2026-06-07 09:55:38 +00:00
bender	b29759b274	Merge version_14 into main Merge version_14 into main	2026-06-07 09:50:06 +00:00
bender	7a5ed3c532	Update src/app/signup/page.tsx	2026-06-07 09:50:03 +00:00
bender	2a9198af8f	Update src/app/page.tsx	2026-06-07 09:50:03 +00:00
bender	476a32f177	Update src/app/login/page.tsx	2026-06-07 09:50:02 +00:00
bender	a102c6fa57	Merge version_13 into main Merge version_13 into main	2026-06-07 09:48:41 +00:00
bender	6ac340740d	Update theme colors	2026-06-07 09:48:35 +00:00
bender	06d3b53fc1	Merge version_12 into main Merge version_12 into main	2026-06-07 09:48:24 +00:00
bender	9edf95644d	Update theme colors	2026-06-07 09:48:21 +00:00
bender	84d2cd5946	Merge version_11 into main Merge version_11 into main	2026-06-07 09:48:03 +00:00
bender	3124d54a69	Update theme colors	2026-06-07 09:48:00 +00:00
bender	330341138a	Merge version_10 into main Merge version_10 into main	2026-06-07 09:47:52 +00:00
bender	778dc09943	Update theme colors	2026-06-07 09:47:46 +00:00
bender	483cd55371	Merge version_9 into main Merge version_9 into main	2026-06-07 09:47:30 +00:00
bender	d603ae0029	Update theme colors	2026-06-07 09:47:27 +00:00
bender	f09eb07b29	Merge version_8 into main Merge version_8 into main	2026-06-07 09:47:21 +00:00
bender	0325263e41	Update theme colors	2026-06-07 09:47:18 +00:00
bender	ecfde0118a	Merge version_7 into main Merge version_7 into main	2026-06-07 09:47:02 +00:00
bender	029f5f7fe5	Update theme colors	2026-06-07 09:46:59 +00:00
bender	f2dab71e9d	Merge version_6 into main Merge version_6 into main	2026-06-07 09:46:46 +00:00
bender	9cf05a14d9	Update theme colors	2026-06-07 09:46:43 +00:00
bender	d50129f3d7	Merge version_5 into main Merge version_5 into main	2026-06-07 09:46:29 +00:00
bender	c9f9b214f8	Update theme colors	2026-06-07 09:46:26 +00:00
bender	9e00eb2e7f	Merge version_4 into main Merge version_4 into main	2026-06-07 09:46:00 +00:00
bender	c4f699f8e0	Update theme colors	2026-06-07 09:45:57 +00:00
bender	880e90a358	Merge version_3 into main Merge version_3 into main	2026-06-07 09:45:47 +00:00
bender	4151b0198b	Update theme colors	2026-06-07 09:45:41 +00:00
bender	15e7724bf3	Merge version_2 into main Merge version_2 into main	2026-06-07 09:35:45 +00:00
bender	289e32f702	Update theme fonts	2026-06-07 09:35:42 +00:00
bender	6a9af86e5c	Update theme fonts	2026-06-07 09:35:41 +00:00
bender	8981238592	Merge version_2 into main Merge version_2 into main	2026-06-07 09:32:16 +00:00
bender	5aba5a6d53	Add src/app/signup/page.tsx	2026-06-07 09:32:13 +00:00
bender	59705560de	Update src/app/page.tsx	2026-06-07 09:32:13 +00:00
bender	5f04836ee8	Add src/app/login/page.tsx	2026-06-07 09:32:12 +00:00
bender	5d994e8083	Merge version_1 into main Merge version_1 into main	2026-06-07 09:22:28 +00:00