bender/afbbf5fc-8056-42fc-a535-ddd29ffb435b
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main

Browse Source 
Merge version_1 into main
This commit was merged in pull request #5.
This commit is contained in:
bender
2026-02-25 11:41:48 +00:00
parent 009eafebd3 c64dd706b8
commit ed92b51381
4 changed files with 131 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,10 +1,9 @@
"use client"; "use client";
import ReactLenis from "lenis/react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider"; import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import { useBlogPosts } from "@/hooks/useBlogPosts"; import { useBlogPosts } from "@/hooks/useBlogPosts";
import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered'; import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
import BlogCardTwo from '@/components/sections/blog/BlogCardTwo'; import FeatureCardTwentyFour from '@/components/sections/feature/FeatureCardTwentyFour';
export default function BlogPage() { export default function BlogPage() {
const { posts, isLoading } = useBlogPosts(); const { posts, isLoading } = useBlogPosts();
@@ -22,38 +21,42 @@ export default function BlogPage() {
secondaryButtonStyle="layered" secondaryButtonStyle="layered"
headingFontWeight="light" headingFontWeight="light"
> >
<ReactLenis root> <div id="nav" data-section="nav">
<div id="nav" data-section="nav"> <NavbarStyleCentered
<NavbarStyleCentered navItems={[
navItems={[ { name: "Home", id: "/" },
{ name: "Home", id: "/" }, { name: "Blog", id: "/blog" },
{ name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" },
{ name: "Shop", id: "/shop" }, ]}
]} button={{ text: "Shop Now", href: "/shop" }}
button={{ text: "Shop Now", href: "/shop" }} brandName="Dring Together"
brandName="Dring Together" />
</div>
{isLoading ? (
<div className="w-content-width mx-auto py-20 text-center">
<p className="text-foreground">Loading posts...</p>
</div>
) : (
<div id="blog" data-section="blog">
<FeatureCardTwentyFour
features={posts.map(post => ({
id: post.id,
title: post.title,
author: post.author || 'Dring Together',
description: post.excerpt,
tags: post.tags || [],
imageSrc: post.image,
imageAlt: post.title,
}))}
title="Latest Articles"
description="Insights and updates from our team"
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={false}
/> />
</div> </div>
)}
{isLoading ? (
<div className="w-content-width mx-auto py-20 text-center">
<p className="text-foreground">Loading posts...</p>
</div>
) : (
<div id="blog" data-section="blog">
<BlogCardTwo
posts={posts}
title="Latest Articles"
description="Insights and updates from our team"
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={false}
carouselMode="buttons"
/>
</div>
)}
</ReactLenis>
</ThemeProvider> </ThemeProvider>
); );
} }

9
src/app/page.tsx
View File

