diff --git a/components/core/Layout/Layout.tsx b/components/core/Layout/Layout.tsx index 7a4d1fa24..90a5bca35 100644 --- a/components/core/Layout/Layout.tsx +++ b/components/core/Layout/Layout.tsx @@ -35,7 +35,6 @@ const Layout: FC = ({ children, pageProps }) => { } }, []) - console.log(displaySidebar, displayDropdown) usePreventScroll({ isDisabled: !displaySidebar, }) diff --git a/components/core/UserNav/DropdownMenu.tsx b/components/core/UserNav/DropdownMenu.tsx index 0f45c7940..1f935657c 100644 --- a/components/core/UserNav/DropdownMenu.tsx +++ b/components/core/UserNav/DropdownMenu.tsx @@ -10,6 +10,21 @@ interface DropdownMenuProps { open: boolean } +const LINKS = [ + { + name: 'My Orders', + href: '/orders', + }, + { + name: 'My Profile', + href: '/profile', + }, + { + name: 'Cart', + href: '/cart', + }, +] + const DropdownMenu: FC = ({ open = false }) => { const { theme, setTheme } = useTheme() @@ -24,39 +39,36 @@ const DropdownMenu: FC = ({ open = false }) => { leaveTo="transform opacity-0 scale-95" > + {LINKS.map(({ name, href }) => ( + + + {({ active }) => ( + {name} + )} + + + ))} - {({ active }) => My Purchases} + + theme === 'dark' ? setTheme('light') : setTheme('dark') + } + > +
+ Theme: {theme}{' '} +
+
+ {theme == 'dark' ? ( + + ) : ( + + )} +
+
- {({ active }) => My Account} - - - {({ active }) => ( - - theme === 'dark' ? setTheme('light') : setTheme('dark') - } - > -
- Theme: {theme}{' '} -
-
- {theme == 'dark' ? ( - - ) : ( - - )} -
-
- )} -
- - {({ active }) => ( - - Logout - - )} + Logout
diff --git a/components/core/UserNav/UserNav.tsx b/components/core/UserNav/UserNav.tsx index c63ba2d9d..bdf867095 100644 --- a/components/core/UserNav/UserNav.tsx +++ b/components/core/UserNav/UserNav.tsx @@ -1,9 +1,9 @@ import Link from 'next/link' import cn from 'classnames' import s from './UserNav.module.css' -import { FC, useRef } from 'react' -import { Avatar } from '@components/core' +import { FC } from 'react' import { Heart, Bag } from '@components/icon' +import { Avatar } from '@components/core' import { useUI } from '@components/ui/context' import DropdownMenu from './DropdownMenu' import { Menu } from '@headlessui/react' @@ -22,7 +22,6 @@ const UserNav: FC = ({ className, children, ...props }) => { const { openSidebar, closeSidebar, displaySidebar } = useUI() const itemsCount = Object.values(data?.line_items ?? {}).reduce(countItems, 0) - let ref = useRef() as React.MutableRefObject return (