Remove watermark

Merge version_2 into main

src/app/about/page.tsx

@@ -0,0 +1,81 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import NavbarStyleCentered from "@/components/navbar/NavbarStyleCentered/NavbarStyleCentered";
+import SplitAbout from "@/components/sections/about/SplitAbout";
+import FooterBaseCard from "@/components/sections/footer/FooterBaseCard";
+import { Leaf, Coffee, Home } from "lucide-react";
+
+const assetMap: Record<string, { url: string; alt?: string }> = {
+  "about-barista": {
+    "url": "https://pixabay.com/get/g975dd100b7fa909cbb921fca6551cc09a4ee95d9166bbc150f0be4c8c4ec10aab542a8a44ad949c3f51bfe36d9e7e8d345c74990b46ffca1c6fda6a4157bbc3d_1280.jpg",    "alt": "barista pouring latte art"
+  }
+};
+
+function resolveAsset(id: string) {
+  const asset = assetMap[id.replace('asset://', '')];
+  return asset ? { src: asset.url, alt: asset.alt } : { src: '', alt: '' };
+}
+
+export default function AboutPage() {
+  return (
+    <ThemeProvider
+      defaultButtonVariant="directional-hover"
+      defaultTextAnimation="entrance-slide"
+      borderRadius="soft"
+      contentWidth="medium"
+      sizing="largeSmall"
+      background="circleGradient"
+      cardStyle="layered-gradient"
+      primaryButtonStyle="double-inset"
+      secondaryButtonStyle="solid"
+      headingFontWeight="extrabold"
+    >
+      <div id="nav" data-section="nav">
+        <NavbarStyleCentered
+          navItems={[
+            { name: "Home", id: "/" },
+            { name: "Menu", id: "/menu" },
+            { name: "About Us", id: "/about" },
+            { name: "Reviews", id: "reviews" },
+            { name: "Contact", id: "contact" }
+          ]}
+          button={{
+            text: "Order Now",            href: "#contact"
+          }}
+          brandName="Brew Bliss"
+        />
+      </div>
+
+      <div id="about" data-section="about">
+        <SplitAbout
+          title="Our Story & Philosophy"
+          description="At Brew Bliss, we believe coffee is more than just a drink; it's an experience. We source the finest beans, roast them to perfection, and craft each cup with care, ensuring a blissful moment for every customer. Our commitment to quality and community drives everything we do."
+          bulletPoints={[
+            { title: "Quality Beans", description: "Ethically sourced from the world's best regions.", icon: Leaf },
+            { title: "Expert Baristas", description: "Passionate artisans crafting your perfect drink.", icon: Coffee },
+            { title: "Cozy Atmosphere", description: "Your perfect spot to relax, work, or socialize.", icon: Home }
+          ]}
+          imageSrc={resolveAsset("asset://about-barista").src}
+          imageAlt={resolveAsset("asset://about-barista").alt}
+          mediaAnimation="slide-up"
+          textboxLayout="default"
+          imagePosition="right"
+          useInvertedBackground={false}
+        />
+      </div>
+
+      <div id="footer" data-section="footer">
+        <FooterBaseCard
+          logoText="Brew Bliss"
+          columns={[
+            { title: "Menu", items: [{ label: "Espresso", href: "/menu" }, { label: "Lattes", href: "/menu" }, { label: "Pastries", href: "/menu" }] },
+            { title: "Company", items: [{ label: "Our Story", href: "/about" }, { label: "Reviews", href: "/#reviews" }, { label: "Contact", href: "/#contact" }] },
+            { title: "Follow Us", items: [{ label: "Instagram", href: "https://instagram.com/brewbliss" }, { label: "Facebook", href: "https://facebook.com/brewbliss" }] }
+          ]}
+          copyrightText="© 2024 Brew Bliss. All rights reserved."
+        />
+      </div>
+    </ThemeProvider>
+  );
+}

src/app/layout.tsx

@@ -4,7 +4,6 @@ import { Inter } from "next/font/google";
 import "./globals.css";
 import "@/lib/gsap-setup";
 import { ServiceWrapper } from "@/components/ServiceWrapper";
-import Tag from "@/tag/Tag";
 import { Manrope } from "next/font/google";
 import { DM_Sans } from "next/font/google";
 
