Merge version_1 into main

Merge version_1 into main
This commit was merged in pull request #3.
This commit is contained in:
2026-02-23 01:11:17 +00:00
4 changed files with 230 additions and 233 deletions

View File

@@ -1,11 +1,9 @@
"use client";
import ReactLenis from "lenis/react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import { useBlogPosts } from "@/hooks/useBlogPosts";
import { useBlogPosts, BlogPost } from "@/hooks/useBlogPosts";
import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
import BlogCardOne from '@/components/sections/blog/BlogCardOne';
import FooterMedia from '@/components/sections/footer/FooterMedia';
export default function BlogPage() {
@@ -24,72 +22,77 @@ export default function BlogPage() {
secondaryButtonStyle="layered"
headingFontWeight="extrabold"
>
<ReactLenis root>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
{ name: "Menu", id: "/#featured-dishes" },
{ name: "About Us", id: "/#about" },
{ name: "Reviews", id: "/#reviews" },
]}
brandName="2 Dogs Pub"
button={{ text: "Visit Us", href: "/#footer" }}
className="py-4 md:py-6"
navItemClassName="text-lg font-semibold"
buttonClassName="px-6 py-3 text-lg font-bold"
buttonTextClassName="tracking-wide"
/>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
{ name: "Menu", id: "/#featured-dishes" },
{ name: "About Us", id: "/#about" },
{ name: "Reviews", id: "/#reviews" },
]}
brandName="2 Dogs Pub"
button={{ text: "Visit Us", href: "/#footer" }}
className="py-4 md:py-6"
navItemClassName="text-lg font-semibold"
buttonClassName="px-6 py-3 text-lg font-bold"
buttonTextClassName="tracking-wide"
/>
</div>
{isLoading ? (
<div className="w-full mx-auto py-20 text-center min-h-screen flex items-center justify-center">
<p className="text-foreground">Loading posts...</p>
</div>
{isLoading ? (
<div className="w-content-width mx-auto py-20 text-center">
<p className="text-foreground">Loading posts...</p>
) : (
<div id="blog" data-section="blog" className="py-16 md:py-24 bg-background text-foreground">
<div className="max-w-screen-xl mx-auto px-4 md:px-8">
<h2 className="text-4xl md:text-6xl font-extrabold text-center text-foreground">Latest Articles</h2>
<p className="text-xl md:text-2xl mt-4 text-center max-w-2xl mx-auto text-foreground opacity-80">Insights and updates from our team</p>
<div className="mt-12 grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8">
{posts.map((post: BlogPost) => (
<a key={post.slug} href={`/blog/${post.slug}`} className="block rounded-lg shadow-xl overflow-hidden bg-card hover:scale-[1.02] transition-transform duration-300 ease-out">
{post.coverImage && <img src={post.coverImage} alt={post.title} className="w-full h-48 object-cover" />}
<div className="p-6">
<h3 className="text-2xl font-semibold text-foreground">{post.title}</h3>
{post.excerpt && <p className="mt-2 text-foreground opacity-80">{post.excerpt}</p>}
{post.date && <p className="mt-4 text-sm text-foreground opacity-60">{new Date(post.date).toLocaleDateString()}</p>}
</div>
</a>
))}
</div>
) : (
<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>
)}
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="https://img.b2bpic.net/free-photo/stone-walled-restaurant-top-lighting_140725-9731.jpg"
imageAlt="Trendy downtown gastropub interior"
columns={[
{ title: "Location", items: [{ label: "123 Pub Street", href: "#" }] },
{
title: "Hours", items: [
{ label: "Mon-Thu: 4 PM - 10 PM", href: "#" },
{ label: "Fri-Sat: 12 PM - 12 AM", href: "#" },
{ label: "Sun: 12 PM - 9 PM", href: "#" },
],
},
{
title: "Social", items: [
{ label: "Instagram", href: "#" },
{ label: "Facebook", href: "#" },
],
},
]}
logoText="2 Dogs Pub"
copyrightText="© 2024 2 Dogs Pub. All rights reserved."
className="bg-background-accent text-foreground pt-16 md:pt-24"
mediaWrapperClassName="h-64 md:h-96 w-full"
logoTextClassName="text-4xl font-extrabold"
columnTitleClassName="text-xl font-bold mb-4 text-primary-cta"
columnItemClassName="text-lg mb-2"
/>
</div>
</ReactLenis>
</div>
)}
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="https://img.b2bpic.net/free-photo/stone-walled-restaurant-top-lighting_140725-9731.jpg"
imageAlt="Trendy downtown gastropub interior"
columns={[
{ title: "Location", items: [{ label: "123 Pub Street", href: "#" }] },
{
title: "Hours", items: [
{ label: "Mon-Thu: 4 PM - 10 PM", href: "#" },
{ label: "Fri-Sat: 12 PM - 12 AM", href: "#" },
{ label: "Sun: 12 PM - 9 PM", href: "#" },
],
},
{
title: "Social", items: [
{ label: "Instagram", href: "#" },
{ label: "Facebook", href: "#" },
],
},
]}
logoText="2 Dogs Pub"
copyrightText="© 2024 2 Dogs Pub. All rights reserved."
className="bg-background-accent text-foreground pt-16 md:pt-24"
mediaWrapperClassName="h-64 md:h-96 w-full"
logoTextClassName="text-4xl font-extrabold"
columnTitleClassName="text-xl font-bold mb-4 text-primary-cta"
columnItemClassName="text-lg mb-2"
/>
</div>
</ThemeProvider>
);
}

