diff --git a/src/components/common/Header/Header.tsx b/src/components/common/Header/Header.tsx index 36bdc6a8c..baf6f84dc 100644 --- a/src/components/common/Header/Header.tsx +++ b/src/components/common/Header/Header.tsx @@ -1,25 +1,9 @@ -import { FC, memo } from 'react' -import { IconUser } from 'src/components/icons' -import MenuDropdown from '../MenuDropdown/MenuDropdown' +import React, { memo } from 'react' import HeaderHighLight from './components/HeaderHighLight/HeaderHighLight' import HeaderMenu from './components/HeaderMenu/HeaderMenu' import HeaderSubMenu from './components/HeaderSubMenu/HeaderSubMenu' import s from './Header.module.scss' -const OPTION_MENU = [ - { - link: '/', - name: 'Account', - }, - { - link: '/', - name: 'Logout', - }, - -] - -// {/* */} - interface Props { className?: string children?: any diff --git a/src/components/common/Header/components/HeaderMenu/HeaderMenu.module.scss b/src/components/common/Header/components/HeaderMenu/HeaderMenu.module.scss index f76908148..23088a132 100644 --- a/src/components/common/Header/components/HeaderMenu/HeaderMenu.module.scss +++ b/src/components/common/Header/components/HeaderMenu/HeaderMenu.module.scss @@ -1,5 +1,19 @@ @import "../../../../../styles/utilities"; -.headerHighLight { - +.headerMenu { + @apply flex justify-between items-center bg-white; + .left { + @apply flex items-center; + } + .menu { + @apply flex items-center list-none; + li { + &:not(:last-child) { + margin-right: 4.8rem; + } + a { + @appy no-underline; + } + } + } } diff --git a/src/components/common/Header/components/HeaderMenu/HeaderMenu.tsx b/src/components/common/Header/components/HeaderMenu/HeaderMenu.tsx index 1f8956f14..7ea2a4c49 100644 --- a/src/components/common/Header/components/HeaderMenu/HeaderMenu.tsx +++ b/src/components/common/Header/components/HeaderMenu/HeaderMenu.tsx @@ -1,6 +1,23 @@ +import Link from 'next/link' import { memo } from 'react' +import InputSearch from 'src/components/common/InputSearch/InputSearch' +import MenuDropdown from 'src/components/common/MenuDropdown/MenuDropdown' +import { IconBuy, IconHistory, IconUser } from 'src/components/icons' +import { ACCOUNT_TAB, QUERY_KEY, ROUTE } from 'src/utils/constanst.utils' import s from './HeaderMenu.module.scss' +const OPTION_MENU = [ + { + link: '/', + name: 'Account', + }, + { + link: '/', + name: 'Logout', + }, + +] + interface Props { className?: string children?: any @@ -8,9 +25,36 @@ interface Props { const HeaderMenu = memo(({ }: Props) => { return ( -
- -
+
+
+
Online Grocery
+ +
+ +
) }) diff --git a/src/components/common/MenuDropdown/MenuDropdown.module.scss b/src/components/common/MenuDropdown/MenuDropdown.module.scss index 93faf3dbb..9ff3beb58 100644 --- a/src/components/common/MenuDropdown/MenuDropdown.module.scss +++ b/src/components/common/MenuDropdown/MenuDropdown.module.scss @@ -1,9 +1,6 @@ @import "../../../styles/utilities"; .menuDropdown { - // todo: remove - margin-left: 20rem; - @apply relative cursor-pointer; width: fit-content; min-width: 4.8rem; diff --git a/src/components/icons/IconHistory.tsx b/src/components/icons/IconHistory.tsx new file mode 100644 index 000000000..c36afe78d --- /dev/null +++ b/src/components/icons/IconHistory.tsx @@ -0,0 +1,11 @@ +import React from 'react' + +const IconHistory = () => { + return ( + + + + ) +} + +export default IconHistory diff --git a/src/components/icons/index.ts b/src/components/icons/index.ts index 9557e7b18..80d6f1dd4 100644 --- a/src/components/icons/index.ts +++ b/src/components/icons/index.ts @@ -2,4 +2,4 @@ export { default as IconBuy } from './IconBuy' export { default as IconSearch } from './IconSearch' export { default as IconArrowRight } from './IconArrowRight' export { default as IconUser } from './IconUser' - +export { default as IconHistory } from './IconHistory' diff --git a/src/utils/constanst.utils.ts b/src/utils/constanst.utils.ts index fb666be57..e168879b7 100644 --- a/src/utils/constanst.utils.ts +++ b/src/utils/constanst.utils.ts @@ -9,8 +9,9 @@ export const ROUTE = { HOME: '/', PRODUCTS: '/products', ABOUT: '/about', + ACCOUNT: '/account', + BUSSINESS: '/bussiness', - CONTACT: '/contact', FAQ: '/faq', CUSTOMER_SERVICE: '/customer-service', @@ -19,6 +20,16 @@ export const ROUTE = { BLOGS: '/blogs', } +export const ACCOUNT_TAB = { + CUSTOMER_INFO: '', + ORDER: 'orders', + FAVOURITE: 'wishlist', +} + +export const QUERY_KEY = { + TAB: 'tab' +} + export const KEY = { ENTER: 'Enter', }