bender/66157114-68b3-456d-9ca0-dddf2725ffa2
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 #1.
This commit is contained in:
bender
2026-02-13 13:33:17 +00:00
parent 1cf3190ac1 1cd7b86621
commit 1c5b682297
8 changed files with 228 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/about/page.tsx
View File

@@ -65,6 +65,7 @@ export default function AboutPage() {
imagePosition="right"
textboxLayout="default"
useInvertedBackground={true}
mediaAnimation="slide-up"
className="py-16 md:py-24 lg:py-32"
/>
</div>

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

@@ -1,11 +1,33 @@
"use client";
import ReactLenis from "lenis/react";
import Link from "next/link";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
import BlogCardThree from '@/components/sections/blog/BlogCardThree';
import { useBlogPosts } from "@/hooks/useBlogPosts";
const navItems = [
{ name: "Home", id: "/" },
{ name: "About", id: "/about" },
{ name: "Menu", id: "/menu" },
{ name: "Contact", id: "/contact" },
];
const Footer = () => (
<footer className="py-8 bg-card border-t">
<div className="container mx-auto px-4 md:px-6 flex flex-col md:flex-row justify-between items-center">
<p className="text-foreground/80 text-sm mb-4 md:mb-0">{`© ${new Date().getFullYear()} Brew Haven. All rights reserved.`}</p>
<nav className="flex gap-4">
{navItems.map((item) => (
<Link key={item.name} href={item.id} className="text-sm text-foreground hover:text-[var(--primary-cta)] transition-colors">
{item.name}
</Link>
))}
</nav>
</div>
</footer>
);
export default function BlogPage() {
const { posts, isLoading } = useBlogPosts();
@@ -22,21 +44,13 @@ export default function BlogPage() {
secondaryButtonStyle="solid"
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
brandName="Brew Haven"
navItems={[
{ name: "Home", id: "/" },
{ name: "Menu", id: "menu" },
{ name: "About", id: "about" },
{ name: "Testimonials", id: "testimonials" },
{ name: "FAQ", id: "faq" },
{ name: "Contact", id: "contact" },
]}
button={{ text: "Order Now", href: "#menu" }}
navItems={navItems}
button={{ text: "Order Now", href: "/menu" }}
buttonClassName="shadow-md"
logoHref="#"
logoHref="/"
/>
</div>
@@ -57,8 +71,7 @@ export default function BlogPage() {
carouselMode="buttons"
/>
</div>
)}
</ReactLenis>
)}\n <Footer />
</ThemeProvider>
);
}

3
src/app/contact/page.tsx
View File

