From 8eacef88a01d8c9de980303aea13a1bf847e8e25 Mon Sep 17 00:00:00 2001 From: YuminPark Date: Wed, 20 Aug 2025 14:37:31 +0900 Subject: [PATCH 1/6] =?UTF-8?q?#188=20[FEAT]=20TokenLoading=20=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EB=A1=9C=EB=94=A9=20=ED=85=8D=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=EB=A5=BC=20=EC=8A=A4=ED=94=BC=EB=84=88=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/onboarding/TokenLoading.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/onboarding/TokenLoading.tsx b/src/pages/onboarding/TokenLoading.tsx index 745a9a95..d8a32ffc 100644 --- a/src/pages/onboarding/TokenLoading.tsx +++ b/src/pages/onboarding/TokenLoading.tsx @@ -6,6 +6,7 @@ import { postReIssueAccessToken } from '../../apis/auth'; import { getWorkspaceProfile } from '../../apis/setting/useGetWorkspaceProfile'; import { LOCAL_STORAGE_KEY } from '../../constants/key'; import { useLocalStorage } from '../../hooks/useLocalStorage'; +import Loading from '../Loading'; const TokenLoading = () => { const { setItem } = useLocalStorage(LOCAL_STORAGE_KEY.accessToken); @@ -43,7 +44,7 @@ const TokenLoading = () => { init(); }, [setItem, navigate]); - return

로딩중입니다.

; + return ; }; export default TokenLoading; From cd812634781c26e0e09a4c33df8126bb069a213a Mon Sep 17 00:00:00 2001 From: YuminPark Date: Wed, 20 Aug 2025 14:41:28 +0900 Subject: [PATCH 2/6] =?UTF-8?q?#188=20[FEAT]=20InviteLoading=20=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EB=A1=9C=EB=94=A9=20=ED=85=8D=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=EB=A5=BC=20=EC=8A=A4=ED=94=BC=EB=84=88=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/onboarding/InviteLoading.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/onboarding/InviteLoading.tsx b/src/pages/onboarding/InviteLoading.tsx index 75f7260c..0ce92df5 100644 --- a/src/pages/onboarding/InviteLoading.tsx +++ b/src/pages/onboarding/InviteLoading.tsx @@ -4,6 +4,7 @@ import { useEffect } from 'react'; import { useNavigate, useParams, useSearchParams } from 'react-router-dom'; import { useLocalStorage } from '../../hooks/useLocalStorage'; import { LOCAL_STORAGE_KEY } from '../../constants/key'; +import Loading from '../Loading'; const InviteLoading = () => { const { workspaceName } = useParams(); // URL 파라미터 추출 @@ -30,7 +31,7 @@ const InviteLoading = () => { return (
-

초대 확인중입니다.

+ ;
); }; From dce7a3a38be85ac2539737289dd63e80473b06e9 Mon Sep 17 00:00:00 2001 From: YuminPark Date: Wed, 20 Aug 2025 14:46:36 +0900 Subject: [PATCH 3/6] =?UTF-8?q?#188=20[FEAT]=20WorkspaceComplete=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=8A=A4=ED=94=BC=EB=84=88=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/pages/workspace/WorkspaceComplete.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/pages/workspace/WorkspaceComplete.tsx b/src/pages/workspace/WorkspaceComplete.tsx index b2ee811b..38949104 100644 --- a/src/pages/workspace/WorkspaceComplete.tsx +++ b/src/pages/workspace/WorkspaceComplete.tsx @@ -1,6 +1,7 @@ import { useGetWorkspaceProfile } from '../../apis/setting/useGetWorkspaceProfile.ts'; import { useEffect } from 'react'; import { useNavigate } from 'react-router-dom'; +import Loading from '../Loading.tsx'; const WorkspaceComplete = () => { const { data } = useGetWorkspaceProfile(); @@ -14,7 +15,11 @@ const WorkspaceComplete = () => { }); } }, [teamId]); - return
; + return ( +
+ ; +
+ ); }; export default WorkspaceComplete; From 3ff663899a428f040ad678e1024c615595eef0b9 Mon Sep 17 00:00:00 2001 From: YuminPark Date: Wed, 20 Aug 2025 21:03:36 +0900 Subject: [PATCH 4/6] =?UTF-8?q?#188=20[RENAME]=20Loading=20->=20LoadingSpi?= =?UTF-8?q?nner=EB=A1=9C=20=EC=9D=B4=EB=A6=84=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/{Loading.tsx => LoadingSpinner.tsx} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename src/pages/{Loading.tsx => LoadingSpinner.tsx} (75%) diff --git a/src/pages/Loading.tsx b/src/pages/LoadingSpinner.tsx similarity index 75% rename from src/pages/Loading.tsx rename to src/pages/LoadingSpinner.tsx index e61d5391..a859130b 100644 --- a/src/pages/Loading.tsx +++ b/src/pages/LoadingSpinner.tsx @@ -1,6 +1,6 @@ import { ClipLoader } from 'react-spinners'; -const Loading = () => { +const LoadingSpinner = () => { return (
@@ -8,4 +8,4 @@ const Loading = () => { ); }; -export default Loading; +export default LoadingSpinner; From bddb0b13b59ce308e1723cc2a5e76a73ace4b868 Mon Sep 17 00:00:00 2001 From: YuminPark Date: Wed, 20 Aug 2025 21:08:03 +0900 Subject: [PATCH 5/6] =?UTF-8?q?#188=20[MOD]=20=EB=B3=80=EA=B2=BD=EB=90=9C?= =?UTF-8?q?=20LoadingSpinner=20=EC=9D=B4=EB=A6=84=EC=97=90=20=EB=A7=9E?= =?UTF-8?q?=EA=B2=8C=20=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layouts/ProtectedLayout.tsx | 4 ++-- src/layouts/PublicLayout.tsx | 4 ++-- src/pages/onboarding/InviteLoading.tsx | 4 ++-- src/pages/onboarding/TokenLoading.tsx | 4 ++-- src/pages/workspace/WorkspaceComplete.tsx | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/layouts/ProtectedLayout.tsx b/src/layouts/ProtectedLayout.tsx index 2f8c2632..209d7b45 100644 --- a/src/layouts/ProtectedLayout.tsx +++ b/src/layouts/ProtectedLayout.tsx @@ -4,7 +4,7 @@ import SettingSidebar from '../components/Sidebar/SettingSidebar'; import { QueryErrorResetBoundary } from '@tanstack/react-query'; import { Suspense } from 'react'; import { ErrorBoundary } from 'react-error-boundary'; -import Loading from '../pages/Loading.tsx'; +import LoadingSpinner from '../pages/LoadingSpinner.tsx'; import ServerError from '../pages/ServerError.tsx'; import { LOCAL_STORAGE_KEY } from '../constants/key.ts'; import { useLocalStorage } from '../hooks/useLocalStorage.ts'; @@ -31,7 +31,7 @@ const ProtectedLayout = () => { {({ reset }) => ( - }> + }>