Merge version_1 into main #1

Merged
bender merged 4 commits from version_1 into main 2026-02-20 14:51:57 +00:00
4 changed files with 224 additions and 236 deletions

View File

@@ -1,6 +1,5 @@
"use client";
import ReactLenis from "lenis/react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import { useBlogPosts } from "@/hooks/useBlogPosts";
@@ -29,21 +28,20 @@ export default function BlogPage() {
secondaryButtonStyle="solid"
headingFontWeight="extrabold"
>
<ReactLenis root>
<div id="nav" data-section="nav">
<NavbarStyleCentered
navItems={[
{ name: "Home", id: "/" },
{ name: "Products", id: "products" },
{ name: "About", id: "about" },
{ name: "Features", id: "features" },
{ name: "Testimonials", id: "testimonials" },
{ name: "FAQ", id: "faq" },
{ name: "Shop", id: "/shop" },
{ name: "Blog", id: "/blog" },
]}
button={{ text: "Shop Now", href: "products" }}
button={{ text: "Shop Now", href: "/shop" }}
brandName="Glow Haven"
className="py-4 lg:py-6"
/>
</div>
<div id="blog" data-section="blog">
{isLoading ? (
<div className="w-content-width mx-auto py-20 text-center">
<p className="text-foreground">Loading posts...</p>
@@ -59,7 +57,9 @@ export default function BlogPage() {
carouselMode="buttons"
/>
)}
</div>
<div id="footer" data-section="footer">
<FooterBaseCard
logoText="Glow Haven"
columns={[
@@ -88,7 +88,7 @@ export default function BlogPage() {
copyrightText="© 2024 Glow Haven. All rights reserved."
className="py-12 lg:py-16"
/>
</ReactLenis>
</div>
</ThemeProvider>
);
}

View File

@@ -35,7 +35,7 @@ export default function LandingPage() {
{ "name": "Testimonials", "id": "testimonials" },
{ "name": "FAQ", "id": "faq" }
]}
button={{ "text": "Shop Now", "href": "products" }}
button={{ "text": "Shop Now", "href": "/shop" }}
brandName="Glow Haven"
className="py-4 lg:py-6"
/>
@@ -45,11 +45,11 @@ export default function LandingPage() {
logoText="Glow Haven"
description="Experience the purity of nature, perfected by science. Elevate your skincare ritual with our thoughtfully crafted formulations for radiant, healthy skin."
buttons={[
{ "text": "Discover More", "href": "products" },
{ "text": "Our Story", "href": "about" }
{ "text": "Discover More", "href": "#products" },
{ "text": "Our Story", "href": "#about" }
]}
buttonAnimation="slide-up"
background={{ "variant": "aurora" }}
background={{ "variant": "sparkles-gradient" }}
imageSrc="https://img.b2bpic.net/free-photo/containers-plants-assortment_23-2149339761.jpg"
imageAlt="Skincare products arranged elegantly"
mediaAnimation="opacity"
@@ -65,8 +65,8 @@ export default function LandingPage() {
{ "type": "text", "content": "Nature." }
]}
buttons={[
{ "text": "Learn More", "href": "about" },
{ "text": "Our Philosophy", "href": "philosophy" }
{ "text": "Learn More", "href": "#about" },
{ "text": "Our Philosophy", "href": "#philosophy" }
]}
buttonAnimation="slide-up"
useInvertedBackground={true}
@@ -149,7 +149,7 @@ export default function LandingPage() {
title="Your Path to Radiant Skin Starts Here"
description="Subscribe to our newsletter for exclusive offers, new product launches, and expert skincare tips directly in your inbox."
tagAnimation="blur-reveal"
background={{ "variant": "aurora" }}
background={{ "variant": "sparkles-gradient" }}
useInvertedBackground={false}
inputPlaceholder="Enter your email address"
buttonText="Subscribe"

View File

@@ -2,7 +2,6 @@
import { use, useCallback } from "react";
import { useRouter } from "next/navigation";
import ReactLenis from "lenis/react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
@@ -80,19 +79,17 @@ export default function ProductPage({ params }: ProductPageProps) {
secondaryButtonStyle="solid"
headingFontWeight="extrabold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarStyleCentered
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
brandName="Glow Haven"
className="py-4 lg:py-6"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
<p className="text-foreground">Loading product...</p>
</main>
</ReactLenis>
<div id="nav" data-section="nav">
<NavbarStyleCentered
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }, { name: "Blog", id: "/blog" }]}
brandName="Glow Haven"
className="py-4 lg:py-6"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
<p className="text-foreground">Loading product...</p>
</main>
</ThemeProvider>
);
}
@@ -111,27 +108,25 @@ export default function ProductPage({ params }: ProductPageProps) {
secondaryButtonStyle="solid"
headingFontWeight="extrabold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarStyleCentered
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
brandName="Glow Haven"
className="py-4 lg:py-6"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
<div id="nav" data-section="nav">
<NavbarStyleCentered
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }, { name: "Blog", id: "/blog" }]}
brandName="Glow Haven"
className="py-4 lg:py-6"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
<div className="text-center">
<p className="text-foreground mb-4">Product not found</p>
<button
onClick={() => router.push("/shop")}
className="primary-button px-6 py-2 rounded-theme"
>
Back to Shop
</button>
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
<div className="text-center">
<p className="text-foreground mb-4">Product not found</p>
<button
onClick={() => router.push("/shop")}
className="primary-button px-6 py-2 rounded-theme"
>
Back to Shop
</button>
</div>
</main>
</ReactLenis>
</main>
</ThemeProvider>
);
}
@@ -149,82 +144,80 @@ export default function ProductPage({ params }: ProductPageProps) {
secondaryButtonStyle="solid"
headingFontWeight="extrabold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarStyleCentered
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
brandName="Glow Haven"
className="py-4 lg:py-6"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<div id="product-detail-card" data-section="product-detail-card">
<ProductDetailCard
layout="page"
name={product.name}
price={product.price}
salePrice={meta.salePrice}
rating={product.rating || 0}
description={product.description}
images={images}
variants={variants.length > 0 ? variants : undefined}
quantity={quantityVariant}
ribbon={meta.ribbon}
inventoryStatus={meta.inventoryStatus}
inventoryQuantity={meta.inventoryQuantity}
sku={meta.sku}
buttons={[
{ text: "Add To Cart", onClick: handleAddToCart },
{ text: "Buy Now", onClick: handleBuyNow },
]}
/>
</div>
<div id="product-cart" data-section="product-cart">
<ProductCart
isOpen={cartOpen}
onClose={() => setCartOpen(false)}
items={cartItems}
onQuantityChange={updateQuantity}
onRemove={removeItem}
total={`$${cartTotal}`}
buttons={[
{
text: isCheckoutLoading ? "Processing..." : "Check Out", onClick: handleCheckout,
},
]}
/>
</div>
<div id="footer" data-section="footer">
<FooterBaseCard
logoText="Glow Haven"
columns={[
{
title: "Shop", items: [
{ label: "Serums", href: "/products#serums" },
{ label: "Moisturizers", href: "/products#moisturizers" },
{ label: "Cleansers", href: "/products#cleansers" },
],
},
{
title: "Company", items: [
{ label: "About Us", href: "/about" },
{ label: "Our Philosophy", href: "/philosophy" },
{ label: "Contact", href: "/contact" },
],
},
{
title: "Support", items: [
{ label: "FAQ", href: "/faq" },
{ label: "Shipping", href: "/shipping" },
{ label: "Returns", href: "/returns" },
],
},
]}
copyrightText="© 2024 Glow Haven. All rights reserved."
className="py-12 lg:py-16"
/>
</div>
</ReactLenis>
<div id="nav" data-section="nav">
<NavbarStyleCentered
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }, { name: "Blog", id: "/blog" }]}
brandName="Glow Haven"
className="py-4 lg:py-6"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<div id="product-detail-card" data-section="product-detail-card">
<ProductDetailCard
layout="page"
name={product.name}
price={product.price}
salePrice={meta.salePrice}
rating={product.rating || 0}
description={product.description}
images={images}
variants={variants.length > 0 ? variants : undefined}
quantity={quantityVariant}
ribbon={meta.ribbon}
inventoryStatus={meta.inventoryStatus}
inventoryQuantity={meta.inventoryQuantity}
sku={meta.sku}
buttons={[
{ text: "Add To Cart", onClick: handleAddToCart },
{ text: "Buy Now", onClick: handleBuyNow },
]}
/>
</div>
<div id="product-cart" data-section="product-cart">
<ProductCart
isOpen={cartOpen}
onClose={() => setCartOpen(false)}
items={cartItems}
onQuantityChange={updateQuantity}
onRemove={removeItem}
total={`$${cartTotal}`}
buttons={[
{
text: isCheckoutLoading ? "Processing..." : "Check Out", onClick: handleCheckout,
},
]}
/>
</div>
<div id="footer" data-section="footer">
<FooterBaseCard
logoText="Glow Haven"
columns={[
{
title: "Shop", items: [
{ label: "Serums", href: "/products#serums" },
{ label: "Moisturizers", href: "/products#moisturizers" },
{ label: "Cleansers", href: "/products#cleansers" },
],
},
{
title: "Company", items: [
{ label: "About Us", href: "/about" },
{ label: "Our Philosophy", href: "/philosophy" },
{ label: "Contact", href: "/contact" },
],
},
{
title: "Support", items: [
{ label: "FAQ", href: "/faq" },
{ label: "Shipping", href: "/shipping" },
{ label: "Returns", href: "/returns" },
],
},
]}
copyrightText="© 2024 Glow Haven. All rights reserved."
className="py-12 lg:py-16"
/>
</div>
</ThemeProvider>
);
}