@@ -31,7 +30,7 @@ export default function RootLayout({
     <html lang="en" suppressHydrationWarning>
       <ServiceWrapper>
         <body className={`${manrope.variable} ${dmSans.variable} antialiased`}>
-          <Tag />
+          
           {children}
         </body>
       </ServiceWrapper>

src/app/menu/page.tsx

@@ -0,0 +1,96 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import NavbarStyleCentered from "@/components/navbar/NavbarStyleCentered/NavbarStyleCentered";
+import ProductCardOne from "@/components/sections/product/ProductCardOne";
+import FooterBaseCard from "@/components/sections/footer/FooterBaseCard";
+
+const assetMap: Record<string, { url: string; alt?: string }> = {
+  "product-espresso": {
+    "url": "https://pixabay.com/get/gf71dbf3ecb82b48876a1a7407baff43e32aeafaa6e02694a3bea260bfa13b60f0b36703799ea9c452568cd4d18d2ab3bedb5815b7bcbd20aab9f9af9eef27fad_1280.jpg",    "alt": "classic espresso shot"
+  },
+  "product-latte": {
+    "url": "https://pixabay.com/get/g829a4d843bbc5ded8bcec2fcd256c4b9be3686f36f9e8c9096947b82da3fadff949885d08557b6324b0fbb57cfc5b40118365cca59ee91b21d9cf0e6bb5bb226_1280.jpg",    "alt": "creamy latte art mug"
+  },
+  "product-cappuccino": {
+    "url": "https://pixabay.com/get/g998cc4010d6e7ceae8492c17dd4682b1073fe2d30d8140387712ac33d186958649f180503554f81cc51c0425ca3ed8c1499008fe7176eef99d12e723876ebb02_1280.jpg",    "alt": "cappuccino with foam and cinnamon"
+  },
+  "product-croissant": {
+    "url": "https://pixabay.com/get/g0605d179f182d23ae56255f5447d95ee8b411cc14ae6f006c035dd6173dee32141af9bc0d4a1cde0c6b29d8bdc3220854c5ec5d227bc58a4191899efbaf44b1f_1280.jpg",    "alt": "freshly baked croissant pastry"
+  },
+  "product-muffin": {
+    "url": "https://pixabay.com/get/gf4c1e327f91c786dc66827e4dcbeea8b919fd7cd29d564e31ce08920240bb0611e1842267357b228b56f5e47b5489eac85f451ef3f762741bdb2781bc978e927_1280.jpg",    "alt": "blueberry muffin baked goods"
+  },
+  "product-iced-americano": {
+    "url": "https://pixabay.com/get/gcfa7b717a7e78fa77566c0f9133ff71203f0b3f1db3eecc6afd0cd23faeb3f62db6b5fd97358d754763f725e5c6e35269517d2ff4959436f915b1f883daef494_1280.jpg",    "alt": "iced americano glass cold coffee"
+  }
+};
+
+function resolveAsset(id: string) {
+  const asset = assetMap[id.replace('asset://', '')];
+  return asset ? { src: asset.url, alt: asset.alt } : { src: '', alt: '' };
+}
+
+export default function MenuPage() {
+  return (
+    <ThemeProvider
+      defaultButtonVariant="directional-hover"
+      defaultTextAnimation="entrance-slide"
+      borderRadius="soft"
+      contentWidth="medium"
+      sizing="largeSmall"
+      background="circleGradient"
+      cardStyle="layered-gradient"
+      primaryButtonStyle="double-inset"
+      secondaryButtonStyle="solid"
+      headingFontWeight="extrabold"
+    >
+      <div id="nav" data-section="nav">
+        <NavbarStyleCentered
+          navItems={[
+            { name: "Home", id: "/" },
+            { name: "Menu", id: "/menu" },
+            { name: "About Us", id: "/about" },
+            { name: "Reviews", id: "reviews" },
+            { name: "Contact", id: "contact" }
+          ]}
+          button={{
+            text: "Order Now",            href: "#contact"
+          }}
+          brandName="Brew Bliss"
+        />
+      </div>
+
+      <div id="menu" data-section="menu">
+        <ProductCardOne
+          title="Our Signature Brews"
+          description="Discover our handcrafted coffee and delightful pastries, made fresh daily with the finest ingredients."
+          products={[
+            { id: "1", name: "Classic Espresso", price: "$3.50", imageSrc: resolveAsset("asset://product-espresso").src, imageAlt: resolveAsset("asset://product-espresso").alt },
+            { id: "2", name: "Creamy Latte", price: "$5.00", imageSrc: resolveAsset("asset://product-latte").src, imageAlt: resolveAsset("asset://product-latte").alt },
+            { id: "3", name: "Cappuccino Delight", price: "$4.75", imageSrc: resolveAsset("asset://product-cappuccino").src, imageAlt: resolveAsset("asset://product-cappuccino").alt },
+            { id: "4", name: "Fresh Croissant", price: "$4.20", imageSrc: resolveAsset("asset://product-croissant").src, imageAlt: resolveAsset("asset://product-croissant").alt },
+            { id: "5", name: "Blueberry Muffin", price: "$3.80", imageSrc: resolveAsset("asset://product-muffin").src, imageAlt: resolveAsset("asset://product-muffin").alt },
+            { id: "6", name: "Iced Americano", price: "$4.00", imageSrc: resolveAsset("asset://product-iced-americano").src, imageAlt: resolveAsset("asset://product-iced-americano").alt }
+          ]}
+          gridVariant="three-columns-all-equal-width"
+          animationType="slide-up"
+          textboxLayout="default"
+          useInvertedBackground={false}
+        />
+      </div>
+
+      <div id="footer" data-section="footer">
+        <FooterBaseCard
+          logoText="Brew Bliss"
+          columns={[
+            { title: "Menu", items: [{ label: "Espresso", href: "/menu" }, { label: "Lattes", href: "/menu" }, { label: "Pastries", href: "/menu" }] },
+            { title: "Company", items: [{ label: "Our Story", href: "/about" }, { label: "Reviews", href: "/#reviews" }, { label: "Contact", href: "/#contact" }] },
+            { title: "Follow Us", items: [{ label: "Instagram", href: "https://instagram.com/brewbliss" }, { label: "Facebook", href: "https://facebook.com/brewbliss" }] }
+          ]}
+          copyrightText="© 2024 Brew Bliss. All rights reserved."
+        />
+      </div>
+    </ThemeProvider>
+  );
+}

src/app/page.tsx

@@ -3,8 +3,6 @@
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarStyleCentered from "@/components/navbar/NavbarStyleCentered/NavbarStyleCentered";
 import HeroLogoBillboardSplit from "@/components/sections/hero/HeroLogoBillboardSplit";
-import SplitAbout from "@/components/sections/about/SplitAbout";
-import ProductCardOne from "@/components/sections/product/ProductCardOne";
 import FeatureCardNineteen from "@/components/sections/feature/FeatureCardNineteen";
 import TestimonialCardFifteen from "@/components/sections/testimonial/TestimonialCardFifteen";
 import ContactSplitForm from "@/components/sections/contact/ContactSplitForm";
@@ -15,27 +13,6 @@ const assetMap: Record<string, { url: string; alt?: string }> = {
   "hero-coffee-beans": {
     "url": "https://pixabay.com/get/gec564114d84fb929b083b17897fc121dfbe3f67f77c20ba81e4ee584ea1fd5d6f51dfef1b349f7b66583cdc80653f3a94a9c6d1f049ffd963753e58fc5488fe9_1280.jpg",    "alt": "fresh coffee beans rustic setup"
   },
-  "about-barista": {
-    "url": "https://pixabay.com/get/g975dd100b7fa909cbb921fca6551cc09a4ee95d9166bbc150f0be4c8c4ec10aab542a8a44ad949c3f51bfe36d9e7e8d345c74990b46ffca1c6fda6a4157bbc3d_1280.jpg",    "alt": "barista pouring latte art"
-  },
-  "product-espresso": {
-    "url": "https://pixabay.com/get/gf71dbf3ecb82b48876a1a7407baff43e32aeafaa6e02694a3bea260bfa13b60f0b36703799ea9c452568cd4d18d2ab3bedb5815b7bcbd20aab9f9af9eef27fad_1280.jpg",    "alt": "classic espresso shot"
-  },
-  "product-latte": {
-    "url": "https://pixabay.com/get/g829a4d843bbc5ded8bcec2fcd256c4b9be3686f36f9e8c9096947b82da3fadff949885d08557b6324b0fbb57cfc5b40118365cca59ee91b21d9cf0e6bb5bb226_1280.jpg",    "alt": "creamy latte art mug"
-  },
-  "product-cappuccino": {
-    "url": "https://pixabay.com/get/g998cc4010d6e7ceae8492c17dd4682b1073fe2d30d8140387712ac33d186958649f180503554f81cc51c0425ca3ed8c1499008fe7176eef99d12e723876ebb02_1280.jpg",    "alt": "cappuccino with foam and cinnamon"
-  },
-  "product-croissant": {
-    "url": "https://pixabay.com/get/g0605d179f182d23ae56255f5447d95ee8b411cc14ae6f006c035dd6173dee32141af9bc0d4a1cde0c6b29d8bdc3220854c5ec5d227bc58a4191899efbaf44b1f_1280.jpg",    "alt": "freshly baked croissant pastry"
-  },
-  "product-muffin": {
-    "url": "https://pixabay.com/get/gf4c1e327f91c786dc66827e4dcbeea8b919fd7cd29d564e31ce08920240bb0611e1842267357b228b56f5e47b5489eac85f451ef3f762741bdb2781bc978e927_1280.jpg",    "alt": "blueberry muffin baked goods"
-  },
-  "product-iced-americano": {
-    "url": "https://pixabay.com/get/gcfa7b717a7e78fa77566c0f9133ff71203f0b3f1db3eecc6afd0cd23faeb3f62db6b5fd97358d754763f725e5c6e35269517d2ff4959436f915b1f883daef494_1280.jpg",    "alt": "iced americano glass cold coffee"
-  },
   "feature-sourcing": {
     "url": "https://pixabay.com/get/gdb3a98d0367cc7e2f9cdef2669665b62f93d311793b938c2daccaaf348d0fbe76765540b79729bcbcd8b5b220e014d7c3ae57e4d74114dcb6bca9fff57acabe2_1280.jpg",    "alt": "coffee bean farm landscape"
   },
@@ -106,8 +83,8 @@ export default function LandingPage() {
           description="Your daily dose of happiness, handcrafted with passion. Taste the difference in every cup."
           background={{ variant: "radial-gradient" }}
           buttons={[
-            { text: "Explore Menu", href: "#menu" },
+            { text: "Explore Menu", href: "/menu" },
-            { text: "Our Story", href: "#about" }
+            { text: "Our Story", href: "/about" }
           ]}
           layoutOrder="default"
           imageSrc={resolveAsset("asset://hero-coffee-beans").src}
@@ -117,43 +94,6 @@ export default function LandingPage() {
         />
       </div>
 
-      <div id="about" data-section="about">
-        <SplitAbout
-          title="Our Story & Philosophy"
-          description="At Brew Bliss, we believe coffee is more than just a drink; it's an experience. We source the finest beans, roast them to perfection, and craft each cup with care, ensuring a blissful moment for every customer. Our commitment to quality and community drives everything we do."
-          bulletPoints={[
-            { title: "Quality Beans", description: "Ethically sourced from the world's best regions.", icon: Leaf },
-            { title: "Expert Baristas", description: "Passionate artisans crafting your perfect drink.", icon: Coffee },
-            { title: "Cozy Atmosphere", description: "Your perfect spot to relax, work, or socialize.", icon: Home }
-          ]}
-          imageSrc={resolveAsset("asset://about-barista").src}
-          imageAlt={resolveAsset("asset://about-barista").alt}
-          mediaAnimation="slide-up"
-          textboxLayout="default"
-          imagePosition="right"
-          useInvertedBackground={false}
-        />
-      </div>
-
-      <div id="menu" data-section="menu">
-        <ProductCardOne
-          title="Our Signature Brews"
-          description="Discover our handcrafted coffee and delightful pastries, made fresh daily with the finest ingredients."
-          products={[
-            { id: "1", name: "Classic Espresso", price: "$3.50", imageSrc: resolveAsset("asset://product-espresso").src, imageAlt: resolveAsset("asset://product-espresso").alt },
-            { id: "2", name: "Creamy Latte", price: "$5.00", imageSrc: resolveAsset("asset://product-latte").src, imageAlt: resolveAsset("asset://product-latte").alt },
-            { id: "3", name: "Cappuccino Delight", price: "$4.75", imageSrc: resolveAsset("asset://product-cappuccino").src, imageAlt: resolveAsset("asset://product-cappuccino").alt },
-            { id: "4", name: "Fresh Croissant", price: "$4.20", imageSrc: resolveAsset("asset://product-croissant").src, imageAlt: resolveAsset("asset://product-croissant").alt },
-            { id: "5", name: "Blueberry Muffin", price: "$3.80", imageSrc: resolveAsset("asset://product-muffin").src, imageAlt: resolveAsset("asset://product-muffin").alt },
-            { id: "6", name: "Iced Americano", price: "$4.00", imageSrc: resolveAsset("asset://product-iced-americano").src, imageAlt: resolveAsset("asset://product-iced-americano").alt }
-          ]}
-          gridVariant="three-columns-all-equal-width"
-          animationType="slide-up"
-          textboxLayout="default"
-          useInvertedBackground={false}
-        />
-      </div>
-
       <div id="features" data-section="features">
         <FeatureCardNineteen
           title="The Brew Bliss Journey"
@@ -208,8 +148,8 @@ export default function LandingPage() {
         <FooterBaseCard
           logoText="Brew Bliss"
           columns={[
-            { title: "Menu", items: [{ label: "Espresso", href: "/#menu" }, { label: "Lattes", href: "/#menu" }, { label: "Pastries", href: "/#menu" }] },
+            { title: "Menu", items: [{ label: "Espresso", href: "/menu" }, { label: "Lattes", href: "/menu" }, { label: "Pastries", href: "/menu" }] },
-            { title: "Company", items: [{ label: "Our Story", href: "/#about" }, { label: "Reviews", href: "/#reviews" }, { label: "Contact", href: "/#contact" }] },
+            { title: "Company", items: [{ label: "Our Story", href: "/about" }, { label: "Reviews", href: "/#reviews" }, { label: "Contact", href: "/#contact" }] },
             { title: "Follow Us", items: [{ label: "Instagram", href: "https://instagram.com/brewbliss" }, { label: "Facebook", href: "https://facebook.com/brewbliss" }] }
           ]}
           copyrightText="© 2024 Brew Bliss. All rights reserved."