From 454e22344cd6ea61e11be759e35cfca268ad59b2 Mon Sep 17 00:00:00 2001 From: lytrankieio123 Date: Tue, 14 Sep 2021 14:57:31 +0700 Subject: [PATCH 1/4] :recycle: enhan: add noti link in header :%s --- .../common/Header/components/HeaderMenu/HeaderMenu.tsx | 4 ++++ .../components/HeaderSubMenuMobile/HeaderSubMenuMobile.tsx | 2 +- src/utils/constanst.utils.ts | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/components/common/Header/components/HeaderMenu/HeaderMenu.tsx b/src/components/common/Header/components/HeaderMenu/HeaderMenu.tsx index 4aefb954c..2e81a4acd 100644 --- a/src/components/common/Header/components/HeaderMenu/HeaderMenu.tsx +++ b/src/components/common/Header/components/HeaderMenu/HeaderMenu.tsx @@ -29,6 +29,10 @@ const HeaderMenu = memo(({ openModalAuthen, openModalInfo, toggleFilter, toggleC onClick: openModalInfo, name: 'Create User Info (Demo)', }, + { + link: ROUTE.NOTIFICATION, + name: 'Notifications', + }, { link: ROUTE.ACCOUNT, name: 'Account', diff --git a/src/components/common/Header/components/HeaderSubMenuMobile/HeaderSubMenuMobile.tsx b/src/components/common/Header/components/HeaderSubMenuMobile/HeaderSubMenuMobile.tsx index ee15ac2cf..7537f7b8e 100644 --- a/src/components/common/Header/components/HeaderSubMenuMobile/HeaderSubMenuMobile.tsx +++ b/src/components/common/Header/components/HeaderSubMenuMobile/HeaderSubMenuMobile.tsx @@ -25,7 +25,7 @@ const OPTION_MENU = [ isMarked: false, }, { - link: `${ROUTE.ACCOUNT}?${QUERY_KEY.TAB}=${ACCOUNT_TAB.NOTIFICATION}`, + link: ROUTE.NOTIFICATION, name: 'Notifications', icon: , isMarked: true, diff --git a/src/utils/constanst.utils.ts b/src/utils/constanst.utils.ts index e85f5fdee..90ac2a175 100644 --- a/src/utils/constanst.utils.ts +++ b/src/utils/constanst.utils.ts @@ -21,6 +21,7 @@ export const ROUTE = { RECIPES: '/recipes', RECIPE_DETAIL: '/recipe', + NOTIFICATION: '/notification', BUSSINESS: '/bussiness', CONTACT: '/contact', CHECKOUT: '/checkout', @@ -35,7 +36,6 @@ export const ACCOUNT_TAB = { CUSTOMER_INFO: '', ORDER: 'orders', FAVOURITE: 'wishlist', - NOTIFICATION: 'notification', } export const QUERY_KEY = { From 5ecc7d8e74e03b863752e8172ab2d093a2855796 Mon Sep 17 00:00:00 2001 From: lytrankieio123 Date: Tue, 14 Sep 2021 15:07:42 +0700 Subject: [PATCH 2/4] :art: styles: home banner :%s --- src/components/common/Banner/Banner.tsx | 2 +- .../modules/home/HomeBanner/HomeBanner.module.scss | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/components/common/Banner/Banner.tsx b/src/components/common/Banner/Banner.tsx index 9b6b1099a..410fded77 100644 --- a/src/components/common/Banner/Banner.tsx +++ b/src/components/common/Banner/Banner.tsx @@ -8,7 +8,7 @@ interface Props { const option = { slidesPerView: 1, - breakpoints: {} + mode: 'free', } const Banner = memo(({ data }: Props) => { if (data.length === 1) { diff --git a/src/components/modules/home/HomeBanner/HomeBanner.module.scss b/src/components/modules/home/HomeBanner/HomeBanner.module.scss index a8b1b1d27..bb65a2549 100644 --- a/src/components/modules/home/HomeBanner/HomeBanner.module.scss +++ b/src/components/modules/home/HomeBanner/HomeBanner.module.scss @@ -31,11 +31,15 @@ width: min-content; color: var(--white); - font-size: 8.8rem; + font-size: 7rem; line-height: 8rem; letter-spacing: -0.03em; font-weight: bold; text-transform: uppercase; + + @screen 2xl { + line-height: 8rem; + } &::after { @apply absolute; content: ""; From 87c9a5ffc1687702ed611bca41fff986ebcf2605 Mon Sep 17 00:00:00 2001 From: lytrankieio123 Date: Tue, 14 Sep 2021 15:18:00 +0700 Subject: [PATCH 3/4] :bug: bug: useEffect in Scroll to Top :%s --- src/components/common/ScrollToTop/ScrollToTop.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/common/ScrollToTop/ScrollToTop.tsx b/src/components/common/ScrollToTop/ScrollToTop.tsx index d148c8937..eef74cb24 100644 --- a/src/components/common/ScrollToTop/ScrollToTop.tsx +++ b/src/components/common/ScrollToTop/ScrollToTop.tsx @@ -34,7 +34,7 @@ const ScrollToTop = ({ visibilityHeight=450 }: ScrollToTopProps) => { useEffect(() => { addEventScroll(); - }); + }, []); return (
Date: Tue, 14 Sep 2021 15:29:19 +0700 Subject: [PATCH 4/4] :art: styles: box shadow header :%s --- src/components/common/Header/Header.module.scss | 16 ++++++++++++---- .../Header/components/HeaderMenu/HeaderMenu.tsx | 3 +-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/components/common/Header/Header.module.scss b/src/components/common/Header/Header.module.scss index 99cd29fe0..1a73bbae5 100644 --- a/src/components/common/Header/Header.module.scss +++ b/src/components/common/Header/Header.module.scss @@ -6,20 +6,28 @@ left: 0; z-index: 9999; margin-bottom: 3.2rem; - @screen md { - @apply relative; - } + &.full { @apply shadow-none; - border: 1px solid var(--border-line); } .menu { + box-shadow: 0 2px 10px rgba(0, 0, 0, 0.05); padding-left: 3.2rem; padding-right: 3.2rem; } .logo { @apply font-logo; } + + @screen md { + @apply relative; + &.full { + border: 1px solid var(--border-line); + } + .menu { + @apply shadow-none; + } + } } .headerSticky { diff --git a/src/components/common/Header/components/HeaderMenu/HeaderMenu.tsx b/src/components/common/Header/components/HeaderMenu/HeaderMenu.tsx index 2e81a4acd..40b329ca8 100644 --- a/src/components/common/Header/components/HeaderMenu/HeaderMenu.tsx +++ b/src/components/common/Header/components/HeaderMenu/HeaderMenu.tsx @@ -1,5 +1,5 @@ -import classNames from 'classnames' import Link from 'next/link' +import { useRouter } from 'next/router' import { memo, useMemo } from 'react' import InputSearch from 'src/components/common/InputSearch/InputSearch' import MenuDropdown from 'src/components/common/MenuDropdown/MenuDropdown' @@ -7,7 +7,6 @@ import { IconBuy, IconFilter, IconHeart, IconHistory, IconUser } from 'src/compo import { ACCOUNT_TAB, QUERY_KEY, ROUTE } from 'src/utils/constanst.utils' import Logo from '../../../Logo/Logo' import s from './HeaderMenu.module.scss' -import { useRouter } from 'next/router' interface Props { children?: any, openModalAuthen: () => void,