Merge version_1 into main #1

Merged
bender merged 4 commits from version_1 into main 2026-02-19 12:46:03 +00:00
4 changed files with 9 additions and 16 deletions

View File

@@ -28,11 +28,7 @@ export default function BlogPage() {
brandName="The Daily Grind"
navItems={[
{ name: "Home", id: "/" },
{ name: "Menu", id: "menu" },
{ name: "About", id: "about" },
{ name: "Reviews", id: "testimonials" },
{ name: "FAQ", id: "faq" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" },
]}
/>
@@ -60,9 +56,8 @@ export default function BlogPage() {
columns={[
{
title: "Quick Links", items: [
{ label: "Menu", href: "#menu" },
{ label: "About Us", href: "#about" },
{ label: "Reviews", href: "#testimonials" },
{ label: "Home", href: "/" },
{ label: "Shop", href: "/shop" },
],
},
{

View File

@@ -46,7 +46,7 @@ export default function LandingPage() {
{ text: "View Menu", href: "#menu" },
{ text: "Visit Us", href: "#contact" },
]}
background={{ variant: "aurora" }}
background={{ variant: "sparkles-gradient" }}
imageSrc="https://img.b2bpic.net/free-photo/close-up-barista-hands-preparing-coffee-customer-coffee-shop_93675-135317.jpg"
imageAlt="Cozy coffee shop interior with barista preparing a drink"
mediaAnimation="slide-up"

View File

@@ -4,7 +4,7 @@ import { use, useCallback } from "react";
import { useRouter } from "next/navigation";
import ReactLenis from "lenis/react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleApple from "@/components/navbar/NavbarStyleApple/NavbarStyleApple";
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
import ProductDetailCard from "@/components/ecommerce/productDetail/ProductDetailCard";
import ProductCart from "@/components/ecommerce/cart/ProductCart";
@@ -197,9 +197,8 @@ export default function ProductPage({ params }: ProductPageProps) {
columns={[
{
title: "Quick Links", items: [
{ label: "Menu", href: "#menu" },
{ label: "About Us", href: "#about" },
{ label: "Reviews", href: "#testimonials" },
{ label: "Home", href: "/" },
{ label: "Shop", href: "/shop" },
],
},
{

View File

@@ -124,9 +124,8 @@ export default function ShopPage() {
columns={[
{
title: "Quick Links", items: [
{ label: "Menu", href: "#menu" },
{ label: "About Us", href: "#about" },
{ label: "Reviews", href: "#testimonials" },
{ label: "Home", href: "/" },
{ label: "Shop", href: "/shop" },
],
},
{