From cd4f725298e5c42e9239d0969c58d2d3ba898a7b Mon Sep 17 00:00:00 2001
From: karl <karl@linconson.com>
Date: Fri, 28 Mar 2025 13:18:17 -0400
Subject: [PATCH] add cart menu

---
 app/layout.tsx                        |  2 +-
 components/layout/UserNav/UserNav.tsx | 86 +++++++++++++--------------
 components/layout/UserNav/index.ts    |  2 +-
 components/layout/navbar/NavbarV2.tsx | 44 +-------------
 components/layout/navbar/index.tsx    |  2 +-
 5 files changed, 49 insertions(+), 87 deletions(-)

diff --git a/app/layout.tsx b/app/layout.tsx
index 99a3d30a4..2cf6aa32b 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -1,5 +1,5 @@
 import { CartProvider } from 'components/cart/cart-context'
-// import { Navbar } from 'components/layout/navbar'
+import { Navbar } from 'components/layout/navbar'
 import NavbarV2 from 'components/layout/navbar/NavbarV2'
 import { WelcomeToast } from 'components/welcome-toast'
 import { GeistSans } from 'geist/font/sans'
diff --git a/components/layout/UserNav/UserNav.tsx b/components/layout/UserNav/UserNav.tsx
index ecd8eae09..86cfc897f 100644
--- a/components/layout/UserNav/UserNav.tsx
+++ b/components/layout/UserNav/UserNav.tsx
@@ -17,50 +17,50 @@
 
 // const countItem = (count: number, item: LineItem) => count + item.quantity
 
-// const UserNav: React.FC<{
-//   className?: string
-// }> = ({ className }) => {
-//   const { data } = useCart()
-//   const { data: isCustomerLoggedIn } = useCustomer()
-//   const {
-//     toggleSidebar,
-//     closeSidebarIfPresent,
-//     openModal,
-//     setSidebarView,
-//     openSidebar,
-//     displaySidebar,
-//   } = useUI()
+const UserNav: React.FC<{
+  className?: string
+}> = ({ className }) => {
+  //   const { data } = useCart()
+  //   const { data: isCustomerLoggedIn } = useCustomer()
+  //   const {
+  //     toggleSidebar,
+  //     closeSidebarIfPresent,
+  //     openModal,
+  //     setSidebarView,
+  //     openSidebar,
+  //     displaySidebar,
+  //   } = useUI()
 
-//   const itemsCount = data?.lineItems?.reduce(countItem, 0) ?? 0
-//   const DropdownTrigger = isCustomerLoggedIn
-//     ? DropdownTriggerInst
-//     : React.Fragment
+  //   const itemsCount = data?.lineItems?.reduce(countItem, 0) ?? 0
+  //   const DropdownTrigger = isCustomerLoggedIn
+  //     ? DropdownTriggerInst
+  //     : React.Fragment
 
-//   return (
-//     <nav className={cn(s.root, className)}>
-//       <ul className={s.list}>
-//         {process.env.COMMERCE_CART_ENABLED && (
-//           <li className={s.item}>
-//             <Button
-//               className={s.item}
-//               variant="naked"
-//               onClick={() => {
-//                 setSidebarView('CART_VIEW')
-//                 openSidebar()
-//               }}
-//               aria-label={`Cart items: ${itemsCount}`}
-//             >
-//               <Bag className={displaySidebar ? undefined : 'text-white'} />
+  return (
+    <nav>Button</nav>
+    // <nav className={cn(s.root, className)}>
+    //   <ul className={s.list}>
+    //     {process.env.COMMERCE_CART_ENABLED && (
+    //       <li className={s.item}>
+    //           className={s.item}
+    //           variant="naked"
+    //           onClick={() => {
+    //             setSidebarView('CART_VIEW')
+    //             openSidebar()
+    //           }}
+    //           aria-label={`Cart items: ${itemsCount}`}
+    //         >
+    //           <Bag className={displaySidebar ? undefined : 'text-white'} />
 
-//               {itemsCount > 0 && (
-//                 <span className={s.bagCount}>{itemsCount}</span>
-//               )}
-//             </Button>
-//           </li>
-//         )}
-//       </ul>
-//     </nav>
-//   )
-// }
+    //           {itemsCount > 0 && (
+    //             <span className={s.bagCount}>{itemsCount}</span>
+    //           )}
+    //         </Button> */}
+    //       </li>
+    //     )}
+    //   </ul>
+    // </nav>
+  )
+}
 
