From 558354693d94d91481753acfd2b1c22aa53f0c4e Mon Sep 17 00:00:00 2001
From: hta218 <hta218.dev@gmail.com>
Date: Tue, 10 Dec 2024 11:58:48 +0700
Subject: [PATCH 1/3] Fix slideshow z-index

---
 app/sections/slideshow/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/sections/slideshow/index.tsx b/app/sections/slideshow/index.tsx
index f7b18a6f..be581a90 100644
--- a/app/sections/slideshow/index.tsx
+++ b/app/sections/slideshow/index.tsx
@@ -15,7 +15,7 @@ import { Arrows } from "./arrows";
 import type { SlideshowDotsProps } from "./dots";
 import { Dots } from "./dots";
 
-let variants = cva("group [&_.swiper]:h-full", {
+let variants = cva("group [&_.swiper]:h-full [&_.swiper]:z-0", {
   variants: {
     height: {
       small: "h-[40vh] lg:h-[50vh]",

From f4c31826a844b8bc934b5ba8cd826e5a2a821f8a Mon Sep 17 00:00:00 2001
From: hta218 <hta218.dev@gmail.com>
Date: Tue, 10 Dec 2024 12:01:41 +0700
Subject: [PATCH 2/3] Fix header z-index

---
 app/components/header/desktop-header.tsx | 2 +-
 app/components/header/mobile-header.tsx  | 2 +-
 app/sections/slideshow/index.tsx         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/components/header/desktop-header.tsx b/app/components/header/desktop-header.tsx
index d8da64b9..dc3d8c21 100644
--- a/app/components/header/desktop-header.tsx
+++ b/app/components/header/desktop-header.tsx
@@ -46,7 +46,7 @@ export function DesktopHeader() {
     <header
       className={cn(
         "transition-all duration-300 ease-in-out",
-        "hidden lg:block lg:w-full z-1",
+        "hidden lg:block lg:w-full z-10",
         "bg-[--color-header-bg] hover:bg-[--color-header-bg]",
         "text-[--color-header-text] hover:text-[--color-header-text]",
         "border-b border-[rgb(230,230,230)]",
diff --git a/app/components/header/mobile-header.tsx b/app/components/header/mobile-header.tsx
index 96caa90b..abea793b 100644
--- a/app/components/header/mobile-header.tsx
+++ b/app/components/header/mobile-header.tsx
@@ -32,7 +32,7 @@ export function MobileHeader({
     <header
       className={cn(
         "transition-colors duration-300 ease-in-out",
-        "h-nav z-1 top-[var(--topbar-height,var(--initial-topbar-height))] w-full leading-none",
+        "h-nav z-10 top-[var(--topbar-height,var(--initial-topbar-height))] w-full leading-none",
         "flex lg:hidden justify-between items-center gap-4",
         "px-3 md:px-10",
         "text-[--color-header-text] bg-[--color-header-bg]",
diff --git a/app/sections/slideshow/index.tsx b/app/sections/slideshow/index.tsx
index be581a90..f7b18a6f 100644
--- a/app/sections/slideshow/index.tsx
+++ b/app/sections/slideshow/index.tsx
@@ -15,7 +15,7 @@ import { Arrows } from "./arrows";
 import type { SlideshowDotsProps } from "./dots";
 import { Dots } from "./dots";
 
-let variants = cva("group [&_.swiper]:h-full [&_.swiper]:z-0", {
+let variants = cva("group [&_.swiper]:h-full", {
   variants: {
     height: {
       small: "h-[40vh] lg:h-[50vh]",

From 70524fba0e8dac0f0ef91cb27792dbc8d8d22a39 Mon Sep 17 00:00:00 2001
From: hta218 <hta218.dev@gmail.com>
Date: Tue, 10 Dec 2024 12:02:27 +0700
Subject: [PATCH 3/3] Fix cart count on header

---
 app/components/header/desktop-header.tsx | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/components/header/desktop-header.tsx b/app/components/header/desktop-header.tsx
index dc3d8c21..df1fcb4d 100644
--- a/app/components/header/desktop-header.tsx
+++ b/app/components/header/desktop-header.tsx
@@ -16,6 +16,7 @@ import { useIsHomePath } from "~/lib/utils";
 import type { RootLoader } from "~/root";
 import { DesktopMenu } from "./menu/desktop-menu";
 import { PredictiveSearchButton } from "./predictive-search";
+import { CartCount } from "./cart-count";
 
 let variants = cva("", {
   variants: {
@@ -72,12 +73,12 @@ export function DesktopHeader() {
         <div className="flex items-center gap-1 z-1">
           <PredictiveSearchButton />
           <AccountLink className="relative flex items-center justify-center w-8 h-8" />
-          <DialogDemo openFrom="right" />
-          {/* <CartCount
+          {/* <DialogDemo openFrom="right" /> */}
+          <CartCount
             isHome={isHome}
-            openCart={openCart}
+            openCart={() => {}}
             isTransparent={isTransparent}
-          /> */}
+          />
         </div>
       </div>
     </header>