bender/b948ca2d-2688-4eb7-a2bd-14515eafa608
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #1

Merged
bender merged 3 commits from version_2 into main 2026-02-16 03:57:06 +00:00
Conversation 0 Commits 3 Files Changed 3 +17 -22
3 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,8 +90,7 @@ export default function ProductPage({ params }: ProductPageProps) {
{ name: "Why Us", id: "about" },
{ name: "Pricing", id: "pricing" },
{ name: "Reviews", id: "testimonials" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -135,8 +134,7 @@ export default function ProductPage({ params }: ProductPageProps) {
{ name: "Why Us", id: "about" },
{ name: "Pricing", id: "pricing" },
{ name: "Reviews", id: "testimonials" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -187,8 +185,7 @@ export default function ProductPage({ params }: ProductPageProps) {
{ name: "Why Us", id: "about" },
{ name: "Pricing", id: "pricing" },
{ name: "Reviews", id: "testimonials" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>

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

@@ -43,8 +43,7 @@ export default function ShopPage() {
{ name: "Why Us", id: "about" },
{ name: "Pricing", id: "pricing" },
{ name: "Reviews", id: "testimonials" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -87,8 +86,7 @@ export default function ShopPage() {
{ name: "Why Us", id: "about" },
{ name: "Pricing", id: "pricing" },
{ name: "Reviews", id: "testimonials" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>

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

@@ -2,21 +2,21 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #f5f5f5;;
--card: #ffffff;;
--foreground: #1c1c1c;;
--primary-cta: #6139e6;;
/* --background: #fafffb;;
--card: #f7fffa;;
--foreground: #001a0a;;
--primary-cta: #0a7039;;
--secondary-cta: #ffffff;;
--accent: #6139e6;;
--background-accent: #b3a8e8;; */
--accent: #a8d9be;;
--background-accent: #6bbf8e;; */
--background: #f5f5f5;;
--card: #ffffff;;
--foreground: #1c1c1c;;
--primary-cta: #6139e6;;
--background: #fafffb;;
--card: #f7fffa;;
--foreground: #001a0a;;
--primary-cta: #0a7039;;
--secondary-cta: #ffffff;;
--accent: #6139e6;;
--background-accent: #b3a8e8;;
--accent: #a8d9be;;
--background-accent: #6bbf8e;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);