-// export default UserNav
+export default UserNav
diff --git a/components/layout/UserNav/index.ts b/components/layout/UserNav/index.ts
index d644aeb3b..93ab97806 100644
--- a/components/layout/UserNav/index.ts
+++ b/components/layout/UserNav/index.ts
@@ -1,3 +1,3 @@
-// export { default } from './UserNav'
+export { default } from './UserNav'
 // export { default as MenuSidebarView } from './MenuSidebarView'
 // export { default as CustomerMenuContent } from './CustomerMenuContent'
diff --git a/components/layout/navbar/NavbarV2.tsx b/components/layout/navbar/NavbarV2.tsx
index cf9f545cf..78185692d 100644
--- a/components/layout/navbar/NavbarV2.tsx
+++ b/components/layout/navbar/NavbarV2.tsx
@@ -2,7 +2,7 @@
 
 import { FC, useEffect, useMemo, useRef } from 'react'
 import Link from 'next/link'
-// import { UserNav } from '@components/common'
+import UserNav from '../UserNav'
 import { useRouter, usePathname } from 'next/navigation'
 import Image from 'next/image'
 
@@ -18,6 +18,7 @@ import {
 // Product data
 import { GLOVES_DATA } from '@/data/Gloves'
 import { INDUSTRIAL_DATA } from '@/data/Industrial'
+import CartModal from '@/components/cart/modal'
 
 let _scrollTopValue: number | null = null
 
@@ -573,6 +574,7 @@ const Navbar: FC<NavbarProps> = ({ links }) => {
                       {/* Cart */}
                       <div className="ml-4 flow-root lg:ml-8">
                         {/* <UserNav /> */}
+                        <CartModal />
                       </div>
                     </div>
                   </div>
@@ -583,46 +585,6 @@ const Navbar: FC<NavbarProps> = ({ links }) => {
         </nav>
       </header>
 
-      {/* <NavbarRoot>
-        <Container clean className="mx-auto max-w-8xl px-6">
-          <div className={s.nav}>
-            <div className="flex items-center flex-1">
-              <Link href="/" className={s.logo} aria-label="Logo">
-                <Logo />
-              </Link>
-
-              <nav className={s.navMenu}>
-                {NAVIGATION.map((menuContent) => (
-                  <Link
-                    key={menuContent.category}
-                    href={menuContent.link}
-                    className={s.link}
-                  >
-                    {menuContent.category}
-                  </Link>
-                ))}
-              </nav>
-            </div> */}
-
-      {/* {process.env.COMMERCE_SEARCH_ENABLED && (
-            <div className="justify-center flex-1 hidden lg:flex">
-              <Searchbar />
-            </div>
-          )} */}
-
-      {/* <div className="flex items-center justify-end flex-1 space-x-8">
-              <UserNav />
-            </div>
-          </div>
-
-          {process.env.COMMERCE_SEARCH_ENABLED && (
-            <div className="flex pb-4 lg:px-6 lg:hidden">
-              <Searchbar id="mobile-search" />
-            </div>
-          )}
-        </Container>
-      </NavbarRoot> */}
-
       <div
         style={{
           height:
diff --git a/components/layout/navbar/index.tsx b/components/layout/navbar/index.tsx
index 14aaa0387..b6e8511a8 100644
--- a/components/layout/navbar/index.tsx
+++ b/components/layout/navbar/index.tsx
@@ -13,7 +13,7 @@ export async function Navbar() {
   const menu = await getMenu('next-js-frontend-header-menu')
 
   return (
-    <nav className="relative flex items-center justify-between p-4 lg:px-6">
+    <nav className="relative flex items-center justify-between p-100 lg:px-6">
       <div className="block flex-none md:hidden">
         <Suspense fallback={null}>
           <MobileMenu menu={menu} />