@@ -68,9 +68,9 @@ export default function SitePage() {
buttonAnimation="slide-up" buttonAnimation="slide-up"
dashboard={{ dashboard={{
title: "Featured Collection", stats: [ title: "Featured Collection", stats: [
{ title: "Sustainable Materials", values: [95, 98, 100], valueSuffix: "%", description: "Sustainably sourced materials." }, { title: "Sustainable Materials", values: [100], valueSuffix: "%", description: "Sustainably sourced materials." },
{ title: "Customer Satisfaction", values: [94, 96, 98], valueSuffix: "%", description: "Based on 500+ reviews." }, { title: "Customer Satisfaction", values: [98], valueSuffix: "%", description: "Based on 500+ reviews." },
{ title: "Global Shipping", values: [180, 190, 200], valueSuffix: "+ Countries", description: "Available worldwide." }, { title: "Global Shipping", values: [200], valueSuffix: "+ Countries", description: "Available worldwide." },
], ],
logoIcon: Coffee, logoIcon: Coffee,
sidebarItems: [ sidebarItems: [
@@ -99,8 +99,6 @@ export default function SitePage() {
descriptionClassName="text-lg text-gray-600 max-w-2xl mb-8" descriptionClassName="text-lg text-gray-600 max-w-2xl mb-8"
tagClassName="inline-flex items-center px-3 py-1 rounded-full text-sm font-medium bg-purple-100 text-purple-800 mb-6" tagClassName="inline-flex items-center px-3 py-1 rounded-full text-sm font-medium bg-purple-100 text-purple-800 mb-6"
buttonContainerClassName="flex flex-col sm:flex-row gap-4" buttonContainerClassName="flex flex-col sm:flex-row gap-4"
buttonClassName="px-6 py-3 rounded-lg font-medium transition-all duration-300 hover:shadow-lg"
buttonTextClassName="flex items-center gap-2"
dashboardClassName="mt-12" dashboardClassName="mt-12"
/> />
</div> </div>
@@ -257,7 +255,6 @@ export default function SitePage() {
titleClassName="text-3xl font-bold text-gray-900 mb-4" titleClassName="text-3xl font-bold text-gray-900 mb-4"
descriptionClassName="text-lg text-gray-600 mb-8" descriptionClassName="text-lg text-gray-600 mb-8"
buttonClassName="bg-purple-600 hover:bg-purple-700 text-white font-semibold py-3 px-6 rounded-lg transition duration-300 ease-in-out transform hover:-translate-y-0.5" buttonClassName="bg-purple-600 hover:bg-purple-700 text-white font-semibold py-3 px-6 rounded-lg transition duration-300 ease-in-out transform hover:-translate-y-0.5"
buttonTextClassName="flex items-center justify-center"
mediaWrapperClassName="relative rounded-2xl overflow-hidden shadow-xl" mediaWrapperClassName="relative rounded-2xl overflow-hidden shadow-xl"
mediaClassName="w-full h-full object-cover" mediaClassName="w-full h-full object-cover"
/> />

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

@@ -2,7 +2,6 @@
import { Suspense, use, useCallback } from "react"; import { Suspense, use, useCallback } from "react";
import { useRouter } from "next/navigation"; import { useRouter } from "next/navigation";
import ReactLenis from "lenis/react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider"; import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered'; import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
import ProductDetailCard from "@/components/ecommerce/productDetail/ProductDetailCard"; import ProductDetailCard from "@/components/ecommerce/productDetail/ProductDetailCard";
@@ -101,14 +100,12 @@ function ProductPageContent({ params }: ProductPageProps) {
secondaryButtonStyle="layered" secondaryButtonStyle="layered"
headingFontWeight="light" headingFontWeight="light"
> >
<ReactLenis root> <div id="nav" data-section="nav">
<div id="navbar" data-section="navbar"> {navbar}
{navbar} </div>
</div> <main className="min-h-screen flex items-center justify-center pt-20">
<main className="min-h-screen flex items-center justify-center pt-20"> <p className="text-foreground">Loading product...</p>
<p className="text-foreground">Loading product...</p> </main>
</main>
</ReactLenis>
</ThemeProvider> </ThemeProvider>
); );
} }
@@ -127,22 +124,20 @@ function ProductPageContent({ params }: ProductPageProps) {
secondaryButtonStyle="layered" secondaryButtonStyle="layered"
headingFontWeight="light" headingFontWeight="light"
> >
<ReactLenis root> <div id="nav" data-section="nav">
<div id="navbar" data-section="navbar"> {navbar}
{navbar} </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 text-primary-cta-text"
>
Back to Shop
</button>
</div> </div>
<main className="min-h-screen flex items-center justify-center pt-20"> </main>
<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 text-primary-cta-text"
>
Back to Shop
</button>
</div>
</main>
</ReactLenis>
</ThemeProvider> </ThemeProvider>
); );
} }
@@ -160,47 +155,45 @@ function ProductPageContent({ params }: ProductPageProps) {
secondaryButtonStyle="layered" secondaryButtonStyle="layered"
headingFontWeight="light" headingFontWeight="light"
> >
<ReactLenis root> <div id="nav" data-section="nav">
<div id="navbar" data-section="navbar"> {navbar}
{navbar} </div>
</div> <div id="product-detail-card" data-section="product-detail-card">
<div id="product-detail-card" data-section="product-detail-card"> <ProductDetailCard
<ProductDetailCard layout="page"
layout="page" name={product.name}
name={product.name} price={product.price}
price={product.price} salePrice={meta.salePrice}
salePrice={meta.salePrice} rating={product.rating || 0}
rating={product.rating || 0} description={product.description}
description={product.description} images={images}
images={images} variants={variants.length > 0 ? variants : undefined}
variants={variants.length > 0 ? variants : undefined} quantity={quantityVariant}
quantity={quantityVariant} ribbon={meta.ribbon}
ribbon={meta.ribbon} inventoryStatus={meta.inventoryStatus}
inventoryStatus={meta.inventoryStatus} inventoryQuantity={meta.inventoryQuantity}
inventoryQuantity={meta.inventoryQuantity} sku={meta.sku}
sku={meta.sku} buttons={[
buttons={[ { text: "Add To Cart", onClick: handleAddToCart },
{ text: "Add To Cart", onClick: handleAddToCart }, { text: "Buy Now", onClick: handleBuyNow },
{ text: "Buy Now", onClick: handleBuyNow }, ]}
]} />
/> </div>
</div> <div id="product-cart" data-section="product-cart">
<div id="product-cart" data-section="product-cart"> <ProductCart
<ProductCart isOpen={cartOpen}
isOpen={cartOpen} onClose={() => setCartOpen(false)}
onClose={() => setCartOpen(false)} items={cartItems}
items={cartItems} onQuantityChange={updateQuantity}
onQuantityChange={updateQuantity} onRemove={removeItem}
onRemove={removeItem} total={`$${cartTotal}`}
total={`$${cartTotal}`} buttons={[
buttons={[ {
{ text: isCheckoutLoading ? "Processing..." : "Check Out", onClick: handleCheckout,
text: isCheckoutLoading ? "Processing..." : "Check Out", onClick: handleCheckout, },
}, ]}
]} />
/> </div>
</div>
</ReactLenis>
</ThemeProvider> </ThemeProvider>
); );
} }

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

