diff --git a/src/app/dashboard/[id]/edit/page.tsx b/src/app/dashboard/[id]/edit/page.tsx index 0f1b81d..8d1cd97 100644 --- a/src/app/dashboard/[id]/edit/page.tsx +++ b/src/app/dashboard/[id]/edit/page.tsx @@ -23,14 +23,16 @@ export default function DashBoardEditPage() { 돌아가기

돌아가기

-
+ + {/* 컨텐츠 박스: 기본 너비 500px, 화면 작으면 100% 최대 500px */} +
- {/* 삭제 버튼 영역 */} -
+ {/* 삭제 버튼 영역: 기본 너비 292px, 화면 작으면 100% 최대 292px, 좌측 margin 제거 */} +
diff --git a/src/app/features/auth/hooks/useAuth.ts b/src/app/features/auth/hooks/useAuth.ts index 18a0140..6432b31 100644 --- a/src/app/features/auth/hooks/useAuth.ts +++ b/src/app/features/auth/hooks/useAuth.ts @@ -24,5 +24,6 @@ export function useAuth() { return { updateAuthState, logout, + setUser, } } diff --git a/src/app/features/dashboard/components/edit/DeleteDashboardButton.tsx b/src/app/features/dashboard/components/edit/DeleteDashboardButton.tsx index f0b5764..29d4460 100644 --- a/src/app/features/dashboard/components/edit/DeleteDashboardButton.tsx +++ b/src/app/features/dashboard/components/edit/DeleteDashboardButton.tsx @@ -58,7 +58,7 @@ export default function DeleteDashboardButton({ onClick={handleDelete} // isLoading -> isPending으로 수정됨 disabled={mutation.isPending} - className={`Text-black my-8 rounded-8 font-semibold transition-opacity ${ + className={`Text-black my-8 whitespace-nowrap rounded-8 font-semibold transition-opacity ${ mutation.isPending ? 'cursor-not-allowed opacity-50' : 'hover:opacity-90' diff --git a/src/app/features/dashboard/components/edit/EditInfo.tsx b/src/app/features/dashboard/components/edit/EditInfo.tsx index 2c0534f..2fe513c 100644 --- a/src/app/features/dashboard/components/edit/EditInfo.tsx +++ b/src/app/features/dashboard/components/edit/EditInfo.tsx @@ -16,7 +16,7 @@ export default function EditInfo() { return (
-
+

{selectedDashboard?.title || '대시보드 편집'}

diff --git a/src/app/features/dashboard/components/edit/EditInvitation.tsx b/src/app/features/dashboard/components/edit/EditInvitation.tsx index 3f732e1..a7fa396 100644 --- a/src/app/features/dashboard/components/edit/EditInvitation.tsx +++ b/src/app/features/dashboard/components/edit/EditInvitation.tsx @@ -97,85 +97,77 @@ export default function EditInvitation() { : null return ( -
-
- + + - - -
- -
- {isLoading && ( -

로딩 중...

- )} - - {errorMessage && ( -

{errorMessage}

- )} - - {!isLoading && !errorMessage && currentItems.length === 0 && ( -

- 초대된 사용자가 없습니다. -

- )} - - {!isLoading && - !errorMessage && - currentItems.map((member, index) => { - const isLast = index === currentItems.length - 1 - return ( -
+ 초대 버튼 +
+

초대하기

+ + + + + +
+ {isLoading && ( +

로딩 중...

+ )} + + {errorMessage && ( +

{errorMessage}

+ )} + + {!isLoading && + !errorMessage && + currentItems.map((member, index) => { + const isLast = index === currentItems.length - 1 + return ( +
+
+
+ +

+ {member.invitee.email} +

+
+
+
+ + -
- ) - })} -
- -
+ {cancelMutation.isPending ? '취소 중...' : '취소'} + +
+ ) + })} +
+
) } diff --git a/src/app/features/dashboard/components/edit/EditMember.tsx b/src/app/features/dashboard/components/edit/EditMember.tsx index ba12246..bf43e2e 100644 --- a/src/app/features/dashboard/components/edit/EditMember.tsx +++ b/src/app/features/dashboard/components/edit/EditMember.tsx @@ -64,7 +64,7 @@ export default function EditMember() { return (
-
+
+

{title}

-
-

+

+

{totalPages} 페이지 중 {currentPage}