Merge version_1 into main #2

Merged
bender merged 4 commits from version_1 into main 2026-02-19 13:46:25 +00:00
4 changed files with 205 additions and 226 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";
import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
@@ -23,69 +22,49 @@ export default function BlogPage() {
secondaryButtonStyle="layered"
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "about" },
{ name: "Fragrances", id: "fragrances" },
{ name: "Testimonials", id: "testimonials" },
{ name: "FAQ", id: "faq" },
]}
navItems={[{ name: "Home", id: "/" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }]}
brandName="Zapah"
button={{ text: "Shop Now", href: "#fragrances" }}
button={{ text: "Shop Now", href: "/shop" }}
className="py-4 px-6 md:px-10 lg:px-14"
navItemClassName="text-lg font-medium"
buttonClassName="px-6 py-3 text-lg"
logoHref="#"
logoHref="/"
/>
</div>
<main>
{isLoading ? (
<div className="w-content-width mx-auto py-20 text-center">
<p className="text-foreground">Loading posts...</p>
</div>
) : (
<BlogCardOne
items={posts}
title="Latest Articles"
description="Insights and updates from our team"
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={false}
carouselMode="buttons"
/>
<div id="blog" data-section="blog">
<BlogCardOne
posts={posts}
title="Latest Articles"
description="Insights and updates from our team"
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={false}
carouselMode="buttons"
/>
</div>
)}
</main>
<div id="footer" data-section="footer">
<FooterBaseReveal
columns={[
{
title: "Shop", items: [
{ label: "All Fragrances", href: "#fragrances" },
{ label: "New Arrivals", href: "#products" },
{ label: "Best Sellers", href: "#products" },
],
},
{
title: "Company", items: [
{ label: "About Us", href: "#about" },
{ label: "Our Story", href: "#about" },
{ label: "Contact", href: "#contact" },
],
},
{
title: "Support", items: [
{ label: "FAQ", href: "#faq" },
{ label: "Shipping", href: "#" },
{ label: "Returns", href: "#" },
],
},
{ title: "Shop", items: [{ label: "All Fragrances", href: "/shop" }, { label: "New Arrivals", href: "/shop" }, { label: "Best Sellers", href: "/shop" }] },
{ title: "Company", items: [{ label: "About Us", href: "/#about" }, { label: "Our Story", href: "/#about" }, { label: "Contact", href: "/#contact" }] },
{ title: "Support", items: [{ label: "FAQ", href: "/#faq" }, { label: "Shipping", href: "#" }, { label: "Returns", href: "#" }] }
]}
copyrightText="© 2024 Zapah. All rights reserved."
ariaLabel="Footer Navigation"
wrapperClassName="mt-10 md:mt-16 lg:mt-24"
footerClassName="bg-background py-10"
/>
</ReactLenis>
</div>
</ThemeProvider>
);
}

View File

