From 9f4148d83b746889909ed948281c9c5285543a35 Mon Sep 17 00:00:00 2001 From: heejin Date: Sun, 1 Dec 2024 21:46:59 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=F0=9F=90=9B=20fix:=20redirection=20for=20n?= =?UTF-8?q?on=20token?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/middleware.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/middleware.ts b/src/middleware.ts index c447acb..5e6dc2e 100644 --- a/src/middleware.ts +++ b/src/middleware.ts @@ -8,7 +8,7 @@ export function middleware(request: NextRequest) { return NextResponse.redirect(new URL('/mydashboard', request.url)); } - if (!userToken) { + if (!userToken && request.nextUrl.pathname !== '/') { return NextResponse.redirect(new URL('/login', request.url)); } From 2d9d9ecd92f7c04fca076ac11a3028e8bfba6e74 Mon Sep 17 00:00:00 2001 From: heejin Date: Sun, 1 Dec 2024 21:58:13 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=F0=9F=90=9B=20fix:=20get=20total=20count?= =?UTF-8?q?=20on=20header=20members?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dashboard/[id]/edit/_hooks/useMember.ts | 4 ++++ src/components/header/DashboardMembers.tsx | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/app/(with-header-sidebar)/dashboard/[id]/edit/_hooks/useMember.ts b/src/app/(with-header-sidebar)/dashboard/[id]/edit/_hooks/useMember.ts index 369a73f..f198a27 100644 --- a/src/app/(with-header-sidebar)/dashboard/[id]/edit/_hooks/useMember.ts +++ b/src/app/(with-header-sidebar)/dashboard/[id]/edit/_hooks/useMember.ts @@ -7,12 +7,14 @@ import { toast } from '@/store/toastStore'; interface MemberState { page: number; totalPages: number; + totalCount: number; members: Member[]; } const DEFAULT_MEMBERS_STATE: MemberState = { page: 1, totalPages: 0, + totalCount: 0, members: [], }; @@ -44,6 +46,7 @@ const useMember = (dashboardId: string | null, pageSize = 4) => { ...prevState, members, totalPages, + totalCount, })); } catch (error) { throw error; @@ -84,6 +87,7 @@ const useMember = (dashboardId: string | null, pageSize = 4) => { page: memberState.page, members: memberState.members, totalPages: memberState.totalPages, + totalCount: memberState.totalCount, isLoading, error, handlePageChange, diff --git a/src/components/header/DashboardMembers.tsx b/src/components/header/DashboardMembers.tsx index 025d8ce..40e5de1 100644 --- a/src/components/header/DashboardMembers.tsx +++ b/src/components/header/DashboardMembers.tsx @@ -15,12 +15,12 @@ export default function DashboardMembers() { const dashboard = useDashboardStore((state) => state.dashboard); const { isMobile } = useWindowSize(); - const { members, totalPages } = useMember( + const { members, totalCount } = useMember( dashboard?.id.toString() || null, MEMBERS_VIEW_COUNT.desktop ); - if (totalPages === 0) { + if (totalCount === 0) { return null; } @@ -31,7 +31,7 @@ export default function DashboardMembers() { return (
{members - .slice(0, totalPages > maxViewCount ? maxViewCount - 1 : maxViewCount) + .slice(0, totalCount > maxViewCount ? maxViewCount - 1 : maxViewCount) .map(({ id, nickname, profileImageUrl }) => ( ))} - {totalPages > maxViewCount && ( + {totalCount > maxViewCount && ( )} From 69515bc8a107689f015f2702aebec21f444fcb4a Mon Sep 17 00:00:00 2001 From: heejin Date: Sun, 1 Dec 2024 22:09:41 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20fix:=20typo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dashboard/[id]/components/CreateColumnModal.tsx | 2 +- src/components/header/DashboardMembers.tsx | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/app/(with-header-sidebar)/dashboard/[id]/components/CreateColumnModal.tsx b/src/app/(with-header-sidebar)/dashboard/[id]/components/CreateColumnModal.tsx index a01b91a..e9cbfc8 100644 --- a/src/app/(with-header-sidebar)/dashboard/[id]/components/CreateColumnModal.tsx +++ b/src/app/(with-header-sidebar)/dashboard/[id]/components/CreateColumnModal.tsx @@ -46,7 +46,7 @@ export default function CreateColumnModal() { { diff --git a/src/components/header/DashboardMembers.tsx b/src/components/header/DashboardMembers.tsx index 40e5de1..45d78bb 100644 --- a/src/components/header/DashboardMembers.tsx +++ b/src/components/header/DashboardMembers.tsx @@ -28,6 +28,10 @@ export default function DashboardMembers() { ? MEMBERS_VIEW_COUNT.mobile : MEMBERS_VIEW_COUNT.desktop; + console.log({ maxViewCount }); + console.log({ totalCount }); + console.log(totalCount > maxViewCount); + return (
{members From 64852e9daaf9d70ad22cd1304abcf40673f157b0 Mon Sep 17 00:00:00 2001 From: heejin Date: Sun, 1 Dec 2024 22:10:18 +0900 Subject: [PATCH 4/5] =?UTF-8?q?=F0=9F=94=87=20remove:=20console?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/header/DashboardMembers.tsx | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/components/header/DashboardMembers.tsx b/src/components/header/DashboardMembers.tsx index 45d78bb..40e5de1 100644 --- a/src/components/header/DashboardMembers.tsx +++ b/src/components/header/DashboardMembers.tsx @@ -28,10 +28,6 @@ export default function DashboardMembers() { ? MEMBERS_VIEW_COUNT.mobile : MEMBERS_VIEW_COUNT.desktop; - console.log({ maxViewCount }); - console.log({ totalCount }); - console.log(totalCount > maxViewCount); - return (
{members From 7365572df585af9bf27f3fb22f97847f1f751156 Mon Sep 17 00:00:00 2001 From: heejin Date: Sun, 1 Dec 2024 22:35:40 +0900 Subject: [PATCH 5/5] =?UTF-8?q?=F0=9F=90=9B=20fix:=20logout=20router=20rep?= =?UTF-8?q?lace?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/header/UserSection.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/header/UserSection.tsx b/src/components/header/UserSection.tsx index a6e71c9..c12c393 100644 --- a/src/components/header/UserSection.tsx +++ b/src/components/header/UserSection.tsx @@ -25,7 +25,7 @@ export default function UserSection() { const handleLogout = () => { clearUser(); setTimeout(() => { - router.push('/'); + router.replace('/'); }, 0); // 비동기적 push 호출 보장 };