From b7fa60c9001026d5b2f56c9563c0501024828e21 Mon Sep 17 00:00:00 2001 From: lydiacho Date: Fri, 16 Feb 2024 03:15:40 +0900 Subject: [PATCH 1/8] =?UTF-8?q?design:=20fixed=20=EC=9D=BC=EA=B4=84=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Custom/Common/OnBoardingFooter.tsx | 7 ++++--- src/components/Custom/Common/Receipt/ReceiptFooter.tsx | 3 ++- src/components/Custom/NoDesign/NoDesignFooter.tsx | 3 ++- src/components/Custom/PriceFooter.tsx | 3 ++- src/components/List/FilterBottom.tsx | 4 ++-- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/components/Custom/Common/OnBoardingFooter.tsx b/src/components/Custom/Common/OnBoardingFooter.tsx index 3f7b8a47..b08e4103 100644 --- a/src/components/Custom/Common/OnBoardingFooter.tsx +++ b/src/components/Custom/Common/OnBoardingFooter.tsx @@ -78,7 +78,7 @@ export default OnBoardingFooter; const St = { OnBoardingFooter: styled.footer` - position: sticky; + position: fixed; bottom: 0; display: flex; @@ -86,14 +86,15 @@ const St = { align-items: center; width: 100%; + max-width: 43rem; height: 7rem; - background-color: ${({ theme }) => theme.colors.gray9}; + background-color: ${({ theme }) => theme.colors.pink5}; z-index: 2; `, FooterText: styled.p` - color: ${({ theme }) => theme.colors.pink5}; + color: ${({ theme }) => theme.colors.gray9}; ${({ theme }) => theme.fonts.title_semibold_18}; `, }; diff --git a/src/components/Custom/Common/Receipt/ReceiptFooter.tsx b/src/components/Custom/Common/Receipt/ReceiptFooter.tsx index 44db0f8f..ef359a38 100644 --- a/src/components/Custom/Common/Receipt/ReceiptFooter.tsx +++ b/src/components/Custom/Common/Receipt/ReceiptFooter.tsx @@ -22,10 +22,11 @@ const St = { display: flex; justify-content: center; align-items: center; - position: sticky; + position: fixed; bottom: 0; width: 100%; + max-width: 43rem; height: 7rem; background-color: ${({ theme }) => theme.colors.gray9}; diff --git a/src/components/Custom/NoDesign/NoDesignFooter.tsx b/src/components/Custom/NoDesign/NoDesignFooter.tsx index 591d217c..483f08d1 100644 --- a/src/components/Custom/NoDesign/NoDesignFooter.tsx +++ b/src/components/Custom/NoDesign/NoDesignFooter.tsx @@ -42,7 +42,7 @@ export default NoDesignFooter; const St = { NoDesignFooter: styled.footer<{ $isActiveNext: boolean }>` - position: sticky; + position: fixed; bottom: 0; display: flex; @@ -50,6 +50,7 @@ const St = { align-items: center; width: 100%; + max-width: 43rem; height: 7rem; background-color: ${({ $isActiveNext, theme }) => diff --git a/src/components/Custom/PriceFooter.tsx b/src/components/Custom/PriceFooter.tsx index a62698ba..cfb30791 100644 --- a/src/components/Custom/PriceFooter.tsx +++ b/src/components/Custom/PriceFooter.tsx @@ -63,7 +63,7 @@ const PriceFooter = ({ const St = { CustomFooter: styled.footer` - position: sticky; + position: fixed; bottom: 0; display: flex; @@ -71,6 +71,7 @@ const St = { align-items: center; width: 100%; + max-width: 43rem; height: 7rem; background-color: ${({ theme }) => theme.colors.gray9}; diff --git a/src/components/List/FilterBottom.tsx b/src/components/List/FilterBottom.tsx index 91ffce4d..3d23346c 100644 --- a/src/components/List/FilterBottom.tsx +++ b/src/components/List/FilterBottom.tsx @@ -196,7 +196,7 @@ const St = { } `, Footer: styled.footer` - position: sticky; + position: fixed; bottom: 0; display: flex; @@ -204,7 +204,6 @@ const St = { align-items: center; width: 100%; height: 7rem; - margin-top: 4rem; background-color: ${({ theme }) => theme.colors.gray9}; `, @@ -223,6 +222,7 @@ const CustomSheet = styled(Sheet)` } .react-modal-sheet-container { border-radius: 1rem !important; + padding-bottom: 11rem; } .react-modal-sheet-header { height: 1.6rem !important; From f2d49935d179f2de8fbc56be769393b5eef3b043 Mon Sep 17 00:00:00 2001 From: lydiacho Date: Fri, 16 Feb 2024 03:16:06 +0900 Subject: [PATCH 2/8] =?UTF-8?q?design:=20UX=EB=9D=BC=EC=9D=B4=ED=8C=85=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Register/RegisterName.tsx | 2 +- src/constants/TitleInfo.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Register/RegisterName.tsx b/src/components/Register/RegisterName.tsx index a470aef3..89c39721 100644 --- a/src/components/Register/RegisterName.tsx +++ b/src/components/Register/RegisterName.tsx @@ -18,7 +18,7 @@ const RegisterName = ({ setUserName }: RegisterNameProps) => { ) => handleChangeInputContent(e)} onInput={(e: React.ChangeEvent) => sliceMaxLength(e, 5, 'onlyString')} > diff --git a/src/constants/TitleInfo.ts b/src/constants/TitleInfo.ts index be14a813..fcc531c1 100644 --- a/src/constants/TitleInfo.ts +++ b/src/constants/TitleInfo.ts @@ -1,4 +1,4 @@ -export const TITLE = ['이름을 입력해주세요', '전화번호를 입력해주세요']; +export const TITLE = ['실명을 입력해주세요', '전화번호를 입력해주세요']; export const SUB_TITLE = [ '주문 시 입금자명 확인을 위해 실명이 필요해요', '주문 후 문자로 안내드리기 위해 필요해요.', From b0022376d72e8128b4e35ced3a714762130b84f8 Mon Sep 17 00:00:00 2001 From: lydiacho Date: Fri, 16 Feb 2024 03:16:40 +0900 Subject: [PATCH 3/8] =?UTF-8?q?design:=20=EC=8B=A0=EC=B2=AD=EC=99=84?= =?UTF-8?q?=EB=A3=8C=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=ED=97=A4=EB=8D=94=20?= =?UTF-8?q?=EC=9D=B4=ED=83=88=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Custom/Common/Receipt/ReceiptLayout.tsx | 21 +------------------ 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/src/components/Custom/Common/Receipt/ReceiptLayout.tsx b/src/components/Custom/Common/Receipt/ReceiptLayout.tsx index 20a1ea44..f75fbf59 100644 --- a/src/components/Custom/Common/Receipt/ReceiptLayout.tsx +++ b/src/components/Custom/Common/Receipt/ReceiptLayout.tsx @@ -1,7 +1,3 @@ -import { useState } from 'react'; -import BackBtn from '../../../../common/Header/BackBtn'; -import CancelBtn from '../../../../common/Header/CancelBtn'; -import CustomSizeEscapeModal from '../../../../common/Modal/EscapeModal/CustomSizeEscapeModal'; import Header from '../../../Header'; import PageLayout from '../../../PageLayout'; import ReceiptDetail from './ReceiptDetail'; @@ -15,23 +11,8 @@ interface ReceiptLayoutProps { } const ReceiptLayout = ({ receiptData, haveDesign }: ReceiptLayoutProps) => { - const [modalOn, setModalOn] = useState(false); - const renderReceiptLayoutHeader = () => { - return ( -
} - title='커스텀 타투' - rightSection={ - } - /> - } - transparent={true} - /> - ); + return
; }; return ( From 842ca40730f2c1041f80dad006c78c6215701222 Mon Sep 17 00:00:00 2001 From: lydiacho Date: Fri, 16 Feb 2024 03:17:12 +0900 Subject: [PATCH 4/8] =?UTF-8?q?chore:=20console=20log=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Custom/NoDesign/Img/CustomImgLayout.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/Custom/NoDesign/Img/CustomImgLayout.tsx b/src/components/Custom/NoDesign/Img/CustomImgLayout.tsx index ba19443a..ee9c0ae6 100644 --- a/src/components/Custom/NoDesign/Img/CustomImgLayout.tsx +++ b/src/components/Custom/NoDesign/Img/CustomImgLayout.tsx @@ -27,7 +27,6 @@ const CustomImgLayout = ({ setPreviewURL, }: CustomImgLayoutProps) => { // const CUSTOM_VIEW_COUNT = 2; - console.log('customInfo: ', customInfo); const [modalOn, setModalOn] = useState(false); const [isActiveNext, setIsActiveNext] = useState(false); From ccfe64ece85bae6f4f5d316a8db715c05a212bfb Mon Sep 17 00:00:00 2001 From: lydiacho Date: Fri, 16 Feb 2024 03:18:40 +0900 Subject: [PATCH 5/8] =?UTF-8?q?fix:=20=EB=82=B4=ED=83=80=ED=88=AC=20?= =?UTF-8?q?=EC=95=84=EC=9D=B4=ED=85=9C=ED=81=B4=EB=A6=AD=20=EC=8B=9C=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/SmallTattooCard.tsx | 11 +++++------ src/components/MyTattoo/MyLike.tsx | 30 ++++++++++++++---------------- 2 files changed, 19 insertions(+), 22 deletions(-) diff --git a/src/common/SmallTattooCard.tsx b/src/common/SmallTattooCard.tsx index 38206fbd..ee5c8e75 100644 --- a/src/common/SmallTattooCard.tsx +++ b/src/common/SmallTattooCard.tsx @@ -3,7 +3,7 @@ import { LabelCustomSmall } from '../assets/icon'; import { useNavigate } from 'react-router-dom'; const SmallTattooCard = ({ - id, + stickerId, img, title, discountRate, @@ -11,7 +11,7 @@ const SmallTattooCard = ({ originalPrice, isCustom, }: { - id: number; + stickerId: number; img: string; title: string; discountRate: number; @@ -21,12 +21,11 @@ const SmallTattooCard = ({ }) => { const navigate = useNavigate(); - const handleClickItem = (id: number) => { - navigate(`/detail/${id}`); + const handleClickItem = (stickerId: number) => { + navigate(`/detail/${stickerId}`); }; - return ( - handleClickItem(id)}> + handleClickItem(stickerId)}> {isCustom && } {title} diff --git a/src/components/MyTattoo/MyLike.tsx b/src/components/MyTattoo/MyLike.tsx index 0237d323..a9582ce6 100644 --- a/src/components/MyTattoo/MyLike.tsx +++ b/src/components/MyTattoo/MyLike.tsx @@ -9,22 +9,20 @@ const MyLike = () => { {!error && !loading && - response.map( - ({ id, stickerId, mainImageUrl, name, price, discountPrice, discountRate }) => { - return ( - - ); - }, - )} + response.map(({ stickerId, mainImageUrl, name, price, discountPrice, discountRate }) => { + return ( + + ); + })} ); }; From 0500edb1a563905d55818ad188deab2ce534c0b6 Mon Sep 17 00:00:00 2001 From: lydiacho Date: Fri, 16 Feb 2024 03:20:36 +0900 Subject: [PATCH 6/8] =?UTF-8?q?fix:=20yarn=20build=20=EC=97=90=EB=9F=AC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/page/DetailPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/page/DetailPage.tsx b/src/page/DetailPage.tsx index f6009685..f9e8070a 100644 --- a/src/page/DetailPage.tsx +++ b/src/page/DetailPage.tsx @@ -75,7 +75,7 @@ const DetailPage = () => { relatedResponse.map((el) => ( Date: Fri, 16 Feb 2024 03:40:06 +0900 Subject: [PATCH 7/8] =?UTF-8?q?design:=20fixed=EB=A1=9C=20=EC=9D=B8?= =?UTF-8?q?=ED=95=9C=20margin-bottom=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Custom/Common/Receipt/ReceiptDetail.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/Custom/Common/Receipt/ReceiptDetail.tsx b/src/components/Custom/Common/Receipt/ReceiptDetail.tsx index 233c1643..204df83f 100644 --- a/src/components/Custom/Common/Receipt/ReceiptDetail.tsx +++ b/src/components/Custom/Common/Receipt/ReceiptDetail.tsx @@ -99,6 +99,7 @@ const St = { display: flex; flex-direction: column; padding-bottom: 5.8rem; + margin-bottom: 7rem; min-height: calc(100dvh - 36.92rem); `, From d354628490bae71300eec822a2c5cc06b22b7d84 Mon Sep 17 00:00:00 2001 From: lydiacho Date: Fri, 16 Feb 2024 03:51:51 +0900 Subject: [PATCH 8/8] =?UTF-8?q?design:=20=EC=BB=A4=EC=8A=A4=ED=85=80=20?= =?UTF-8?q?=ED=94=8C=EB=A1=9C=EC=9A=B0=EC=97=90=20margin-bottom=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Custom/Common/Size/CustomSelectSize.tsx | 1 + src/components/Custom/HaveDesign/Reference/CustomReference.tsx | 1 + 2 files changed, 2 insertions(+) diff --git a/src/components/Custom/Common/Size/CustomSelectSize.tsx b/src/components/Custom/Common/Size/CustomSelectSize.tsx index 92e4de80..87c4618c 100644 --- a/src/components/Custom/Common/Size/CustomSelectSize.tsx +++ b/src/components/Custom/Common/Size/CustomSelectSize.tsx @@ -113,6 +113,7 @@ const St = { width: 100%; min-height: calc(100dvh - 13.6rem); padding: 0 2rem; + margin-bottom: 7rem; `, SizeInfoContainer: styled.article` diff --git a/src/components/Custom/HaveDesign/Reference/CustomReference.tsx b/src/components/Custom/HaveDesign/Reference/CustomReference.tsx index 617fe321..7f751a8f 100644 --- a/src/components/Custom/HaveDesign/Reference/CustomReference.tsx +++ b/src/components/Custom/HaveDesign/Reference/CustomReference.tsx @@ -62,6 +62,7 @@ const St = { flex-direction: column; /* align-items: center; */ min-height: calc(100dvh - 13.6rem); + margin-bottom: 7rem; `, };