@@ -27,13 +27,13 @@ export default function SitePage() {
>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[{ name: "About", id: "about" }, { name: "Fragrances", id: "fragrances" }, { name: "Testimonials", id: "testimonials" }, { name: "FAQ", id: "faq" }]}
navItems={[{ name: "Home", id: "/" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }]}
brandName="Zapah"
button={{ text: "Shop Now", href: "#fragrances" }}
button={{ text: "Shop Now", href: "/shop" }}
className="py-4 px-6 md:px-10 lg:px-14"
navItemClassName="text-lg font-medium"
buttonClassName="px-6 py-3 text-lg"
logoHref="#"
logoHref="/"
/>
</div>
@@ -41,7 +41,7 @@ export default function SitePage() {
<HeroLogoBillboard
logoText="Zapah"
description="Discover the art of fragrance with Zapah, where every scent tells a unique story. Handcrafted perfumes designed to evoke emotion and elevate your presence."
buttons={[{ text: "Explore Collection", href: "#fragrances" }, { text: "Our Story", href: "#about" }]}
buttons={[{ text: "Explore Collection", href: "#products" }, { text: "Our Story", href: "#about" }]}
background={{ variant: 'sparkles-gradient' }}
imageSrc="https://img.b2bpic.net/free-photo/ecofriendly-beauty-product_23-2150669104.jpg"
imageAlt="Elegant perfume bottles in soft, golden light"
@@ -165,9 +165,9 @@ export default function SitePage() {
<div id="footer" data-section="footer">
<FooterBaseReveal
columns={[
{ title: "Shop", items: [{ label: "All Fragrances", href: "#fragrances" }, { label: "New Arrivals", href: "#products" }, { label: "Best Sellers", href: "#products" }] },
{ title: "Company", items: [{ label: "About Us", href: "#about" }, { label: "Our Story", href: "#about" }, { label: "Contact", href: "#contact" }] },
{ title: "Support", items: [{ label: "FAQ", href: "#faq" }, { label: "Shipping", href: "#" }, { label: "Returns", href: "#" }] }
{ title: "Shop", items: [{ label: "All Fragrances", href: "/shop" }, { label: "New Arrivals", href: "/shop" }, { label: "Best Sellers", href: "/shop" }] },
{ title: "Company", items: [{ label: "About Us", href: "/#about" }, { label: "Our Story", href: "/#about" }, { label: "Contact", href: "/#contact" }] },
{ title: "Support", items: [{ label: "FAQ", href: "/#faq" }, { label: "Shipping", href: "#" }, { label: "Returns", href: "#" }] }
]}
copyrightText="© 2024 Zapah. All rights reserved."
ariaLabel="Footer Navigation"

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 NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloatingInline";
import ProductDetailCard from "@/components/ecommerce/productDetail/ProductDetailCard";
@@ -66,6 +65,12 @@ export default function ProductPage({ params }: ProductPageProps) {
await checkout(getCheckoutItems(), { successUrl: currentUrl.toString() });
}, [cartItems, checkout, getCheckoutItems]);
const footerColumns = [
{ title: "Shop", items: [{ label: "All Fragrances", href: "/shop" }, { label: "New Arrivals", href: "/shop" }, { label: "Best Sellers", href: "/shop" }] },
{ title: "Company", items: [{ label: "About Us", href: "/#about" }, { label: "Our Story", href: "/#about" }, { label: "Contact", href: "/#contact" }] },
{ title: "Support", items: [{ label: "FAQ", href: "/#faq" }, { label: "Shipping", href: "#" }, { label: "Returns", href: "#" }] }
];
if (isLoading) {
return (
<ThemeProvider
@@ -80,31 +85,29 @@ export default function ProductPage({ params }: ProductPageProps) {
secondaryButtonStyle="layered"
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarLayoutFloatingInline
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
brandName="Zapah"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
className="py-4 px-6 md:px-10 lg:px-14"
navItemClassName="text-lg font-medium"
buttonClassName="px-6 py-3 text-lg"
logoHref="#"
/>
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
<p className="text-foreground">Loading product...</p>
</main>
<div id="footer" data-section="footer">
<FooterBaseReveal
columns={[{ "title": "Shop", "items": [{ "label": "All Fragrances", "href": "#fragrances" }, { "label": "New Arrivals", "href": "#products" }, { "label": "Best Sellers", "href": "#products" }] }, { "title": "Company", "items": [{ "label": "About Us", "href": "#about" }, { "label": "Our Story", "href": "#about" }, { "label": "Contact", "href": "#contact" }] }, { "title": "Support", "items": [{ "label": "FAQ", "href": "#faq" }, { "label": "Shipping", "href": "#" }, { "label": "Returns", "href": "#" }] }]}
copyrightText="© 2024 Zapah. All rights reserved."
ariaLabel="Footer Navigation"
wrapperClassName="mt-10 md:mt-16 lg:mt-24"
footerClassName="bg-background py-10"
/>
</div>
</ReactLenis>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[{ name: "Home", id: "/" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }]}
brandName="Zapah"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
className="py-4 px-6 md:px-10 lg:px-14"
navItemClassName="text-lg font-medium"
buttonClassName="px-6 py-3 text-lg"
logoHref="/"
/>
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
<p className="text-foreground">Loading product...</p>
</main>
<div id="footer" data-section="footer">
<FooterBaseReveal
columns={footerColumns}
copyrightText="© 2024 Zapah. All rights reserved."
ariaLabel="Footer Navigation"
wrapperClassName="mt-10 md:mt-16 lg:mt-24"
footerClassName="bg-background py-10"
/>
</div>
</ThemeProvider>
);
}
@@ -123,39 +126,37 @@ export default function ProductPage({ params }: ProductPageProps) {
secondaryButtonStyle="layered"
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarLayoutFloatingInline
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
brandName="Zapah"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
className="py-4 px-6 md:px-10 lg:px-14"
navItemClassName="text-lg font-medium"
buttonClassName="px-6 py-3 text-lg"
logoHref="#"
/>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[{ name: "Home", id: "/" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }]}
brandName="Zapah"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
className="py-4 px-6 md:px-10 lg:px-14"
navItemClassName="text-lg font-medium"
buttonClassName="px-6 py-3 text-lg"
logoHref="/"
/>
</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>
<div id="footer" data-section="footer">
<FooterBaseReveal
columns={[{ "title": "Shop", "items": [{ "label": "All Fragrances", "href": "#fragrances" }, { "label": "New Arrivals", "href": "#products" }, { "label": "Best Sellers", "href": "#products" }] }, { "title": "Company", "items": [{ "label": "About Us", "href": "#about" }, { "label": "Our Story", "href": "#about" }, { "label": "Contact", "href": "#contact" }] }, { "title": "Support", "items": [{ "label": "FAQ", "href": "#faq" }, { "label": "Shipping", "href": "#" }, { "label": "Returns", "href": "#" }] }]}
copyrightText="© 2024 Zapah. All rights reserved."
ariaLabel="Footer Navigation"
wrapperClassName="mt-10 md:mt-16 lg:mt-24"
footerClassName="bg-background py-10"
/>
</div>
</ReactLenis>
</main>
<div id="footer" data-section="footer">
<FooterBaseReveal
columns={footerColumns}
copyrightText="© 2024 Zapah. All rights reserved."
ariaLabel="Footer Navigation"
wrapperClassName="mt-10 md:mt-16 lg:mt-24"
footerClassName="bg-background py-10"
/>
</div>
</ThemeProvider>
);
}
@@ -173,64 +174,62 @@ export default function ProductPage({ params }: ProductPageProps) {
secondaryButtonStyle="layered"
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarLayoutFloatingInline
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
brandName="Zapah"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
className="py-4 px-6 md:px-10 lg:px-14"
navItemClassName="text-lg font-medium"
buttonClassName="px-6 py-3 text-lg"
logoHref="#"
/>
</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">
<FooterBaseReveal
columns={[{ "title": "Shop", "items": [{ "label": "All Fragrances", "href": "#fragrances" }, { "label": "New Arrivals", "href": "#products" }, { "label": "Best Sellers", "href": "#products" }] }, { "title": "Company", "items": [{ "label": "About Us", "href": "#about" }, { "label": "Our Story", "href": "#about" }, { "label": "Contact", "href": "#contact" }] }, { "title": "Support", "items": [{ "label": "FAQ", "href": "#faq" }, { "label": "Shipping", "href": "#" }, { "label": "Returns", "href": "#" }] }]}
copyrightText="© 2024 Zapah. All rights reserved."
ariaLabel="Footer Navigation"
wrapperClassName="mt-10 md:mt-16 lg:mt-24"
footerClassName="bg-background py-10"
/>
</div>
</ReactLenis>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[{ name: "Home", id: "/" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }]}
brandName="Zapah"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
className="py-4 px-6 md:px-10 lg:px-14"
navItemClassName="text-lg font-medium"
buttonClassName="px-6 py-3 text-lg"
logoHref="/"
/>
</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">
<FooterBaseReveal
columns={footerColumns}
copyrightText="© 2024 Zapah. All rights reserved."
ariaLabel="Footer Navigation"
wrapperClassName="mt-10 md:mt-16 lg:mt-24"
footerClassName="bg-background py-10"
/>
</div>
</ThemeProvider>
);
}

