Merge version_5 into main #13

Merged
bender merged 4 commits from version_5 into main 2026-02-21 20:27:22 +00:00
4 changed files with 12 additions and 12 deletions

View File

@@ -1,6 +1,6 @@
"use client";
import BlogCardTwo from '@/components/sections/blog/BlogCardTwo';
import BlogCardThree from '@/components/sections/blog/BlogCardThree';
import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingOverlay from "@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay";
@@ -8,7 +8,7 @@ import NavbarLayoutFloatingOverlay from "@/components/navbar/NavbarLayoutFloatin
const posts = [
{
id: '1',
category: ['Skincare', 'Tips'],
category: 'Skincare',
title: '5 Tips for a Glowing Complexion',
excerpt: 'Discover our top secrets to achieving radiant, healthy-looking skin that glows from within.',
imageSrc: 'https://img.b2bpic.net/free-photo/minimal-assortment-beauty-products_23-2148961325.jpg',
@@ -18,7 +18,7 @@ const posts = [
},
{
id: '2',
category: ['Live Shows'],
category: 'Live Shows',
title: 'What to Expect in Our Next Live Show',
excerpt: 'Get a sneak peek into the exclusive bundles and new drops featured in our upcoming live event.',
imageSrc: 'https://img.b2bpic.net/free-photo/online-workshop-demontration-beauty-products_259150-60056.jpg?_wi=2',
@@ -28,7 +28,7 @@ const posts = [
},
{
id: '3',
category: ['Cosmetics'],
category: 'Cosmetics',
title: 'The Ultimate Guide to Pro Cosmetics',
excerpt: 'Learn how to use our professional cosmetic kits to create stunning looks for any occasion.',
imageSrc: 'https://img.b2bpic.net/free-photo/foundation-bottles-advertising-arrangement_23-2149511243.jpg?_wi=2',
@@ -70,7 +70,7 @@ export default function BlogPage() {
</div>
<div id="blog" data-section="blog">
<BlogCardTwo
<BlogCardThree
blogs={posts}
title="Featured Articles"
description="Explore our latest insights"

View File

@@ -47,11 +47,11 @@ export default function LandingPage() {
description="Elevate Your Glow"
background={{ variant: "radial-gradient" }}
buttons={[{ text: "Join Our Live Show", href: "https://www.whatnot.com/s/xeIJ5XNt" }]}
mediaItems=[
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" }
]
]}
mediaAnimation="opacity"
buttonAnimation="opacity"
className="bg-[--background] text-[--foreground]"

View File

@@ -87,7 +87,7 @@ 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={[
@@ -135,7 +135,7 @@ 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={[
@@ -190,7 +190,7 @@ 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={[

View File

@@ -57,7 +57,7 @@ function ShopPageContent() {
secondaryButtonStyle="radial-glow"
headingFontWeight="medium"
>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
brandName="Glow Theory"
navItems={[
@@ -104,7 +104,7 @@ function ShopPageContent() {
secondaryButtonStyle="radial-glow"
headingFontWeight="medium"
>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
brandName="Glow Theory"
navItems={[