Update src/app/shop/page.tsx

Merge version_1 into main

src/app/blog/page.tsx

@@ -32,6 +32,8 @@ export default function BlogPage() {
                             { name: "Menu", id: "products" },
                             { name: "About", id: "about" },
                             { name: "Reviews", id: "testimonials" },
+                            { name: "Blog", id: "/blog" },
+                            { name: "Shop", id: "/shop" },
                             { name: "Contact", id: "contact" }
                         ]}
                     />
@@ -62,9 +64,12 @@ export default function BlogPage() {
                         columns={[
                             {
                                 title: "Navigation",                                items: [
-                                    { label: "Menu", href: "#products" },
-                                    { label: "About Us", href: "#about" },
-                                    { label: "Contact", href: "#contact" }
+                                    { label: "Home", href: "/" },
+                                    { label: "Menu", href: "products" },
+                                    { label: "Blog", href: "/blog" },
+                                    { label: "Shop", href: "/shop" },
+                                    { label: "About Us", href: "about" },
+                                    { label: "Contact", href: "contact" }
                                 ]
                             },
                             {
@@ -87,4 +92,4 @@ export default function BlogPage() {
             </ReactLenis>
         </ThemeProvider>
     );
-}
+}

src/app/layout.tsx

@@ -1406,4 +1406,4 @@ export default function RootLayout({
       </ServiceWrapper>
     </html>
   );
-}
+}

src/app/page.tsx

@@ -30,9 +30,12 @@ export default function LandingPage() {
         <NavbarStyleApple
           brandName="Brew Haven"
           navItems={[
+            { name: "Home", id: "/" },
             { name: "Menu", id: "products" },
             { name: "About", id: "about" },
             { name: "Reviews", id: "testimonials" },
+            { name: "Blog", id: "/blog" },
+            { name: "Shop", id: "/shop" },
             { name: "Contact", id: "contact" }
           ]}
         />
@@ -44,8 +47,8 @@ export default function LandingPage() {
           description="Crafted with passion, served with care. Experience the finest specialty coffee and artisan pastries in our cozy neighborhood café."
           background={{ variant: "radial-gradient" }}
           buttons={[
-            { text: "View Menu", href: "#products" },
-            { text: "Reserve Table", href: "#contact" }
+            { text: "View Menu", href: "products" },
+            { text: "Reserve Table", href: "contact" }
           ]}
           buttonAnimation="slide-up"
           layoutOrder="default"
@@ -80,15 +83,15 @@ export default function LandingPage() {
           features={[
             {
               title: "Precision Espresso",              description: "Professional-grade machines and expertly trained baristas pull the perfect shot every time",              imageSrc: "https://img.b2bpic.net/free-photo/man-hands-working-with-coffee-machine-restaurant-close-up-barista-hands-preparing-making-coffee-coffee-shop_574295-514.jpg",              imageAlt: "Professional espresso machine in action",              buttonIcon: Coffee,
-              buttonHref: "#products"
+              buttonHref: "products"
             },
             {
               title: "Latte Art Mastery",              description: "Watch our skilled baristas create beautiful designs in your cappuccino or latte",              imageSrc: "https://img.b2bpic.net/free-photo/coffee-with-latte-art-decoration_1150-6325.jpg",              imageAlt: "Latte with intricate latte art",              buttonIcon: Sparkles,
-              buttonHref: "#products"
+              buttonHref: "products"
             },
             {
               title: "Fresh Pastries Daily",              description: "Baked fresh each morning by our in-house bakery team using premium ingredients",              imageSrc: "https://img.b2bpic.net/free-photo/croissant-coffee-food-photography_53876-104492.jpg",              imageAlt: "Assorted fresh pastries on a plate",              buttonIcon: Utensils,
-              buttonHref: "#products"
+              buttonHref: "products"
             },
             {
               title: "Cozy Atmosphere",              description: "A welcoming space designed for connection, creativity, and quality time with friends and family",              imageSrc: "https://img.b2bpic.net/free-photo/smiley-friends-cafe-enjoying-their-time_23-2148735439.jpg",              imageAlt: "Comfortable seating area in the coffee shop",              buttonIcon: Heart,
@@ -214,9 +217,12 @@ export default function LandingPage() {
           columns={[
             {
               title: "Navigation",              items: [
-                { label: "Menu", href: "#products" },
-                { label: "About Us", href: "#about" },
-                { label: "Contact", href: "#contact" }
+                { label: "Home", href: "/" },
+                { label: "Menu", href: "products" },
+                { label: "Blog", href: "/blog" },
+                { label: "Shop", href: "/shop" },
+                { label: "About Us", href: "about" },
+                { label: "Contact", href: "contact" }
               ]
             },
             {
@@ -238,4 +244,4 @@ export default function LandingPage() {
       </div>
     </ThemeProvider>
   );
-}
+}

src/app/shop/[id]/page.tsx

@@ -97,8 +97,9 @@ function ProductPageContent({ params }: ProductPageProps) {
                                 {"name":"Menu","id":"products"},
                                 {"name":"About","id":"about"},
                                 {"name":"Reviews","id":"testimonials"},
-                                {"name":"Contact","id":"contact"},
-                                {"name":"Shop","id":"/shop"}
+                                {"name":"Blog","id":"/blog"},
+                                {"name":"Shop","id":"/shop"},
+                                {"name":"Contact","id":"contact"}
                             ]}
                             button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                         />
@@ -109,7 +110,7 @@ function ProductPageContent({ params }: ProductPageProps) {
                     <div id="footer" data-section="footer">
                         <FooterBaseReveal
                             columns={[
-                                {"title":"Navigation","items":[{"label":"Menu","href":"#products"},{"label":"About Us","href":"#about"},{"label":"Contact","href":"#contact"}]},
+                                {"title":"Navigation","items":[{"label":"Home","href":"/"},{"label":"Menu","href":"products"},{"label":"Blog","href":"/blog"},{"label":"Shop","href":"/shop"},{"label":"About Us","href":"about"},{"label":"Contact","href":"contact"}]},
                                 {"title":"Connect","items":[{"label":"Instagram","href":"https://instagram.com"},{"label":"Facebook","href":"https://facebook.com"},{"label":"Twitter","href":"https://twitter.com"}]},
                                 {"title":"Legal","items":[{"label":"Privacy Policy","href":"#"},{"label":"Terms of Service","href":"#"}]}
                             ]}
@@ -144,8 +145,9 @@ function ProductPageContent({ params }: ProductPageProps) {
                                 {"name":"Menu","id":"products"},
                                 {"name":"About","id":"about"},
                                 {"name":"Reviews","id":"testimonials"},
-                                {"name":"Contact","id":"contact"},
-                                {"name":"Shop","id":"/shop"}
+                                {"name":"Blog","id":"/blog"},
+                                {"name":"Shop","id":"/shop"},
+                                {"name":"Contact","id":"contact"}
                             ]}
                             button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                         />
@@ -164,7 +166,7 @@ function ProductPageContent({ params }: ProductPageProps) {
                     <div id="footer" data-section="footer">
                         <FooterBaseReveal
                             columns={[
-                                {"title":"Navigation","items":[{"label":"Menu","href":"#products"},{"label":"About Us","href":"#about"},{"label":"Contact","href":"#contact"}]},
+                                {"title":"Navigation","items":[{"label":"Home","href":"/"},{"label":"Menu","href":"products"},{"label":"Blog","href":"/blog"},{"label":"Shop","href":"/shop"},{"label":"About Us","href":"about"},{"label":"Contact","href":"contact"}]},
                                 {"title":"Connect","items":[{"label":"Instagram","href":"https://instagram.com"},{"label":"Facebook","href":"https://facebook.com"},{"label":"Twitter","href":"https://twitter.com"}]},
                                 {"title":"Legal","items":[{"label":"Privacy Policy","href":"#"},{"label":"Terms of Service","href":"#"}]}
                             ]}
@@ -198,8 +200,9 @@ function ProductPageContent({ params }: ProductPageProps) {
                             {"name":"Menu","id":"products"},
                             {"name":"About","id":"about"},
                             {"name":"Reviews","id":"testimonials"},
-                            {"name":"Contact","id":"contact"},
-                            {"name":"Shop","id":"/shop"}
+                            {"name":"Blog","id":"/blog"},
+                            {"name":"Shop","id":"/shop"},
+                            {"name":"Contact","id":"contact"}
                         ]}
                         button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                     />
@@ -243,7 +246,7 @@ function ProductPageContent({ params }: ProductPageProps) {
                 <div id="footer" data-section="footer">
                     <FooterBaseReveal
                         columns={[
-                            {"title":"Navigation","items":[{"label":"Menu","href":"#products"},{"label":"About Us","href":"#about"},{"label":"Contact","href":"#contact"}]},
+                            {"title":"Navigation","items":[{"label":"Home","href":"/"},{"label":"Menu","href":"products"},{"label":"Blog","href":"/blog"},{"label":"Shop","href":"/shop"},{"label":"About Us","href":"about"},{"label":"Contact","href":"contact"}]},
                             {"title":"Connect","items":[{"label":"Instagram","href":"https://instagram.com"},{"label":"Facebook","href":"https://facebook.com"},{"label":"Twitter","href":"https://twitter.com"}]},
                             {"title":"Legal","items":[{"label":"Privacy Policy","href":"#"},{"label":"Terms of Service","href":"#"}]}
                         ]}
@@ -253,4 +256,4 @@ function ProductPageContent({ params }: ProductPageProps) {
             </ReactLenis>
         </ThemeProvider>
     );
-}
+}

src/app/shop/page.tsx

@@ -40,8 +40,9 @@ function ShopPageContent() {
                                 {"name":"Menu","id":"products"},
                                 {"name":"About","id":"about"},
                                 {"name":"Reviews","id":"testimonials"},
-                                {"name":"Contact","id":"contact"},
-                                {"name":"Shop","id":"/shop"}
+                                {"name":"Blog","id":"/blog"},
+                                {"name":"Shop","id":"/shop"},
+                                {"name":"Contact","id":"contact"}
                             ]}
                         />
                     </div>
@@ -51,7 +52,7 @@ function ShopPageContent() {
                     <div id="footer" data-section="footer">
                         <FooterBaseReveal
                             columns={[
-                                {"title":"Navigation","items":[{"label":"Menu","href":"#products"},{"label":"About Us","href":"#about"},{"label":"Contact","href":"#contact"}]},
+                                {"title":"Navigation","items":[{"label":"Home","href":"/"},{"label":"Menu","href":"products"},{"label":"Blog","href":"/blog"},{"label":"Shop","href":"/shop"},{"label":"About Us","href":"about"},{"label":"Contact","href":"contact"}]},
                                 {"title":"Connect","items":[{"label":"Instagram","href":"https://instagram.com"},{"label":"Facebook","href":"https://facebook.com"},{"label":"Twitter","href":"https://twitter.com"}]},
                                 {"title":"Legal","items":[{"label":"Privacy Policy","href":"#"},{"label":"Terms of Service","href":"#"}]}
                             ]}
@@ -85,8 +86,9 @@ function ShopPageContent() {
                             {"name":"Menu","id":"products"},
                             {"name":"About","id":"about"},
                             {"name":"Reviews","id":"testimonials"},
-                            {"name":"Contact","id":"contact"},
-                            {"name":"Shop","id":"/shop"}
+                            {"name":"Blog","id":"/blog"},
+                            {"name":"Shop","id":"/shop"},
+                            {"name":"Contact","id":"contact"}
                         ]}
                     />
                 </div>
@@ -104,7 +106,7 @@ function ShopPageContent() {
                 <div id="footer" data-section="footer">
                     <FooterBaseReveal
                         columns={[
-                            {"title":"Navigation","items":[{"label":"Menu","href":"#products"},{"label":"About Us","href":"#about"},{"label":"Contact","href":"#contact"}]},
+                            {"title":"Navigation","items":[{"label":"Home","href":"/"},{"label":"Menu","href":"products"},{"label":"Blog","href":"/blog"},{"label":"Shop","href":"/shop"},{"label":"About Us","href":"about"},{"label":"Contact","href":"contact"}]},
                             {"title":"Connect","items":[{"label":"Instagram","href":"https://instagram.com"},{"label":"Facebook","href":"https://facebook.com"},{"label":"Twitter","href":"https://twitter.com"}]},
                             {"title":"Legal","items":[{"label":"Privacy Policy","href":"#"},{"label":"Terms of Service","href":"#"}]}
                         ]}
@@ -122,4 +124,4 @@ export default function ShopPage() {
             <ShopPageContent />
         </Suspense>
     );
-}
+}