Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export default function CreateColumnModal() {
<Input
name="title"
label="이름"
placeholder="μƒˆλ‘œμš΄ ν”„λ‘œμ νŠΈ"
placeholder="μƒˆλ‘œμš΄ 컬럼"
register={register('title', {
required: ERROR_MESSAGES.TITLE_REQUIRE,
validate: (value) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: [],
};

Expand Down Expand Up @@ -44,6 +46,7 @@ const useMember = (dashboardId: string | null, pageSize = 4) => {
...prevState,
members,
totalPages,
totalCount,
}));
} catch (error) {
throw error;
Expand Down Expand Up @@ -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,
Expand Down
10 changes: 5 additions & 5 deletions src/components/header/DashboardMembers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -31,7 +31,7 @@ export default function DashboardMembers() {
return (
<div className={styles.avatarWrapper}>
{members
.slice(0, totalPages > maxViewCount ? maxViewCount - 1 : maxViewCount)
.slice(0, totalCount > maxViewCount ? maxViewCount - 1 : maxViewCount)
.map(({ id, nickname, profileImageUrl }) => (
<Avatar
key={id}
Expand All @@ -40,9 +40,9 @@ export default function DashboardMembers() {
className={styles.avatar}
/>
))}
{totalPages > maxViewCount && (
{totalCount > maxViewCount && (
<Avatar
name={totalPages - maxViewCount + 1}
name={totalCount - maxViewCount + 1}
className={styles.avatarNumber}
/>
)}
Expand Down
2 changes: 1 addition & 1 deletion src/components/header/UserSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default function UserSection() {
const handleLogout = () => {
clearUser();
setTimeout(() => {
router.push('/');
router.replace('/');
}, 0); // 비동기적 push 호좜 보μž₯
};

Expand Down
2 changes: 1 addition & 1 deletion src/middleware.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

Expand Down