@@ -64,6 +64,7 @@ export default function ContactPage() {
imageAlt="A modern, inviting coffee shop interior"
mediaPosition="right"
useInvertedBackground={false}
mediaAnimation="slide-up"
className="py-16 md:py-24 lg:py-32"
formCardClassName="p-6 md:p-8 rounded-lg shadow-lg"
titleClassName="text-3xl font-semibold"
@@ -85,6 +86,7 @@ export default function ContactPage() {
textboxLayout="default"
useInvertedBackground={true}
faqsAnimation="slide-up"
mediaAnimation="slide-up"
className="py-16 md:py-24 lg:py-32"
containerClassName="max-w-7xl mx-auto"
/>
@@ -101,6 +103,7 @@ export default function ContactPage() {
imagePosition="right"
textboxLayout="default"
useInvertedBackground={false}
mediaAnimation="slide-up"
className="py-16 md:py-24 lg:py-32"
/>
</div>

25
src/app/layout.tsx
View File

@@ -3,36 +3,23 @@ import { Barlow } from "next/font/google";
import "./globals.css";
const barlow = Barlow({
variable: "--font-barlow",
subsets: ["latin"],
variable: "--font-barlow", subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
});
export const metadata: Metadata = {
title: "Brew Haven - Your Daily Coffee Escape",
description: "Experience the finest coffee, expertly crafted in a cozy and welcoming atmosphere. Brew Haven is your perfect spot for quality brews and relaxation.",
robots: {
title: "Brew Haven - Your Daily Coffee Escape", description: "Experience the finest coffee, expertly crafted in a cozy and welcoming atmosphere. Brew Haven is your perfect spot for quality brews and relaxation.", robots: {
index: true,
follow: true,
},
openGraph: {
title: "Brew Haven - Premium Coffee Shop",
description: "Indulge in the best coffee experience at Brew Haven. Freshly brewed, ethically sourced, and passionately served.",
url: "https://www.brewhaven.com",
siteName: "Brew Haven",
images: [
title: "Brew Haven - Premium Coffee Shop", description: "Indulge in the best coffee experience at Brew Haven. Freshly brewed, ethically sourced, and passionately served.", url: "https://www.brewhaven.com", siteName: "Brew Haven", images: [
{
url: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=9h4xtn",
alt: "Freshly roasted coffee beans and a steaming cup of coffee",
},
url: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=9h4xtn", alt: "Freshly roasted coffee beans and a steaming cup of coffee"},
],
type: "website",
},
type: "website"},
twitter: {
card: "summary_large_image",
title: "Brew Haven - Your Daily Coffee Escape",
description: "Experience the finest coffee, expertly crafted in a cozy and welcoming atmosphere.",
images: ["https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=9h4xtn"],
card: "summary_large_image", title: "Brew Haven - Your Daily Coffee Escape", description: "Experience the finest coffee, expertly crafted in a cozy and welcoming atmosphere.", images: ["https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=9h4xtn"],
},
};

1
src/app/menu/page.tsx
View File

@@ -104,6 +104,7 @@ export default function MenuPage() {
textboxLayout="default"
useInvertedBackground={false}
faqsAnimation="slide-up"
mediaAnimation="slide-up"
className="py-16 md:py-24 lg:py-32"
containerClassName="max-w-7xl mx-auto"
/>

2
src/app/page.tsx
View File

@@ -83,6 +83,7 @@ export default function HomePage() {
imagePosition="right"
textboxLayout="default"
useInvertedBackground={true}
mediaAnimation="slide-up"
className="py-16 md:py-24 lg:py-32"
/>
</div>
@@ -154,6 +155,7 @@ export default function HomePage() {
textboxLayout="default"
useInvertedBackground={true}
faqsAnimation="slide-up"
mediaAnimation="slide-up"
className="py-16 md:py-24 lg:py-32"
containerClassName="max-w-7xl mx-auto"
contentClassName="grid grid-cols-1 md:grid-cols-2 gap-8 md:gap-12"

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

@@ -2,7 +2,7 @@
import { use, useCallback } from "react";
import { useRouter } from "next/navigation";
import ReactLenis from "lenis/react";
import Link from "next/link";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
import ProductDetailCard from "@/components/ecommerce/productDetail/ProductDetailCard";
@@ -15,6 +15,28 @@ interface ProductPageProps {
params: Promise<{ id: string }>;
}
const navItems = [
{ name: "Home", id: "/" },
{ name: "About", id: "/about" },
{ name: "Menu", id: "/menu" },
{ name: "Contact", id: "/contact" },
];
const Footer = () => (
<footer className="py-8 bg-card border-t">
<div className="container mx-auto px-4 md:px-6 flex flex-col md:flex-row justify-between items-center">
<p className="text-foreground/80 text-sm mb-4 md:mb-0">{`© ${new Date().getFullYear()} Brew Haven. All rights reserved.`}</p>
<nav className="flex gap-4">
{navItems.map((item) => (
<Link key={item.name} href={item.id} className="text-sm text-foreground hover:text-[var(--primary-cta)] transition-colors">
{item.name}
</Link>
))}
</nav>
</div>
</footer>
);
export default function ProductPage({ params }: ProductPageProps) {
const { id } = use(params);
const router = useRouter();
@@ -79,14 +101,13 @@ export default function ProductPage({ params }: ProductPageProps) {
secondaryButtonStyle="solid"
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
brandName="Brew Haven"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
navItems={navItems}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
buttonClassName="shadow-md"
logoHref="#"
logoHref="/"
/>
</div>
<div id="loading-section" data-section="loading-section">
@@ -94,7 +115,7 @@ export default function ProductPage({ params }: ProductPageProps) {
<p className="text-foreground">Loading product...</p>
</main>
</div>
</ReactLenis>
<Footer />
</ThemeProvider>
);
}
@@ -113,14 +134,13 @@ export default function ProductPage({ params }: ProductPageProps) {
secondaryButtonStyle="solid"
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
brandName="Brew Haven"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
navItems={navItems}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
buttonClassName="shadow-md"
logoHref="#"
logoHref="/"
/>
</div>
<div id="not-found-section" data-section="not-found-section">
@@ -136,7 +156,7 @@ export default function ProductPage({ params }: ProductPageProps) {
</div>
</main>
</div>
</ReactLenis>
<Footer />
</ThemeProvider>
);
}
@@ -154,14 +174,13 @@ export default function ProductPage({ params }: ProductPageProps) {
secondaryButtonStyle="solid"
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
brandName="Brew Haven"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
navItems={navItems}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
buttonClassName="shadow-md"
logoHref="#"
logoHref="/"
/>
</div>
<div id="product-detail-card" data-section="product-detail-card">
@@ -200,7 +219,7 @@ export default function ProductPage({ params }: ProductPageProps) {
]}
/>
</div>
</ReactLenis>
<Footer />
</ThemeProvider>
);
}

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

@@ -1,11 +1,33 @@
"use client";
import ReactLenis from "lenis/react";
import Link from "next/link";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
import ProductCatalog from "@/components/ecommerce/productCatalog/ProductCatalog";
import { useProductCatalog } from "@/hooks/useProductCatalog";
const navItems = [
{ name: "Home", id: "/" },
{ name: "About", id: "/about" },
{ name: "Menu", id: "/menu" },
{ name: "Contact", id: "/contact" },
];
const Footer = () => (
<footer className="py-8 bg-card border-t">
<div className="container mx-auto px-4 md:px-6 flex flex-col md:flex-row justify-between items-center">
<p className="text-foreground/80 text-sm mb-4 md:mb-0">{`© ${new Date().getFullYear()} Brew Haven. All rights reserved.`}</p>
<nav className="flex gap-4">
{navItems.map((item) => (
<Link key={item.name} href={item.id} className="text-sm text-foreground hover:text-[var(--primary-cta)] transition-colors">
{item.name}
</Link>
))}
</nav>
</div>
</footer>
);
export default function ShopPage() {
const {
products,
@@ -29,14 +51,13 @@ export default function ShopPage() {
secondaryButtonStyle="solid"
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
brandName="Brew Haven"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
navItems={navItems}
button={{ text: "Cart", onClick: () => {} }}
buttonClassName="shadow-md"
logoHref="#"
logoHref="/"
/>
</div>
<div id="loading-section" data-section="loading-section">
@@ -44,7 +65,7 @@ export default function ShopPage() {
<p className="text-foreground">Loading products...</p>
</main>
</div>
</ReactLenis>
<Footer />
</ThemeProvider>
);
}
@@ -62,14 +83,13 @@ export default function ShopPage() {
secondaryButtonStyle="solid"
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
brandName="Brew Haven"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
navItems={navItems}
button={{ text: "Cart", onClick: () => {} }}
buttonClassName="shadow-md"
logoHref="#"
logoHref="/"
/>
</div>
<div id="product-catalog" data-section="product-catalog">
@@ -83,7 +103,7 @@ export default function ShopPage() {
emptyMessage="No products found"
/>
</div>
</ReactLenis>
<Footer />
</ThemeProvider>
);
}