Merge version_7 into main #18

Merged
bender merged 5 commits from version_7 into main 2026-02-21 22:36:01 +00:00
5 changed files with 5 additions and 11 deletions

View File

@@ -95,7 +95,6 @@ export default function BlogPage() {
]}
copyrightText={`© ${new Date().getFullYear()} Glow Theory`}
className="bg-[--background] text-[--foreground] py-6 px-4"
linkClassName="text-[--foreground] hover:text-[--primary-cta] transition-colors duration-200"
columnTitleClassName="font-bold text-lg mb-2"
columnItemClassName="text-md"
/>

View File

@@ -3,7 +3,7 @@
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
import ProductCardTwo from '@/components/sections/product/ProductCardTwo';
import { CalendarCheck, Mail, MessageSquare, Sparkles, Timer, Tv, Quote } from "lucide-react";
import { CalendarCheck, Mail, MessageSquare, Quote, Timer, Tv } from "lucide-react";
// New imports for replaced components
import HeroBillboard from '@/components/sections/hero/HeroBillboard';
@@ -69,7 +69,6 @@ export default function LandingPage() {
className="bg-[--card] text-[--foreground]"
titleClassName="text-3xl md:text-4xl lg:text-5xl font-thin tracking-wide"
tagClassName="text-[--primary-cta] font-semibold"
buttonAnimation="entrance-slide"
buttons={[]}
/>
</div>
@@ -126,6 +125,9 @@ export default function LandingPage() {
testimonials={[
{
id: "1", name: "Ariel S.", role: "Reseller Queen", testimonial: "Glow Theory has completely transformed my reseller business! The bundles are always top-notch, and the live shows are so much fun and informative. Highly recommend joining the Glow Fam!", icon: Quote
},
{
id: "2", name: "Jessica P.", role: "Beauty Entrepreneur", testimonial: "The quality and variety of products in the Glow Theory bundles are unmatched. It has been a game-changer for my online store!", icon: Quote
}
]}
title="What Our Customers Say"
@@ -139,7 +141,7 @@ export default function LandingPage() {
testimonialClassName="text-xl md:text-2xl font-light text-center leading-relaxed mb-4"
nameClassName="text-lg font-semibold"
roleClassName="text-md text-[--foreground] opacity-80"
titleClassName="text-4xl md:text-5xl lg:text-6xl font-thin tracking-wide"
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"
/>
</div>
@@ -205,7 +207,6 @@ export default function LandingPage() {
]}
copyrightText={`© ${new Date().getFullYear()} Glow Theory`}
className="bg-[--background] text-[--foreground] py-6 px-4"
linkClassName="text-[--foreground] hover:text-[--primary-cta] transition-colors duration-200"
columnTitleClassName="font-bold text-lg mb-2"
columnItemClassName="text-md"
/>

View File

@@ -86,7 +86,6 @@ export default function PrivacyPage() {
]}
copyrightText={`© ${new Date().getFullYear()} Glow Theory`}
className="bg-[--background] text-[--foreground] py-6 px-4"
linkClassName="text-[--foreground] hover:text-[--primary-cta] transition-colors duration-200"
columnTitleClassName="font-bold text-lg mb-2"
columnItemClassName="text-md"
/>

View File

@@ -122,7 +122,6 @@ function ProductPageContent({ params }: ProductPageProps) {
]}
copyrightText={`© ${new Date().getFullYear()} Glow Theory`}
className="bg-[--background] text-[--foreground] py-6 px-4"
linkClassName="text-[--foreground] hover:text-[--primary-cta] transition-colors duration-200"
columnTitleClassName="font-bold text-lg mb-2"
columnItemClassName="text-md"
/>
@@ -188,7 +187,6 @@ function ProductPageContent({ params }: ProductPageProps) {
]}
copyrightText={`© ${new Date().getFullYear()} Glow Theory`}
className="bg-[--background] text-[--foreground] py-6 px-4"
linkClassName="text-[--foreground] hover:text-[--primary-cta] transition-colors duration-200"
columnTitleClassName="font-bold text-lg mb-2"
columnItemClassName="text-md"
/>
@@ -276,7 +274,6 @@ function ProductPageContent({ params }: ProductPageProps) {
]}
copyrightText={`© ${new Date().getFullYear()} Glow Theory`}
className="bg-[--background] text-[--foreground] py-6 px-4"
linkClassName="text-[--foreground] hover:text-[--primary-cta] transition-colors duration-200"
columnTitleClassName="font-bold text-lg mb-2"
columnItemClassName="text-md"
/>

View File

@@ -92,7 +92,6 @@ function ShopPageContent() {
]}
copyrightText={`© ${new Date().getFullYear()} Glow Theory`}
className="bg-[--background] text-[--foreground] py-6 px-4"
linkClassName="text-[--foreground] hover:text-[--primary-cta] transition-colors duration-200"
columnTitleClassName="font-bold text-lg mb-2"
columnItemClassName="text-md"
/>
@@ -170,7 +169,6 @@ function ShopPageContent() {
]}
copyrightText={`© ${new Date().getFullYear()} Glow Theory`}
className="bg-[--background] text-[--foreground] py-6 px-4"
linkClassName="text-[--foreground] hover:text-[--primary-cta] transition-colors duration-200"
columnTitleClassName="font-bold text-lg mb-2"
columnItemClassName="text-md"
/>