View File

@@ -1,6 +1,5 @@
"use client";
import ReactLenis from "lenis/react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
@@ -56,49 +55,47 @@ export default function ShopPage() {
secondaryButtonStyle="solid"
headingFontWeight="extrabold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarStyleCentered
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
brandName="Glow Haven"
className="py-4 lg:py-6"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
<p className="text-foreground">Loading products...</p>
</main>
<div id="footer" data-section="footer">
<FooterBaseCard
logoText="Glow Haven"
columns={[
{
title: "Shop", items: [
{ label: "Serums", href: "/products#serums" },
{ label: "Moisturizers", href: "/products#moisturizers" },
{ label: "Cleansers", href: "/products#cleansers" },
],
},
{
title: "Company", items: [
{ label: "About Us", href: "/about" },
{ label: "Our Philosophy", href: "/philosophy" },
{ label: "Contact", href: "/contact" },
],
},
{
title: "Support", items: [
{ label: "FAQ", href: "/faq" },
{ label: "Shipping", href: "/shipping" },
{ label: "Returns", href: "/returns" },
],
},
]}
copyrightText="© 2024 Glow Haven. All rights reserved."
className="py-12 lg:py-16"
/>
</div>
</ReactLenis>
<div id="nav" data-section="nav">
<NavbarStyleCentered
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }, { name: "Blog", id: "/blog" }]}
brandName="Glow Haven"
className="py-4 lg:py-6"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
<p className="text-foreground">Loading products...</p>
</main>
<div id="footer" data-section="footer">
<FooterBaseCard
logoText="Glow Haven"
columns={[
{
title: "Shop", items: [
{ label: "Serums", href: "/products#serums" },
{ label: "Moisturizers", href: "/products#moisturizers" },
{ label: "Cleansers", href: "/products#cleansers" },
],
},
{
title: "Company", items: [
{ label: "About Us", href: "/about" },
{ label: "Our Philosophy", href: "/philosophy" },
{ label: "Contact", href: "/contact" },
],
},
{
title: "Support", items: [
{ label: "FAQ", href: "/faq" },
{ label: "Shipping", href: "/shipping" },
{ label: "Returns", href: "/returns" },
],
},
]}
copyrightText="© 2024 Glow Haven. All rights reserved."
className="py-12 lg:py-16"
/>
</div>
</ThemeProvider>
);
}
@@ -116,72 +113,70 @@ export default function ShopPage() {
secondaryButtonStyle="solid"
headingFontWeight="extrabold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarStyleCentered
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
brandName="Glow Haven"
className="py-4 lg:py-6"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<div id="product-catalog" data-section="product-catalog">
<ProductCatalog
layout="page"
products={products}
searchValue={search}
onSearchChange={setSearch}
searchPlaceholder="Search products..."
filters={filters}
emptyMessage="No products found"
/>
</div>
<div id="product-cart" data-section="product-cart">
<ProductCart
isOpen={cartOpen}
onClose={() => setCartOpen(false)}
items={cartItems}
onQuantityChange={updateQuantity}
onRemove={removeItem}
total={`$${cartTotal}`}
buttons={[
{
text: isCheckoutLoading ? "Processing..." : "Check Out", onClick: handleCheckout,
},
]}
/>
</div>
<div id="footer" data-section="footer">
<FooterBaseCard
logoText="Glow Haven"
columns={[
{
title: "Shop", items: [
{ label: "Serums", href: "/products#serums" },
{ label: "Moisturizers", href: "/products#moisturizers" },
{ label: "Cleansers", href: "/products#cleansers" },
],
},
{
title: "Company", items: [
{ label: "About Us", href: "/about" },
{ label: "Our Philosophy", href: "/philosophy" },
{ label: "Contact", href: "/contact" },
],
},
{
title: "Support", items: [
{ label: "FAQ", href: "/faq" },
{ label: "Shipping", href: "/shipping" },
{ label: "Returns", href: "/returns" },
],
},
]}
copyrightText="© 2024 Glow Haven. All rights reserved."
className="py-12 lg:py-16"
/>
</div>
</ReactLenis>
<div id="nav" data-section="nav">
<NavbarStyleCentered
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }, { name: "Blog", id: "/blog" }]}
brandName="Glow Haven"
className="py-4 lg:py-6"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<div id="product-catalog" data-section="product-catalog">
<ProductCatalog
layout="page"
products={products}
searchValue={search}
onSearchChange={setSearch}
searchPlaceholder="Search products..."
filters={filters}
emptyMessage="No products found"
/>
</div>
<div id="product-cart" data-section="product-cart">
<ProductCart
isOpen={cartOpen}
onClose={() => setCartOpen(false)}
items={cartItems}
onQuantityChange={updateQuantity}
onRemove={removeItem}
total={`$${cartTotal}`}
buttons={[
{
text: isCheckoutLoading ? "Processing..." : "Check Out", onClick: handleCheckout,
},
]}
/>
</div>
<div id="footer" data-section="footer">
<FooterBaseCard
logoText="Glow Haven"
columns={[
{
title: "Shop", items: [
{ label: "Serums", href: "/products#serums" },
{ label: "Moisturizers", href: "/products#moisturizers" },
{ label: "Cleansers", href: "/products#cleansers" },
],
},
{
title: "Company", items: [
{ label: "About Us", href: "/about" },
{ label: "Our Philosophy", href: "/philosophy" },
{ label: "Contact", href: "/contact" },
],
},
{
title: "Support", items: [
{ label: "FAQ", href: "/faq" },
{ label: "Shipping", href: "/shipping" },
{ label: "Returns", href: "/returns" },
],
},
]}
copyrightText="© 2024 Glow Haven. All rights reserved."
className="py-12 lg:py-16"
/>
</div>
</ThemeProvider>
);
}