Merge pull request #149 from softeerbootcamp4th/dev

1.0.1.2 핫픽스
softeerbootcamp4th · Aug 26, 2024 · 5b814fd · 5b814fd
2 parents 1920d5d + 51ecd93
commit 5b814fd
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/packages/adminPage/src/features/comment/id/Comments.jsx b/packages/adminPage/src/features/comment/id/Comments.jsx
@@ -2,16 +2,17 @@ import { useQuery } from "@common/dataFetch/getQuery.js";
 import { fetchServer } from "@common/dataFetch/fetchServer.js";
 import { formatDate } from "@common/utils.js";
 import Pagination from "@admin/components/Pagination";
-import { useState } from "react";
 
 export default function Comments({
   eventId,
   checkedComments,
   setCheckedComments,
   setAllId,
   searchString,
+  page,
+  setPage
 }) {
-  const [page, setPage] = useState(1);
+
   const data = useQuery(
     eventId,
     () =>

diff --git a/packages/adminPage/src/features/comment/id/index.jsx b/packages/adminPage/src/features/comment/id/index.jsx
@@ -9,6 +9,7 @@ export default function AdminCommentID({ eventId }) {
   const [formString, setFormString] = useState("");
   const [searchString, setSearchString] = useState("");
   const [allId, setAllId] = useState([]);
+  const [page, setPage] = useState(1);
 
   function selectAll() {
     if (allId.every((id) => checkedComments.has(id))) {
@@ -26,6 +27,7 @@ export default function AdminCommentID({ eventId }) {
 
   function searchComment(e) {
     e.preventDefault();
+    setPage(1);
     setSearchString(formString);
   }
 
@@ -78,6 +80,8 @@ export default function AdminCommentID({ eventId }) {
           setCheckedComments={setCheckedComments}
           setAllId={setAllId}
           searchString={searchString}
+          page={page}
+          setPage={setPage}
         />
       </Suspense>
     </div>

diff --git a/packages/adminPage/src/features/users/Users.jsx b/packages/adminPage/src/features/users/Users.jsx
@@ -1,10 +1,9 @@
 import { useQuery } from "@common/dataFetch/getQuery.js";
 import { fetchServer } from "@common/dataFetch/fetchServer.js";
 import Pagination from "@admin/components/Pagination";
-import { useState } from "react";
 
-export default function Comments({ searchParams }) {
-  const [page, setPage] = useState(1);
+export default function Comments({ searchParams, page, setPage }) {
+
   const data = useQuery(
     "admin-users",
     () =>

diff --git a/packages/adminPage/src/features/users/index.jsx b/packages/adminPage/src/features/users/index.jsx
@@ -8,11 +8,13 @@ export default function AdminCommentID() {
   const [formString, setFormString] = useState("");
   const [searchString, setSearchString] = useState("");
   const [category, setCategory] = useState("userName");
+  const [page, setPage] = useState(1);
 
   const [searchParams, setSearchParams] = useSearchParams();
 
   function searchComment(e) {
     e.preventDefault();
+    setPage(1);
     setSearchString(formString);
     setSearchParams({ search: formString, field: category });
   }
@@ -62,7 +64,12 @@ export default function AdminCommentID() {
       </div>
 
       <Suspense fallback={<Loading />}>
-        <Users searchParams={searchParams} setSearchParams={setSearchParams} />
+        <Users
+          searchParams={searchParams}
+          setSearchParams={setSearchParams}
+          page={page}
+          setPage={setPage}
+        />
       </Suspense>
     </div>
   );