From 5c83a26ff47b7a67cfb46c3d12bdcfa2cdadda89 Mon Sep 17 00:00:00 2001 From: lytrankieio123 Date: Fri, 10 Sep 2021 18:19:00 +0700 Subject: [PATCH 1/6] :recycle: enhan: toggle cart :%s --- next-env.d.ts | 3 --- src/components/common/Header/Header.tsx | 19 +++++++++++++++++-- .../components/HeaderMenu/HeaderMenu.tsx | 5 +++-- src/components/common/Layout/Layout.tsx | 19 +++---------------- .../TabCommon/components/TabItem/TabItem.tsx | 8 -------- 5 files changed, 23 insertions(+), 31 deletions(-) diff --git a/next-env.d.ts b/next-env.d.ts index 9bc3dd46b..c6643fda1 100644 --- a/next-env.d.ts +++ b/next-env.d.ts @@ -1,6 +1,3 @@ /// /// /// - -// NOTE: This file should not be edited -// see https://nextjs.org/docs/basic-features/typescript for more information. diff --git a/src/components/common/Header/Header.tsx b/src/components/common/Header/Header.tsx index 308c9289b..5b42c6aaf 100644 --- a/src/components/common/Header/Header.tsx +++ b/src/components/common/Header/Header.tsx @@ -2,6 +2,7 @@ import classNames from 'classnames' import React, { memo, useEffect, useMemo, useRef, useState } from 'react' import { useModalCommon } from 'src/components/hooks' import { isMobile } from 'src/utils/funtion.utils' +import { CartDrawer } from '..' import ModalAuthenticate from '../ModalAuthenticate/ModalAuthenticate' import ModalCreateUserInfo from '../ModalCreateUserInfo/ModalCreateUserInfo' import HeaderHighLight from './components/HeaderHighLight/HeaderHighLight' @@ -10,14 +11,23 @@ import HeaderSubMenu from './components/HeaderSubMenu/HeaderSubMenu' import HeaderSubMenuMobile from './components/HeaderSubMenuMobile/HeaderSubMenuMobile' import s from './Header.module.scss' interface props { - toggleFilter:()=>void + toggleFilter: () => void } -const Header = memo(({toggleFilter}:props) => { +const Header = memo(({ toggleFilter }: props) => { const headeFullRef = useRef(null) const [isFullHeader, setIsFullHeader] = useState(true) const { visible: visibleModalAuthen, closeModal: closeModalAuthen, openModal: openModalAuthen } = useModalCommon({ initialValue: false }) const { visible: visibleModalInfo, closeModal: closeModalInfo, openModal: openModalInfo } = useModalCommon({ initialValue: false }) + const { visible: visibleCartDrawer, openModal: openCartDrawer, closeModal: closeCartDrawer } = useModalCommon({ initialValue: false }) + + const toggleCart = () => { + if (visibleCartDrawer) { + closeCartDrawer() + } else { + openCartDrawer() + } + } const headerHeight = useMemo(() => { return headeFullRef.current?.offsetHeight @@ -46,6 +56,7 @@ const Header = memo(({toggleFilter}:props) => {
@@ -60,6 +71,7 @@ const Header = memo(({toggleFilter}:props) => { })}>
@@ -67,6 +79,9 @@ const Header = memo(({toggleFilter}:props) => { + ) }) diff --git a/src/components/common/Header/components/HeaderMenu/HeaderMenu.tsx b/src/components/common/Header/components/HeaderMenu/HeaderMenu.tsx index 56b1e8ee6..8037b357a 100644 --- a/src/components/common/Header/components/HeaderMenu/HeaderMenu.tsx +++ b/src/components/common/Header/components/HeaderMenu/HeaderMenu.tsx @@ -14,11 +14,12 @@ interface Props { openModalAuthen: () => void, openModalInfo: () => void, toggleFilter:() => void, + toggleCart:() => void, } const FILTER_PAGE = [ROUTE.HOME,ROUTE.PRODUCTS] -const HeaderMenu = memo(({ isFull, openModalAuthen, openModalInfo, toggleFilter }: Props) => { +const HeaderMenu = memo(({ isFull, openModalAuthen, openModalInfo, toggleFilter, toggleCart }: Props) => { const router = useRouter() const optionMenu = useMemo(() => [ { @@ -81,7 +82,7 @@ const HeaderMenu = memo(({ isFull, openModalAuthen, openModalInfo, toggleFilter
  • -
    • diff --git a/src/components/common/Layout/Layout.tsx b/src/components/common/Layout/Layout.tsx index 204956fbd..8b93825b4 100644 --- a/src/components/common/Layout/Layout.tsx +++ b/src/components/common/Layout/Layout.tsx @@ -1,10 +1,9 @@ import { CommerceProvider } from '@framework' import { useRouter } from 'next/router' import { FC } from 'react' -import { FilterProvider } from 'src/components/contexts/FilterContext' import { useModalCommon } from 'src/components/hooks' import { BRAND, CATEGORY, FEATURED } from 'src/utils/constanst.utils' -import { CartDrawer, CustomShapeSvg } from '..' +import { CustomShapeSvg } from '..' import Footer from '../Footer/Footer' import Header from '../Header/Header' import MenuNavigationProductList from '../MenuNavigationProductList/MenuNavigationProductList' @@ -18,18 +17,9 @@ interface Props { // note: demo code const Layout: FC = ({ children }) => { const { locale = 'en-US' } = useRouter() - const { visible: visibleCartDrawer, openModal, closeModal: closeCartDrawer } = useModalCommon({ initialValue: false }) const { visible: visibleFilter, openModal: openFilter, closeModal: closeFilter } = useModalCommon({ initialValue: false }) - - const toggle = () => { - if (visibleCartDrawer) { - closeCartDrawer() - } else { - openModal() - } - } + const toggleFilter = () => { - console.log("click") if (visibleFilter) { closeFilter() } else { @@ -41,11 +31,8 @@ const Layout: FC = ({ children }) => {
    {children}
    - + -
    diff --git a/src/components/common/TabCommon/components/TabItem/TabItem.tsx b/src/components/common/TabCommon/components/TabItem/TabItem.tsx index cc1737e44..49750dc55 100644 --- a/src/components/common/TabCommon/components/TabItem/TabItem.tsx +++ b/src/components/common/TabCommon/components/TabItem/TabItem.tsx @@ -1,9 +1,5 @@ import classNames from 'classnames' -<<<<<<< HEAD -import React, { RefObject, useRef } from 'react' -======= import React from 'react' ->>>>>>> 88f90912429447f6ae7bafa77484465965e0ee13 import s from './TabItem.module.scss' interface TabItemProps { @@ -32,8 +28,4 @@ const TabItem = ({ ) } -<<<<<<< HEAD export default TabItem -======= -export default TabItem ->>>>>>> 88f90912429447f6ae7bafa77484465965e0ee13 From 2214d5a5678194e7aa406bb8b4377b2d3541cf6e Mon Sep 17 00:00:00 2001 From: lytrankieio123 Date: Fri, 10 Sep 2021 18:22:51 +0700 Subject: [PATCH 2/6] :recycle: enhan: add link product detail demo :%s --- src/components/common/ProductCard/ProductCard.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/common/ProductCard/ProductCard.tsx b/src/components/common/ProductCard/ProductCard.tsx index 4f1e3b329..a6022efa4 100644 --- a/src/components/common/ProductCard/ProductCard.tsx +++ b/src/components/common/ProductCard/ProductCard.tsx @@ -1,5 +1,6 @@ import Link from 'next/link' import React from 'react' +import { ROUTE } from 'src/utils/constanst.utils' import { ProductProps } from 'src/utils/types.utils' import ButtonCommon from '../ButtonCommon/ButtonCommon' import ButtonIconBuy from '../ButtonIconBuy/ButtonIconBuy' @@ -31,7 +32,7 @@ const ProductCard = ({ return (
    - +
    image
    @@ -42,7 +43,7 @@ const ProductCard = ({
    - +
    {name}
    {weight}
    From 1667d5859cb0263bfaa9bdde2b62995552953159 Mon Sep 17 00:00:00 2001 From: lytrankieio123 Date: Fri, 10 Sep 2021 18:28:35 +0700 Subject: [PATCH 3/6] :art: styles: page account :%s --- pages/account.tsx | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 pages/account.tsx diff --git a/pages/account.tsx b/pages/account.tsx new file mode 100644 index 000000000..7da102c52 --- /dev/null +++ b/pages/account.tsx @@ -0,0 +1,13 @@ +import React from 'react'; +import { Layout } from 'src/components/common'; +import { AccountPage } from 'src/components/modules/account'; + +const Account = () => { + return ( + + ); +}; + +Account.Layout = Layout + +export default Account; \ No newline at end of file From 99d4f74ab898c44888c96f651e37b97afc7dd288 Mon Sep 17 00:00:00 2001 From: lytrankieio123 Date: Fri, 10 Sep 2021 18:33:32 +0700 Subject: [PATCH 4/6] :bug: bug: fix bug import :%s --- .../modules/account/AccountNavigation/AccountNavigation.tsx | 2 +- .../AccountNavigation/components/AccountNavigationItem.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/modules/account/AccountNavigation/AccountNavigation.tsx b/src/components/modules/account/AccountNavigation/AccountNavigation.tsx index 929f386f2..013b4cbf1 100644 --- a/src/components/modules/account/AccountNavigation/AccountNavigation.tsx +++ b/src/components/modules/account/AccountNavigation/AccountNavigation.tsx @@ -1,7 +1,7 @@ import React, { useRef, useEffect, Children, ReactElement, PropsWithChildren, useState, cloneElement } from "react" import s from './AccountNavigation.module.scss' -import AccountNavigationItem from './components/AccountNavigationItem/AccountNavigationItem' +import AccountNavigationItem from './components/AccountNavigationItem' import {TabPaneProps} from '../../../common/TabCommon/components/TabPane/TabPane' interface AccountNavigationProps { diff --git a/src/components/modules/account/AccountNavigation/components/AccountNavigationItem.tsx b/src/components/modules/account/AccountNavigation/components/AccountNavigationItem.tsx index 9ac8a387f..9f94fb1fc 100644 --- a/src/components/modules/account/AccountNavigation/components/AccountNavigationItem.tsx +++ b/src/components/modules/account/AccountNavigation/components/AccountNavigationItem.tsx @@ -1,4 +1,4 @@ -import React, { RefObject } from "react"; +import React from "react"; import classNames from "classnames"; import s from './AccountNavigationItem.module.scss' From c10125e72ed16e79984acc2ae8f11c73a3a6a23c Mon Sep 17 00:00:00 2001 From: lytrankieio123 Date: Fri, 10 Sep 2021 18:40:21 +0700 Subject: [PATCH 5/6] :wrench: config: set port = 3005 in script start :%s --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 57df2ec3b..85d71c286 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "dev": "NODE_OPTIONS='--inspect' PORT=3005 next dev", "dev-windows": "set NODE_OPTIONS='--inspect' && set PORT=3005 && next dev", "build": "next build", - "start": "next start", + "start": "PORT=3005 next start", "analyze": "BUNDLE_ANALYZE=both yarn build", "prettier-fix": "prettier --write .", "find:unused": "npx next-unused", From d99abb51e9649ba36986f9105a2e004f0b045493 Mon Sep 17 00:00:00 2001 From: lytrankieio123 Date: Fri, 10 Sep 2021 18:51:10 +0700 Subject: [PATCH 6/6] :bug: bug: fix error import :%s --- pages/_error.tsx | 12 ------------ .../components/AccountNavigationItem.module.scss | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 pages/_error.tsx diff --git a/pages/_error.tsx b/pages/_error.tsx deleted file mode 100644 index 1cfdb5a4e..000000000 --- a/pages/_error.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import { } from "src/components/modules/404" -import { Layout } from 'src/components/common' -import { ErrorPage } from "src/components/modules/error" - -export default function Error() { - return ( -
    - -
    - ) -} -Error.Layout = Layout diff --git a/src/components/modules/account/AccountNavigation/components/AccountNavigationItem.module.scss b/src/components/modules/account/AccountNavigation/components/AccountNavigationItem.module.scss index 12d3e1f02..10037cdc7 100644 --- a/src/components/modules/account/AccountNavigation/components/AccountNavigationItem.module.scss +++ b/src/components/modules/account/AccountNavigation/components/AccountNavigationItem.module.scss @@ -1,4 +1,4 @@ -@import '../../../../../../styles/utilities'; +@import '../../../../../styles/utilities'; .accountNavigationItem { width: 28rem;