From a45c7a758beb14437145dbbe69b57c3f3af062e5 Mon Sep 17 00:00:00 2001 From: ghdtjgus76 Date: Wed, 27 Dec 2023 13:59:21 +0900 Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC?= =?UTF-8?q?=20=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EC=8A=A4=ED=86=A0?= =?UTF-8?q?=EB=A6=AC=EB=B6=81=20=EB=B9=8C=EB=93=9C=20=EC=97=90=EB=9F=AC=20?= =?UTF-8?q?=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../atoms/Category/Category.stories.tsx | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src/components/atoms/Category/Category.stories.tsx b/src/components/atoms/Category/Category.stories.tsx index 95426d3e..ecf29348 100644 --- a/src/components/atoms/Category/Category.stories.tsx +++ b/src/components/atoms/Category/Category.stories.tsx @@ -52,53 +52,53 @@ export const MakeupCategory: Story = { key={0} children="여름쿨톤" colorIndex={0} - iconIndex={0} - smallCategory={undefined} - detailCategory={undefined} + iconIndex={2} + smallCategory="MAKEUP" + detailCategory="LIP" answerNumber={0} />, , , , , , From 18f877a0c2f60bf819e1c944984a5aef3cca24a2 Mon Sep 17 00:00:00 2001 From: ghdtjgus76 Date: Wed, 27 Dec 2023 14:05:38 +0900 Subject: [PATCH 2/6] =?UTF-8?q?fix:=20=ED=94=84=EB=A1=9C=ED=95=84=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EB=B9=8C=EB=93=9C=20=EC=97=90=EB=9F=AC=20?= =?UTF-8?q?=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/atoms/Input/SearchInput/index.tsx | 5 ++--- src/pages/profile/EditUserInfo.tsx | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/components/atoms/Input/SearchInput/index.tsx b/src/components/atoms/Input/SearchInput/index.tsx index 03bdf048..6230ad1b 100644 --- a/src/components/atoms/Input/SearchInput/index.tsx +++ b/src/components/atoms/Input/SearchInput/index.tsx @@ -1,7 +1,6 @@ import styled from '@emotion/styled' -import { ChangeEvent, TextareaHTMLAttributes, useRef, useState } from 'react' +import { ChangeEvent, TextareaHTMLAttributes, useState } from 'react' import { theme } from '@styles/theme' -import { FlexBox } from '@components/layouts/FlexBox' import { SearchIcon } from '@assets/icons/SearchIcon' import { useRecoilState } from 'recoil' import { forwardRef } from 'react' @@ -50,7 +49,7 @@ export const SearchInput = forwardRef( customRemoveHandler() } setContent('') - setBtnColor(false) + // setBtnColor(false) setSearchText('') setSelectedIndex(-1) setIsCancel(true) diff --git a/src/pages/profile/EditUserInfo.tsx b/src/pages/profile/EditUserInfo.tsx index cecd5aa0..427fe580 100644 --- a/src/pages/profile/EditUserInfo.tsx +++ b/src/pages/profile/EditUserInfo.tsx @@ -10,7 +10,7 @@ import { Padding } from '@components/layouts/Padding' import OnboardingStatus from '@components/profile/OnboardingStatus' import EditProfileButton from './EditProfileButton' import { authState } from '@libs/store/auth' -import { isBtnColorState, onboardingState } from '@libs/store/onboard' +import { onboardingState } from '@libs/store/onboard' import { profileState } from '@libs/store/profile' import useGetDate from '@libs/hooks/useGetDate' @@ -18,7 +18,6 @@ const EditUserInfo = () => { const auth = useRecoilValue(authState) const profileStateData = useRecoilValue(profileState) const [info, setInfo] = useRecoilState(onboardingState) - const setBtnColor = useSetRecoilState(isBtnColorState) const [userName, setUserName] = useState(auth.userProfile.userName) const [userId, setUserId] = useState(auth.userProfile.userId) @@ -46,7 +45,6 @@ const EditUserInfo = () => { ), onboardingState: auth.userProfile.onBoardingStatus, })) - setBtnColor(true) } }, []) From dbc17aa516004659f16b652df9c40724cacdb10a Mon Sep 17 00:00:00 2001 From: ghdtjgus76 Date: Wed, 27 Dec 2023 14:21:22 +0900 Subject: [PATCH 3/6] =?UTF-8?q?fix:=20=EC=98=A8=EB=B3=B4=EB=94=A9=20?= =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EC=BB=AC=EB=9F=AC=20=EB=B9=8C=EB=93=9C=20?= =?UTF-8?q?=EC=97=90=EB=9F=AC=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/atoms/Input/SearchInput/index.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/atoms/Input/SearchInput/index.tsx b/src/components/atoms/Input/SearchInput/index.tsx index 6230ad1b..8891cf1f 100644 --- a/src/components/atoms/Input/SearchInput/index.tsx +++ b/src/components/atoms/Input/SearchInput/index.tsx @@ -5,7 +5,6 @@ import { SearchIcon } from '@assets/icons/SearchIcon' import { useRecoilState } from 'recoil' import { forwardRef } from 'react' import { - isBtnColorState, isCancelState, isSearchActiveBtn, isSearchInputState, @@ -32,7 +31,7 @@ export const SearchInput = forwardRef( inputRef, ) { const [focus, setFocus] = useState(false) - const [btnColor, setBtnColor] = useRecoilState(isBtnColorState) + const [btnColor, setBtnColor] = useState(false) const [content, setContent] = useState('') const [searchText, setSearchText] = useRecoilState(isSearchInputState) const [selectedIndex, setSelectedIndex] = useRecoilState(isSearchActiveBtn) @@ -49,7 +48,7 @@ export const SearchInput = forwardRef( customRemoveHandler() } setContent('') - // setBtnColor(false) + setBtnColor(false) setSearchText('') setSelectedIndex(-1) setIsCancel(true) From 0966686525e74576c2fe7b053d832023ad06bf73 Mon Sep 17 00:00:00 2001 From: ghdtjgus76 Date: Wed, 27 Dec 2023 14:28:13 +0900 Subject: [PATCH 4/6] =?UTF-8?q?fix:=20=EC=83=88=EB=A1=9C=EC=9A=B4=20?= =?UTF-8?q?=EC=B7=A8=ED=96=A5=20=EB=8B=B5=EB=B3=80=20=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20title=20undefined=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4?= =?UTF-8?q?=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/profile/NewTasteCategoryListItem.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/profile/NewTasteCategoryListItem.tsx b/src/components/profile/NewTasteCategoryListItem.tsx index 20b291ff..f50b44fb 100644 --- a/src/components/profile/NewTasteCategoryListItem.tsx +++ b/src/components/profile/NewTasteCategoryListItem.tsx @@ -19,6 +19,8 @@ interface NewTasteCategoryListItemProps { const NewTasteCategoryListItem = ({ subCategoryList, }: NewTasteCategoryListItemProps) => { + console.log(subCategoryList) + const [subCategory, setSubCategory] = useRecoilState(subCategoryState) const navigate = useNavigate() @@ -63,8 +65,8 @@ const NewTasteCategoryListItem = ({ key={idx} onClick={() => handleClickSubCategory(category)} variant={getVariant(category)} - text={subCategoryTitle[category.smallCategory]['title']} - img={subCategoryTitle[category.smallCategory]['img']} + text={subCategoryTitle[category.smallCategory]?.['title']} + img={subCategoryTitle[category.smallCategory]?.['img']} /> ))} From 55d7035964c24741c850749f8bd58d7537a70811 Mon Sep 17 00:00:00 2001 From: ghdtjgus76 Date: Wed, 27 Dec 2023 14:32:59 +0900 Subject: [PATCH 5/6] =?UTF-8?q?chore:=20=ED=95=84=EC=9A=94=20=EC=97=86?= =?UTF-8?q?=EB=8A=94=20=EB=A1=9C=EA=B7=B8=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/profile/NewTasteCategoryListItem.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/components/profile/NewTasteCategoryListItem.tsx b/src/components/profile/NewTasteCategoryListItem.tsx index f50b44fb..0c7053d0 100644 --- a/src/components/profile/NewTasteCategoryListItem.tsx +++ b/src/components/profile/NewTasteCategoryListItem.tsx @@ -19,8 +19,6 @@ interface NewTasteCategoryListItemProps { const NewTasteCategoryListItem = ({ subCategoryList, }: NewTasteCategoryListItemProps) => { - console.log(subCategoryList) - const [subCategory, setSubCategory] = useRecoilState(subCategoryState) const navigate = useNavigate() From b5af643211d7004996aa0236797c79edfa77bcd0 Mon Sep 17 00:00:00 2001 From: ghdtjgus76 Date: Wed, 27 Dec 2023 15:28:12 +0900 Subject: [PATCH 6/6] =?UTF-8?q?chore:=20base=20href=20=EC=A3=BC=EC=84=9D?= =?UTF-8?q?=20=ED=95=B4=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index e9a96daf..1dc9cea7 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - + TIFY