@@ -1,7 +1,6 @@
"use client"; "use client";
import { Suspense, useCallback } from "react"; import { Suspense, useCallback } from "react";
import ReactLenis from "lenis/react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider"; import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered'; import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
import ProductCatalog from "@/components/ecommerce/productCatalog/ProductCatalog"; import ProductCatalog from "@/components/ecommerce/productCatalog/ProductCatalog";
@@ -68,14 +67,12 @@ function ShopPageContent() {
secondaryButtonStyle="layered" secondaryButtonStyle="layered"
headingFontWeight="light" headingFontWeight="light"
> >
<ReactLenis root> <div id="nav" data-section="nav">
<div id="navbar" data-section="navbar"> {navbar}
{navbar} </div>
</div> <main className="min-h-screen flex items-center justify-center pt-20">
<main className="min-h-screen flex items-center justify-center pt-20"> <p className="text-foreground">Loading products...</p>
<p className="text-foreground">Loading products...</p> </main>
</main>
</ReactLenis>
</ThemeProvider> </ThemeProvider>
); );
} }
@@ -93,37 +90,35 @@ function ShopPageContent() {
secondaryButtonStyle="layered" secondaryButtonStyle="layered"
headingFontWeight="light" headingFontWeight="light"
> >
<ReactLenis root> <div id="nav" data-section="nav">
<div id="navbar" data-section="navbar"> {navbar}
{navbar} </div>
</div> <div id="product-catalog" data-section="product-catalog">
<div id="product-catalog" data-section="product-catalog"> <ProductCatalog
<ProductCatalog layout="page"
layout="page" products={products}
products={products} searchValue={search}
searchValue={search} onSearchChange={setSearch}
onSearchChange={setSearch} searchPlaceholder="Search products..."
searchPlaceholder="Search products..." filters={filters}
filters={filters} emptyMessage="No products found"
emptyMessage="No products found" />
/> </div>
</div> <div id="product-cart" data-section="product-cart">
<div id="product-cart" data-section="product-cart"> <ProductCart
<ProductCart isOpen={cartOpen}
isOpen={cartOpen} onClose={() => setCartOpen(false)}
onClose={() => setCartOpen(false)} items={cartItems}
items={cartItems} onQuantityChange={updateQuantity}
onQuantityChange={updateQuantity} onRemove={removeItem}
onRemove={removeItem} total={`$${cartTotal}`}
total={`$${cartTotal}`} buttons={[
buttons={[ {
{ text: isCheckoutLoading ? "Processing..." : "Check Out", onClick: handleCheckout,
text: isCheckoutLoading ? "Processing..." : "Check Out", onClick: handleCheckout, },
}, ]}
]} />
/> </div>
</div>
</ReactLenis>
</ThemeProvider> </ThemeProvider>
); );
} }