bender/bee8badf-1fb3-4ed9-82e9-a2aabca03fd9
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-20 18:03:44 +00:00
parent bf0578f8f0 c7d6f7fa36
commit d82c4eb6d7
4 changed files with 98 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,12 @@ import { useBlogPosts } from "@/hooks/useBlogPosts";
export default function BlogPage() {
const { posts, isLoading } = useBlogPosts();
const navItems = [
{ name: "Home", id: "/" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" },
];
return (
<ThemeProvider
defaultButtonVariant="hover-bubble"
@@ -24,21 +30,16 @@ export default function BlogPage() {
headingFontWeight="extrabold"
>
<ReactLenis root>
<NavbarStyleCentered
brandName="Goldenberg's Deli"
navItems={[
{ name: "Home", id: "/" },
{ name: "Menu", id: "#menu" },
{ name: "About", id: "#about" },
{ name: "Testimonials", id: "#testimonials" },
{ name: "FAQs", id: "#faqs" },
{ name: "Contact", id: "#contact" },
]}
button={{ text: "Order Now", href: "#contact" }}
/>
<div id="nav" data-section="nav">
<NavbarStyleCentered
brandName="Goldenberg's Deli"
navItems={navItems}
button={{ text: "Order Now", href: "/#contact" }}
/>
</div>
{isLoading ? (
<div className="w-content-width mx-auto py-20 text-center">
<div className="w-content-width mx-auto py-20 text-center min-h-screen">
<p className="text-foreground">Loading posts...</p>
</div>
) : (
@@ -54,36 +55,36 @@ export default function BlogPage() {
/>
</div>
)}
<FooterBase
logoText="Goldenberg's Deli"
columns={[
{
title: "Menu", items: [
{ label: "Corned Beef", href: "#product" },
{ label: "Pastrami", href: "#product" },
{ label: "Soups", href: "#product" },
{ label: "Sandwiches", href: "#product" },
],
},
{
title: "About Us", items: [
{ label: "Our Story", href: "#about" },
{ label: "Reviews", href: "#testimonials" },
{ label: "FAQs", href: "#faqs" },
],
},
{
title: "Contact", items: [
{ label: "Location", href: "#contact" },
{ label: "Catering", href: "#contact" },
{ label: "Order Online", href: "#contact" },
],
},
]}
copyrightText="© 2024 Goldenberg's Deli. All rights reserved."
useInvertedBackground={false}
/>
<div id="footer" data-section="footer">
<FooterBase
logoText="Goldenberg's Deli"
columns={[
{
title: "Menu", items: [
{ label: "Corned Beef", href: "/#product" },
{ label: "Pastrami", href: "/#product" },
{ label: "Soups", href: "/#product" },
{ label: "Sandwiches", href: "/#product" },
],
},
{
title: "About Us", items: [
{ label: "Our Story", href: "/#about" },
{ label: "Reviews", href: "/#testimonial" },
{ label: "FAQs", href: "/#faq" },
],
},
{
title: "Contact", items: [
{ label: "Location", href: "/#contact" },
{ label: "Catering", href: "/#contact" },
{ label: "Order Online", href: "/#contact" },
],
},
]}
copyrightText="© 2024 Goldenberg's Deli. All rights reserved."
/>
</div>
</ReactLenis>
</ThemeProvider>
);

24
src/app/page.tsx
View File

@@ -31,13 +31,13 @@ export default function LandingPage() {
<NavbarStyleCentered
brandName="Goldenberg's Deli"
navItems={[
{name: "Menu", id: "#menu"},
{name: "Menu", id: "#product"},
{name: "About", id: "#about"},
{name: "Testimonials", id: "#testimonials"},
{name: "FAQs", id: "#faqs"},
{name: "Testimonials", id: "#testimonial"},
{name: "FAQs", id: "#faq"},
{name: "Contact", id: "#contact"}
]}
button={{text: "Order Now", href: "#contact"}}
button={{text: "Order Now", href: "/#contact"}}
/>
</div>
<div id="hero" data-section="hero">
@@ -52,7 +52,7 @@ export default function LandingPage() {
]}
rating={5}
ratingText="Loved by Generations of Customers"
buttons={[{ text: "View Our Menu", href: "#menu" }, { text: "Order Pickup", href: "#contact" }]}
buttons={[{ text: "View Our Menu", href: "#product" }, { text: "Order Pickup", href: "#contact" }]}
mediaAnimation="slide-up"
tagAnimation="reveal-blur"
buttonAnimation="reveal-blur"
@@ -114,8 +114,8 @@ export default function LandingPage() {
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={true}
titleClassName="text-foreground"
descriptionClassName="text-foreground"
textBoxTitleClassName="text-foreground"
textBoxDescriptionClassName="text-foreground"
/>
</div>
<div id="testimonial" data-section="testimonial">
@@ -130,8 +130,8 @@ export default function LandingPage() {
]}
textboxLayout="default"
useInvertedBackground={false}
titleClassName="text-foreground"
descriptionClassName="text-foreground"
textBoxTitleClassName="text-foreground"
textBoxDescriptionClassName="text-foreground"
testimonialTitleClassName="text-foreground"
quoteClassName="text-foreground"
nameClassName="text-foreground"
@@ -154,8 +154,8 @@ export default function LandingPage() {
textboxLayout="default"
useInvertedBackground={true}
animationType="smooth"
titleClassName="text-foreground"
descriptionClassName="text-foreground"
textBoxTitleClassName="text-foreground"
textBoxDescriptionClassName="text-foreground"
accordionTitleClassName="text-foreground"
accordionContentClassName="text-foreground"
/>
@@ -183,7 +183,7 @@ export default function LandingPage() {
logoText="Goldenberg's Deli"
columns={[
{ title: "Menu", items: [{ label: "Corned Beef", href: "#product" }, { label: "Pastrami", href: "#product" }, { label: "Soups", href: "#product" }, { label: "Sandwiches", href: "#product" }] },
{ title: "About Us", items: [{ label: "Our Story", href: "#about" }, { label: "Reviews", href: "#testimonials" }, { label: "FAQs", href: "#faqs" }] },
{ title: "About Us", items: [{ label: "Our Story", href: "#about" }, { label: "Reviews", href: "#testimonial" }, { label: "FAQs", href: "#faq" }] },
{ title: "Contact", items: [{ label: "Location", href: "#contact" }, { label: "Catering", href: "#contact" }, { label: "Order Online", href: "#contact" }] }
]}
copyrightText="© 2024 Goldenberg's Deli. All rights reserved."

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

@@ -1,4 +1,4 @@
use client";
"use client";
import { Suspense, use, useCallback } from "react";
import { useRouter } from "next/navigation";
@@ -74,6 +74,18 @@ function ProductPageContent({ params }: ProductPageProps) {
await checkout(getCheckoutItems(), { successUrl: currentUrl.toString() });
}, [cartItems, checkout, getCheckoutItems]);
const navItems = [
{ name: "Home", id: "/" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" },
];
const footerColumns = [
{ title: "Menu", items: [{ label: "Corned Beef", href: "/#product" }, { label: "Pastrami", href: "/#product" }, { label: "Soups", href: "/#product" }, { label: "Sandwiches", href: "/#product" }] },
{ title: "About Us", items: [{ label: "Our Story", href: "/#about" }, { label: "Reviews", href: "/#testimonial" }, { label: "FAQs", href: "/#faq" }] },
{ title: "Contact", items: [{ label: "Location", href: "/#contact" }, { label: "Catering", href: "/#contact" }, { label: "Order Online", href: "/#contact" }] }
];
if (isLoading) {
return (
<ThemeProvider
@@ -89,13 +101,10 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="extrabold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleCentered
brandName="Goldenberg's Deli"
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" }
]}
navItems={navItems}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
@@ -107,13 +116,8 @@ function ProductPageContent({ params }: ProductPageProps) {
<div id="footer" data-section="footer">
<FooterBase
logoText="Goldenberg's Deli"
columns={[
{ title: "Menu", items: [{ label: "Corned Beef", href: "#product" }, { label: "Pastrami", href: "#product" }, { label: "Soups", href: "#product" }, { label: "Sandwiches", href: "#product" }] },
{ title: "About Us", items: [{ label: "Our Story", href: "#about" }, { label: "Reviews", href: "#testimonials" }, { label: "FAQs", href: "#faqs" }] },
{ title: "Contact", items: [{ label: "Location", href: "#contact" }, { label: "Catering", href: "#contact" }, { label: "Order Online", href: "#contact" }] }
]}
columns={footerColumns}
copyrightText="© 2024 Goldenberg's Deli. All rights reserved."
useInvertedBackground={false}
/>
</div>
</ReactLenis>
@@ -136,13 +140,10 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="extrabold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleCentered
brandName="Goldenberg's Deli"
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" }
]}
navItems={navItems}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
@@ -162,13 +163,8 @@ function ProductPageContent({ params }: ProductPageProps) {
<div id="footer" data-section="footer">
<FooterBase
logoText="Goldenberg's Deli"
columns={[
{ title: "Menu", items: [{ label: "Corned Beef", href: "#product" }, { label: "Pastrami", href: "#product" }, { label: "Soups", href: "#product" }, { label: "Sandwiches", href: "#product" }] },
{ title: "About Us", items: [{ label: "Our Story", href: "#about" }, { label: "Reviews", href: "#testimonials" }, { label: "FAQs", href: "#faqs" }] },
{ title: "Contact", items: [{ label: "Location", href: "#contact" }, { label: "Catering", href: "#contact" }, { label: "Order Online", href: "#contact" }] }
]}
columns={footerColumns}
copyrightText="© 2024 Goldenberg's Deli. All rights reserved."
useInvertedBackground={false}
/>
</div>
</ReactLenis>
@@ -190,14 +186,11 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="extrabold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleCentered
brandName="Goldenberg's Deli"
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
navItems={navItems}
button={{ text: `Cart (${cartItems.length})`, onClick: () => setCartOpen(true) }}
/>
</div>
<div id="product-detail-card" data-section="product-detail-card">
@@ -239,13 +232,8 @@ function ProductPageContent({ params }: ProductPageProps) {
<div id="footer" data-section="footer">
<FooterBase
logoText="Goldenberg's Deli"
columns={[
{ title: "Menu", items: [{ label: "Corned Beef", href: "#product" }, { label: "Pastrami", href: "#product" }, { label: "Soups", href: "#product" }, { label: "Sandwiches", href: "#product" }] },
{ title: "About Us", items: [{ label: "Our Story", href: "#about" }, { label: "Reviews", href: "#testimonials" }, { label: "FAQs", href: "#faqs" }] },
{ title: "Contact", items: [{ label: "Location", href: "#contact" }, { label: "Catering", href: "#contact" }, { label: "Order Online", href: "#contact" }] }
]}
columns={footerColumns}
copyrightText="© 2024 Goldenberg's Deli. All rights reserved."
useInvertedBackground={false}
/>
</div>
</ReactLenis>

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

@@ -1,4 +1,4 @@
use client";
"use client";
import ReactLenis from "lenis/react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
@@ -16,6 +16,18 @@ export default function ShopPage() {
filters,
} = useProductCatalog({ basePath: "/shop" });
const navItems = [
{ name: "Home", id: "/" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" },
];
const footerColumns = [
{ title: "Menu", items: [{ label: "Corned Beef", href: "/#product" }, { label: "Pastrami", href: "/#product" }, { label: "Soups", href: "/#product" }, { label: "Sandwiches", href: "/#product" }] },
{ title: "About Us", items: [{ label: "Our Story", href: "/#about" }, { label: "Reviews", href: "/#testimonial" }, { label: "FAQs", href: "/#faq" }] },
{ title: "Contact", items: [{ label: "Location", href: "/#contact" }, { label: "Catering", href: "/#contact" }, { label: "Order Online", href: "/#contact" }] }
];
if (isLoading) {
return (
<ThemeProvider
@@ -31,13 +43,10 @@ export default function ShopPage() {
headingFontWeight="extrabold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleCentered
brandName="Goldenberg's Deli"
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" }
]}
navItems={navItems}
button={{ text: "Cart", onClick: () => {} }}
/>
</div>
@@ -49,13 +58,8 @@ export default function ShopPage() {
<div id="footer" data-section="footer">
<FooterBase
logoText="Goldenberg's Deli"
columns={[
{ title: "Menu", items: [{ label: "Corned Beef", href: "#product" }, { label: "Pastrami", href: "#product" }, { label: "Soups", href: "#product" }, { label: "Sandwiches", href: "#product" }] },
{ title: "About Us", items: [{ label: "Our Story", href: "#about" }, { label: "Reviews", href: "#testimonials" }, { label: "FAQs", href: "#faqs" }] },
{ title: "Contact", items: [{ label: "Location", href: "#contact" }, { label: "Catering", href: "#contact" }, { label: "Order Online", href: "#contact" }] }
]}
columns={footerColumns}
copyrightText="© 2024 Goldenberg's Deli. All rights reserved."
useInvertedBackground={false}
/>
</div>
</ReactLenis>
@@ -77,13 +81,10 @@ export default function ShopPage() {
headingFontWeight="extrabold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleCentered
brandName="Goldenberg's Deli"
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" }
]}
navItems={navItems}
button={{ text: "Cart", onClick: () => {} }}
/>
</div>
@@ -101,13 +102,8 @@ export default function ShopPage() {
<div id="footer" data-section="footer">
<FooterBase
logoText="Goldenberg's Deli"
columns={[
{ title: "Menu", items: [{ label: "Corned Beef", href: "#product" }, { label: "Pastrami", href: "#product" }, { label: "Soups", href: "#product" }, { label: "Sandwiches", href: "#product" }] },
{ title: "About Us", items: [{ label: "Our Story", href: "#about" }, { label: "Reviews", href: "#testimonials" }, { label: "FAQs", href: "#faqs" }] },
{ title: "Contact", items: [{ label: "Location", href: "#contact" }, { label: "Catering", href: "#contact" }, { label: "Order Online", href: "#contact" }] }
]}
columns={footerColumns}
copyrightText="© 2024 Goldenberg's Deli. All rights reserved."
useInvertedBackground={false}
/>
</div>
</ReactLenis>