Update src/app/shop/page.tsx

Merge version_3 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"
@@ -73,4 +74,4 @@ export default function BlogPage() {
             </ReactLenis>
         </ThemeProvider>
     );
-}
+}

src/app/contacts/page.tsx

@@ -4,6 +4,7 @@ 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 (
@@ -13,7 +14,7 @@ export default function ContactsPage() {
       borderRadius="pill"
       contentWidth="mediumSmall"
       sizing="mediumLargeSizeLargeTitles"
-      background="aurora"
+      background="noise"
       cardStyle="glass-depth"
       primaryButtonStyle="gradient"
       secondaryButtonStyle="layered"
@@ -43,7 +44,8 @@ export default function ContactsPage() {
           ]}
           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=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"
@@ -66,4 +68,4 @@ export default function ContactsPage() {
       </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 "../styles/variables.css";
-import Tag from "@/tag/Tag";
 
-const plusJakartaSans = Plus_Jakarta_Sans({
+const inter = Inter({ subsets: ["latin"] });
-  variable: "--font-plus-jakarta-sans",  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"],
+  title: "Find Mouse",  description: "Discover the wholesome goodness of our farm-fresh milk and handcrafted cheeses, made with passion and tradition."};
-  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"],
-  },
-};
 
 export default function RootLayout({
   children,
@@ -27,14 +14,8 @@ export default function RootLayout({
   children: React.ReactNode;
 }>) {
   return (
-    <html lang="en" suppressHydrationWarning>
+    <html lang="en">
-      <ServiceWrapper>
+      <body className={inter.className}>{children}
-        <body
-          className={`${plusJakartaSans.variable} antialiased`}
-        >
-          <Tag />
-          {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,7 +29,7 @@ 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:"/contacts"}]}
+          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"
         />
@@ -119,8 +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"
-          imageSrc="/placeholders/placeholder1.webp"
+          imageSrc="/placeholders/placeholder1.webp?_wi=1"
-          videoSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3A47KqSdGj7sEG8mcGU4TIVm5ml/uploaded-1771850674704-2zcygfwe.mp4"
+          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"
@@ -139,4 +140,4 @@ export default function LandingPage() {
       </div>
     </ThemeProvider>
   );
-}
+}

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 }>;
@@ -94,7 +95,8 @@ function ProductPageContent({ params }: ProductPageProps) {
             { 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 (
@@ -104,7 +106,7 @@ function ProductPageContent({ params }: ProductPageProps) {
                 borderRadius="pill"
                 contentWidth="mediumSmall"
                 sizing="mediumLargeSizeLargeTitles"
-                background="aurora"
+                background="noise"
                 cardStyle="glass-depth"
                 primaryButtonStyle="gradient"
                 secondaryButtonStyle="layered"
@@ -133,7 +135,7 @@ function ProductPageContent({ params }: ProductPageProps) {
                 borderRadius="pill"
                 contentWidth="mediumSmall"
                 sizing="mediumLargeSizeLargeTitles"
-                background="aurora"
+                background="noise"
                 cardStyle="glass-depth"
                 primaryButtonStyle="gradient"
                 secondaryButtonStyle="layered"
@@ -169,7 +171,7 @@ function ProductPageContent({ params }: ProductPageProps) {
             borderRadius="pill"
             contentWidth="mediumSmall"
             sizing="mediumLargeSizeLargeTitles"
-            background="aurora"
+            background="noise"
             cardStyle="glass-depth"
             primaryButtonStyle="gradient"
             secondaryButtonStyle="layered"
@@ -221,4 +223,4 @@ function ProductPageContent({ params }: ProductPageProps) {
             </ReactLenis>
         </ThemeProvider>
     );
-}
+}

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 {
@@ -61,7 +62,8 @@ function ShopPageContent() {
             { 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 (
@@ -71,7 +73,7 @@ function ShopPageContent() {
                 borderRadius="pill"
                 contentWidth="mediumSmall"
                 sizing="mediumLargeSizeLargeTitles"
-                background="aurora"
+                background="noise"
                 cardStyle="glass-depth"
                 primaryButtonStyle="gradient"
                 secondaryButtonStyle="layered"
@@ -99,7 +101,7 @@ function ShopPageContent() {
             borderRadius="pill"
             contentWidth="mediumSmall"
             sizing="mediumLargeSizeLargeTitles"
-            background="aurora"
+            background="noise"
             cardStyle="glass-depth"
             primaryButtonStyle="gradient"
             secondaryButtonStyle="layered"
@@ -149,4 +151,4 @@ export default function ShopPage() {
             <ShopPageContent />
         </Suspense>
     );
-}
+}

src/app/styles/variables.css

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