crowetic/commerce
1
0
Fork 1
mirror of https://github.com/vercel/commerce.git synced 2025-07-22 12:24:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

bug: fix bug conflict

Browse Source
This commit is contained in:
Quangnhankie 2021-09-14 15:23:56 +07:00
parent 54ef4d9446
commit 571bfe44ac
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/common/Header/components/HeaderMenu/HeaderMenu.tsx
View File

@ -1,20 +1,17 @@
import classNames from 'classnames' import classNames from 'classnames'
import Link from 'next/link' import Link from 'next/link'
import { memo, useEffect, useMemo, useState } from 'react' import { useRouter } from 'next/router'
import { memo, useMemo } from 'react'
import InputSearch from 'src/components/common/InputSearch/InputSearch' import InputSearch from 'src/components/common/InputSearch/InputSearch'
import MenuDropdown from 'src/components/common/MenuDropdown/MenuDropdown' import MenuDropdown from 'src/components/common/MenuDropdown/MenuDropdown'
import { IconBuy, IconFilter, IconHeart, IconHistory, IconUser } from 'src/components/icons' import { IconBuy, IconFilter, IconHeart, IconHistory, IconUser } from 'src/components/icons'
import { ACCOUNT_TAB, QUERY_KEY, ROUTE } from 'src/utils/constanst.utils' import { ACCOUNT_TAB, QUERY_KEY, ROUTE } from 'src/utils/constanst.utils'
import Logo from '../../../Logo/Logo' import Logo from '../../../Logo/Logo'
import s from './HeaderMenu.module.scss' import s from './HeaderMenu.module.scss'
import { useRouter } from 'next/router'
interface Props { interface Props {
children?: any, children?: any,
<<<<<<< HEAD
isFull: boolean, isFull: boolean,
visibleFilter?:boolean, visibleFilter?:boolean,
=======
>>>>>>> 2cd36b2d66249e898f8234d210f77f5e2a4c5a2e
openModalAuthen: () => void, openModalAuthen: () => void,
openModalInfo: () => void, openModalInfo: () => void,
toggleFilter: () => void, toggleFilter: () => void,
@ -23,11 +20,7 @@ interface Props {
const FILTER_PAGE = [ROUTE.HOME, ROUTE.PRODUCTS] const FILTER_PAGE = [ROUTE.HOME, ROUTE.PRODUCTS]
<<<<<<< HEAD const HeaderMenu = memo(({ visibleFilter,openModalAuthen, openModalInfo, toggleFilter, toggleCart}: Props) => {
const HeaderMenu = memo(({ visibleFilter,isFull, openModalAuthen, openModalInfo, toggleFilter, toggleCart }: Props) => {
=======
const HeaderMenu = memo(({ openModalAuthen, openModalInfo, toggleFilter, toggleCart }: Props) => {
>>>>>>> 2cd36b2d66249e898f8234d210f77f5e2a4c5a2e
const router = useRouter() const router = useRouter()