Update src/app/shop/page.tsx

Merge version_3 into main

src/app/blog/page.tsx

@@ -59,6 +59,7 @@ export default function BlogPage() {
                     navItems={[
                         { name: "Home", id: "/" },
                         { name: "Shop", id: "/shop" },
+                        { name: "Support", id: "/support" }
                     ]}
                     button={{ text: "Join Live", href: "/#live-shows" }}
                     className="py-4 px-6 md:px-8"
@@ -81,7 +82,7 @@ export default function BlogPage() {
             <div id="footer" data-section="footer">
                 <FooterLogoReveal
                     logoText="Glow Theory"
-                    leftLink={{ text: "Customer Support", href: "/#contact-support" }}
+                    leftLink={{ text: "Customer Support", href: "/support" }}
                     rightLink={{ text: "Privacy Policy", href: "/privacy" }}
                     className="bg-[--background] text-[--foreground] py-6 px-4"
                     linkClassName="text-[--foreground] hover:text-[--primary-cta] transition-colors duration-200"
@@ -90,4 +91,4 @@ export default function BlogPage() {
             </div>
         </ThemeProvider>
     );
-}
+}

src/app/layout.tsx

@@ -12,12 +12,12 @@ export const metadata: Metadata = {
   title: "Glow Theory - Premium Beauty Wholesale Live Selling",  description: "Elevate your glow with Glow Theory, your Miami-based source for luxury beauty, skincare, fragrance, and cosmetic reseller bundles through live shows on Whatnot.",  openGraph: {
     title: "Glow Theory - Premium Beauty Wholesale Live Selling",    description: "Elevate your glow with Glow Theory, your Miami-based source for luxury beauty, skincare, fragrance, and cosmetic reseller bundles through live shows on Whatnot.",    url: "https://glowtheory.com",    siteName: "Glow Theory",    images: [
       {
-        url: "https://img.b2bpic.net/free-photo/minimal-assortment-beauty-products_23-2148961325.jpg",        alt: "Glow Theory beauty products with a soft pink glow"},
+        url: "https://img.b2bpic.net/free-photo/minimal-assortment-beauty-products_23-2148961325.jpg",        alt: "Glow Theory beauty products with a soft pink glow"}
     ],
     type: "website"},
   twitter: {
-    card: "summary_large_image",    title: "Glow Theory - Premium Beauty Wholesale Live Selling",    description: "Elevate your glow with Glow Theory, your Miami-based source for luxury beauty, skincare, fragrance, and cosmetic reseller bundles through live shows on Whatnot.",    images: ["https://img.b2bpic.net/free-photo/minimal-assortment-beauty-products_23-2148961325.jpg"],
-  },
+    card: "summary_large_image",    title: "Glow Theory - Premium Beauty Wholesale Live Selling",    description: "Elevate your glow with Glow Theory, your Miami-based source for luxury beauty, skincare, fragrance, and cosmetic reseller bundles through live shows on Whatnot.",    images: ["https://img.b2bpic.net/free-photo/minimal-assortment-beauty-products_23-2148961325.jpg"]
+  }
 };
 
 export default function RootLayout({
@@ -1404,4 +1404,4 @@ export default function RootLayout({
       </ServiceWrapper>
     </html>
   );
-}
+}

src/app/page.tsx

@@ -7,7 +7,6 @@ import TestimonialAboutCard from '@/components/sections/about/TestimonialAboutCa
 import FeatureBorderGlow from '@/components/sections/feature/featureBorderGlow/FeatureBorderGlow';
 import ProductCardTwo from '@/components/sections/product/ProductCardTwo';
 import TestimonialCardFifteen from '@/components/sections/testimonial/TestimonialCardFifteen';
-import ContactSplitForm from '@/components/sections/contact/ContactSplitForm';
 import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
 import { CalendarCheck, Mail, MessageSquare, Sparkles, Timer, Tv } from "lucide-react";
 
@@ -33,7 +32,7 @@ export default function LandingPage() {
             { name: "Live Shows", id: "live-shows" },
             { name: "Bundles", id: "bundles" },
             { name: "Reviews", id: "reviews" },
-            { name: "Support", id: "support" },
+            { name: "Support", id: "/support" },
             { name: "Shop", id: "/shop" },
             { name: "Blog", id: "/blog" }
           ]}
