Merge version_4 into main

Merge version_4 into main

src/app/blog/page.tsx

@@ -6,6 +6,7 @@ import { useBlogPosts } from "@/hooks/useBlogPosts";
 import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
 import BlogCardOne from '@/components/sections/blog/BlogCardOne';
 import FooterMedia from '@/components/sections/footer/FooterMedia';
+import Link from 'next/link';
 
 export default function BlogPage() {
     const { posts, isLoading } = useBlogPosts();
@@ -17,7 +18,7 @@ export default function BlogPage() {
             borderRadius="pill"
             contentWidth="mediumSmall"
             sizing="mediumLargeSizeLargeTitles"
-            background="aurora"
+            background="noise"
             cardStyle="glass-depth"
             primaryButtonStyle="gradient"
             secondaryButtonStyle="layered"
@@ -29,8 +30,10 @@ export default function BlogPage() {
                         navItems={[
                             { name: "Home", id: "/" },
                             { name: "About", id: "/#about" },
-                            { name: "Shop", id: "/shop" },
-                            { name: "Blog", id: "/blog" },
+                            { name: "Products", id: "/#products" },
+                            { name: "Testimonials", id: "/#testimonials" },
+                            { name: "FAQ", id: "/#faq" },
+                            { name: "Contact", id: "/contacts" }
                         ]}
                         button={{ text: "Shop Now", href: "/shop" }}
                         brandName="Find Mouse"
@@ -60,9 +63,9 @@ export default function BlogPage() {
                             imageSrc="https://img.b2bpic.net/free-photo/beautiful-shot-sheep-grazing-green-fields-sunset_181624-11278.jpg?_wi=2"
                             imageAlt="Scenic dairy farm landscape"
                             columns={[
-                                { title: "Shop", items: [{ label: "Milk", href: "products" }, { label: "Cheese", href: "products" }, { label: "Specials", href: "products" }] },
-                                { title: "About Us", items: [{ label: "Our Story", href: "about" }, { label: "Sustainability", href: "about" }, { label: "Team", href: "#" }] },
-                                { title: "Support", items: [{ label: "FAQ", href: "faq" }, { label: "Contact", href: "contact" }, { label: "Privacy Policy", href: "#" }] }
+                                { title: "Shop", items: [{ label: "Milk", href: "/shop" }, { label: "Cheese", href: "/shop" }, { label: "Specials", href: "/shop" }] },
+                                { title: "About Us", items: [{ label: "Our Story", href: "/#about" }, { label: "Sustainability", href: "/#about" }, { label: "Team", href: "#" }] },
+                                { title: "Support", items: [{ label: "FAQ", href: "/#faq" }, { label: "Contact", href: "/contacts" }, { label: "Privacy Policy", href: "#" }] }
                             ]}
                             logoText="Find Mouse"
                             copyrightText="© 2024 Find Mouse. All rights reserved."

src/app/contacts/page.tsx

@@ -0,0 +1,71 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
+import ContactSplitForm from '@/components/sections/contact/ContactSplitForm';
+import FooterMedia from '@/components/sections/footer/FooterMedia';
+import Link from 'next/link';
+
+export default function ContactsPage() {
+  return (
+    <ThemeProvider
+      defaultButtonVariant="shift-hover"
+      defaultTextAnimation="entrance-slide"
+      borderRadius="pill"
+      contentWidth="mediumSmall"
+      sizing="mediumLargeSizeLargeTitles"
+      background="noise"
+      cardStyle="glass-depth"
+      primaryButtonStyle="gradient"
+      secondaryButtonStyle="layered"
+      headingFontWeight="extrabold"
+    >
+      <div id="nav" data-section="nav">
+        <NavbarStyleCentered
+          navItems={[
+            { name: "Home", id: "/" },
+            { name: "About", id: "/#about" },
+            { name: "Products", id: "/#products" },
+            { name: "Testimonials", id: "/#testimonials" },
+            { name: "FAQ", id: "/#faq" },
+            { name: "Contact", id: "/contacts" }
+          ]}
+          button={{ text: "Shop Now", href: "/shop" }}
+          brandName="Find Mouse"
+        />
+      </div>
+      <div id="contact-page-section" data-section="contact-page-section">
+        <ContactSplitForm
+          title="Get in Touch with Find Mouse"
+          description="Have questions about our products, farm tours, or special orders? We'd love to hear from you!"
+          inputs={[
+            { name: "name", type: "text", placeholder: "Your Name", required: true },
+            { name: "email", type: "email", placeholder: "Your Email", required: true }
+          ]}
+          textarea={{ name: "message", placeholder: "Tell us more...", rows: 5, required: true }}
+          buttonText="Send Message"
+          imageSrc="/placeholders/placeholder1.webp?_wi=2"
+          videoSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3A47KqSdGj7sEG8mcGU4TIVm5ml/uploaded-1771850674704-2zcygfwe.mp4?_wi=2"
+          imageAlt="People contacting a business"
+          mediaAnimation="slide-up"
+          mediaPosition="right"
+          useInvertedBackground={false}
+          ariaLabel="Contact form for Find Mouse"
+        />
+      </div>
+      <div id="footer" data-section="footer">
+        <FooterMedia
+          imageSrc="https://img.b2bpic.net/free-photo/beautiful-shot-sheep-grazing-green-fields-sunset_181624-11278.jpg?_wi=1"
+          imageAlt="Scenic dairy farm landscape"
+          columns={[
+            { title: "Shop", items: [{ label: "Milk", href: "/shop" }, { label: "Cheese", href: "/shop" }, { label: "Specials", href: "/shop" }] },
+            { title: "About Us", items: [{ label: "Our Story", href: "/#about" }, { label: "Sustainability", href: "/#about" }, { label: "Team", href: "#" }] },
+            { title: "Support", items: [{ label: "FAQ", href: "/#faq" }, { label: "Contact", href: "/contacts" }, { label: "Privacy Policy", href: "#" }] }
+          ]}
+          logoText="Find Mouse"
+          copyrightText="© 2024 Find Mouse. All rights reserved."
+        />
+      </div>
+    </ThemeProvider>
+  );
+}

src/app/layout.tsx

@@ -1,25 +1,12 @@
 import type { Metadata } from "next";
-import { Plus_Jakarta_Sans } from "next/font/google";
+import { Inter } from "next/font/google";
 import "./globals.css";
-import { ServiceWrapper } from "@/components/ServiceWrapper";
-import Tag from "@/tag/Tag";
+import "../styles/variables.css";
 
-const plusJakartaSans = Plus_Jakarta_Sans({
-  variable: "--font-plus-jakarta-sans",  subsets: ["latin"],
-});
+const inter = Inter({ subsets: ["latin"] });
 
 export const metadata: Metadata = {
-  title: "Find Mouse | Fresh Milk & Artisanal Cheese",  description: "Discover farm-fresh milk and handcrafted artisanal cheeses from Find Mouse. Quality dairy products made with tradition and care.",  keywords: ["milk", "cheese", "dairy", "artisanal", "farm fresh", "natural", "organic", "cheddar", "goat cheese", "yogurt", "butter"],
-  openGraph: {
-    title: "Find Mouse | Fresh Milk & Artisanal Cheese",    description: "Discover farm-fresh milk and handcrafted artisanal cheeses from Find Mouse. Quality dairy products made with tradition and care.",    url: "/",    siteName: "Find Mouse",    images: [
-      {
-        url: "https://img.b2bpic.net/free-photo/different-types-cheese-wooden-background-composition-delicatessen-concept-gourmet-cheeses_169016-4622.jpg",        alt: "Find Mouse dairy products on a rustic table"},
-    ],
-    type: "website"},
-  twitter: {
-    card: "summary_large_image",    title: "Find Mouse | Fresh Milk & Artisanal Cheese",    description: "Discover farm-fresh milk and handcrafted artisanal cheeses from Find Mouse. Quality dairy products made with tradition and care.",    images: ["https://img.b2bpic.net/free-photo/different-types-cheese-wooden-background-composition-delicatessen-concept-gourmet-cheeses_169016-4622.jpg"],
-  },
-};
+  title: "Find Mouse",  description: "Discover the wholesome goodness of our farm-fresh milk and handcrafted cheeses, made with passion and tradition."};
 
 export default function RootLayout({
   children,
@@ -27,14 +14,8 @@ export default function RootLayout({
   children: React.ReactNode;
 }>) {
   return (
-    <html lang="en" suppressHydrationWarning>
-      <ServiceWrapper>
-        <body
-          className={`${plusJakartaSans.variable} antialiased`}
-        >
-          <Tag />
-          {children}
-        
+    <html lang="en">
+      <body className={inter.className}>{children}
         <script
           dangerouslySetInnerHTML={{
             __html: `
@@ -1402,7 +1383,6 @@ export default function RootLayout({
           }}
         />
       </body>
-      </ServiceWrapper>
     </html>
   );
 }

src/app/page.tsx

@@ -11,6 +11,7 @@ import FaqDouble from '@/components/sections/faq/FaqDouble';
 import ContactSplitForm from '@/components/sections/contact/ContactSplitForm';
 import FooterMedia from '@/components/sections/footer/FooterMedia';
 import { CookingPot, Egg, Milk, Sparkles, Sprout } from "lucide-react";
+import Link from 'next/link';
 
 export default function LandingPage() {
   return (
@@ -20,7 +21,7 @@ export default function LandingPage() {
       borderRadius="pill"
       contentWidth="mediumSmall"
       sizing="mediumLargeSizeLargeTitles"
-      background="aurora"
+      background="noise"
       cardStyle="glass-depth"
       primaryButtonStyle="gradient"
       secondaryButtonStyle="layered"
@@ -28,8 +29,8 @@ export default function LandingPage() {
     >
       <div id="nav" data-section="nav">
         <NavbarStyleCentered 
-          navItems={[{name:"About",id:"about"},{name:"Products",id:"products"},{name:"Testimonials",id:"testimonials"},{name:"FAQ",id:"faq"},{name:"Contact",id:"contact"}]}
-          button={{text:"Shop Now",href:"products"}}
+          navItems={[{name:"Home", id: "/"}, {name:"About",id:"/#about"},{name:"Products",id:"/#products"},{name:"Testimonials",id:"/#testimonials"},{name:"FAQ",id:"/#faq"},{name:"Contact",id:"/contacts"}]}
+          button={{text:"Shop Now",href:"/shop"}}
           brandName="Find Mouse"
         />
       </div>
@@ -39,13 +40,10 @@ export default function LandingPage() {
           description="Discover the wholesome goodness of our farm-fresh milk and handcrafted cheeses, made with passion and tradition."
           background={{variant:"radial-gradient"}}
           tag="Naturally Delicious"
-          buttons={[{text:"Explore Products",href:"products"},{text:"Our Story",href:"about"}]}
+          buttons={[{text:"Explore Products",href:"/shop"},{text:"Our Story",href:"#about"}]}
           dashboard={{
             title: "Dairy Delights",            stats: [
-              {title:"Years Crafting",values:[30,35,40],valuePrefix:"",description:"Of artisanal excellence."},
-              {title:"Happy Cows",values:[100,120,150],valuePrefix:"",description:"Grazing our green pastures."},
-              {title:"Cheese Varieties",values:[15,20,25],description:"Handcrafted with care."}
-            ],
+              {title:"Years Crafting",values:[30,35,40],valuePrefix:"",description:"Of artisanal excellence."},              {title:"Happy Cows",values:[100,120,150],valuePrefix:"",description:"Grazing our green pastures."},              {title:"Cheese Varieties",values:[15,20,25],description:"Handcrafted with care."}            ],
             logoIcon: Sparkles,
             sidebarItems: [{icon:Milk,active:true},{icon:CookingPot},{icon:Sprout}],
             buttons: [{text:"Farm Tour",href:"#"},{text:"Recipes",href:"#"}],
@@ -122,7 +120,8 @@ export default function LandingPage() {
           inputs={[{name:"name",type:"text",placeholder:"Your Name",required:true},{name:"email",type:"email",placeholder:"Your Email",required:true}]}
           textarea={{name:"message",placeholder:"Tell us more...",rows:5,required:true}}
           buttonText="Send Message"
-          videoSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3A47KqSdGj7sEG8mcGU4TIVm5ml/uploaded-1771850674704-2zcygfwe.mp4"
+          imageSrc="/placeholders/placeholder1.webp?_wi=1"
+          videoSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3A47KqSdGj7sEG8mcGU4TIVm5ml/uploaded-1771850674704-2zcygfwe.mp4?_wi=1"
           imageAlt="Country road leading to a dairy farm"
           mediaAnimation="slide-up"
           mediaPosition="right"
@@ -134,7 +133,7 @@ export default function LandingPage() {
         <FooterMedia 
           imageSrc="https://img.b2bpic.net/free-photo/beautiful-shot-sheep-grazing-green-fields-sunset_181624-11278.jpg?_wi=1"
           imageAlt="Scenic dairy farm landscape"
-          columns={[{title:"Shop",items:[{label:"Milk",href:"products"},{label:"Cheese",href:"products"},{label:"Specials",href:"products"}]},{title:"About Us",items:[{label:"Our Story",href:"about"},{label:"Sustainability",href:"about"},{label:"Team",href:"#"}]},{title:"Support",items:[{label:"FAQ",href:"faq"},{label:"Contact",href:"contact"},{label:"Privacy Policy",href:"#"}]}]}
+          columns={[{title:"Shop",items:[{label:"Milk",href:"/shop"},{label:"Cheese",href:"/shop"},{label:"Specials",href:"/shop"}]},{title:"About Us",items:[{label:"Our Story",href:"/#about"},{label:"Sustainability",href:"/#about"},{label:"Team",href:"#"}]},{title:"Support",items:[{label:"FAQ",href:"/#faq"},{label:"Contact",href:"/contacts"},{label:"Privacy Policy",href:"#"}]}]}
           logoText="Find Mouse"
           copyrightText="© 2024 Find Mouse. All rights reserved."
         />

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

@@ -11,6 +11,7 @@ import ProductCart from "@/components/ecommerce/cart/ProductCart";
 import { useProductDetail } from "@/hooks/useProductDetail";
 import { useCart } from "@/hooks/useCart";
 import { useCheckout } from "@/hooks/useCheckout";
+import Link from 'next/link';
 
 interface ProductPageProps {
     params: Promise<{ id: string }>;
@@ -77,8 +78,10 @@ function ProductPageContent({ params }: ProductPageProps) {
     const navItems = [
         { name: "Home", id: "/" },
         { name: "About", id: "/#about" },
-        { name: "Shop", id: "/shop" },
-        { name: "Blog", id: "/blog" },
+        { name: "Products", id: "/#products" },
+        { name: "Testimonials", id: "/#testimonials" },
+        { name: "FAQ", id: "/#faq" },
+        { name: "Contact", id: "/contacts" }
     ];
 
     const navbarProps = {
@@ -88,11 +91,12 @@ function ProductPageContent({ params }: ProductPageProps) {
 
     const footerProps = {
         imageSrc: "https://img.b2bpic.net/free-photo/beautiful-shot-sheep-grazing-green-fields-sunset_181624-11278.jpg?_wi=4",        imageAlt: "Scenic dairy farm landscape",        columns: [
-            { title: "Shop", items: [{ label: "Milk", href: "products" }, { label: "Cheese", href: "products" }, { label: "Specials", href: "products" }] },
-            { title: "About Us", items: [{ label: "Our Story", href: "about" }, { label: "Sustainability", href: "about" }, { label: "Team", href: "#" }] },
-            { title: "Support", items: [{ label: "FAQ", href: "faq" }, { label: "Contact", href: "contact" }, { label: "Privacy Policy", href: "#" }] }
+            { title: "Shop", items: [{ label: "Milk", href: "/shop" }, { label: "Cheese", href: "/shop" }, { label: "Specials", href: "/shop" }] },
+            { title: "About Us", items: [{ label: "Our Story", href: "/#about" }, { label: "Sustainability", href: "/#about" }, { label: "Team", href: "#" }] },
+            { title: "Support", items: [{ label: "FAQ", href: "/#faq" }, { label: "Contact", href: "/contacts" }, { label: "Privacy Policy", href: "#" }] }
         ],
-        logoText: "Find Mouse",        copyrightText: "© 2024 Find Mouse. All rights reserved."};
+        logoText: "Find Mouse",        copyrightText: "© 2024 Find Mouse. All rights reserved."
+    };
 
     if (isLoading) {
         return (
@@ -102,7 +106,7 @@ function ProductPageContent({ params }: ProductPageProps) {
                 borderRadius="pill"
                 contentWidth="mediumSmall"
                 sizing="mediumLargeSizeLargeTitles"
-                background="aurora"
+                background="noise"
                 cardStyle="glass-depth"
                 primaryButtonStyle="gradient"
                 secondaryButtonStyle="layered"
@@ -131,7 +135,7 @@ function ProductPageContent({ params }: ProductPageProps) {
                 borderRadius="pill"
                 contentWidth="mediumSmall"
                 sizing="mediumLargeSizeLargeTitles"
-                background="aurora"
+                background="noise"
                 cardStyle="glass-depth"
                 primaryButtonStyle="gradient"
                 secondaryButtonStyle="layered"
@@ -167,7 +171,7 @@ function ProductPageContent({ params }: ProductPageProps) {
             borderRadius="pill"
             contentWidth="mediumSmall"
             sizing="mediumLargeSizeLargeTitles"
-            background="aurora"
+            background="noise"
             cardStyle="glass-depth"
             primaryButtonStyle="gradient"
             secondaryButtonStyle="layered"

src/app/shop/page.tsx

@@ -6,10 +6,11 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
 import FooterMedia from '@/components/sections/footer/FooterMedia';
 import ProductCatalog from "@/components/ecommerce/productCatalog/ProductCatalog";
+import ProductCart from "@/components/ecommerce/cart/ProductCart";
 import { useProductCatalog } from "@/hooks/useProductCatalog";
 import { useCart } from "@/hooks/useCart";
 import { useCheckout } from "@/hooks/useCheckout";
-import ProductCart from "@/components/ecommerce/cart/ProductCart";
+import Link from 'next/link';
 
 function ShopPageContent() {
     const {
@@ -44,8 +45,10 @@ function ShopPageContent() {
     const navItems = [
         { name: "Home", id: "/" },
         { name: "About", id: "/#about" },
-        { name: "Shop", id: "/shop" },
-        { name: "Blog", id: "/blog" },
+        { name: "Products", id: "/#products" },
+        { name: "Testimonials", id: "/#testimonials" },
+        { name: "FAQ", id: "/#faq" },
+        { name: "Contact", id: "/contacts" }
     ];
 
     const navbarProps = {
@@ -55,11 +58,12 @@ function ShopPageContent() {
 
     const footerProps = {
         imageSrc: "https://img.b2bpic.net/free-photo/beautiful-shot-sheep-grazing-green-fields-sunset_181624-11278.jpg?_wi=3",        imageAlt: "Scenic dairy farm landscape",        columns: [
-            { title: "Shop", items: [{ label: "Milk", href: "products" }, { label: "Cheese", href: "products" }, { label: "Specials", href: "products" }] },
-            { title: "About Us", items: [{ label: "Our Story", href: "about" }, { label: "Sustainability", href: "about" }, { label: "Team", href: "#" }] },
-            { title: "Support", items: [{ label: "FAQ", href: "faq" }, { label: "Contact", href: "contact" }, { label: "Privacy Policy", href: "#" }] }
+            { title: "Shop", items: [{ label: "Milk", href: "/shop" }, { label: "Cheese", href: "/shop" }, { label: "Specials", href: "/shop" }] },
+            { title: "About Us", items: [{ label: "Our Story", href: "/#about" }, { label: "Sustainability", href: "/#about" }, { label: "Team", href: "#" }] },
+            { title: "Support", items: [{ label: "FAQ", href: "/#faq" }, { label: "Contact", href: "/contacts" }, { label: "Privacy Policy", href: "#" }] }
         ],
-        logoText: "Find Mouse",        copyrightText: "© 2024 Find Mouse. All rights reserved."};
+        logoText: "Find Mouse",        copyrightText: "© 2024 Find Mouse. All rights reserved."
+    };
 
     if (isLoading) {
         return (
@@ -69,7 +73,7 @@ function ShopPageContent() {
                 borderRadius="pill"
                 contentWidth="mediumSmall"
                 sizing="mediumLargeSizeLargeTitles"
-                background="aurora"
+                background="noise"
                 cardStyle="glass-depth"
                 primaryButtonStyle="gradient"
                 secondaryButtonStyle="layered"
@@ -97,7 +101,7 @@ function ShopPageContent() {
             borderRadius="pill"
             contentWidth="mediumSmall"
             sizing="mediumLargeSizeLargeTitles"
-            background="aurora"
+            background="noise"
             cardStyle="glass-depth"
             primaryButtonStyle="gradient"
             secondaryButtonStyle="layered"

src/app/styles/variables.css

@@ -2,23 +2,23 @@
   /* Base units */
   /* --vw is set by ThemeProvider */
 
-  /* --background: #f7f6f7;;
-  --card: #ffffff;;
-  --foreground: #25190c;;
-  --primary-cta: #ff6207;;
-  --secondary-cta: #ffffff;;
-  --accent: #ffce93;;
-  --background-accent: #e8cfa8;; */
+  /* --background: #ffffff;;
+  --card: #f0f0f0;;
+  --foreground: #000000;;
+  --primary-cta: #000000;;
+  --secondary-cta: #f0f0f0;;
+  --accent: #505050;;
+  --background-accent: #e0e0e0;; */
 
-  --background: #f7f6f7;;
-  --card: #ffffff;;
-  --foreground: #25190c;;
-  --primary-cta: #ff6207;;
-  --primary-cta-text: #f7f6f7;;
-  --secondary-cta: #ffffff;;
-  --secondary-cta-text: #25190c;;
-  --accent: #ffce93;;
-  --background-accent: #e8cfa8;;
+  --background: #ffffff;;
+  --card: #f0f0f0;;
+  --foreground: #000000;;
+  --primary-cta: #000000;;
+  --primary-cta-text: #ffffff;;
+  --secondary-cta: #f0f0f0;;
+  --secondary-cta-text: #000000;;
+  --accent: #505050;;
+  --background-accent: #e0e0e0;;
 
   /* text sizing - set by ThemeProvider */
   /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);