bender/b1e64d4a-0f82-4a25-9e95-456fe2eed868
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge version_6 into main #15

Merged
bender merged 5 commits from version_6 into main 2026-02-21 22:21:57 +00:00
Conversation 0 Commits 5 Files Changed 5 +17 -17
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/blog/page.tsx
View File

@@ -59,8 +59,8 @@ export default function BlogPage() {
navItems={[
{ name: "Home", id: "/" },
{ name: "Live Shows", id: "/#live-shows" },
{ name: "Shop", id: "/shop" },
{ name: "Support", id: "/#contact-support" }
{ name: "Support", id: "/#contact-support" },
{ name: "Privacy", id: "/privacy" }
]}
button={{ text: "Join Live", href: "/#live-shows" }}
className="py-4 px-6 md:px-8"

6
src/app/page.tsx
View File

@@ -31,8 +31,8 @@ export default function LandingPage() {
navItems={[
{ name: "Home", id: "/" },
{ name: "Live Shows", id: "/#live-shows" },
{ name: "Shop", id: "/shop" },
{ name: "Support", id: "/#contact-support" }
{ name: "Support", id: "/#contact-support" },
{ name: "Privacy", id: "/privacy" }
]}
button={{ text: "Join Live", href: "#live-shows" }}
className="py-4 px-6 md:px-8"
@@ -45,7 +45,7 @@ export default function LandingPage() {
<HeroBillboardGallery
title="Glow Theory"
description="Elevate Your Glow"
background={{ variant: "aurora" }}
background={{ variant: "sparkles-gradient" }}
buttons={[{ text: "Join Our Live Show", href: "https://www.whatnot.com/s/xeIJ5XNt" }]}
mediaItems={[
{ imageSrc: "https://img.b2bpic.net/free-photo/hands-holding-face-cream_23-2149544901.jpg", imageAlt: "Hand holding face cream" },

4
src/app/privacy/page.tsx
View File

@@ -25,8 +25,8 @@ export default function PrivacyPage() {
navItems={[
{ name: "Home", id: "/" },
{ name: "Live Shows", id: "/#live-shows" },
{ name: "Shop", id: "/shop" },
{ name: "Support", id: "/#contact-support" }
{ name: "Support", id: "/#contact-support" },
{ name: "Privacy", id: "/privacy" }
]}
button={{ text: "Join Live", href: "/#live-shows" }}
className="py-4 px-6 md:px-8"

12
src/app/shop/[id]/page.tsx
View File

@@ -93,8 +93,8 @@ function ProductPageContent({ params }: ProductPageProps) {
navItems={[
{ name: "Home", id: "/" },
{ name: "Live Shows", id: "/#live-shows" },
{ name: "Shop", id: "/shop" },
{ name: "Support", id: "/#contact-support" }
{ name: "Support", id: "/#contact-support" },
{ name: "Privacy", id: "/privacy" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
className="py-4 px-6 md:px-8"
@@ -141,8 +141,8 @@ function ProductPageContent({ params }: ProductPageProps) {
navItems={[
{ name: "Home", id: "/" },
{ name: "Live Shows", id: "/#live-shows" },
{ name: "Shop", id: "/shop" },
{ name: "Support", id: "/#contact-support" }
{ name: "Support", id: "/#contact-support" },
{ name: "Privacy", id: "/privacy" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
className="py-4 px-6 md:px-8"
@@ -196,8 +196,8 @@ function ProductPageContent({ params }: ProductPageProps) {
navItems={[
{ name: "Home", id: "/" },
{ name: "Live Shows", id: "/#live-shows" },
{ name: "Shop", id: "/shop" },
{ name: "Support", id: "/#contact-support" }
{ name: "Support", id: "/#contact-support" },
{ name: "Privacy", id: "/privacy" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
className="py-4 px-6 md:px-8"

8
src/app/shop/page.tsx
View File

@@ -63,8 +63,8 @@ function ShopPageContent() {
navItems={[
{ name: "Home", id: "/" },
{ name: "Live Shows", id: "/#live-shows" },
{ name: "Shop", id: "/shop" },
{ name: "Support", id: "/#contact-support" }
{ name: "Support", id: "/#contact-support" },
{ name: "Privacy", id: "/privacy" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
className="py-4 px-6 md:px-8"
@@ -110,8 +110,8 @@ function ShopPageContent() {
navItems={[
{ name: "Home", id: "/" },
{ name: "Live Shows", id: "/#live-shows" },
{ name: "Shop", id: "/shop" },
{ name: "Support", id: "/#contact-support" }
{ name: "Support", id: "/#contact-support" },
{ name: "Privacy", id: "/privacy" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
className="py-4 px-6 md:px-8"