From 06ba84577d81d9c91cda79f8cae658ff065327f6 Mon Sep 17 00:00:00 2001 From: AAminha Date: Thu, 30 Jan 2025 23:54:05 +0900 Subject: [PATCH 1/7] =?UTF-8?q?fix:=20=ED=86=A0=ED=81=B0=20=EC=9E=AC?= =?UTF-8?q?=EB=B0=9C=EA=B8=89=20=EB=A1=9C=EC=A7=81=20=EC=A4=91=20=EC=97=90?= =?UTF-8?q?=EB=9F=AC=20=EC=B2=98=EB=A6=AC=EA=B0=80=20=EC=95=88=EB=90=98?= =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apis/auth.ts | 1 + src/apis/client.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/apis/auth.ts b/src/apis/auth.ts index c7ac10b..f6a3f5a 100644 --- a/src/apis/auth.ts +++ b/src/apis/auth.ts @@ -83,5 +83,6 @@ export const getAccessToken = async () => { if (error instanceof Error) { console.error(error.message) } + throw new Error('토큰 재발급 실패') } } diff --git a/src/apis/client.ts b/src/apis/client.ts index d03499a..bbdc756 100644 --- a/src/apis/client.ts +++ b/src/apis/client.ts @@ -35,7 +35,7 @@ client.interceptors.response.use( return client(originalRequest) } catch { // 토큰 재발급 실패 시 로그아웃 - if (window.confirm('토큰 재발급에 실패했습니다. 다시 로그인하시겠습니까?')) { + if (window.confirm('오류가 발생했습니다. 다시 로그인하시겠어요?')) { useAuthStore.getState().logout() window.location.href = '/login' } From 63ff4153ec5c73a7e4d6b3fdea7e9bc1ae63f675 Mon Sep 17 00:00:00 2001 From: AAminha Date: Thu, 30 Jan 2025 23:54:28 +0900 Subject: [PATCH 2/7] =?UTF-8?q?style:=20=ED=82=A4=EA=B0=92=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/constants/index.ts | 1 - src/constants/key.ts | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/constants/index.ts b/src/constants/index.ts index c5a15a4..a5092e5 100644 --- a/src/constants/index.ts +++ b/src/constants/index.ts @@ -35,7 +35,6 @@ export const WITHDRAW_OPTIONS = [ '그 외 기타', ] -// TODO: 스토리지 변경 export const MAIN_BACKGROUND_IMAGE_BASE_LINK = 'https://storage.googleapis.com/to-hero/images/' export const MAIN_BACKGROUND_IMAGE_LINK = [ diff --git a/src/constants/key.ts b/src/constants/key.ts index 6c9ca17..44a4c24 100644 --- a/src/constants/key.ts +++ b/src/constants/key.ts @@ -1,4 +1,4 @@ -export const SHARE_CODE_KEY = 'TH-SC-qa-5' -export const REFRESH_TOKEN_KEY = 'TH-RT-qa-5' -export const MEMBER_INFO_KEY = 'TH-MI-qa-5' -export const GUEST_INFO_KEY = 'TH-GI-qa-5' +export const SHARE_CODE_KEY = 'TH-SC-qa-7' +export const REFRESH_TOKEN_KEY = 'TH-RT-qa-7' +export const MEMBER_INFO_KEY = 'TH-MI-qa-7' +export const GUEST_INFO_KEY = 'TH-GI-qa-7' From 14c6047bd6dc4edfd32ee4c947d48e9df3682714 Mon Sep 17 00:00:00 2001 From: AAminha Date: Thu, 30 Jan 2025 23:55:01 +0900 Subject: [PATCH 3/7] =?UTF-8?q?fix:=20=ED=8E=B8=EC=A7=80=20=EC=B5=9C?= =?UTF-8?q?=EB=8C=80=20=EA=B8=80=EC=9E=90=20=EC=88=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/constants/write.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/constants/write.ts b/src/constants/write.ts index 1b929dd..8f4d2ee 100644 --- a/src/constants/write.ts +++ b/src/constants/write.ts @@ -1,4 +1,4 @@ -export const MESSAGE_MAX_LENGTH = 100 +export const MESSAGE_MAX_LENGTH = 300 export const WRITE_STEPS = [ 'select-target', 'select-hero-type', From e240e478626978426993df347210f75d4f034520 Mon Sep 17 00:00:00 2001 From: AAminha Date: Thu, 30 Jan 2025 23:55:20 +0900 Subject: [PATCH 4/7] =?UTF-8?q?fix:=20=EB=A9=94=ED=83=80=20=ED=83=9C?= =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layouts/MetaTag.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/layouts/MetaTag.tsx b/src/layouts/MetaTag.tsx index 1dd4706..3b8057a 100644 --- a/src/layouts/MetaTag.tsx +++ b/src/layouts/MetaTag.tsx @@ -3,6 +3,7 @@ import { Helmet } from 'react-helmet-async' export default function MetaTag() { return ( + - + + Date: Thu, 30 Jan 2025 23:55:31 +0900 Subject: [PATCH 5/7] =?UTF-8?q?fix:=20=EB=A9=94=EC=9D=B8=20=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=A1=B0?= =?UTF-8?q?=EA=B1=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/extractImgLink.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/extractImgLink.ts b/src/utils/extractImgLink.ts index e29211c..84e7de3 100644 --- a/src/utils/extractImgLink.ts +++ b/src/utils/extractImgLink.ts @@ -15,7 +15,7 @@ export const extractImgLink = (messageCount: number) => { imgLink = MAIN_BACKGROUND_IMAGE_LINK[4] } else if (messageCount < 750) { imgLink = MAIN_BACKGROUND_IMAGE_LINK[5] - } else if (messageCount < 999) { + } else if (messageCount <= 999) { imgLink = MAIN_BACKGROUND_IMAGE_LINK[6] } else { imgLink = MAIN_BACKGROUND_IMAGE_LINK[7] From 6ecdf56931d0652cc308a54fd8ffb8632dd5fa84 Mon Sep 17 00:00:00 2001 From: AAminha Date: Thu, 30 Jan 2025 23:55:57 +0900 Subject: [PATCH 6/7] =?UTF-8?q?design:=20=EB=8B=89=EB=84=A4=EC=9E=84=20?= =?UTF-8?q?=EA=B8=80=EC=9E=90=20=EC=B4=88=EA=B3=BC=EB=90=98=EC=96=B4=20?= =?UTF-8?q?=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EA=B9=A8=EC=A7=80=EB=8A=94=20?= =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/containers/Share/BuildingWindow.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/containers/Share/BuildingWindow.tsx b/src/containers/Share/BuildingWindow.tsx index 79ed2dc..3b44581 100644 --- a/src/containers/Share/BuildingWindow.tsx +++ b/src/containers/Share/BuildingWindow.tsx @@ -7,7 +7,7 @@ interface BuildingWindowProps { export default function BuildingWindow({ imgSrc, name }: BuildingWindowProps) { return ( -
+
{name !== null ? ( <>
@@ -15,7 +15,7 @@ export default function BuildingWindow({ imgSrc, name }: BuildingWindowProps) {
{name && ( -

+

{name}

)} From a8007d3d103a2eb64ff97352dd51244cfe8631de Mon Sep 17 00:00:00 2001 From: AAminha Date: Thu, 30 Jan 2025 23:56:19 +0900 Subject: [PATCH 7/7] =?UTF-8?q?fix:=20=EB=A9=94=EC=8B=9C=EC=A7=80=20?= =?UTF-8?q?=EC=9E=91=EC=84=B1=20=ED=9B=84=20=EB=A9=94=EC=8B=9C=EC=A7=80=20?= =?UTF-8?q?=EA=B0=9C=EC=88=98=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8=20?= =?UTF-8?q?=EC=95=88=EB=90=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/Main.tsx | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/pages/Main.tsx b/src/pages/Main.tsx index 36145f7..d964d41 100644 --- a/src/pages/Main.tsx +++ b/src/pages/Main.tsx @@ -24,8 +24,14 @@ export default function Main() { const location = useLocation() useBodyBackgroundColor('#14192F') - const { data: mainData } = useMainData() - const { data, fetchNextPage, hasNextPage, isFetchingNextPage, refetch } = useGetMessages() + const { data: mainData, refetch: mainDataRefetch } = useMainData() + const { + data, + fetchNextPage, + hasNextPage, + isFetchingNextPage, + refetch: messagesRefetch, + } = useGetMessages() const messages = data?.pages.flatMap((page) => page.openedLetters ?? []) ?? [] @@ -48,7 +54,8 @@ export default function Main() { useEffect(() => { if (location.state && location.state.from === 'write') { - refetch() + mainDataRefetch() + messagesRefetch() } }, [location])