From 2313b06487b8f8cbda2719b73c0f9815e7fa008d Mon Sep 17 00:00:00 2001 From: ohgus <123801385+ohgus@users.noreply.github.com> Date: Sat, 25 May 2024 17:30:36 +0900 Subject: [PATCH 1/4] =?UTF-8?q?[fix]:=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20?= =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?-=20=EC=B9=9C=EA=B5=AC=EC=9D=98=20=ED=94=84=EB=A1=9C=ED=95=84?= =?UTF-8?q?=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20response=20=EA=B0=92=EC=9D=B4?= =?UTF-8?q?=20null=EC=9D=B4=EB=A9=B4=20=EA=B8=B0=EB=B3=B8=20=EC=9D=B4?= =?UTF-8?q?=EB=AF=B8=EC=A7=80=EB=A5=BC=20=EB=9D=84=EC=9B=8C=EC=A3=BC?= =?UTF-8?q?=EA=B2=8C=20=EC=88=98=EC=A0=95=20-=20=EC=97=AC=EB=9F=AC?= =?UTF-8?q?=EB=AA=85=EC=9D=84=20=EC=84=A0=ED=83=9D=ED=96=88=EC=9D=84=20?= =?UTF-8?q?=EB=95=8C=20=EB=9D=84=EC=9B=8C=EC=A3=BC=EB=8A=94=20=EC=9D=B4?= =?UTF-8?q?=EB=AF=B8=EC=A7=80=20=EA=B2=BD=EB=A1=9C=20=EC=A0=88=EB=8C=80=20?= =?UTF-8?q?=EA=B2=BD=EB=A1=9C=EB=A1=9C=20=EC=88=98=EC=A0=95=20(#300)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/useSelectedFriendsStore.ts | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/src/store/useSelectedFriendsStore.ts b/src/store/useSelectedFriendsStore.ts index cad97477..32428a28 100644 --- a/src/store/useSelectedFriendsStore.ts +++ b/src/store/useSelectedFriendsStore.ts @@ -5,7 +5,10 @@ import { PickerResponseData, User } from 'types/user'; const defaultImgUrl = 'https://github.com/KakaoFunding/front-end/blob/dev/src/assets/bg_profile_default.png?raw=true'; -const peopleImgUrl = 'src/assets/profile_people.png'; +const peopleImgUrl = + 'https://github.com/KakaoFunding/front-end/blob/dev/src/assets/profile_people.png?raw=true'; +const friendsDefaultImgUrl = + 'https://github.com/KakaoFunding/front-end/blob/dev/src/assets/profile_default.png?raw=true'; type SelectedFriendsState = { isSelected: boolean; @@ -55,9 +58,20 @@ export const useSelectedFriendsStore = create< }), getImgUrl: () => { - if (get().selectedHeadCount > 1) return peopleImgUrl; - if (get().selectedHeadCount === 1) - return get().selectedFriends[0].profile_thumbnail_image!; + const selectCount = get().selectedHeadCount; + + if (selectCount > 1) return peopleImgUrl; + if (selectCount === 1) { + const friendsProfileImgUrl = + get().selectedFriends[0].profile_thumbnail_image; + + if (!friendsProfileImgUrl) { + return friendsDefaultImgUrl; + } + + return friendsProfileImgUrl; + } + return defaultImgUrl; }, }), From 1fe5f3e3ff11c1ef09bf6049bf2849298a660153 Mon Sep 17 00:00:00 2001 From: ohgus <123801385+ohgus@users.noreply.github.com> Date: Sat, 25 May 2024 17:40:32 +0900 Subject: [PATCH 2/4] =?UTF-8?q?[refactor]:=20=EB=A1=9C=EA=B7=B8=EC=95=84?= =?UTF-8?q?=EC=9B=83,=20reissue=20404=20=EB=A6=AC=EC=8A=A4=ED=8F=B0?= =?UTF-8?q?=EC=8A=A4=20=EC=83=81=ED=99=A9=EC=97=90=EC=84=9C=20=EC=84=A0?= =?UTF-8?q?=ED=83=9D=ED=95=9C=20=EC=B9=9C=EA=B5=AC=EB=A5=BC=20=EC=B4=88?= =?UTF-8?q?=EA=B8=B0=ED=99=94=ED=95=98=EA=B2=8C=20=EC=88=98=EC=A0=95=20(#3?= =?UTF-8?q?00)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layouts/App/Header/LogoutModal/index.tsx | 5 +++++ src/services/api/v1/index.ts | 2 ++ 2 files changed, 7 insertions(+) diff --git a/src/layouts/App/Header/LogoutModal/index.tsx b/src/layouts/App/Header/LogoutModal/index.tsx index ede1833a..036c1d24 100644 --- a/src/layouts/App/Header/LogoutModal/index.tsx +++ b/src/layouts/App/Header/LogoutModal/index.tsx @@ -1,6 +1,7 @@ import clsx from 'clsx'; import { useNavigate } from 'react-router-dom'; +import { useSelectedFriendsStore } from 'store/useSelectedFriendsStore'; import { useUserStore } from 'store/useUserStore'; import { @@ -24,6 +25,9 @@ const LogoutModal = ({ modalState, userState }: LogoutModalProps) => { const navigate = useNavigate(); const clearUser = useUserStore((state) => state.clearUserInfo); + const clearSelectedFiends = useSelectedFriendsStore( + (state) => state.clearSelectedFriends, + ); const accessToken = getSessionStorageItem('accessToken'); const refreshToken = getLocalStorageItem('refreshToken'); @@ -31,6 +35,7 @@ const LogoutModal = ({ modalState, userState }: LogoutModalProps) => { await logout({ accessToken, refreshToken }); clearUser(); + clearSelectedFiends(); clearSessionStorageItem(); clearLocalStorageItem('refreshToken'); diff --git a/src/services/api/v1/index.ts b/src/services/api/v1/index.ts index 8691c29e..41f87536 100644 --- a/src/services/api/v1/index.ts +++ b/src/services/api/v1/index.ts @@ -1,5 +1,6 @@ import axios from 'axios'; +import { useSelectedFriendsStore } from 'store/useSelectedFriendsStore'; import { useUserStore } from 'store/useUserStore'; import { @@ -68,6 +69,7 @@ apiV1.interceptors.response.use( if (response.status === 404) { useUserStore.getState().clearUserInfo(); + useSelectedFriendsStore.getState().clearSelectedFriends(); clearSessionStorageItem(); clearLocalStorageItem('refreshToken'); window.location.replace('/'); From ad981ca4e6869a7f40f6a42cfe358a7561e68062 Mon Sep 17 00:00:00 2001 From: ohgus <123801385+ohgus@users.noreply.github.com> Date: Sun, 26 May 2024 16:44:53 +0900 Subject: [PATCH 3/4] =?UTF-8?q?[refactor]:=20=EB=B0=B0=ED=8F=AC=ED=99=98?= =?UTF-8?q?=EA=B2=BD=EC=97=90=20=EB=A7=9E=EB=8A=94=20=EC=83=81=EB=8C=80=20?= =?UTF-8?q?=EA=B2=BD=EB=A1=9C=EB=A1=9C=20=EC=88=98=EC=A0=95=20(#300)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/useSelectedFriendsStore.ts | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/store/useSelectedFriendsStore.ts b/src/store/useSelectedFriendsStore.ts index 32428a28..01da7ece 100644 --- a/src/store/useSelectedFriendsStore.ts +++ b/src/store/useSelectedFriendsStore.ts @@ -3,12 +3,9 @@ import { persist } from 'zustand/middleware'; import { PickerResponseData, User } from 'types/user'; -const defaultImgUrl = - 'https://github.com/KakaoFunding/front-end/blob/dev/src/assets/bg_profile_default.png?raw=true'; -const peopleImgUrl = - 'https://github.com/KakaoFunding/front-end/blob/dev/src/assets/profile_people.png?raw=true'; -const friendsDefaultImgUrl = - 'https://github.com/KakaoFunding/front-end/blob/dev/src/assets/profile_default.png?raw=true'; +const defaultImgUrl = 'assets/bg_profile_default.png'; +const peopleImgUrl = 'assets/profile_people.png'; +const friendsDefaultImgUrl = 'assets/profile_default.png'; type SelectedFriendsState = { isSelected: boolean; From d2349e31d41d70a1fb53f18f23ce9273dbeefbdf Mon Sep 17 00:00:00 2001 From: ohgus <123801385+ohgus@users.noreply.github.com> Date: Sun, 26 May 2024 17:05:31 +0900 Subject: [PATCH 4/4] =?UTF-8?q?[refactor]:=20const=20->=20import=EB=A1=9C?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD=20(#300)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/useSelectedFriendsStore.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/store/useSelectedFriendsStore.ts b/src/store/useSelectedFriendsStore.ts index 01da7ece..9c9fbe8d 100644 --- a/src/store/useSelectedFriendsStore.ts +++ b/src/store/useSelectedFriendsStore.ts @@ -3,9 +3,9 @@ import { persist } from 'zustand/middleware'; import { PickerResponseData, User } from 'types/user'; -const defaultImgUrl = 'assets/bg_profile_default.png'; -const peopleImgUrl = 'assets/profile_people.png'; -const friendsDefaultImgUrl = 'assets/profile_default.png'; +import defaultImgUrl from 'assets/bg_profile_default.png'; +import friendsDefaultImgUrl from 'assets/profile_default.png'; +import peopleImgUrl from 'assets/profile_people.png'; type SelectedFriendsState = { isSelected: boolean;