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

Merge version_1 into main #2

Merged
bender merged 4 commits from version_1 into main 2026-02-21 19:55:12 +00:00
Conversation 0 Commits 4 Files Changed 4 +11 -27
4 changed files with 11 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,18 +29,12 @@ export default function BlogPage() {
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" },
]}
button={{ text: "Join Live", href: "#live-shows" }}
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"
brandNameClassName="font-semibold text-lg"
navItemsClassName="text-lg"
/>
</div>
@@ -64,7 +58,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: "/#contact-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"

6
src/app/page.tsx
View File

@@ -49,9 +49,9 @@ export default function LandingPage() {
background={{ variant: "radial-gradient" }}
buttons={[{ text: "Join Our Live Show", href: "#live-shows" }]}
mediaItems={[
{ imageSrc: "https://img.b2bpic.net/free-photo/minimal-assortment-beauty-products_23-2148961325.jpg?_wi=1", imageAlt: "Beauty products with a soft pink glow" },
{ imageSrc: "https://img.b2bpic.net/free-photo/minimal-assortment-beauty-products_23-2148961325.jpg?_wi=2", imageAlt: "Beauty products with a soft pink glow" },
{ imageSrc: "https://img.b2bpic.net/free-photo/minimal-assortment-beauty-products_23-2148961325.jpg?_wi=3", imageAlt: "Beauty products with a soft pink glow" },
{ imageSrc: "https://img.b2bpic.net/free-photo/minimal-assortment-beauty-products_23-2148961325.jpg", imageAlt: "Beauty products with a soft pink glow" },
{ imageSrc: "https://img.b2bpic.net/free-photo/minimal-assortment-beauty-products_23-2148961325.jpg", imageAlt: "Beauty products with a soft pink glow" },
{ imageSrc: "https://img.b2bpic.net/free-photo/minimal-assortment-beauty-products_23-2148961325.jpg", imageAlt: "Beauty products with a soft pink glow" },
]}
mediaAnimation="opacity"
tagAnimation="opacity"

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

@@ -97,8 +97,6 @@ function ProductPageContent({ params }: ProductPageProps) {
className="py-4 px-6 md:px-8"
buttonClassName="shadow-md !bg-[--primary-cta] !text-[--primary-cta-text]"
buttonTextClassName="font-medium"
brandNameClassName="font-semibold text-lg"
navItemsClassName="text-lg"
/>
</div>
<div id="loading-section" data-section="loading-section">
@@ -109,7 +107,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: "/#contact-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"
@@ -144,8 +142,6 @@ function ProductPageContent({ params }: ProductPageProps) {
className="py-4 px-6 md:px-8"
buttonClassName="shadow-md !bg-[--primary-cta] !text-[--primary-cta-text]"
buttonTextClassName="font-medium"
brandNameClassName="font-semibold text-lg"
navItemsClassName="text-lg"
/>
</div>
<div id="not-found-section" data-section="not-found-section">
@@ -164,7 +160,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: "/#contact-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"
@@ -198,8 +194,6 @@ function ProductPageContent({ params }: ProductPageProps) {
className="py-4 px-6 md:px-8"
buttonClassName="shadow-md !bg-[--primary-cta] !text-[--primary-cta-text]"
buttonTextClassName="font-medium"
brandNameClassName="font-semibold text-lg"
navItemsClassName="text-lg"
/>
</div>
<div id="product-detail-card" data-section="product-detail-card">
@@ -241,7 +235,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: "/#contact-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"

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

@@ -64,8 +64,6 @@ function ShopPageContent() {
className="py-4 px-6 md:px-8"
buttonClassName="shadow-md !bg-[--primary-cta] !text-[--primary-cta-text]"
buttonTextClassName="font-medium"
brandNameClassName="font-semibold text-lg"
navItemsClassName="text-lg"
/>
</div>
<div id="loading-section" data-section="loading-section">
@@ -76,7 +74,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: "/#contact-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"
@@ -110,8 +108,6 @@ function ShopPageContent() {
className="py-4 px-6 md:px-8"
buttonClassName="shadow-md !bg-[--primary-cta] !text-[--primary-cta-text]"
buttonTextClassName="font-medium"
brandNameClassName="font-semibold text-lg"
navItemsClassName="text-lg"
/>
</div>
<div id="product-catalog" data-section="product-catalog">
@@ -143,7 +139,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: "/#contact-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"