View File

@@ -45,8 +45,8 @@ export default function LandingPage() {
description="Classic pub food done right. Where every dish is a statement and every drink hits the spot."
background={{ variant: "radial-gradient" }}
buttons={[
{ text: "View Menu", href: "featured-dishes" },
{ text: "Visit Us", href: "footer" },
{ text: "View Menu", href: "#featured-dishes" },
{ text: "Visit Us", href: "#footer" },
]}
mediaItems={[
{
@@ -77,7 +77,7 @@ export default function LandingPage() {
className="py-16 md:py-24 bg-card text-foreground"
titleClassName="text-4xl md:text-6xl font-extrabold text-center max-w-4xl mx-auto"
metricsContainerClassName="mt-12 grid grid-cols-1 md:grid-cols-3 gap-8"
metricCardClassName="p-6 md:p-8 rounded-lg shadow-lg flex flex-col items-center justify-center text-center bg-background"
metricCardClassName="p-6 md:p-8 rounded-lg shadow-lg flex flex-col items-center justify-center text-center bg-card-inverted"
metricIconClassName="mb-4 text-primary-cta text-5xl"
metricLabelClassName="text-lg font-semibold text-foreground opacity-80"
metricValueClassName="text-6xl font-extrabold text-primary-cta"

View File

@@ -2,7 +2,6 @@
import { Suspense, 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";
@@ -87,104 +86,102 @@ function ProductPageContent({ params }: ProductPageProps) {
secondaryButtonStyle="layered"
headingFontWeight="extrabold"
>
<ReactLenis root>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" }
]}
brandName="2 Dogs Pub"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
className="py-4 md:py-6"
navItemClassName="text-lg font-semibold"
buttonClassName="px-6 py-3 text-lg font-bold"
buttonTextClassName="tracking-wide"
/>
</div>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" }
]}
brandName="2 Dogs Pub"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
className="py-4 md:py-6"
navItemClassName="text-lg font-semibold"
buttonClassName="px-6 py-3 text-lg font-bold"
buttonTextClassName="tracking-wide"
/>
</div>
{isLoading ? (
<main className="min-h-screen flex items-center justify-center pt-20">
<p className="text-foreground">Loading product...</p>
</main>
) : !product ? (
<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>
</main>
) : (
<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 },
]}
/>
{isLoading ? (
<main className="min-h-screen flex items-center justify-center pt-20">
<p className="text-foreground">Loading product...</p>
</main>
) : !product ? (
<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 id="product-cart" data-section="product-cart">
<ProductCart
isOpen={cartOpen}
onClose={() => setCartOpen(false)}
items={cartItems}
onQuantityChange={updateQuantity}
onRemove={removeItem}
total={`$${cartTotal}`}
</main>
) : (
<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: isCheckoutLoading ? "Processing..." : "Check Out", onClick: handleCheckout,
},
{ 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">
<FooterMedia
imageSrc="https://img.b2bpic.net/free-photo/stone-walled-restaurant-top-lighting_140725-9731.jpg"
imageAlt="Trendy downtown gastropub interior"
columns={[
{ title: "Location", items: [{ label: "123 Pub Street", href: "#" }] },
{ title: "Hours", items: [
{ label: "Mon-Thu: 4 PM - 10 PM", href: "#" },
{ label: "Fri-Sat: 12 PM - 12 AM", href: "#" },
{ label: "Sun: 12 PM - 9 PM", href: "#" }
]},
{ title: "Social", items: [
{ label: "Instagram", href: "#" },
{ label: "Facebook", href: "#" }
]}
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="https://img.b2bpic.net/free-photo/stone-walled-restaurant-top-lighting_140725-9731.jpg"
imageAlt="Trendy downtown gastropub interior"
columns={[
{ title: "Location", items: [{ label: "123 Pub Street", href: "#" }] },
{ title: "Hours", items: [
{ label: "Mon-Thu: 4 PM - 10 PM", href: "#" },
{ label: "Fri-Sat: 12 PM - 12 AM", href: "#" },
{ label: "Sun: 12 PM - 9 PM", href: "#" }
]},
{ title: "Social", items: [
{ label: "Instagram", href: "#" },
{ label: "Facebook", href: "#" }
]}
logoText="2 Dogs Pub"
copyrightText="© 2024 2 Dogs Pub. All rights reserved."
className="bg-background-accent text-foreground pt-16 md:pt-24"
mediaWrapperClassName="h-64 md:h-96 w-full"
logoTextClassName="text-4xl font-extrabold"
columnTitleClassName="text-xl font-bold mb-4 text-primary-cta"
columnItemClassName="text-lg mb-2"
/>
</div>
</ReactLenis>
]}
logoText="2 Dogs Pub"
copyrightText="© 2024 2 Dogs Pub. All rights reserved."
className="bg-background-accent text-foreground pt-16 md:pt-24"
mediaWrapperClassName="h-64 md:h-96 w-full"
logoTextClassName="text-4xl font-extrabold"
columnTitleClassName="text-xl font-bold mb-4 text-primary-cta"
columnItemClassName="text-lg mb-2"
/>
</div>
</ThemeProvider>
);
}

View File

@@ -1,7 +1,6 @@
"use client";
import { Suspense, useCallback } from "react";
import ReactLenis from "lenis/react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
import ProductCatalog from "@/components/ecommerce/productCatalog/ProductCatalog";
@@ -54,82 +53,80 @@ function ShopPageContent() {
secondaryButtonStyle="layered"
headingFontWeight="extrabold"
>
<ReactLenis root>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" }
]}
brandName="2 Dogs Pub"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
className="py-4 md:py-6"
navItemClassName="text-lg font-semibold"
buttonClassName="px-6 py-3 text-lg font-bold"
buttonTextClassName="tracking-wide"
/>
</div>
{isLoading ? (
<main className="min-h-screen flex items-center justify-center pt-20">
<p className="text-foreground">Loading products...</p>
</main>
) : (
<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 id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" }
]}
brandName="2 Dogs Pub"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
className="py-4 md:py-6"
navItemClassName="text-lg font-semibold"
buttonClassName="px-6 py-3 text-lg font-bold"
buttonTextClassName="tracking-wide"
/>
</div>
{isLoading ? (
<main className="min-h-screen flex items-center justify-center pt-20">
<p className="text-foreground">Loading products...</p>
</main>
) : (
<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">
<FooterMedia
imageSrc="https://img.b2bpic.net/free-photo/stone-walled-restaurant-top-lighting_140725-9731.jpg"
imageAlt="Trendy downtown gastropub interior"
columns={[
{ title: "Location", items: [{ label: "123 Pub Street", href: "#" }] },
{ title: "Hours", items: [
{ label: "Mon-Thu: 4 PM - 10 PM", href: "#" },
{ label: "Fri-Sat: 12 PM - 12 AM", href: "#" },
{ label: "Sun: 12 PM - 9 PM", href: "#" }
]},
{ title: "Social", items: [
{ label: "Instagram", href: "#" },
{ label: "Facebook", href: "#" }
]}
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="https://img.b2bpic.net/free-photo/stone-walled-restaurant-top-lighting_140725-9731.jpg"
imageAlt="Trendy downtown gastropub interior"
columns={[
{ title: "Location", items: [{ label: "123 Pub Street", href: "#" }] },
{ title: "Hours", items: [
{ label: "Mon-Thu: 4 PM - 10 PM", href: "#" },
{ label: "Fri-Sat: 12 PM - 12 AM", href: "#" },
{ label: "Sun: 12 PM - 9 PM", href: "#" }
]},
{ title: "Social", items: [
{ label: "Instagram", href: "#" },
{ label: "Facebook", href: "#" }
]}
logoText="2 Dogs Pub"
copyrightText="© 2024 2 Dogs Pub. All rights reserved."
className="bg-background-accent text-foreground pt-16 md:pt-24"
mediaWrapperClassName="h-64 md:h-96 w-full"
logoTextClassName="text-4xl font-extrabold"
columnTitleClassName="text-xl font-bold mb-4 text-primary-cta"
columnItemClassName="text-lg mb-2"
/>
</div>
</ReactLenis>
]}
logoText="2 Dogs Pub"
copyrightText="© 2024 2 Dogs Pub. All rights reserved."
className="bg-background-accent text-foreground pt-16 md:pt-24"
mediaWrapperClassName="h-64 md:h-96 w-full"
logoTextClassName="text-4xl font-extrabold"
columnTitleClassName="text-xl font-bold mb-4 text-primary-cta"
columnItemClassName="text-lg mb-2"
/>
</div>
</ThemeProvider>
);
}