@@ -96,8 +95,7 @@ export default function LandingPage() {
           description="Experience the thrill of live selling with daily product drops and exclusive reseller bundles on Whatnot. Don't miss out on the best deals and the latest beauty trends!"
           features={[
             { icon: CalendarCheck, title: "Upcoming Shows", description: "Stay updated with our schedule and never miss a live event for the freshest drops." },
-            { icon: Tv, title: "Watch Us Live", description: "Tune in now to catch our current live broadcast and snag exclusive beauty bundles." },
-            { icon: Timer, title: "Countdown Timer", description: "See exactly when our next exciting live show is about to begin!" },
+            { icon: Tv, title: "Watch Us Live", description: "Tune in now to catch our current live broadcast and snag exclusive beauty bundles." },            { icon: Timer, title: "Countdown Timer", description: "See exactly when our next exciting live show is about to begin!" },
           ]}
           animationType="slide-up"
           textboxLayout="default"
@@ -180,43 +178,15 @@ export default function LandingPage() {
           iconContainerClassName="!bg-[--primary-cta] !text-[--primary-cta-text] rounded-full p-4 shadow-md"
           cardTitleClassName="text-xl md:text-2xl font-semibold mt-4"
           cardDescriptionClassName="text-md md:text-lg font-light text-balance"
-          buttons={[{ text: "Join The Glow Fam", href: "#contact-support" }]}
+          buttons={[{ text: "Join The Glow Fam", href: "/support" }]} 
           buttonAnimation="slide-up"
         />
       </div>
 
-      <div id="contact-support" data-section="contact-support">
-        <ContactSplitForm
-          title="Customer Support"
-          description="Need help with your order, bundles, or live show purchases? Our support team is here to assist you.\n\nCall Us: 786-919-1243\nLocation: Miami, Florida"
-          inputs={[
-            { name: "fullName", type: "text", placeholder: "Full Name", required: true },
-            { name: "emailAddress", type: "email", placeholder: "Email Address", required: true },
-            { name: "orderNumber", type: "text", placeholder: "Order Number (Optional)", required: false },
-          ]}
-          textarea={{ name: "message", placeholder: "Type your message...", rows: 5, required: true }}
-          buttonText="Contact Support"
-          imageSrc="https://img.b2bpic.net/free-photo/medium-shot-pretty-woman-indoors_23-2148879269.jpg"
-          imageAlt="Beauty customer support representative"
-          mediaAnimation="opacity"
-          mediaPosition="right"
-          useInvertedBackground={false}
-          className="bg-[--background-accent] text-[--foreground]"
-          formCardClassName="!bg-[--card] rounded-[--radius] shadow-lg p-8 md:p-12"
-          titleClassName="text-4xl md:text-5xl lg:text-6xl font-thin tracking-wide"
-          descriptionClassName="text-md md:text-lg font-light mt-4 mb-8 leading-relaxed"
-          buttonClassName="min-w-[12rem] px-8 py-3 rounded-full shadow-lg !bg-[--primary-cta] !text-[--primary-cta-text] hover:!bg-[--primary-cta] hover:scale-105 transition-transform duration-300"
-          buttonTextClassName="font-semibold"
-          mediaWrapperClassName="rounded-[--radius] overflow-hidden"
-          mediaClassName="object-cover h-full w-full"
-          contentClassName="grid-cols-1 md:grid-cols-2 gap-8 md:gap-12"
-        />
-      </div>
-
       <div id="footer" data-section="footer">
         <FooterLogoReveal
           logoText="Glow Theory"
-          leftLink={{ text: "Customer Support", href: "#contact-support" }}
+          leftLink={{ text: "Customer Support", href: "/support" }}
           rightLink={{ text: "Privacy Policy", href: "/privacy" }}
           className="bg-[--background] text-[--foreground] py-6 px-4"
           linkClassName="text-[--foreground] hover:text-[--primary-cta] transition-colors duration-200"
@@ -225,4 +195,4 @@ export default function LandingPage() {
       </div>
     </ThemeProvider>
   );
-}
+}

src/app/privacy/page.tsx

