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/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 4aefb954c..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,
@@ -29,6 +28,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: