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 ( -// -// -// {process.env.COMMERCE_CART_ENABLED && ( -// -// { -// setSidebarView('CART_VIEW') -// openSidebar() -// }} -// aria-label={`Cart items: ${itemsCount}`} -// > -// + return ( + Button + // + // + // {process.env.COMMERCE_CART_ENABLED && ( + // + // className={s.item} + // variant="naked" + // onClick={() => { + // setSidebarView('CART_VIEW') + // openSidebar() + // }} + // aria-label={`Cart items: ${itemsCount}`} + // > + // -// {itemsCount > 0 && ( -// {itemsCount} -// )} -// -// -// )} -// -// -// ) -// } + // {itemsCount > 0 && ( + // {itemsCount} + // )} + // */} + // + // )} + // + // + ) +} -// 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 = ({ links }) => { {/* Cart */} {/* */} + @@ -583,46 +585,6 @@ const Navbar: FC = ({ links }) => { - {/* - - - - - - - - - {NAVIGATION.map((menuContent) => ( - - {menuContent.category} - - ))} - - */} - - {/* {process.env.COMMERCE_SEARCH_ENABLED && ( - - - - )} */} - - {/* - - - - - {process.env.COMMERCE_SEARCH_ENABLED && ( - - - - )} - - */} - +