Merge pull request #196 from BCSDLab/hotfix/pagination

[회비 관리] 페이지네이션 에러 수정
BCSDLab · Jan 6, 2025 · 04127c6 · 04127c6
2 parents dd9dd54 + 5708b83
commit 04127c6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/src/component/YearPagination/index.tsx b/src/component/YearPagination/index.tsx
@@ -6,11 +6,12 @@ import { useQueryParam } from 'util/hooks/useQueryParam';
 import * as S from './style';
 
 interface YearPaginationProps {
+  pageName: string;
   duesYear: number;
   setDuesYear: React.Dispatch<React.SetStateAction<number>>;
 }
 
-export default function YearPagination({ duesYear, setDuesYear }: YearPaginationProps) {
+export default function YearPagination({ pageName, duesYear, setDuesYear }: YearPaginationProps) {
   const navigate = useNavigate();
   const currentYear = new Date().getFullYear();
   const param = useQueryParam('page');
@@ -20,14 +21,14 @@ export default function YearPagination({ duesYear, setDuesYear }: YearPagination
     // 재학생 회비 내역이 2021년부터 시작하므로 2021년 이전으로 이동할 수 없음
     const prevYear = page ? page + 1 : 2;
     if (prevYear <= currentYear - 2020) {
-      navigate(`/dues?page=${prevYear}`);
+      navigate(`/${pageName}?page=${prevYear}`);
       setDuesYear((prev) => prev - 1);
     }
   };
 
   const goToNextYear = () => {
     if (page && page > 1) {
-      navigate(`/dues?page=${page - 1}`);
+      navigate(`/${pageName}?page=${page - 1}`);
       setDuesYear((prev) => prev + 1);
     }
   };

diff --git a/src/page/DuesManagement/index.tsx b/src/page/DuesManagement/index.tsx
@@ -154,7 +154,7 @@ function DefaultTable() {
     <>
       <div css={S.searchAndPagination}>
         <div css={S.pagination}>
-          <YearPagination duesYear={duesYear} setDuesYear={setDuesYear} />
+          <YearPagination pageName="dues" duesYear={duesYear} setDuesYear={setDuesYear} />
         </div>
         <div>
           <Input

diff --git a/src/page/EditDues/index.tsx b/src/page/EditDues/index.tsx
@@ -246,7 +246,7 @@ function DefaultTable() {
     <>
       <div css={S.searchAndPagination}>
         <div css={S.pagination}>
-          <YearPagination duesYear={duesYear} setDuesYear={setDuesYear} />
+          <YearPagination pageName="edit-dues" duesYear={duesYear} setDuesYear={setDuesYear} />
         </div>
         <div>
           {(myInfo.authority === 'ADMIN' || myInfo.authority === 'MANAGER') && (

diff --git a/src/page/PersonalDues/index.tsx b/src/page/PersonalDues/index.tsx
@@ -27,7 +27,7 @@ export default function PersonalDues() {
   return (
     <div css={S.container}>
       <div css={S.pagination}>
-        <YearPagination duesYear={duesYear} setDuesYear={setDuesYear} />
+        <YearPagination pageName="dues" duesYear={duesYear} setDuesYear={setDuesYear} />
       </div>
       <div>
         <div>