Update src/app/page.tsx

Merge version_11 into main

src/app/about/page.tsx

@@ -27,10 +27,9 @@ export default function AboutPage() {
             navItems={[
               { name: "Menu", id: "/menu" },
               { name: "About", id: "/about" },
-              { name: "Catering", id: "/#catering" },
+              { name: "Services", id: "/services" },
               { name: "Events", id: "/#events" },
               { name: "Visit", id: "/#visit" },
-              { name: "Contact", id: "/contact" },
             ]}
             brandName="Molisana Bakery"
           />
@@ -54,9 +53,9 @@ export default function AboutPage() {
         <div id="footer" data-section="footer">
           <FooterSimple
             columns={[
-              { title: "Bakery", items: [{ label: "Menu", href: "/menu" }, { label: "Catering", href: "/#catering" }] },
-              { title: "Company", items: [{ label: "About Us", href: "/about" }, { label: "Events", href: "/#events" }] },
-              { title: "Visit", items: [{ label: "Directions", href: "/#visit" }, { label: "Contact", href: "/contact" }] },
+              { title: "Bakery", items: [{ label: "Menu", href: "/menu" }, { label: "Services", href: "/services" }] },
+              { title: "Company", items: [{ label: "About Us", href: "/about" }, { label: "Events", href: "/" }] },
+              { title: "Visit", items: [{ label: "Directions", href: "/" }, { label: "Contact", href: "/" }] },
             ]}
             bottomLeftText="© 2024 Molisana Bakery. All rights reserved."
             bottomRightText="Authentic Italian Daily Rituals"

src/app/contact/page.tsx

@@ -1,64 +0,0 @@
-"use client";
-
-import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import ReactLenis from "lenis/react";
-import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
-import ContactText from '@/components/sections/contact/ContactText';
-import FooterSimple from '@/components/sections/footer/FooterSimple';
-
-export default function ContactPage() {
-  return (
-    <ThemeProvider
-        defaultButtonVariant="icon-arrow"
-        defaultTextAnimation="entrance-slide"
-        borderRadius="pill"
-        contentWidth="medium"
-        sizing="medium"
-        background="floatingGradient"
-        cardStyle="gradient-bordered"
-        primaryButtonStyle="shadow"
-        secondaryButtonStyle="solid"
-        headingFontWeight="normal"
-    >
-      <ReactLenis root>
-        <div id="nav" data-section="nav">
-          <NavbarLayoutFloatingOverlay
-            navItems={[
-              { name: "Menu", id: "/menu" },
-              { name: "About", id: "/about" },
-              { name: "Catering", id: "/#catering" },
-              { name: "Events", id: "/#events" },
-              { name: "Visit", id: "/#visit" },
-              { name: "Contact", id: "/contact" },
-            ]}
-            brandName="Molisana Bakery"
-          />
-        </div>
-
-        <div id="contact" data-section="contact">
-          <ContactText
-            useInvertedBackground={false}
-            background={{ variant: "sparkles-gradient" }}
-            text="Visit us at 5731 Hwy 7, Woodbridge, ON L4L 1T7. We are open daily from 6 a.m. to 10 p.m. Call us at (905) 856-6100 for orders and inquiries."
-            buttons={[
-              { text: "Get a Catering Quote", href: "mailto:hello@molisanabakery.com" },
-              { text: "Call (905) 856-6100", href: "tel:+19058566100" },
-            ]}
-          />
-        </div>
-
-        <div id="footer" data-section="footer">
-          <FooterSimple
-            columns={[
-              { title: "Bakery", items: [{ label: "Menu", href: "/menu" }, { label: "Catering", href: "/#catering" }] },
-              { title: "Company", items: [{ label: "About Us", href: "/about" }, { label: "Events", href: "/#events" }] },
-              { title: "Visit", items: [{ label: "Directions", href: "/#visit" }, { label: "Contact", href: "/contact" }] },
-            ]}
-            bottomLeftText="© 2024 Molisana Bakery. All rights reserved."
-            bottomRightText="Authentic Italian Daily Rituals"
-          />
-        </div>
-      </ReactLenis>
-    </ThemeProvider>
-  );
-}

src/app/menu/page.tsx

@@ -26,10 +26,9 @@ export default function MenuPage() {
             navItems={[
               { name: "Menu", id: "/menu" },
               { name: "About", id: "/about" },
-              { name: "Catering", id: "/#catering" },
+              { name: "Services", id: "/services" },
               { name: "Events", id: "/#events" },
               { name: "Visit", id: "/#visit" },
-              { name: "Contact", id: "/contact" },
             ]}
             brandName="Molisana Bakery"
           />
@@ -40,7 +39,7 @@ export default function MenuPage() {
                 <ProductCardThree 
                     title="Espresso Bar"
                     description="Premium Italian roasted coffee rituals."
-                    products={[{id: "e1", name: "Espresso", price: "", imageSrc: "http://img.b2bpic.net/free-photo/glass-foamy-latte-decorated-with-daffodil_141793-433.jpg?_wi=2"}]}
+                    products={[{id: "e1", name: "Espresso", price: "", imageSrc: "http://img.b2bpic.net/free-photo/glass-foamy-latte-decorated-with-daffodil_141793-433.jpg"}]}
                     gridVariant="uniform-all-items-equal"
                     animationType="slide-up"
                     textboxLayout="default"
@@ -51,7 +50,7 @@ export default function MenuPage() {
                 <ProductCardThree 
                     title="Hot Table Classics"
                     description="Scratch-made daily rotating specials."
-                    products={[{id: "h1", name: "Lasagna", price: "", imageSrc: "http://img.b2bpic.net/free-photo/top-view-delicious-italian-pasta-with-meat-tomato-sauce-grey-surface-meal-pasta-dough-food-dinner_140725-85885.jpg?_wi=2"}]}
+                    products={[{id: "h1", name: "Lasagna", price: "", imageSrc: "http://img.b2bpic.net/free-photo/top-view-delicious-italian-pasta-with-meat-tomato-sauce-grey-surface-meal-pasta-dough-food-dinner_140725-85885.jpg"}]}
                     gridVariant="uniform-all-items-equal"
                     animationType="slide-up"
                     textboxLayout="default"
@@ -62,7 +61,7 @@ export default function MenuPage() {
                 <ProductCardThree 
                     title="Sandwiches"
                     description="Fresh bread, packed with cured meats."
-                    products={[{id: "s1", name: "Porchetta Sandwich", price: "", imageSrc: "http://img.b2bpic.net/free-photo/roll-hot-smoked-fish_2829-14225.jpg?_wi=2"}]}
+                    products={[{id: "s1", name: "Porchetta Sandwich", price: "", imageSrc: "http://img.b2bpic.net/free-photo/roll-hot-smoked-fish_2829-14225.jpg"}]}
                     gridVariant="uniform-all-items-equal"
                     animationType="slide-up"
                     textboxLayout="default"
@@ -73,7 +72,7 @@ export default function MenuPage() {
                 <ProductCardThree 
                     title="Pastries"
                     description="Sweet treats, artisan style."
-                    products={[{id: "p1", name: "Pistachio Cannoli", price: "", imageSrc: "http://img.b2bpic.net/free-photo/closeup-raw-vegan-roll-made-from-hazelnuts-purple-grunge-tabletop_181624-44513.jpg?_wi=2"}]}
+                    products={[{id: "p1", name: "Pistachio Cannoli", price: "", imageSrc: "http://img.b2bpic.net/free-photo/closeup-raw-vegan-roll-made-from-hazelnuts-purple-grunge-tabletop_181624-44513.jpg"}]}
                     gridVariant="uniform-all-items-equal"
                     animationType="slide-up"
                     textboxLayout="default"
@@ -84,7 +83,7 @@ export default function MenuPage() {
                 <ProductCardThree 
                     title="Catering Trays"
                     description="Perfect for your next gathering."
-                    products={[{id: "c1", name: "Party Tray", price: "", imageSrc: "http://img.b2bpic.net/free-photo/mozzarella-sliders-summer-picnic-sandwiches_53876-103644.jpg?_wi=2"}]}
+                    products={[{id: "c1", name: "Party Tray", price: "", imageSrc: "http://img.b2bpic.net/free-photo/mozzarella-sliders-summer-picnic-sandwiches_53876-103644.jpg"}]}
                     gridVariant="uniform-all-items-equal"
                     animationType="slide-up"
                     textboxLayout="default"
@@ -96,9 +95,9 @@ export default function MenuPage() {
         <div id="footer" data-section="footer">
           <FooterSimple
             columns={[
-              { title: "Bakery", items: [{ label: "Menu", href: "/menu" }, { label: "Catering", href: "/#catering" }] },
-              { title: "Company", items: [{ label: "About Us", href: "/about" }, { label: "Events", href: "/#events" }] },
-              { title: "Visit", items: [{ label: "Directions", href: "/#visit" }, { label: "Contact", href: "/contact" }] },
+              { title: "Bakery", items: [{ label: "Menu", href: "/menu" }, { label: "Services", href: "/services" }] },
+              { title: "Company", items: [{ label: "About Us", href: "/about" }, { label: "Events", href: "/" }] },
+              { title: "Visit", items: [{ label: "Directions", href: "/" }, { label: "Contact", href: "/" }] },
             ]}
             bottomLeftText="© 2024 Molisana Bakery. All rights reserved."
             bottomRightText="Authentic Italian Daily Rituals"

src/app/page.tsx

@@ -31,10 +31,9 @@ export default function LandingPage() {
       navItems={[
         { name: "Menu", id: "/menu" },
         { name: "About", id: "/about" },
-        { name: "Catering", id: "/#catering" },
+        { name: "Services", id: "/services" },
         { name: "Events", id: "/#events" },
         { name: "Visit", id: "/#visit" },
-        { name: "Contact", id: "/contact" },
       ]}
       brandName="Molisana Bakery"
     />
@@ -43,11 +42,12 @@ export default function LandingPage() {
   <div id="hero" data-section="hero">
       <HeroSplit
       background={{ variant: "gradient-bars" }}
+      tag="Cibo, Amore, Tradizione"
       title="Wood-Fired Comfort, Italian Classics & Espresso Done Right."
-      description="From early-morning cappuccinos to hot table favourites and fresh pastries — Molisana Bakery is your daily Italian ritual."
+      description="From early-morning cappuccinos to hot table favourites and fresh pastries — Molisana Bakery is your daily Italian ritual. Simply put: There is no substitute for the Italian way of food."
       buttons={[
         { text: "View Menu", href: "/menu" },
-        { text: "Order Catering", href: "/#catering" },
+        { text: "View Services", href: "/services" },
       ]}
       imageSrc="http://img.b2bpic.net/free-photo/woman-white-sweater-pouring-milk-into-coffee-dessert_1157-26624.jpg"
       imageAlt="authentic italian bakery display"
@@ -90,12 +90,12 @@ export default function LandingPage() {
       gridVariant="one-large-left-three-stacked-right"
       useInvertedBackground={false}
       products={[
-        { id: "p1", name: "Lasagna Al Forno", price: "CA$15", imageSrc: "http://img.b2bpic.net/free-photo/top-view-delicious-italian-pasta-with-meat-tomato-sauce-grey-surface-meal-pasta-dough-food-dinner_140725-85885.jpg?_wi=1" },
+        { id: "p1", name: "Lasagna Al Forno", price: "CA$15", imageSrc: "http://img.b2bpic.net/free-photo/top-view-delicious-italian-pasta-with-meat-tomato-sauce-grey-surface-meal-pasta-dough-food-dinner_140725-85885.jpg" },
         { id: "p2", name: "Signature Tiramisu", price: "CA$8", imageSrc: "http://img.b2bpic.net/free-photo/tasty-homemade-tiramisu-cake_114579-43299.jpg" },
-        { id: "p3", name: "Pistachio Cannoli", price: "CA$5", imageSrc: "http://img.b2bpic.net/free-photo/closeup-raw-vegan-roll-made-from-hazelnuts-purple-grunge-tabletop_181624-44513.jpg?_wi=1" },
-        { id: "p4", name: "Porchetta Sandwich", price: "CA$12", imageSrc: "http://img.b2bpic.net/free-photo/roll-hot-smoked-fish_2829-14225.jpg?_wi=1" },
-        { id: "p5", name: "Cafe Crema", price: "CA$4", imageSrc: "http://img.b2bpic.net/free-photo/glass-foamy-latte-decorated-with-daffodil_141793-433.jpg?_wi=1" },
-        { id: "p6", name: "Focaccia Sandwich", price: "CA$14", imageSrc: "http://img.b2bpic.net/free-photo/mozzarella-sliders-summer-picnic-sandwiches_53876-103644.jpg?_wi=1" },
+        { id: "p3", name: "Pistachio Cannoli", price: "CA$5", imageSrc: "http://img.b2bpic.net/free-photo/closeup-raw-vegan-roll-made-from-hazelnuts-purple-grunge-tabletop_181624-44513.jpg" },
+        { id: "p4", name: "Porchetta Sandwich", price: "CA$12", imageSrc: "http://img.b2bpic.net/free-photo/roll-hot-smoked-fish_2829-14225.jpg" },
+        { id: "p5", name: "Cafe Crema", price: "CA$4", imageSrc: "http://img.b2bpic.net/free-photo/glass-foamy-latte-decorated-with-daffodil_141793-433.jpg" },
+        { id: "p6", name: "Focaccia Sandwich", price: "CA$14", imageSrc: "http://img.b2bpic.net/free-photo/mozzarella-sliders-summer-picnic-sandwiches_53876-103644.jpg" },
       ]}
       title="Our Daily Classics"
       description="Authentic recipes, generous portions, and the quality you expect from a real Italian eatery."
@@ -120,12 +120,24 @@ export default function LandingPage() {
     />
   </div>
 
+  <div id="contact" data-section="contact">
+      <ContactText
+      useInvertedBackground={false}
+      background={{ variant: "sparkles-gradient" }}
+      text="Visit us at 5731 Hwy 7, Woodbridge, ON L4L 1T7. We are open daily from 6 a.m. to 10 p.m. Call us at (905) 856-6100 for orders and inquiries."
+      buttons={[
+        { text: "View Catering Details", href: "/services" },
+        { text: "Call (905) 856-6100", onClick: () => { const el = document.getElementById('contact'); el?.scrollIntoView({ behavior: 'smooth' }); } },
+      ]}
+    />
+  </div>
+
   <div id="footer" data-section="footer">
       <FooterSimple
       columns={[
-        { title: "Bakery", items: [{ label: "Menu", href: "/menu" }, { label: "Catering", href: "/#catering" }] },
-        { title: "Company", items: [{ label: "About Us", href: "/about" }, { label: "Events", href: "/#events" }] },
-        { title: "Visit", items: [{ label: "Directions", href: "/#visit" }, { label: "Contact", href: "/contact" }] },
+        { title: "Bakery", items: [{ label: "Menu", href: "/menu" }, { label: "Services", href: "/services" }] },
+        { title: "Company", items: [{ label: "About Us", href: "/about" }, { label: "Events", href: "/" }] },
+        { title: "Visit", items: [{ label: "Directions", href: "/" }, { label: "Contact", onClick: () => { const el = document.getElementById('contact'); el?.scrollIntoView({ behavior: 'smooth' }); } }] },
       ]}
       bottomLeftText="© 2024 Molisana Bakery. All rights reserved."
       bottomRightText="Authentic Italian Daily Rituals"
@@ -134,4 +146,4 @@ export default function LandingPage() {
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}

src/app/services/page.tsx

@@ -0,0 +1,78 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import ReactLenis from "lenis/react";
+import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
+import FooterSimple from '@/components/sections/footer/FooterSimple';
+import SplitAbout from '@/components/sections/about/SplitAbout';
+import { Phone } from "lucide-react";
+
+export default function ServicesPage() {
+  return (
+    <ThemeProvider
+        defaultButtonVariant="icon-arrow"
+        defaultTextAnimation="entrance-slide"
+        borderRadius="pill"
+        contentWidth="medium"
+        sizing="medium"
+        background="floatingGradient"
+        cardStyle="gradient-bordered"
+        primaryButtonStyle="shadow"
+        secondaryButtonStyle="solid"
+        headingFontWeight="normal"
+    >
+      <ReactLenis root>
+        <div id="nav" data-section="nav">
+          <NavbarLayoutFloatingOverlay
+            navItems={[
+              { name: "Home", id: "/" },
+              { name: "About", id: "/about" },
+              { name: "Services", id: "/services" },
+              { name: "Contact", id: "/contact" },
+            ]}
+            brandName="Molisana Bakery"
+          />
+        </div>
+
+        <div id="services" data-section="about">
+          <SplitAbout
+            tag="Our Services"
+            title="Catering Capabilities"
+            description="From corporate lunches to family gatherings, we bring the authentic Molisana Bakery experience to your event. We specialize in custom party trays featuring our signature sandwiches, hot table classics, and house-made pastries."
+            className="py-32"
+            useInvertedBackground={false}
+            textboxLayout="default"
+            bulletPoints={[
+              { title: "Custom Party Trays", description: "Signature sandwiches and house-made pastries." },
+              { title: "Hot Table Classics", description: "Authentic Italian daily rituals for your event." }
+            ]}
+            mediaAnimation="none"
+          />
+          <div className="max-w-4xl mx-auto px-6 pb-20">
+            <div className="bg-card p-8 rounded-2xl border flex items-center gap-6">
+              <div className="p-4 bg-accent rounded-full">
+                <Phone className="w-8 h-8" />
+              </div>
+              <div>
+                <h3 className="text-2xl font-semibold mb-2">Ready to Book?</h3>
+                <p className="text-lg">Give us a call at (905) 856-6100 to discuss your catering requirements or email us at hello@molisanabakery.com.</p>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <div id="footer" data-section="footer">
+          <FooterSimple
+            columns={[
+              { title: "Bakery", items: [{ label: "Services", href: "/services" }] },
+              { title: "Company", items: [{ label: "About Us", href: "/about" }, { label: "Home", href: "/" }] },
+              { title: "Visit", items: [{ label: "Contact", href: "/contact" }] },
+            ]}
+            bottomLeftText="© 2024 Molisana Bakery. All rights reserved."
+            bottomRightText="Authentic Italian Daily Rituals"
+          />
+        </div>
+      </ReactLenis>
+    </ThemeProvider>
+  );
+}

src/app/styles/variables.css

@@ -10,15 +10,15 @@
   --accent: #ffffff;
   --background-accent: #ffffff; */
 
-  --background: #526bac;
+  --background: #F6F1E8;
   --card: #ffffff;
-  --foreground: #071645;
-  --primary-cta: #000000;
-  --primary-cta-text: #000000;
-  --secondary-cta: #000000;
+  --foreground: #141414;
+  --primary-cta: #B08D57;
+  --primary-cta-text: #1c140f;
+  --secondary-cta: #2F4A3A;
   --secondary-cta-text: #ffffff;
   --accent: #2B1B14;
-  --background-accent: #000000;
+  --background-accent: #B08D57;
 
   /* text sizing - set by ThemeProvider */
   /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);