bender/f78dfed3-e1be-40b3-85bb-4dd996e7dc19
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main

Browse Source 
Merge version_2 into main
This commit was merged in pull request #2.
This commit is contained in:
bender
2026-02-20 08:58:25 +00:00
parent 31d64512b6 5137fd0c9c
commit 9ab04c38d3
4 changed files with 26 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,7 @@ export default function BlogPage() {
<NavbarLayoutFloatingOverlay
brandName="IndoLor"
navItems={[
{ name: "Home", id: "/" },
{ name: "Home", id: "hero" },
{ name: "About", id: "about" },
{ name: "Collections", id: "collections" },
{ name: "Services", id: "services" },

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

@@ -85,14 +85,13 @@ export default function ProductPage({ params }: ProductPageProps) {
<NavbarLayoutFloatingOverlay
brandName="IndoLor"
navItems={[
{ name: "Home", id: "/" },
{ name: "Home", id: "hero" },
{ name: "About", id: "about" },
{ name: "Collections", id: "collections" },
{ name: "Services", id: "services" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
button={{ text: "Order Now", href: "contact" }}
/>
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
@@ -129,14 +128,13 @@ export default function ProductPage({ params }: ProductPageProps) {
<NavbarLayoutFloatingOverlay
brandName="IndoLor"
navItems={[
{ name: "Home", id: "/" },
{ name: "Home", id: "hero" },
{ name: "About", id: "about" },
{ name: "Collections", id: "collections" },
{ name: "Services", id: "services" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
button={{ text: "Order Now", href: "contact" }}
/>
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
@@ -180,14 +178,13 @@ export default function ProductPage({ params }: ProductPageProps) {
<NavbarLayoutFloatingOverlay
brandName="IndoLor"
navItems={[
{ name: "Home", id: "/" },
{ name: "Home", id: "hero" },
{ name: "About", id: "about" },
{ name: "Collections", id: "collections" },
{ name: "Services", id: "services" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
button={{ text: "Order Now", href: "contact" }}
/>
</div>
<div id="productDetailCard" data-section="productDetailCard">

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

@@ -35,14 +35,13 @@ export default function ShopPage() {
<NavbarLayoutFloatingOverlay
brandName="IndoLor"
navItems={[
{ name: "Home", id: "/" },
{ name: "Home", id: "hero" },
{ name: "About", id: "about" },
{ name: "Collections", id: "collections" },
{ name: "Services", id: "services" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => console.log("cart") }}
button={{ text: "Order Now", href: "contact" }}
/>
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
@@ -78,14 +77,13 @@ export default function ShopPage() {
<NavbarLayoutFloatingOverlay
brandName="IndoLor"
navItems={[
{ name: "Home", id: "/" },
{ name: "Home", id: "hero" },
{ name: "About", id: "about" },
{ name: "Collections", id: "collections" },
{ name: "Services", id: "services" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => console.log("cart") }}
button={{ text: "Order Now", href: "contact" }}
/>
</div>
<div id="productCatalog" data-section="productCatalog">

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

@@ -2,21 +2,21 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #f5f5f5;;
--card: #ffffff;;
--foreground: #1c1c1c;;
/* --background: #fffafa;;
--card: #fff7f7;;
--foreground: #1a0000;;
--primary-cta: #e63946;;
--secondary-cta: #ffffff;;
--accent: #e63946;;
--background-accent: #e8bea8;; */
--accent: #f5c4c7;;
--background-accent: #f09199;; */
--background: #f5f5f5;;
--card: #ffffff;;
--foreground: #1c1c1c;;
--background: #fffafa;;
--card: #fff7f7;;
--foreground: #1a0000;;
--primary-cta: #e63946;;
--secondary-cta: #ffffff;;
--accent: #e63946;;
--background-accent: #e8bea8;;
--accent: #f5c4c7;;
--background-accent: #f09199;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);