Merge version_2 into main

Update src/app/about/page.tsx
2026-04-11 21:12:53 +00:00 · 2026-04-11 21:12:50 +00:00 · 2026-04-11 21:12:20 +00:00 · 2026-04-11 21:12:17 +00:00 · 2026-04-11 21:11:54 +00:00 · 2026-04-11 21:11:51 +00:00
5 changed files with 188 additions and 231 deletions
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -0,0 +1,46 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import ReactLenis from "lenis/react";
+import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
+import TestimonialAboutCard from '@/components/sections/about/TestimonialAboutCard';
+import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
+import { Coffee } from "lucide-react";
+
+export default function AboutPage() {
+  return (
+    <ThemeProvider defaultButtonVariant="hover-magnetic" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
+      <ReactLenis root>
+        <div id="nav" data-section="nav">
+          <NavbarStyleFullscreen
+            navItems={[
+              { name: "Home", id: "/" },
+              { name: "About", id: "/about" },
+              { name: "Menu", id: "/menu" },
+              { name: "Testimonials", id: "/testimonials" },
+              { name: "Contact", id: "/contact" },
+            ]}
+            brandName="Mary's Cafe"
+          />
+        </div>
+        <div id="about" data-section="about">
+          <TestimonialAboutCard
+            tag="Our Story"
+            title="Where Hospitality Meets Heart"
+            description="Alaa and Samah pour their dedication into every cup served. Our cafe is more than a place to eat; it is a community hub built on kindness, value, and authentic flavor."
+            subdescription="Come for the coffee, stay for the warmth."
+            icon={Coffee}
+            imageSrc="https://images.unsplash.com/photo-1554118811-1e0d58224f24?q=80&w=2047&auto=format&fit=crop"
+            useInvertedBackground={false}
+          />
+        </div>
+        <div id="footer" data-section="footer">
+          <FooterLogoEmphasis
+            columns={[{ items: [{ label: "Home", href: "/" }, { label: "About", href: "/about" }, { label: "Menu", href: "/menu" }] }]}
+            logoText="Mary's Cafe"
+          />
+        </div>
+      </ReactLenis>
+    </ThemeProvider>
+  );
+}
--- a/src/app/contact/page.tsx
+++ b/src/app/contact/page.tsx
@@ -0,0 +1,33 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import ReactLenis from "lenis/react";
+import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
+import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
+
+export default function ContactPage() {
+  return (
+    <ThemeProvider defaultButtonVariant="hover-magnetic" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
+      <ReactLenis root>
+        <div id="nav" data-section="nav">
+          <NavbarStyleFullscreen
+            navItems={[
+              { name: "Home", id: "/" },
+              { name: "About", id: "/about" },
+              { name: "Menu", id: "/menu" },
+              { name: "Testimonials", id: "/testimonials" },
+              { name: "Contact", id: "/contact" },
+            ]}
+            brandName="Mary's Cafe"
+          />
+        </div>
+        <div id="footer" data-section="footer">
+          <FooterLogoEmphasis
+            columns={[{ items: [{ label: "Home", href: "/" }, { label: "About", href: "/about" }, { label: "Menu", href: "/menu" }] }]}
+            logoText="Mary's Cafe"
+          />
+        </div>
+      </ReactLenis>
+    </ThemeProvider>
+  );
+}
--- a/src/app/menu/page.tsx
+++ b/src/app/menu/page.tsx
@@ -0,0 +1,49 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import ReactLenis from "lenis/react";
+import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
+import ProductCardTwo from '@/components/sections/product/ProductCardTwo';
+import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
+
+export default function MenuPage() {
+  return (
+    <ThemeProvider defaultButtonVariant="hover-magnetic" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
+      <ReactLenis root>
+        <div id="nav" data-section="nav">
+          <NavbarStyleFullscreen
+            navItems={[
+              { name: "Home", id: "/" },
+              { name: "About", id: "/about" },
+              { name: "Menu", id: "/menu" },
+              { name: "Testimonials", id: "/testimonials" },
+              { name: "Contact", id: "/contact" },
+            ]}
+            brandName="Mary's Cafe"
+          />
+        </div>
+        <div id="menu" data-section="menu">
+          <ProductCardTwo
+            gridVariant="uniform-all-items-equal"
+            animationType="slide-up"
+            textboxLayout="default"
+            title="Our Menu"
+            description="Explore our simple, honest, and high-quality menu."
+            useInvertedBackground={false}
+            products={[
+              { id: "p1", brand: "Signature", name: "Egg Mayo Sandwich", price: "$8", rating: 5, reviewCount: "120", imageSrc: "http://img.b2bpic.net/free-photo/top-view-friends-having-lunch-luxury-restaurant_23-2151081455.jpg" },
+              { id: "p2", brand: "Premium", name: "Artisan Latte", price: "$4", rating: 5, reviewCount: "200", imageSrc: "http://img.b2bpic.net/free-photo/closeup-turkish-coffee-making-cezve-sand-coffee-bar-professional-barista-manually-prepares-coffee-traditional-way-using-modern-equipment-selective-focus-space-text_166373-2976.jpg" },
+              { id: "p3", brand: "Fresh", name: "Daily Pastry", price: "$6", rating: 5, reviewCount: "80", imageSrc: "http://img.b2bpic.net/free-photo/top-view-yummy-sweet-pancakes-with-cup-tea-light-desk_140725-91396.jpg" },
+            ]}
+          />
+        </div>
+        <div id="footer" data-section="footer">
+          <FooterLogoEmphasis
+            columns={[{ items: [{ label: "Home", href: "/" }, { label: "About", href: "/about" }, { label: "Menu", href: "/menu" }] }]}
+            logoText="Mary's Cafe"
+          />
+        </div>
+      </ReactLenis>
+    </ThemeProvider>
+  );
+}
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -29,26 +29,11 @@ export default function LandingPage() {
  <div id="nav" data-section="nav">
      <NavbarStyleFullscreen
      navItems={[
-        {
-          name: "Home",
-          id: "home",
-        },
-        {
-          name: "About",
-          id: "about",
-        },
-        {
-          name: "Menu",
-          id: "menu",
-        },
-        {
-          name: "Reviews",
-          id: "testimonials",
-        },
-        {
-          name: "Visit",
-          id: "contact",
-        },
+        { name: "Home", id: "/" },
+        { name: "About", id: "/#about" },
+        { name: "Menu", id: "/#menu" },
+        { name: "Reviews", id: "/testimonials" },
+        { name: "Visit", id: "/contact" },
      ]}
      brandName="Mary's Cafe"
    />
@@ -56,78 +41,32 @@ export default function LandingPage() {

  <div id="home" data-section="home">
      <HeroSplitKpi
-      background={{
-        variant: "gradient-bars",
-      }}
+      background={{ variant: "gradient-bars" }}
      title="Experience Mary's Warmth"
      description="Crafting the finest coffee and freshest meals with love. Join us for a moment of quiet luxury."
      kpis={[
-        {
-          value: "100%",
-          label: "Genuine Hospitality",
-        },
-        {
-          value: "Best",
-          label: "Coffee in Town",
-        },
-        {
-          value: "Fresh",
-          label: "Daily Ingredients",
-        },
+        { value: "100%", label: "Genuine Hospitality" },
+        { value: "Best", label: "Coffee in Town" },
+        { value: "Fresh", label: "Daily Ingredients" },
      ]}
      enableKpiAnimation={true}
      imageSrc="http://img.b2bpic.net/free-photo/details-catered-holiday-table-restaurant_8353-9663.jpg"
      imageAlt="Luxury cafe interior morning light"
      mediaAnimation="blur-reveal"
      avatars={[
-        {
-          src: "http://img.b2bpic.net/free-photo/hot-latte-coffee-cup-table_1203-9913.jpg",
-          alt: "Hot latte coffee cup on table",
-        },
-        {
-          src: "http://img.b2bpic.net/free-photo/trendy-coffee-shop-city_53876-30213.jpg",
-          alt: "A trendy coffee shop in the city",
-        },
-        {
-          src: "http://img.b2bpic.net/free-photo/hot-cup-coffee-with-cream-macaroon_140725-7521.jpg",
-          alt: "Hot cup of coffee with cream and macaroon",
-        },
-        {
-          src: "http://img.b2bpic.net/free-photo/woman-works-cafe-evening_1153-3549.jpg",
-          alt: "Woman works at a cafe in the evening",
-        },
-        {
-          src: "http://img.b2bpic.net/free-photo/portrait-smiling-brunette-woman-drinks-morning-coffee-cafe_613910-12094.jpg",
-          alt: "Portrait of smiling brunette woman",
-        },
+        { src: "http://img.b2bpic.net/free-photo/hot-latte-coffee-cup-table_1203-9913.jpg", alt: "Hot latte coffee cup on table" },
+        { src: "http://img.b2bpic.net/free-photo/trendy-coffee-shop-city_53876-30213.jpg", alt: "A trendy coffee shop in the city" },
+        { src: "http://img.b2bpic.net/free-photo/hot-cup-coffee-with-cream-macaroon_140725-7521.jpg", alt: "Hot cup of coffee with cream and macaroon" },
+        { src: "http://img.b2bpic.net/free-photo/woman-works-cafe-evening_1153-3549.jpg", alt: "Woman works at a cafe in the evening" },
+        { src: "http://img.b2bpic.net/free-photo/portrait-smiling-brunette-woman-drinks-morning-coffee-cafe_613910-12094.jpg", alt: "Portrait of smiling brunette woman" },
      ]}
      avatarText="Join our community of coffee lovers"
      marqueeItems={[
-        {
-          type: "text-icon",
-          text: "Artisan Coffee",
-          icon: Coffee,
-        },
-        {
-          type: "text-icon",
-          text: "Fresh Pastries",
-          icon: Croissant,
-        },
-        {
-          type: "text-icon",
-          text: "Cozy Atmosphere",
-          icon: Coffee,
-        },
-        {
-          type: "text-icon",
-          text: "Quality Service",
-          icon: Heart,
-        },
-        {
-          type: "text-icon",
-          text: "Open Daily",
-          icon: Clock,
-        },
+        { type: "text-icon", text: "Artisan Coffee", icon: Coffee },
+        { type: "text-icon", text: "Fresh Pastries", icon: Croissant },
+        { type: "text-icon", text: "Cozy Atmosphere", icon: Coffee },
+        { type: "text-icon", text: "Quality Service", icon: Heart },
+        { type: "text-icon", text: "Open Daily", icon: Clock },
      ]}
    />
  </div>
@@ -152,166 +91,23 @@ export default function LandingPage() {
      gridVariant="uniform-all-items-equal"
      useInvertedBackground={false}
      products={[
-        {
-          id: "p1",
-          brand: "Signature",
-          name: "Egg Mayo Sandwich",
-          price: "$8",
-          rating: 5,
-          reviewCount: "120",
-          imageSrc: "http://img.b2bpic.net/free-photo/top-view-friends-having-lunch-luxury-restaurant_23-2151081455.jpg",
-        },
-        {
-          id: "p2",
-          brand: "Premium",
-          name: "Artisan Latte",
-          price: "$4",
-          rating: 5,
-          reviewCount: "200",
-          imageSrc: "http://img.b2bpic.net/free-photo/closeup-turkish-coffee-making-cezve-sand-coffee-bar-professional-barista-manually-prepares-coffee-traditional-way-using-modern-equipment-selective-focus-space-text_166373-2976.jpg",
-        },
-        {
-          id: "p3",
-          brand: "Fresh",
-          name: "Daily Pastry",
-          price: "$6",
-          rating: 5,
-          reviewCount: "80",
-          imageSrc: "http://img.b2bpic.net/free-photo/top-view-yummy-sweet-pancakes-with-cup-tea-light-desk_140725-91396.jpg",
-        },
-        {
-          id: "p4",
-          brand: "Classic",
-          name: "Flat White",
-          price: "$4",
-          rating: 5,
-          reviewCount: "150",
-          imageSrc: "http://img.b2bpic.net/free-photo/view-coffee-cup-with-pastel-colored-background_23-2151753032.jpg",
-        },
-        {
-          id: "p5",
-          brand: "Signature",
-          name: "Avocado Toast",
-          price: "$12",
-          rating: 5,
-          reviewCount: "95",
-          imageSrc: "http://img.b2bpic.net/free-photo/slices-smoked-salmon-served-with-radishes-lettuce-greens_140725-8161.jpg",
-        },
-        {
-          id: "p6",
-          brand: "Premium",
-          name: "Iced Americano",
-          price: "$5",
-          rating: 5,
-          reviewCount: "110",
-          imageSrc: "http://img.b2bpic.net/free-photo/coffee-cookie_1388-153.jpg",
-        },
+        { id: "p1", brand: "Signature", name: "Egg Mayo Sandwich", price: "$8", rating: 5, reviewCount: "120", imageSrc: "http://img.b2bpic.net/free-photo/top-view-friends-having-lunch-luxury-restaurant_23-2151081455.jpg" },
+        { id: "p2", brand: "Premium", name: "Artisan Latte", price: "$4", rating: 5, reviewCount: "200", imageSrc: "http://img.b2bpic.net/free-photo/closeup-turkish-coffee-making-cezve-sand-coffee-bar-professional-barista-manually-prepares-coffee-traditional-way-using-modern-equipment-selective-focus-space-text_166373-2976.jpg" },
+        { id: "p3", brand: "Fresh", name: "Daily Pastry", price: "$6", rating: 5, reviewCount: "80", imageSrc: "http://img.b2bpic.net/free-photo/top-view-yummy-sweet-pancakes-with-cup-tea-light-desk_140725-91396.jpg" },
+        { id: "p4", brand: "Classic", name: "Flat White", price: "$4", rating: 5, reviewCount: "150", imageSrc: "http://img.b2bpic.net/free-photo/view-coffee-cup-with-pastel-colored-background_23-2151753032.jpg" },
+        { id: "p5", brand: "Signature", name: "Avocado Toast", price: "$12", rating: 5, reviewCount: "95", imageSrc: "http://img.b2bpic.net/free-photo/slices-smoked-salmon-served-with-radishes-lettuce-greens_140725-8161.jpg" },
+        { id: "p6", brand: "Premium", name: "Iced Americano", price: "$5", rating: 5, reviewCount: "110", imageSrc: "http://img.b2bpic.net/free-photo/coffee-cookie_1388-153.jpg" },
      ]}
      title="Culinary Delights"
      description="From our legendary egg mayo sandwich to the finest roasted beans, explore our simple, honest, and high-quality menu."
    />
  </div>

-  <div id="testimonials" data-section="testimonials">
-      <TestimonialCardSix
-      animationType="slide-up"
-      textboxLayout="default"
-      useInvertedBackground={true}
-      testimonials={[
-        {
-          id: "t1",
-          name: "Chris Ward",
-          handle: "@chrisward",
-          testimonial: "Cheapest coffee in town and great value. Really kind people.",
-          imageSrc: "http://img.b2bpic.net/free-photo/woman-holding-coffee-cup-work-medium-shot_23-2149308464.jpg",
-        },
-        {
-          id: "t2",
-          name: "Ada Wang",
-          handle: "@adawang",
-          testimonial: "Very affordable price and great food. Egg mayo sandwich is my favourite.",
-          imageSrc: "http://img.b2bpic.net/free-photo/woman-trying-listening-some-sound_1187-3768.jpg",
-        },
-        {
-          id: "t3",
-          name: "Kaoutar Mahani",
-          handle: "@kaoutar",
-          testimonial: "Excellent service and food quality. Always a 5-star experience.",
-          imageSrc: "http://img.b2bpic.net/free-photo/portrait-beautiful-stylish-cool-funny-teenage-woman-going-crazy-checkered-shirt-holding-plastic-coffee-cup_158538-8194.jpg",
-        },
-        {
-          id: "t4",
-          name: "Sarah Jenkins",
-          handle: "@sarahj",
-          testimonial: "The atmosphere is always welcoming. A hidden gem in the city.",
-          imageSrc: "http://img.b2bpic.net/free-photo/close-up-woman-holding-coffee-cup_23-2148877753.jpg",
-        },
-        {
-          id: "t5",
-          name: "Michael Roberts",
-          handle: "@mroberts",
-          testimonial: "Consistently great coffee. It's my daily stop for a reason.",
-          imageSrc: "http://img.b2bpic.net/free-photo/smiling-man-holding-cup-coffee-coffee-shop_1170-2324.jpg",
-        },
-      ]}
-      title="Loved by Our Community"
-      description="Don't just take our word for it. Hear what our regulars have to say."
-    />
-  </div>
-
-  <div id="contact" data-section="contact">
-      <ContactCTA
-      useInvertedBackground={false}
-      background={{
-        variant: "sparkles-gradient",
-      }}
-      tag="Visit Us"
-      title="Ready for a Coffee?"
-      description="Come visit Mary's Cafe today for the best experience in town. We look forward to serving you."
-      buttons={[
-        {
-          text: "Get Directions",
-          href: "#",
-        },
-      ]}
-    />
-  </div>
-
  <div id="footer" data-section="footer">
      <FooterLogoEmphasis
      columns={[
-        {
-          items: [
-            {
-              label: "Home",
-              href: "#home",
-            },
-            {
-              label: "About",
-              href: "#about",
-            },
-            {
-              label: "Menu",
-              href: "#menu",
-            },
-          ],
-        },
-        {
-          items: [
-            {
-              label: "Reviews",
-              href: "#testimonials",
-            },
-            {
-              label: "Contact",
-              href: "#contact",
-            },
-            {
-              label: "Privacy Policy",
-              href: "#",
-            },
-          ],
-        },
+        { items: [{ label: "Home", href: "/" }, { label: "About", href: "/#about" }, { label: "Menu", href: "/#menu" }] },
+        { items: [{ label: "Reviews", href: "/testimonials" }, { label: "Contact", href: "/contact" }, { label: "Privacy Policy", href: "#" }] },
      ]}
      logoText="Mary's Cafe"
    />
--- a/src/app/testimonials/page.tsx
+++ b/src/app/testimonials/page.tsx
@@ -0,0 +1,33 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import ReactLenis from "lenis/react";
+import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
+import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
+
+export default function TestimonialsPage() {
+  return (
+    <ThemeProvider defaultButtonVariant="hover-magnetic" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
+      <ReactLenis root>
+        <div id="nav" data-section="nav">
+          <NavbarStyleFullscreen
+            navItems={[
+              { name: "Home", id: "/" },
+              { name: "About", id: "/about" },
+              { name: "Menu", id: "/menu" },
+              { name: "Testimonials", id: "/testimonials" },
+              { name: "Contact", id: "/contact" },
+            ]}
+            brandName="Mary's Cafe"
+          />
+        </div>
+        <div id="footer" data-section="footer">
+          <FooterLogoEmphasis
+            columns={[{ items: [{ label: "Home", href: "/" }, { label: "About", href: "/about" }, { label: "Menu", href: "/menu" }] }]}
+            logoText="Mary's Cafe"
+          />
+        </div>
+      </ReactLenis>
+    </ThemeProvider>
+  );
+}
Author	SHA1	Message	Date
bender	221ad39725	Merge version_2 into main Merge version_2 into main	2026-04-11 21:12:53 +00:00
bender	72bdad2376	Update src/app/about/page.tsx	2026-04-11 21:12:50 +00:00
bender	cf055346fd	Merge version_2 into main Merge version_2 into main	2026-04-11 21:12:20 +00:00
bender	2e1c8c91c2	Update src/app/about/page.tsx	2026-04-11 21:12:17 +00:00
bender	29d20baede	Merge version_2 into main Merge version_2 into main	2026-04-11 21:11:54 +00:00
bender	4e11747d27	Update src/app/testimonials/page.tsx	2026-04-11 21:11:51 +00:00
bender	e2668665df	Update src/app/menu/page.tsx	2026-04-11 21:11:51 +00:00
bender	117dba0989	Update src/app/contact/page.tsx	2026-04-11 21:11:51 +00:00
bender	5cca527f30	Update src/app/about/page.tsx	2026-04-11 21:11:50 +00:00
bender	92d23b91fb	Merge version_2 into main Merge version_2 into main	2026-04-11 21:11:22 +00:00
bender	4b512b17f0	Add src/app/testimonials/page.tsx	2026-04-11 21:11:19 +00:00
bender	50ca75c64f	Update src/app/page.tsx	2026-04-11 21:11:19 +00:00
bender	97a424f627	Add src/app/menu/page.tsx	2026-04-11 21:11:18 +00:00
bender	465e66cbf3	Add src/app/contact/page.tsx	2026-04-11 21:11:18 +00:00
bender	80e421f973	Add src/app/about/page.tsx	2026-04-11 21:11:18 +00:00