bender/aeee36e6-6590-4af7-bfc0-92ba56070c1d
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #2

Merged
bender merged 4 commits from version_1 into main 2026-02-23 01:08:41 +00:00
Conversation 0 Commits 4 Files Changed 4 +20 -23
4 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,12 +29,12 @@ export default function BlogPage() {
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
{ name: "Menu", id: "#featured-dishes" },
{ name: "About Us", id: "#about" },
{ name: "Reviews", id: "#reviews" },
{ name: "Menu", id: "/#featured-dishes" },
{ name: "About Us", id: "/#about" },
{ name: "Reviews", id: "/#reviews" },
]}
brandName="2 Dogs Pub"
button={{ text: "Visit Us", href: "#footer" }}
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"
@@ -62,7 +62,7 @@ export default function BlogPage() {
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="https://img.b2bpic.net/free-photo/stone-walled-restaurant-top-lighting_140725-9731.jpg?_wi=2"
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: "#" }] },
@@ -82,7 +82,6 @@ export default function BlogPage() {
]}
logoText="2 Dogs Pub"
copyrightText="© 2024 2 Dogs Pub. All rights reserved."
useInvertedBackground={false}
className="bg-background-accent text-foreground pt-16 md:pt-24"
mediaWrapperClassName="h-64 md:h-96 w-full"
logoTextClassName="text-4xl font-extrabold"

16
src/app/page.tsx
View File

@@ -26,12 +26,12 @@ export default function LandingPage() {
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[
{ name: "Menu", id: "#featured-dishes" },
{ name: "About Us", id: "#about" },
{ name: "Reviews", id: "#reviews" },
{ name: "Menu", id: "featured-dishes" },
{ name: "About Us", id: "about" },
{ name: "Reviews", id: "reviews" },
]}
brandName="2 Dogs Pub"
button={{ text: "Visit Us", href: "#footer" }}
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"
@@ -43,10 +43,10 @@ export default function LandingPage() {
<HeroBillboardGallery
title="Bold American Flavor. No Apologies."
description="Classic pub food done right. Where every dish is a statement and every drink hits the spot."
background={{ variant: "radial-gradient" as any }}
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={[
{
@@ -134,7 +134,7 @@ export default function LandingPage() {
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="https://img.b2bpic.net/free-photo/stone-walled-restaurant-top-lighting_140725-9731.jpg?_wi=1"
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: "#" }] },

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

@@ -1,10 +1,10 @@
use client";
"use client";
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 NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
import ProductDetailCard from "@/components/ecommerce/productDetail/ProductDetailCard";
import ProductCart from "@/components/ecommerce/cart/ProductCart";
import { useProductDetail } from "@/hooks/useProductDetail";
@@ -88,7 +88,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="extrabold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
@@ -161,7 +161,7 @@ function ProductPageContent({ params }: ProductPageProps) {
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="https://img.b2bpic.net/free-photo/stone-walled-restaurant-top-lighting_140725-9731.jpg?_wi=4"
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: "#" }] },
@@ -177,7 +177,6 @@ function ProductPageContent({ params }: ProductPageProps) {
]}
logoText="2 Dogs Pub"
copyrightText="© 2024 2 Dogs Pub. All rights reserved."
useInvertedBackground={false}
className="bg-background-accent text-foreground pt-16 md:pt-24"
mediaWrapperClassName="h-64 md:h-96 w-full"
logoTextClassName="text-4xl font-extrabold"

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

@@ -1,4 +1,4 @@
use client";
"use client";
import { Suspense, useCallback } from "react";
import ReactLenis from "lenis/react";
@@ -55,7 +55,7 @@ function ShopPageContent() {
headingFontWeight="extrabold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
@@ -106,7 +106,7 @@ function ShopPageContent() {
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="https://img.b2bpic.net/free-photo/stone-walled-restaurant-top-lighting_140725-9731.jpg?_wi=3"
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: "#" }] },
@@ -122,7 +122,6 @@ function ShopPageContent() {
]}
logoText="2 Dogs Pub"
copyrightText="© 2024 2 Dogs Pub. All rights reserved."
useInvertedBackground={false}
className="bg-background-accent text-foreground pt-16 md:pt-24"
mediaWrapperClassName="h-64 md:h-96 w-full"
logoTextClassName="text-4xl font-extrabold"