@@ -25,6 +25,7 @@ export default function PrivacyPage() {
           navItems={[
             { name: "Home", id: "/" },
             { name: "Shop", id: "/shop" },
+            { name: "Support", id: "/support" }
           ]}
           button={{ text: "Join Live", href: "/#live-shows" }}
           className="py-4 px-6 md:px-8"
@@ -42,25 +43,28 @@ export default function PrivacyPage() {
             {
               heading: "1. Introduction",              content: [
                 {
-                  type: "paragraph",                  text: "Welcome to Glow Theory. We are committed to protecting your personal information and your right to privacy. If you have any questions or concerns about our policy, or our practices with regards to your personal information, please contact us at support@glowtheory.com."},
-              ],
+                  type: "paragraph",                  text: "Welcome to Glow Theory. We are committed to protecting your personal information and your right to privacy. If you have any questions or concerns about our policy, or our practices with regards to your personal information, please contact us at support@glowtheory.com."
+                }
+              ]
             },
             {
               heading: "2. Information We Collect",              content: [
                 {
-                  type: "paragraph",                  text: "We collect personal information that you voluntarily provide to us when you express an interest in obtaining information about us or our products and services, when you participate in activities on the website or otherwise when you contact us."},
+                  type: "paragraph",                  text: "We collect personal information that you voluntarily provide to us when you express an interest in obtaining information about us or our products and services, when you participate in activities on the website or otherwise when you contact us."
+                },
                 {
                   type: "list",                  items: [
-                    "Personal Information: We may collect names, phone numbers, email addresses, mailing addresses, job titles, contact preferences, contact or authentication data, billing addresses, and other similar information.",                    "Payment Data: We may collect data necessary to process your payment if you make purchases, such as your payment instrument number (such as a credit card number), and the security code associated with your payment instrument."],
-                },
-              ],
+                    "Personal Information: We may collect names, phone numbers, email addresses, mailing addresses, job titles, contact preferences, contact or authentication data, billing addresses, and other similar information.",                    "Payment Data: We may collect data necessary to process your payment if you make purchases, such as your payment instrument number (such as a credit card number), and the security code associated with your payment instrument."
+                  ]
+                }
+              ]
             },
             {
-                heading: "3. How We Use Your Information",                content: [
-                    {
-                        type: "paragraph",                        text: "We use personal information collected via our website for a variety of business purposes described below. We process your personal information for these purposes in reliance on our legitimate business interests, in order to enter into or perform a contract with you, with your consent, and/or for compliance with our legal obligations."
-                    }
-                ]
+              heading: "3. How We Use Your Information",              content: [
+                {
+                  type: "paragraph",                  text: "We use personal information collected via our website for a variety of business purposes described below. We process your personal information for these purposes in reliance on our legitimate business interests, in order to enter into or perform a contract with you, with your consent, and/or for compliance with our legal obligations."
+                }
+              ]
             }
           ]}
         />
@@ -69,7 +73,7 @@ export default function PrivacyPage() {
       <div id="footer" data-section="footer">
         <FooterLogoReveal
           logoText="Glow Theory"
-          leftLink={{ text: "Customer Support", href: "/#contact-support" }}
+          leftLink={{ text: "Customer Support", href: "/support" }}
           rightLink={{ text: "Home", href: "/" }}
           className="bg-[--background] text-[--foreground] py-6 px-4"
           linkClassName="text-[--foreground] hover:text-[--primary-cta] transition-colors duration-200"

src/app/shop/[id]/page.tsx

@@ -87,10 +87,10 @@ function ProductPageContent({ params }: ProductPageProps) {
                 secondaryButtonStyle="radial-glow"
                 headingFontWeight="medium"
             >
-                <div id="navbar" data-section="navbar">
+                <div id="nav" data-section="nav">
                     <NavbarLayoutFloatingOverlay
                         brandName="Glow Theory"
-                        navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]} 
+                        navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }, { name: "Support", id: "/support" }]} 
                         button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                         className="py-4 px-6 md:px-8"
                         buttonClassName="shadow-md !bg-[--primary-cta] !text-[--primary-cta-text]"
