diff --git a/src/app/blog/page.tsx b/src/app/blog/page.tsx index 66d3f49..3378765 100644 --- a/src/app/blog/page.tsx +++ b/src/app/blog/page.tsx @@ -17,6 +17,15 @@ export default function BlogPage() { // Preserved posts fetching logic const { posts, isLoading } = useBlogPosts(); + const navItems = [ + { name: "Home", id: "/" }, + { name: "About", id: "/#about" }, + { name: "Shop", id: "/shop" }, + { name: "Blog", id: "/blog" }, + { name: "Testimonials", id: "/#testimonials" }, + { name: "Contact", id: "/#contact" }, + ]; + return ( - {/* Navbar from NAVBAR_INFO */} - + {/* Preserved loading state and posts logic */} {isLoading ? ( @@ -90,7 +94,6 @@ export default function BlogPage() { ]} logoText="Olla" copyrightText="© 2024 Olla Flowers Studio. All rights reserved." - useInvertedBackground={false} ariaLabel="Site footer" /> diff --git a/src/app/page.tsx b/src/app/page.tsx index 8f83a90..1112996 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -11,6 +11,15 @@ import ContactCTA from '@/components/sections/contact/ContactCTA'; import FooterBase from '@/components/sections/footer/FooterBase'; export default function SitePage() { + const navItems = [ + { name: "Home", id: "/" }, + { name: "About", id: "/#about" }, + { name: "Shop", id: "/shop" }, + { name: "Blog", id: "/blog" }, + { name: "Testimonials", id: "/#testimonials" }, + { name: "Contact", id: "/#contact" }, + ]; + return (
@@ -43,8 +46,8 @@ export default function SitePage() { description="Crafting exquisite floral arrangements for every occasion. Discover the beauty of nature, artfully designed." tag="Welcome to Olla" buttons={[ - { text: "Shop Now", href: "shop" }, - { text: "Learn More", href: "about" }, + { text: "Shop Now", href: "/shop" }, + { text: "Learn More", href: "/#about" }, ]} imageSrc="http://img.b2bpic.net/free-photo/woman-holds-festive-flower-arrangement-with-bright-chrysanthemum-flowers_169016-51483.jpg" imageAlt="Elegant floral arrangement for Olla Flowers Studio" diff --git a/src/app/shop/[id]/page.tsx b/src/app/shop/[id]/page.tsx index eb6c20c..876bf2c 100644 --- a/src/app/shop/[id]/page.tsx +++ b/src/app/shop/[id]/page.tsx @@ -74,6 +74,15 @@ function ProductPageContent({ params }: ProductPageProps) { await checkout(getCheckoutItems(), { successUrl: currentUrl.toString() }); }, [cartItems, checkout, getCheckoutItems]); + const navItems = [ + { name: "Home", id: "/" }, + { name: "About", id: "/#about" }, + { name: "Shop", id: "/shop" }, + { name: "Blog", id: "/blog" }, + { name: "Testimonials", id: "/#testimonials" }, + { name: "Contact", id: "/#contact" }, + ]; + if (isLoading) { return ( - @@ -132,10 +140,10 @@ function ProductPageContent({ params }: ProductPageProps) { headingFontWeight="light" > - @@ -182,10 +189,10 @@ function ProductPageContent({ params }: ProductPageProps) { headingFontWeight="light" > - diff --git a/src/app/shop/page.tsx b/src/app/shop/page.tsx index 21e3fa0..6585000 100644 --- a/src/app/shop/page.tsx +++ b/src/app/shop/page.tsx @@ -17,6 +17,15 @@ function ShopPageContent() { filters, } = useProductCatalog({ basePath: "/shop" }); + const navItems = [ + { name: "Home", id: "/" }, + { name: "About", id: "/#about" }, + { name: "Shop", id: "/shop" }, + { name: "Blog", id: "/blog" }, + { name: "Testimonials", id: "/#testimonials" }, + { name: "Contact", id: "/#contact" }, + ]; + if (isLoading) { return ( - @@ -74,10 +82,10 @@ function ShopPageContent() { headingFontWeight="light" > -