From 4ee5745bdc167c6e024eb9d52b0c032d8aa772ca Mon Sep 17 00:00:00 2001 From: strfunctionk Date: Fri, 22 Aug 2025 11:14:10 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=94=A8=20Fix:=20=EB=A6=AC=EB=8B=A4?= =?UTF-8?q?=EC=9D=B4=EB=A0=89=ED=8A=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InstagramCallBackClient.client.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/features/sns-event-assistant/components/InstagramCallBackClient/InstagramCallBackClient.client.tsx b/src/features/sns-event-assistant/components/InstagramCallBackClient/InstagramCallBackClient.client.tsx index aa253042..57d3783b 100644 --- a/src/features/sns-event-assistant/components/InstagramCallBackClient/InstagramCallBackClient.client.tsx +++ b/src/features/sns-event-assistant/components/InstagramCallBackClient/InstagramCallBackClient.client.tsx @@ -41,7 +41,7 @@ const InstagramCallBackClient = () => { if (!code) { // workspaceId 조건은 위에서 이미 확인했으므로 제거 가능 console.error('인증 코드가 없습니다.'); - router.push(ROUTES.MODAL.SETTING.WORKSPACE_SETTING(workspaceId)); + router.push(ROUTES.WORKSPACE_MAIN(workspaceId)); return; } @@ -58,8 +58,8 @@ const InstagramCallBackClient = () => { type: OnboardingToastType.SUCCESS_SNS_ACCOUNT, snsAccount: data.instagramAccountName, }); - // 3. 온보딩 페이지로 복귀 - router.push(ROUTES.MODAL.SETTING.WORKSPACE_SETTING(workspaceId)); + // 3. 워크스페이스 페이지로 복귀 + router.push(ROUTES.WORKSPACE_MAIN(workspaceId)); }, }, ); From 80db344225f1fa4cc30723f2c8210e1980c64b8c Mon Sep 17 00:00:00 2001 From: strfunctionk Date: Fri, 22 Aug 2025 11:20:57 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=94=A8=20Fix:=20edit=20modal=20fallba?= =?UTF-8?q?ck?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../settings/change-password/page.tsx | 24 +++++++++---------- .../settings/page.tsx | 21 +++++++--------- 2 files changed, 20 insertions(+), 25 deletions(-) diff --git a/src/app/workspace/[workspaceId]/(inner-workspaceId-modal-fallback)/settings/change-password/page.tsx b/src/app/workspace/[workspaceId]/(inner-workspaceId-modal-fallback)/settings/change-password/page.tsx index a8a995aa..4892f0b4 100644 --- a/src/app/workspace/[workspaceId]/(inner-workspaceId-modal-fallback)/settings/change-password/page.tsx +++ b/src/app/workspace/[workspaceId]/(inner-workspaceId-modal-fallback)/settings/change-password/page.tsx @@ -1,17 +1,15 @@ 'use client'; -import { Suspense } from 'react'; -import MainWithWorkspacePage from '@app/workspace/[workspaceId]/page'; -// import SettingsPage from '@app/workspace/[workspaceId]/@innerWorkspaceIdModal/(.)settings/page'; -import ChangePasswordModalPage from '@app/workspace/[workspaceId]/@innerWorkspaceIdModal/(.)settings/change-password/page'; +import { ROUTES } from '@common/constants/routes.constants'; -const ChangePasswordStandalonePage = () => ( - <> - 로딩중...}> - - - - -); +import useStandaloneModalRedirect from '@common/hooks/useStandaloneModalRedirect'; -export default ChangePasswordStandalonePage; +const ChangePasswordStandalonePage = () => { + useStandaloneModalRedirect((workspaceId) => ROUTES.WORKSPACE_MAIN(workspaceId), { + useBack: false, + }); + + return null; // 화면 표시 없음 +}; + +export default ChangePasswordStandalonePage; \ No newline at end of file diff --git a/src/app/workspace/[workspaceId]/(inner-workspaceId-modal-fallback)/settings/page.tsx b/src/app/workspace/[workspaceId]/(inner-workspaceId-modal-fallback)/settings/page.tsx index 6b6ff1f1..4eb5900d 100644 --- a/src/app/workspace/[workspaceId]/(inner-workspaceId-modal-fallback)/settings/page.tsx +++ b/src/app/workspace/[workspaceId]/(inner-workspaceId-modal-fallback)/settings/page.tsx @@ -1,16 +1,13 @@ 'use client'; -import SettingModalPage from '../../@innerWorkspaceIdModal/(.)settings/page'; -import { Suspense } from 'react'; -import MainWithWorkspacePage from '@app/workspace/[workspaceId]/page'; +import { ROUTES } from '@common/constants/routes.constants'; -const SettingsStandalonePage = () => ( - <> - 로딩중...}> - - - - -); +import useStandaloneModalRedirect from '@common/hooks/useStandaloneModalRedirect'; -export default SettingsStandalonePage; +const SettingsStandalonePage = () => { + useStandaloneModalRedirect((workspaceId) => ROUTES.WORKSPACE_MAIN(workspaceId)); + + return null; // 화면 표시 없음 +}; + +export default SettingsStandalonePage; \ No newline at end of file