@@ -105,7 +105,7 @@ function ProductPageContent({ params }: ProductPageProps) {
                 <div id="footer" data-section="footer">
                     <FooterLogoReveal
                         logoText="Glow Theory"
-                        leftLink={{ text: "Customer Support", href: "/#contact-support" }}
+                        leftLink={{ text: "Customer Support", href: "/support" }}
                         rightLink={{ text: "Privacy Policy", href: "/privacy" }}
                         className="bg-[--background] text-[--foreground] py-6 px-4"
                         linkClassName="text-[--foreground] hover:text-[--primary-cta] transition-colors duration-200"
@@ -130,10 +130,10 @@ function ProductPageContent({ params }: ProductPageProps) {
                 secondaryButtonStyle="radial-glow"
                 headingFontWeight="medium"
             >
-                <div id="navbar" data-section="navbar">
+                <div id="nav" data-section="nav">
                     <NavbarLayoutFloatingOverlay
                         brandName="Glow Theory"
-                        navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]} 
+                        navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }, { name: "Support", id: "/support" }]} 
                         button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                         className="py-4 px-6 md:px-8"
                         buttonClassName="shadow-md !bg-[--primary-cta] !text-[--primary-cta-text]"
@@ -156,7 +156,7 @@ function ProductPageContent({ params }: ProductPageProps) {
                 <div id="footer" data-section="footer">
                     <FooterLogoReveal
                         logoText="Glow Theory"
-                        leftLink={{ text: "Customer Support", href: "/#contact-support" }}
+                        leftLink={{ text: "Customer Support", href: "/support" }}
                         rightLink={{ text: "Privacy Policy", href: "/privacy" }}
                         className="bg-[--background] text-[--foreground] py-6 px-4"
                         linkClassName="text-[--foreground] hover:text-[--primary-cta] transition-colors duration-200"
@@ -180,10 +180,10 @@ function ProductPageContent({ params }: ProductPageProps) {
             secondaryButtonStyle="radial-glow"
             headingFontWeight="medium"
         >
-            <div id="navbar" data-section="navbar">
+            <div id="nav" data-section="nav">
                 <NavbarLayoutFloatingOverlay
                     brandName="Glow Theory"
-                    navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]} 
+                    navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }, { name: "Support", id: "/support" }]} 
                     button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                     className="py-4 px-6 md:px-8"
                     buttonClassName="shadow-md !bg-[--primary-cta] !text-[--primary-cta-text]"
@@ -229,7 +229,7 @@ function ProductPageContent({ params }: ProductPageProps) {
             <div id="footer" data-section="footer">
                 <FooterLogoReveal
                     logoText="Glow Theory"
-                    leftLink={{ text: "Customer Support", href: "/#contact-support" }}
+                    leftLink={{ text: "Customer Support", href: "/support" }}
                     rightLink={{ text: "Privacy Policy", href: "/privacy" }}
                     className="bg-[--background] text-[--foreground] py-6 px-4"
                     linkClassName="text-[--foreground] hover:text-[--primary-cta] transition-colors duration-200"
@@ -238,4 +238,4 @@ function ProductPageContent({ params }: ProductPageProps) {
             </div>
         </ThemeProvider>
     );
-}
+}

src/app/shop/page.tsx

@@ -57,10 +57,10 @@ function ShopPageContent() {
                 secondaryButtonStyle="radial-glow"
                 headingFontWeight="medium"
             >
-                <div id="navbar" data-section="navbar">
+                <div id="nav" data-section="nav">
                     <NavbarLayoutFloatingOverlay
                         brandName="Glow Theory"
-                        navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]} 
+                        navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }, { name: "Support", id: "/support" }]} 
                         button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                         className="py-4 px-6 md:px-8"
                         buttonClassName="shadow-md !bg-[--primary-cta] !text-[--primary-cta-text]"
@@ -75,7 +75,7 @@ function ShopPageContent() {
                 <div id="footer" data-section="footer">
                     <FooterLogoReveal
                         logoText="Glow Theory"
-                        leftLink={{ text: "Customer Support", href: "/#contact-support" }}
+                        leftLink={{ text: "Customer Support", href: "/support" }}
                         rightLink={{ text: "Privacy Policy", href: "/privacy" }}
                         className="bg-[--background] text-[--foreground] py-6 px-4"
                         linkClassName="text-[--foreground] hover:text-[--primary-cta] transition-colors duration-200"
@@ -99,10 +99,10 @@ function ShopPageContent() {
             secondaryButtonStyle="radial-glow"
             headingFontWeight="medium"
         >
-            <div id="navbar" data-section="navbar">
+            <div id="nav" data-section="nav">
                 <NavbarLayoutFloatingOverlay
                     brandName="Glow Theory"
-                    navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]} 
+                    navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }, { name: "Support", id: "/support" }]} 
                     button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                     className="py-4 px-6 md:px-8"
                     buttonClassName="shadow-md !bg-[--primary-cta] !text-[--primary-cta-text]"
