bender/847689e4-b3bf-4e99-848a-a2ae969ac907
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #2

Merged
bender merged 3 commits from version_1 into main 2026-02-14 12:20:50 +00:00
Conversation 0 Commits 3 Files Changed 3 +8 -8
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/page.tsx
View File

@@ -1,4 +1,4 @@
"use client"
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleCentered from "@/components/navbar/NavbarStyleCentered/NavbarStyleCentered";

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

@@ -4,8 +4,8 @@ import { use, useCallback } from "react";
import { useRouter } from "next/navigation";
import ReactLenis from "lenis/react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
import FooterBase from '@/components/sections/footer/FooterBase';
import NavbarStyleCentered from "@/components/navbar/NavbarStyleCentered/NavbarStyleCentered";
import FooterBase from "@/components/sections/footer/FooterBase";
import ProductDetailCard from "@/components/ecommerce/productDetail/ProductDetailCard";
import ProductCart from "@/components/ecommerce/cart/ProductCart";
import { useProductDetail } from "@/hooks/useProductDetail";
@@ -120,7 +120,7 @@ export default function ProductPage({ params }: ProductPageProps) {
{ label: "Visit Us", href: "#" }
]
}
]
]}
copyrightText="© 2025 Lumina Hotel. All rights reserved."
onPrivacyClick={null}
/>
@@ -192,7 +192,7 @@ export default function ProductPage({ params }: ProductPageProps) {
{ label: "Visit Us", href: "#" }
]
}
]
]}
copyrightText="© 2025 Lumina Hotel. All rights reserved."
onPrivacyClick={null}
/>

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

@@ -2,8 +2,8 @@
import ReactLenis from "lenis/react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
import FooterBase from '@/components/sections/footer/FooterBase';
import NavbarStyleCentered from "@/components/navbar/NavbarStyleCentered/NavbarStyleCentered";
import FooterBase from "@/components/sections/footer/FooterBase";
import ProductCatalog from "@/components/ecommerce/productCatalog/ProductCatalog";
import { useProductCatalog } from "@/hooks/useProductCatalog";
import { useState } from "react";
@@ -73,7 +73,7 @@ export default function ShopPage() {
{ label: "Visit Us", href: "#" }
]
}
]
]}
copyrightText="© 2025 Lumina Hotel. All rights reserved."
onPrivacyClick={null}
/>