bender/9b3d198a-9e69-4f57-808d-dac06450c592
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_6 into main #12

Merged
bender merged 2 commits from version_6 into main 2026-02-20 21:59:21 +00:00
Conversation 0 Commits 2 Files Changed 2 +1 -11
2 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,7 @@ import ProductCart from "@/components/ecommerce/cart/ProductCart";
import { useProductDetail } from "@/hooks/useProductDetail";
import { useCart } from "@/hooks/useCart";
import { useCheckout } from "@/hooks/useCheckout";
import FooterCard from '@/components/sections/footer/Footer/FooterCard';
import FooterCard from '@/components/sections/footer/FooterCard';
import { Twitter, Linkedin, Instagram } from 'lucide-react';
interface ProductPageProps {
@@ -94,7 +94,6 @@ function ProductPageContent({ params }: ProductPageProps) {
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" },
{ name: "About", id: "/#about" },
{ name: "Services", id: "/#features-detailed" },
{ name: "Contact", id: "/#contact" }
@@ -150,7 +149,6 @@ function ProductPageContent({ params }: ProductPageProps) {
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" },
{ name: "About", id: "/#about" },
{ name: "Services", id: "/#features-detailed" },
{ name: "Contact", id: "/#contact" }
@@ -213,7 +211,6 @@ function ProductPageContent({ params }: ProductPageProps) {
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" },
{ name: "About", id: "/#about" },
{ name: "Services", id: "/#features-detailed" },
{ name: "Contact", id: "/#contact" }
@@ -231,16 +228,11 @@ function ProductPageContent({ params }: ProductPageProps) {
layout="page"
name={product.name}
price={product.price}
salePrice={meta.salePrice}
rating={product.rating || 0}
description={product.description}
images={images}
variants={variants.length > 0 ? variants : undefined}
quantity={quantityVariant}
ribbon={meta.ribbon}
inventoryStatus={meta.inventoryStatus}
inventoryQuantity={meta.inventoryQuantity}
sku={meta.sku}
buttons={[
{ text: "Add To Cart", onClick: handleAddToCart },
{ text: "Buy Now", onClick: handleBuyNow },

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

@@ -61,7 +61,6 @@ export default function ShopPage() {
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" },
{ name: "About", id: "/#about" },
{ name: "Services", id: "/#features-detailed" },
{ name: "Contact", id: "/#contact" }
@@ -116,7 +115,6 @@ export default function ShopPage() {
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" },
{ name: "About", id: "/#about" },
{ name: "Services", id: "/#features-detailed" },
{ name: "Contact", id: "/#contact" }