From 3cee1de79d245adbbc4c427eaee50ce968b10477 Mon Sep 17 00:00:00 2001 From: datnguyenkieio <76099413+datnguyenkieio@users.noreply.github.com> Date: Wed, 8 Sep 2021 09:30:09 +0700 Subject: [PATCH 1/4] Update src/components/common/PaginationCommon/PaginationCommon.tsx Co-authored-by: lytrankieio123 <76729908+lytrankieio123@users.noreply.github.com> --- src/components/common/PaginationCommon/PaginationCommon.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/common/PaginationCommon/PaginationCommon.tsx b/src/components/common/PaginationCommon/PaginationCommon.tsx index d0df5efe7..59ae8cbc2 100644 --- a/src/components/common/PaginationCommon/PaginationCommon.tsx +++ b/src/components/common/PaginationCommon/PaginationCommon.tsx @@ -61,7 +61,7 @@ const PaginationCommon = ({ })}
= pageNum - 1, + [s.disable]: currentPage >= pageNum - 1, })} onClick={onNextClick} > From 9db2a1b5a35141b277851599f771b135714a7642 Mon Sep 17 00:00:00 2001 From: lytrankieio123 Date: Wed, 8 Sep 2021 16:41:58 +0700 Subject: [PATCH 2/4] :fire: remove: fix warning :%s --- public/bg-products.svg | 8 ++++---- src/components/icons/IconArrowUp.tsx | 2 +- src/components/icons/IconHide.tsx | 4 ++-- .../modules/home/HomeVideo/assets/bg_left.svg | 12 ++++++------ .../modules/home/HomeVideo/assets/bg_right.svg | 12 ++++++------ 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/public/bg-products.svg b/public/bg-products.svg index 2118c3277..1eaa1df8b 100644 --- a/public/bg-products.svg +++ b/public/bg-products.svg @@ -1,7 +1,7 @@ - - - - + + + + diff --git a/src/components/icons/IconArrowUp.tsx b/src/components/icons/IconArrowUp.tsx index 3eac6391b..1f518d612 100644 --- a/src/components/icons/IconArrowUp.tsx +++ b/src/components/icons/IconArrowUp.tsx @@ -2,7 +2,7 @@ const ArrowUp = () => { return ( - + ) } diff --git a/src/components/icons/IconHide.tsx b/src/components/icons/IconHide.tsx index 9b84671c6..a977aff84 100644 --- a/src/components/icons/IconHide.tsx +++ b/src/components/icons/IconHide.tsx @@ -3,8 +3,8 @@ import React from 'react' const IconHide = () => { return ( - - + + ) } diff --git a/src/components/modules/home/HomeVideo/assets/bg_left.svg b/src/components/modules/home/HomeVideo/assets/bg_left.svg index d730f777d..74b215ae0 100644 --- a/src/components/modules/home/HomeVideo/assets/bg_left.svg +++ b/src/components/modules/home/HomeVideo/assets/bg_left.svg @@ -1,19 +1,19 @@ - - + + - - + + - - + + diff --git a/src/components/modules/home/HomeVideo/assets/bg_right.svg b/src/components/modules/home/HomeVideo/assets/bg_right.svg index e89652a3a..346d14e31 100644 --- a/src/components/modules/home/HomeVideo/assets/bg_right.svg +++ b/src/components/modules/home/HomeVideo/assets/bg_right.svg @@ -1,21 +1,21 @@ - - + + - - + + - - + + From a3a185cc19b315612e192496653e6dc01d82770b Mon Sep 17 00:00:00 2001 From: lytrankieio123 Date: Wed, 8 Sep 2021 16:43:39 +0700 Subject: [PATCH 3/4] :bug: bug: not show menu filter product list in tablet-and-up screen :%s --- .../MenuNavigationProductList.module.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/common/MenuNavigationProductList/MenuNavigationProductList.module.scss b/src/components/common/MenuNavigationProductList/MenuNavigationProductList.module.scss index 06a40f49c..aa3f5e6c3 100644 --- a/src/components/common/MenuNavigationProductList/MenuNavigationProductList.module.scss +++ b/src/components/common/MenuNavigationProductList/MenuNavigationProductList.module.scss @@ -1,6 +1,8 @@ @import "../../../styles/utilities"; .menuNavigationProductListDesktop{ - @apply hidden; + @screen sm-only { + @apply hidden; + } } .menuNavigationProductListMobile{ @apply hidden; From 0e1ed45e46a7b4020e051770854a9f537ac83b92 Mon Sep 17 00:00:00 2001 From: datnguyenkieio <76099413+datnguyenkieio@users.noreply.github.com> Date: Wed, 8 Sep 2021 16:49:17 +0700 Subject: [PATCH 4/4] Update src/components/common/PaginationCommon/PaginationCommon.tsx Co-authored-by: lytrankieio123 <76729908+lytrankieio123@users.noreply.github.com> --- src/components/common/PaginationCommon/PaginationCommon.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/common/PaginationCommon/PaginationCommon.tsx b/src/components/common/PaginationCommon/PaginationCommon.tsx index 59ae8cbc2..3b0e6fb5d 100644 --- a/src/components/common/PaginationCommon/PaginationCommon.tsx +++ b/src/components/common/PaginationCommon/PaginationCommon.tsx @@ -54,7 +54,7 @@ const PaginationCommon = ({ )