View File

@@ -1,6 +1,5 @@
"use client";
import ReactLenis from "lenis/react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloatingInline";
import ProductCatalog from "@/components/ecommerce/productCatalog/ProductCatalog";
@@ -15,6 +14,12 @@ export default function ShopPage() {
setSearch,
filters,
} = useProductCatalog({ basePath: "/shop" });
const footerColumns = [
{ title: "Shop", items: [{ label: "All Fragrances", href: "/shop" }, { label: "New Arrivals", href: "/shop" }, { label: "Best Sellers", href: "/shop" }] },
{ title: "Company", items: [{ label: "About Us", href: "/#about" }, { label: "Our Story", href: "/#about" }, { label: "Contact", href: "/#contact" }] },
{ title: "Support", items: [{ label: "FAQ", href: "/#faq" }, { label: "Shipping", href: "#" }, { label: "Returns", href: "#" }] }
];
if (isLoading) {
return (
@@ -30,31 +35,29 @@ export default function ShopPage() {
secondaryButtonStyle="layered"
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarLayoutFloatingInline
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
brandName="Zapah"
button={{ text: "Cart", onClick: () => {} }}
className="py-4 px-6 md:px-10 lg:px-14"
navItemClassName="text-lg font-medium"
buttonClassName="px-6 py-3 text-lg"
logoHref="#"
/>
</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">
<FooterBaseReveal
columns={[{ "title": "Shop", "items": [{ "label": "All Fragrances", "href": "#fragrances" }, { "label": "New Arrivals", "href": "#products" }, { "label": "Best Sellers", "href": "#products" }] }, { "title": "Company", "items": [{ "label": "About Us", "href": "#about" }, { "label": "Our Story", "href": "#about" }, { "label": "Contact", "href": "#contact" }] }, { "title": "Support", "items": [{ "label": "FAQ", "href": "#faq" }, { "label": "Shipping", "href": "#" }, { "label": "Returns", "href": "#" }] }]}
copyrightText="© 2024 Zapah. All rights reserved."
ariaLabel="Footer Navigation"
wrapperClassName="mt-10 md:mt-16 lg:mt-24"
footerClassName="bg-background py-10"
/>
</div>
</ReactLenis>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[{ name: "Home", id: "/" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }]}
brandName="Zapah"
button={{ text: "Cart", onClick: () => {} }}
className="py-4 px-6 md:px-10 lg:px-14"
navItemClassName="text-lg font-medium"
buttonClassName="px-6 py-3 text-lg"
logoHref="/"
/>
</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">
<FooterBaseReveal
columns={footerColumns}
copyrightText="© 2024 Zapah. All rights reserved."
ariaLabel="Footer Navigation"
wrapperClassName="mt-10 md:mt-16 lg:mt-24"
footerClassName="bg-background py-10"
/>
</div>
</ThemeProvider>
);
}
@@ -72,39 +75,37 @@ export default function ShopPage() {
secondaryButtonStyle="layered"
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarLayoutFloatingInline
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
brandName="Zapah"
button={{ text: "Cart", onClick: () => {} }}
className="py-4 px-6 md:px-10 lg:px-14"
navItemClassName="text-lg font-medium"
buttonClassName="px-6 py-3 text-lg"
logoHref="#"
/>
</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="footer" data-section="footer">
<FooterBaseReveal
columns={[{ "title": "Shop", "items": [{ "label": "All Fragrances", "href": "#fragrances" }, { "label": "New Arrivals", "href": "#products" }, { "label": "Best Sellers", "href": "#products" }] }, { "title": "Company", "items": [{ "label": "About Us", "href": "#about" }, { "label": "Our Story", "href": "#about" }, { "label": "Contact", "href": "#contact" }] }, { "title": "Support", "items": [{ "label": "FAQ", "href": "#faq" }, { "label": "Shipping", "href": "#" }, { "label": "Returns", "href": "#" }] }]}
copyrightText="© 2024 Zapah. All rights reserved."
ariaLabel="Footer Navigation"
wrapperClassName="mt-10 md:mt-16 lg:mt-24"
footerClassName="bg-background py-10"
/>
</div>
</ReactLenis>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[{ name: "Home", id: "/" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }]}
brandName="Zapah"
button={{ text: "Cart", onClick: () => {} }}
className="py-4 px-6 md:px-10 lg:px-14"
navItemClassName="text-lg font-medium"
buttonClassName="px-6 py-3 text-lg"
logoHref="/"
/>
</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="footer" data-section="footer">
<FooterBaseReveal
columns={footerColumns}
copyrightText="© 2024 Zapah. All rights reserved."
ariaLabel="Footer Navigation"
wrapperClassName="mt-10 md:mt-16 lg:mt-24"
footerClassName="bg-background py-10"
/>
</div>
</ThemeProvider>
);
}