@@ -138,7 +138,7 @@ function ShopPageContent() {
             <div id="footer" data-section="footer">
                 <FooterLogoReveal
                     logoText="Glow Theory"
-                    leftLink={{ text: "Customer Support", href: "/#contact-support" }}
+                    leftLink={{ text: "Customer Support", href: "/support" }}
                     rightLink={{ text: "Privacy Policy", href: "/privacy" }}
                     className="bg-[--background] text-[--foreground] py-6 px-4"
                     linkClassName="text-[--foreground] hover:text-[--primary-cta] transition-colors duration-200"

src/app/support/page.tsx

@@ -0,0 +1,77 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
+import FeatureBorderGlow from '@/components/sections/feature/featureBorderGlow/FeatureBorderGlow';
+import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
+import { Mail, Phone, Tv } from "lucide-react";
+
+export default function SupportPage() {
+  return (
+    <ThemeProvider
+      defaultButtonVariant="elastic-effect"
+      defaultTextAnimation="entrance-slide"
+      borderRadius="rounded"
+      contentWidth="mediumLarge"
+      sizing="largeSmall"
+      background="noise"
+      cardStyle="gradient-mesh"
+      primaryButtonStyle="primary-glow"
+      secondaryButtonStyle="radial-glow"
+      headingFontWeight="medium"
+    >
+      <div id="nav" data-section="nav">
+        <NavbarLayoutFloatingOverlay
+          brandName="Glow Theory"
+          navItems={[
+            { name: "Home", id: "/" },
+            { name: "About", id: "/#about" },
+            { name: "Live Shows", id: "/#live-shows" },
+            { name: "Bundles", id: "/#bundles" },
+            { name: "Reviews", id: "/#reviews" },
+            { name: "Support", id: "/support" },
+            { name: "Shop", id: "/shop" },
+            { name: "Blog", id: "/blog" }
+          ]}
+          button={{ text: "Join Live", href: "/#live-shows" }}
+          className="py-4 px-6 md:px-8"
+          buttonClassName="shadow-md !bg-[--primary-cta] !text-[--primary-cta-text]"
+          buttonTextClassName="font-medium"
+        />
+      </div>
+
+      <div id="support" data-section="support">
+        <FeatureBorderGlow
+          title="How Can We Help You?"
+          description="Choose from our support options to get the assistance you need, fast."
+          features={[
+            { icon: Tv, title: "Live Show Support", description: "Get real-time help during our Whatnot live shows for immediate assistance. Visit our page: https://www.whatnot.com/user/glowtheory" },
+            { icon: Phone, title: "Order Inquiries", description: "Contact us for questions about your recent purchases, shipping, and returns. Call us at: 786-919-1243." },
+            { icon: Mail, title: "General Assistance", description: "For all other questions or general inquiries, our team is ready to help via email." }
+          ]}
+          animationType="slide-up"
+          textboxLayout="default"
+          useInvertedBackground={false}
+          className="bg-[--background-accent] text-[--foreground]"
+          textBoxTitleClassName="text-4xl md:text-5xl lg:text-6xl font-thin tracking-wide"
+          textBoxDescriptionClassName="text-lg md:text-xl font-light max-w-2xl mx-auto"
+          cardClassName="rounded-[--radius] p-8 !bg-[--card] border border-[--accent] shadow-lg"
+          iconContainerClassName="!bg-[--primary-cta] !text-[--primary-cta-text] rounded-full p-4 shadow-md"
+          cardTitleClassName="text-xl md:text-2xl font-semibold mt-4"
+          cardDescriptionClassName="text-md md:text-lg font-light text-balance"
+        />
+      </div>
+
+      <div id="footer" data-section="footer">
+        <FooterLogoReveal
+          logoText="Glow Theory"
+          leftLink={{ text: "Customer Support", href: "/support" }}
+          rightLink={{ text: "Privacy Policy", href: "/privacy" }}
+          className="bg-[--background] text-[--foreground] py-6 px-4"
+          linkClassName="text-[--foreground] hover:text-[--primary-cta] transition-colors duration-200"
+          logoClassName="text-2xl font-bold tracking-tight"
+        />
+      </div>
+    </ThemeProvider>
+  );
+}