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
392 changes: 389 additions & 3 deletions package-lock.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"react-dom": "^18.2.0",
"react-error-boundary": "^6.0.0",
"react-icons": "^5.4.0",
"recharts": "^3.1.2",
"type-hangul": "^0.2.4"
},
"devDependencies": {
Expand Down
63 changes: 61 additions & 2 deletions src/app/admin/page.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import UserDetailsModal from '@/components/admin/UserDetailsModal';
import AdminTableCell from '@/components/admin/AdminTableCell';
import AdminTableTopContent from '@/components/admin/AdminTableTopContent';
import AdminTableBottomContent from '@/components/admin/AdminTableBottomContent';
import AdminDashboard from '@/components/admin/AdminDashboard';

import { useAuthenticatedApi } from '@/hooks/useAuthenticatedApi';

Expand Down Expand Up @@ -36,6 +37,12 @@ export default function Page() {
const [totalUsers, setTotalUsers] = React.useState(0);
const [totalPages, setTotalPages] = React.useState(0);

// 대시보드 통계용 전체 멤버 데이터
const [statsUsers, setStatsUsers] = React.useState([]);
const [statsTotal, setStatsTotal] = React.useState(0);
const [statsLoading, setStatsLoading] = React.useState(false);
const [statsError, setStatsError] = React.useState('');

const rowsPerPage = 10; //한 페이지당 표시될 유저 수

//유저 데이터 조회
Expand Down Expand Up @@ -67,6 +74,45 @@ export default function Page() {
}
}, [apiClient, page, rowsPerPage, query]);

// 통계용 전체 멤버 데이터 조회 (페이지네이션 병렬 수집)
const fetchAllUsersForStats = useCallback(async () => {
setStatsLoading(true);
setStatsError('');
try {
const pageSize = 200;
const baseParams = { size: pageSize, sort: 'createdAt', dir: 'DESC' };

const firstRes = await apiClient.get('/recruit/members', { params: { ...baseParams, page: 0 } });
const firstList = Array.isArray(firstRes?.data?.data) ? firstRes.data.data : [];
const total = firstRes?.data?.meta?.totalElements ?? firstList.length;
const totalPagesForStats = Math.max(1, Math.ceil(total / pageSize));

let all = firstList;
if (totalPagesForStats > 1) {
const promises = [];
for (let p = 1; p < totalPagesForStats; p++) {
promises.push(apiClient.get('/recruit/members', { params: { ...baseParams, page: p } }));
}
const results = await Promise.allSettled(promises);
results.forEach((res) => {
if (res.status === 'fulfilled') {
const list = Array.isArray(res.value?.data?.data) ? res.value.data.data : [];
all = all.concat(list);
}
});
}

setStatsUsers(all);
setStatsTotal(total);
} catch (e) {
setStatsUsers([]);
setStatsTotal(0);
setStatsError(String(e?.message || 'failed to load stats'));
} finally {
setStatsLoading(false);
}
}, [apiClient]);

//회비 지불여부 체크박스
const handleTogglePay = useCallback(
async (userId, nextValue) => {
Expand Down Expand Up @@ -159,11 +205,15 @@ export default function Page() {
fetchUsers();
}, [fetchUsers]);

useEffect(() => {
fetchAllUsersForStats();
}, [fetchAllUsersForStats]);

return (
<>
<div>
<Table
className='dark py-[30px] px-[96px] mobile:px-[10px]'
className='dark text-white py-[30px] px-[96px] mobile:px-[10px]'
aria-label='Example table with custom cells'
bottomContent={
<div className='relative'>
Expand Down Expand Up @@ -197,7 +247,7 @@ export default function Page() {
>
{(item) => (
<TableRow
className='hover:bg-[#35353b99] cursor-pointer'
className='hover:bg-[#35353b99] cursor-pointer text-white'
key={item.member?.id ?? item.id}
onClick={() => handleRowClick(item)}
>
Expand All @@ -212,6 +262,15 @@ export default function Page() {
</Table>

<UserDetailsModal user={selectedUser} isOpen={modalOpen} onClose={handleCloseModal} preventClose />

{/* 대시보드 */}
{/* {statsError ? (
<div className='px-[96px] mobile:px-[10px] text-red-400 py-4'>대시보드 로드 실패: {statsError}</div>
) : statsLoading ? (
<div className='px-[96px] mobile:px-[10px] text-white py-4'>대시보드 불러오는 중...</div>
) : (
<AdminDashboard members={statsUsers} totalCount={statsTotal} />
)} */}
</div>
</>
);
Expand Down
17 changes: 17 additions & 0 deletions src/app/core-recruit/layout.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { Suspense } from "react";
import Loader from '@/components/ui/common/Loader.jsx';

export const metadata = {
title: "Core Recruit",
description: "GDGoC INHA Core Member Recruitment Form",
};

export default function CoreRecruitLayout({ children }) {
return (
<Suspense fallback={ <Loader /> }>
{children}
</Suspense>
);
}


Loading