bender/16bfe43e-2467-4779-a49e-7782577601e7
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_4 into main #17

Merged
bender merged 7 commits from version_4 into main 2026-02-23 13:51:56 +00:00
Conversation 0 Commits 7 Files Changed 7 +32 -1440
7 changed files with 32 additions and 1440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/blog/page.tsx
View File

@@ -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"
@@ -62,11 +62,11 @@ export default function BlogPage() {
<FooterMedia
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={[
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."
/>
@@ -74,4 +74,4 @@ export default function BlogPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

8
src/app/contacts/page.tsx
View File

@@ -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"
@@ -57,15 +57,15 @@ export default function ContactsPage() {
<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={[
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>
);
}
}

1407
src/app/layout.tsx
View File

File diff suppressed because it is too large Load Diff

4
src/app/page.tsx
View File

@@ -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"
@@ -140,4 +140,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}

6
src/app/shop/[id]/page.tsx
View File

@@ -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"

7
src/app/shop/page.tsx
View File

@@ -9,7 +9,6 @@ import ProductCatalog from "@/components/ecommerce/productCatalog/ProductCatalog
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 +72,7 @@ function ShopPageContent() {
borderRadius="pill"
contentWidth="mediumSmall"
sizing="mediumLargeSizeLargeTitles"
background="aurora"
background="noise"
cardStyle="glass-depth"
primaryButtonStyle="gradient"
secondaryButtonStyle="layered"
@@ -101,7 +100,7 @@ function ShopPageContent() {
borderRadius="pill"
contentWidth="mediumSmall"
sizing="mediumLargeSizeLargeTitles"
background="aurora"
background="noise"
cardStyle="glass-depth"
primaryButtonStyle="gradient"
secondaryButtonStyle="layered"
@@ -151,4 +150,4 @@ export default function ShopPage() {
<ShopPageContent />
</Suspense>
);
}
}

32
src/app/styles/variables.css
View File

@@ -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);