Merge version_4 into main

Update src/app/shop/page.tsx
2026-02-23 13:54:28 +00:00 · 2026-02-23 13:54:23 +00:00 · 2026-02-23 13:54:22 +00:00 · 2026-02-23 13:54:21 +00:00 · 2026-02-23 13:54:20 +00:00 · 2026-02-23 13:54:20 +00:00
7 changed files with 36 additions and 56 deletions
--- a/src/app/blog/page.tsx
+++ b/src/app/blog/page.tsx
@@ -18,7 +18,7 @@ export default function BlogPage() {
            borderRadius="pill"
            contentWidth="mediumSmall"
            sizing="mediumLargeSizeLargeTitles"
-            background="aurora"
+            background="noise"
            cardStyle="glass-depth"
            primaryButtonStyle="gradient"
            secondaryButtonStyle="layered"
@@ -74,4 +74,4 @@ export default function BlogPage() {
            </ReactLenis>
        </ThemeProvider>
    );
-}
+}
--- a/src/app/contacts/page.tsx
+++ b/src/app/contacts/page.tsx
@@ -14,7 +14,7 @@ export default function ContactsPage() {
      borderRadius="pill"
      contentWidth="mediumSmall"
      sizing="mediumLargeSizeLargeTitles"
-      background="aurora"
+      background="noise"
      cardStyle="glass-depth"
      primaryButtonStyle="gradient"
      secondaryButtonStyle="layered"
@@ -68,4 +68,4 @@ export default function ContactsPage() {
      </div>
    </ThemeProvider>
  );
-}
+}
--- a/src/app/layout.tsx
+++ b/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>
  );
 }
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -21,7 +21,7 @@ export default function LandingPage() {
      borderRadius="pill"
      contentWidth="mediumSmall"
      sizing="mediumLargeSizeLargeTitles"
-      background="aurora"
+      background="noise"
      cardStyle="glass-depth"
      primaryButtonStyle="gradient"
      secondaryButtonStyle="layered"
@@ -29,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"
        />
@@ -140,4 +140,4 @@ export default function LandingPage() {
      </div>
    </ThemeProvider>
  );
-}
+}
--- a/src/app/shop/[id]/page.tsx
+++ b/src/app/shop/[id]/page.tsx
@@ -106,7 +106,7 @@ function ProductPageContent({ params }: ProductPageProps) {
                borderRadius="pill"
                contentWidth="mediumSmall"
                sizing="mediumLargeSizeLargeTitles"
-                background="aurora"
+                background="noise"
                cardStyle="glass-depth"
                primaryButtonStyle="gradient"
                secondaryButtonStyle="layered"
@@ -135,7 +135,7 @@ function ProductPageContent({ params }: ProductPageProps) {
                borderRadius="pill"
                contentWidth="mediumSmall"
                sizing="mediumLargeSizeLargeTitles"
-                background="aurora"
+                background="noise"
                cardStyle="glass-depth"
                primaryButtonStyle="gradient"
                secondaryButtonStyle="layered"
@@ -171,7 +171,7 @@ function ProductPageContent({ params }: ProductPageProps) {
            borderRadius="pill"
            contentWidth="mediumSmall"
            sizing="mediumLargeSizeLargeTitles"
-            background="aurora"
+            background="noise"
            cardStyle="glass-depth"
            primaryButtonStyle="gradient"
            secondaryButtonStyle="layered"
--- a/src/app/shop/page.tsx
+++ b/src/app/shop/page.tsx
@@ -6,10 +6,10 @@ 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() {
@@ -73,7 +73,7 @@ function ShopPageContent() {
                borderRadius="pill"
                contentWidth="mediumSmall"
                sizing="mediumLargeSizeLargeTitles"
-                background="aurora"
+                background="noise"
                cardStyle="glass-depth"
                primaryButtonStyle="gradient"
                secondaryButtonStyle="layered"
@@ -101,7 +101,7 @@ function ShopPageContent() {
            borderRadius="pill"
            contentWidth="mediumSmall"
            sizing="mediumLargeSizeLargeTitles"
-            background="aurora"
+            background="noise"
            cardStyle="glass-depth"
            primaryButtonStyle="gradient"
            secondaryButtonStyle="layered"
@@ -151,4 +151,4 @@ export default function ShopPage() {
            <ShopPageContent />
        </Suspense>
    );
-}
+}
--- a/src/app/styles/variables.css
+++ b/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);
Author	SHA1	Message	Date
bender	24d8754656	Merge version_4 into main Merge version_4 into main	2026-02-23 13:54:28 +00:00
bender	06a11fcac3	Update src/app/shop/page.tsx	2026-02-23 13:54:23 +00:00
bender	9349a745ed	Update src/app/page.tsx	2026-02-23 13:54:22 +00:00
bender	9d4215b9c1	Update src/app/layout.tsx	2026-02-23 13:54:21 +00:00
bender	1023d56148	Update src/app/contacts/page.tsx	2026-02-23 13:54:20 +00:00
bender	653a7cf295	Update src/app/blog/page.tsx	2026-02-23 13:54:20 +00:00
bender	d67d11b3fb	Merge version_4 into main Merge version_4 into main	2026-02-23 13:51:56 +00:00
bender	cb7c41461d	Update src/app/styles/variables.css	2026-02-23 13:51:51 +00:00
bender	da6968c158	Update src/app/shop/page.tsx	2026-02-23 13:51:50 +00:00
bender	c145e178ef	Update src/app/shop/[id]/page.tsx	2026-02-23 13:51:49 +00:00
bender	3724a927d7	Update src/app/page.tsx	2026-02-23 13:51:48 +00:00
bender	a88d87ccfb	Update src/app/layout.tsx	2026-02-23 13:51:48 +00:00
bender	10d0db4bd5	Update src/app/contacts/page.tsx	2026-02-23 13:51:47 +00:00
bender	5d13ce7a68	Update src/app/blog/page.tsx	2026-02-23 13:51:46 +00:00
bender	fde33834c9	Merge version_3 into main Merge version_3 into main	2026-02-23 13:17:58 +00:00
bender	b8ebf194d7	Merge version_3 into main Merge version_3 into main	2026-02-23 13:17:12 +00:00
bender	452726c310	Merge version_3 into main Merge version_3 into main	2026-02-23 13:15:06 +00:00