Update src/app/contact/page.tsx

Merge version_2 into main

src/app/about/page.tsx

@@ -3,48 +3,35 @@
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
-import SplitAbout from '@/components/sections/about/SplitAbout';
+import InlineImageSplitTextAbout from '@/components/sections/about/InlineImageSplitTextAbout';
 import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
 
 const navLinks = [
   { name: "Home", id: "/" },
+  { name: "Menu", id: "/menu" },
   { name: "About", id: "/about" },
   { name: "Contact", id: "/contact" }
 ];
 
 export default function AboutPage() {
   return (
-    <ThemeProvider
+    <ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
-      defaultButtonVariant="hover-magnetic"
-      defaultTextAnimation="entrance-slide"
-      borderRadius="soft"
-      contentWidth="medium"
-      sizing="mediumLargeSizeMediumTitles"
-      background="noiseDiagonalGradient"
-      cardStyle="glass-elevated"
-      primaryButtonStyle="primary-glow"
-      secondaryButtonStyle="glass"
-      headingFontWeight="light"
-    >
       <ReactLenis root>
-        <NavbarLayoutFloatingOverlay navItems={navLinks} brandName="Sheescakes'N More" />
+        <div id="nav" data-section="nav">
-        <div id="about" data-section="about" className="pt-20">
+          <NavbarLayoutFloatingOverlay navItems={navLinks} />
-          <SplitAbout
+        </div>
-            title="Our Bakery Story"
+        <div id="about" data-section="about">
-            textboxLayout="split"
+          <InlineImageSplitTextAbout
+            heading={[{ type: 'text', content: "Our Bakery Story" }]}
             useInvertedBackground={false}
-            description="Born and raised in Northern Cambria, our bakery started as a dream to bring authentic, homemade sweetness to our local community. We use time-honored techniques and the finest ingredients to craft cheesecakes, cupcakes, and pastries that feel like home."
-            imageSrc="http://img.b2bpic.net/free-photo/portrait-smiling-baker-holding-mould-stack-tray_1170-2040.jpg"
-            bulletPoints={[
-              { title: "Handcrafted Quality", description: "Every treat is made from scratch." },
-              { title: "Local Roots", description: "Proudly serving Northern Cambria since 2024." }
-            ]}
           />
         </div>
-        <FooterBaseReveal
+        <div id="footer" data-section="footer">
-          logoText="Sheescakes'N More"
+          <FooterBaseReveal
-          columns={[{ title: "Quick Links", items: [{ label: "Home", href: "/" }, { label: "About", href: "/about" }, { label: "Contact", href: "/contact" }] }]}
+            logoText="Sheescakes'N More"
-        />
+            columns={[{ title: "Navigation", items: [{ label: "Home", href: "/" }, { label: "Menu", href: "/menu" }, { label: "About", href: "/about" }, { label: "Contact", href: "/contact" }] }]}
+          />
+        </div>
       </ReactLenis>
     </ThemeProvider>
   );

src/app/contact/page.tsx

@@ -3,45 +3,39 @@
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
-import ContactCTA from '@/components/sections/contact/ContactCTA';
+import ContactSplit from '@/components/sections/contact/ContactSplit';
 import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
 
 const navLinks = [
   { name: "Home", id: "/" },
   { name: "About", id: "/about" },
+  { name: "Order", id: "/order" },
   { name: "Contact", id: "/contact" }
 ];
 
 export default function ContactPage() {
   return (
-    <ThemeProvider
+    <ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
-      defaultButtonVariant="hover-magnetic"
-      defaultTextAnimation="entrance-slide"
-      borderRadius="soft"
-      contentWidth="medium"
-      sizing="mediumLargeSizeMediumTitles"
-      background="noiseDiagonalGradient"
-      cardStyle="glass-elevated"
-      primaryButtonStyle="primary-glow"
-      secondaryButtonStyle="glass"
-      headingFontWeight="light"
-    >
       <ReactLenis root>
-        <NavbarLayoutFloatingOverlay navItems={navLinks} brandName="Sheescakes'N More" />
+        <div id="nav" data-section="nav">
-        <div id="contact" data-section="contact" className="pt-20">
+          <NavbarLayoutFloatingOverlay navItems={navLinks} />
-          <ContactCTA
+        </div>
-            background={{ variant: "plain" }}
+        <div id="contact" data-section="contact">
+          <ContactSplit
+            tag="Contact Us"
+            title="Get in Touch"
+            description="Have questions or want to place a custom order? Reach out to us!"
             useInvertedBackground={false}
-            tag="Visit Us"
+            background={{ variant: "plain" }}
-            title="Contact Sheescakes'N More"
+          />
-            description="We're located right in the heart of Northern Cambria, Pennsylvania. Stop by for a fresh treat or reach out to place a custom order!"
+        </div>
-            buttons={[{ text: "Call Us Now", href: "tel:+18140000000" }]}
+        <div id="footer" data-section="footer">
+          <FooterBaseReveal
+            logoText="Sheescakes'N More"
+            columns={[{ title: "Quick Links", items: [{ label: "Home", href: "/" }, { label: "About", href: "/about" }, { label: "Order", href: "/order" }, { label: "Contact", href: "/contact" }] }]}
+            copyrightText="© 2024 Sheescakes'N More."
           />
         </div>
-        <FooterBaseReveal
-          logoText="Sheescakes'N More"
-          columns={[{ title: "Quick Links", items: [{ label: "Home", href: "/" }, { label: "About", href: "/about" }, { label: "Contact", href: "/contact" }] }]}
-        />
       </ReactLenis>
     </ThemeProvider>
   );

src/app/menu/page.tsx

@@ -3,45 +3,44 @@
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
-import ProductCardOne from '@/components/sections/product/ProductCardOne';
+import ProductCardThree from '@/components/sections/product/ProductCardThree';
 import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
 
+const navLinks = [
+  { name: "Home", id: "/" },
+  { name: "Menu", id: "/menu" },
+  { name: "About", id: "/about" },
+  { name: "Contact", id: "/contact" }
+];
+
 export default function MenuPage() {
   return (
-    <ThemeProvider
+    <ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
-      defaultButtonVariant="hover-magnetic"
-      defaultTextAnimation="entrance-slide"
-      borderRadius="soft"
-      contentWidth="medium"
-      sizing="medium"
-      background="circleGradient"
-      cardStyle="glass-elevated"
-      primaryButtonStyle="gradient"
-      secondaryButtonStyle="glass"
-      headingFontWeight="normal"
-    >
       <ReactLenis root>
-        <NavbarLayoutFloatingOverlay
+        <div id="nav" data-section="nav">
-          navItems={[{ name: "Home", id: "/" }, { name: "Menu", id: "/menu" }, { name: "Order", id: "/order" }, { name: "About", id: "/about" }, { name: "Contact", id: "/contact" }]}
+          <NavbarLayoutFloatingOverlay navItems={navLinks} />
-          brandName="Sheescakes'N More"
+        </div>
-        />
+        <div id="menu" data-section="menu">
-        <ProductCardOne
+          <ProductCardThree
-          title="Our Bakery Menu"
+            title="Our Sweet Creations"
-          description="Handcrafted cakes and treats made daily in Northern Cambria."
+            description="Indulge in our selection of freshly baked desserts, from signature cheesecakes to artisan cupcakes."
-          gridVariant="three-columns-all-equal-width"
+            gridVariant="bento-grid"
-          animationType="slide-up"
+            animationType="slide-up"
-          textboxLayout="default"
+            textboxLayout="split"
-          useInvertedBackground={false}
+            useInvertedBackground={false}
-          products={[
+            products={[
-            { id: "p1", name: "Classic Strawberry Cheesecake", price: "$35.00", imageSrc: "http://img.b2bpic.net/free-photo/homemade-cheese-cake_169016-1935.jpg" },
+              { id: "1", name: "Signature Strawberry Cheesecake", price: "$35", imageSrc: "http://img.b2bpic.net/free-photo/waitress-holding-cake_23-2147821281.jpg?_wi=1" },
-            { id: "p2", name: "Chocolate Fudge Cupcake", price: "$4.50", imageSrc: "http://img.b2bpic.net/free-photo/female-hand-holding-sweet-roll-from-wooden-board_114579-25729.jpg" },
+              { id: "2", name: "Double Chocolate Cupcakes", price: "$18", imageSrc: "http://img.b2bpic.net/free-photo/waitress-holding-cake_23-2147821281.jpg?_wi=1" },
-            { id: "p3", name: "Signature Latte", price: "$5.00", imageSrc: "http://img.b2bpic.net/free-photo/side-view-frappe-cake-wooden-plate_23-2148222451.jpg" }
+              { id: "3", name: "Vanilla Bean Tart", price: "$22", imageSrc: "http://img.b2bpic.net/free-photo/waitress-holding-cake_23-2147821281.jpg?_wi=1" }
-          ]}
+            ]}
-        />
+          />
-        <FooterBaseReveal
+        </div>
-          logoText="Sheescakes'N More"
+        <div id="footer" data-section="footer">
-          columns={[{ title: "Quick Links", items: [{ label: "Home", href: "/" }, { label: "Menu", href: "/menu" }, { label: "Order", href: "/order" }, { label: "Contact", href: "/contact" }] }, { title: "Info", items: [{ label: "About Us", href: "/about" }, { label: "Privacy Policy", href: "#" }] }]}
+          <FooterBaseReveal
-        />
+            logoText="Sheescakes'N More"
+            columns={[{ title: "Navigation", items: [{ label: "Home", href: "/" }, { label: "Menu", href: "/menu" }, { label: "About", href: "/about" }, { label: "Contact", href: "/contact" }] }]}
+          />
+        </div>
       </ReactLenis>
     </ThemeProvider>
   );

src/app/order/page.tsx

@@ -3,41 +3,45 @@
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
-import ContactCenter from '@/components/sections/contact/ContactCenter';
+import ProductCardThree from '@/components/sections/product/ProductCardThree';
 import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
 
+const navLinks = [
+  { name: "Home", id: "/" },
+  { name: "About", id: "/about" },
+  { name: "Order", id: "/order" },
+  { name: "Contact", id: "/contact" }
+];
+
 export default function OrderPage() {
   return (
-    <ThemeProvider
+    <ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
-      defaultButtonVariant="hover-magnetic"
-      defaultTextAnimation="entrance-slide"
-      borderRadius="soft"
-      contentWidth="medium"
-      sizing="medium"
-      background="circleGradient"
-      cardStyle="glass-elevated"
-      primaryButtonStyle="gradient"
-      secondaryButtonStyle="glass"
-      headingFontWeight="normal"
-    >
       <ReactLenis root>
-        <NavbarLayoutFloatingOverlay
+        <div id="nav" data-section="nav">
-          navItems={[{ name: "Home", id: "/" }, { name: "Menu", id: "/menu" }, { name: "Order", id: "/order" }, { name: "About", id: "/about" }, { name: "Contact", id: "/contact" }]}
+          <NavbarLayoutFloatingOverlay navItems={navLinks} />
-          brandName="Sheescakes'N More"
+        </div>
-        />
+        <div id="order" data-section="order">
-        <ContactCenter
+          <ProductCardThree
-          background={{ variant: "plain" }}
+            title="Our Menu"
-          useInvertedBackground={false}
+            description="Select your favorite items from our bakery selection."
-          tag="Order Process"
+            gridVariant="three-columns-all-equal-width"
-          title="Place Your Order"
+            animationType="slide-up"
-          description="Fill out the details below to request your favorite treats. We will contact you to confirm timing and pickup/delivery options."
+            textboxLayout="default"
-          inputPlaceholder="Your Name and Order Details"
+            useInvertedBackground={false}
-          buttonText="Submit Order Request"
+            products={[
-        />
+              { id: "1", name: "New York Cheesecake", price: "$25.00", imageSrc: "http://img.b2bpic.net/free-photo/waitress-holding-cake_23-2147821281.jpg?_wi=1" },
-        <FooterBaseReveal
+              { id: "2", name: "Cupcake Box", price: "$15.00", imageSrc: "http://img.b2bpic.net/free-photo/delicious-cupcakes-display_23-2148766164.jpg?_wi=1" },
-          logoText="Sheescakes'N More"
+              { id: "3", name: "Macaron Assortment", price: "$20.00", imageSrc: "http://img.b2bpic.net/free-photo/delicious-cupcakes-display_23-2148766164.jpg?_wi=1" }
-          columns={[{ title: "Quick Links", items: [{ label: "Home", href: "/" }, { label: "Menu", href: "/menu" }, { label: "Order", href: "/order" }, { label: "Contact", href: "/contact" }] }, { title: "Info", items: [{ label: "About Us", href: "/about" }, { label: "Privacy Policy", href: "#" }] }]}
+            ]}
-        />
+          />
+        </div>
+        <div id="footer" data-section="footer">
+          <FooterBaseReveal
+            logoText="Sheescakes'N More"
+            columns={[{ title: "Quick Links", items: [{ label: "Home", href: "/" }, { label: "About", href: "/about" }, { label: "Order", href: "/order" }, { label: "Contact", href: "/contact" }] }]}
+            copyrightText="© 2024 Sheescakes'N More."
+          />
+        </div>
       </ReactLenis>
     </ThemeProvider>
   );

src/app/page.tsx

@@ -9,6 +9,7 @@ import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
 const navLinks = [
   { name: "Home", id: "/" },
   { name: "About", id: "/about" },
+  { name: "Order", id: "/order" },
   { name: "Contact", id: "/contact" }
 ];
 
@@ -39,7 +40,7 @@ export default function LandingPage() {
             background={{ variant: "gradient-bars" }}
             title="Homemade Cheesecakes & Sweet Treats"
             description="Freshly baked with love in Northern Cambria."
-            buttons={[{ text: "Order Now", href: "/contact" }]}
+            buttons={[{ text: "Order Now", href: "/order" }]}
             imageSrc="http://img.b2bpic.net/free-photo/waitress-holding-cake_23-2147821281.jpg?_wi=1"
             testimonials={[{ name: "Jane Doe", handle: "@janedoe", testimonial: "The best cheesecake I've ever had!", rating: 5 }]}
           />
@@ -49,7 +50,7 @@ export default function LandingPage() {
           <FooterBaseReveal
             logoText="Sheescakes'N More"
             columns={[
-              { title: "Quick Links", items: [{ label: "Home", href: "/" }, { label: "About", href: "/about" }, { label: "Contact", href: "/contact" }] }
+              { title: "Quick Links", items: [{ label: "Home", href: "/" }, { label: "About", href: "/about" }, { label: "Order", href: "/order" }, { label: "Contact", href: "/contact" }] }
             ]}
             copyrightText="© 2024 Sheescakes'N More."
           />

src/app/styles/base.css

@@ -11,7 +11,7 @@ html {
 body {
   background-color: var(--background);
   color: var(--foreground);
-  font-family: var(--font-mulish), sans-serif;
+  font-family: var(--font-playfair), sans-serif;
   position: relative;
   min-height: 100vh;
   overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
 h4,
 h5,
 h6 {
-  font-family: var(--font-mulish), sans-serif;
+  font-family: var(--font-playfair), sans-serif;
 }

src/app/styles/variables.css

@@ -10,7 +10,7 @@
   --accent: #ffffff;
   --background-accent: #ffffff; */
 
-  --background: #fbf8f5;
+  --background: #fdfbf7;
   --card: #f4ede6;
   --foreground: #4a3c31;
   --primary-cta: #d4a373;