From 14ac9b1039838271bb11f6f07dd1425d322e5fa4 Mon Sep 17 00:00:00 2001 From: darkdulgi Date: Fri, 23 Aug 2024 11:26:54 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[feat]=20=EC=96=B4=EB=93=9C=EB=AF=BC=20?= =?UTF-8?q?=EC=9C=A0=EC=A0=80=20=EA=B2=80=EC=83=89=20=EC=8B=9C=20=EC=9C=A0?= =?UTF-8?q?=EC=A0=80=EC=84=B1=EB=AA=85=20=EC=99=B8=20=ED=95=84=EB=93=9C?= =?UTF-8?q?=EA=B0=92=EC=9C=BC=EB=A1=9C=EB=8F=84=20=EA=B2=80=EC=83=89=20?= =?UTF-8?q?=EA=B0=80=EB=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/adminPage/src/features/users/Users.jsx | 4 +++- packages/adminPage/src/features/users/index.jsx | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/adminPage/src/features/users/Users.jsx b/packages/adminPage/src/features/users/Users.jsx index 8f682e57..7e045c21 100644 --- a/packages/adminPage/src/features/users/Users.jsx +++ b/packages/adminPage/src/features/users/Users.jsx @@ -9,7 +9,9 @@ export default function Comments({ searchString, category }) { const data = useQuery( "admin-users", () => - fetchServer(`/api/v1/admin/event-users?page=${page - 1}&search=${searchString}&size=15`) + fetchServer( + `/api/v1/admin/event-users?page=${page - 1}&search=${searchString}&field=${category}&size=15`, + ) .then((res) => { console.log(category); return res; diff --git a/packages/adminPage/src/features/users/index.jsx b/packages/adminPage/src/features/users/index.jsx index bb4afb49..f6ddd519 100644 --- a/packages/adminPage/src/features/users/index.jsx +++ b/packages/adminPage/src/features/users/index.jsx @@ -6,7 +6,7 @@ import { useState } from "react"; export default function AdminCommentID() { const [formString, setFormString] = useState(""); const [searchString, setSearchString] = useState(""); - const [category, setCategory] = useState("name"); + const [category, setCategory] = useState("userName"); function searchComment(e) { e.preventDefault(); @@ -37,7 +37,7 @@ export default function AdminCommentID() { onChange={(e) => setCategory(e.target.value)} className="bg-transparent text-neutral-600" > - + From 0b7cded42d6471a78547caa99e243dbc50e4c4eb Mon Sep 17 00:00:00 2001 From: darkdulgi Date: Fri, 23 Aug 2024 11:27:32 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[chore]=20console.log=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/adminPage/src/features/users/Users.jsx | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/adminPage/src/features/users/Users.jsx b/packages/adminPage/src/features/users/Users.jsx index 7e045c21..e5aee4e3 100644 --- a/packages/adminPage/src/features/users/Users.jsx +++ b/packages/adminPage/src/features/users/Users.jsx @@ -13,7 +13,6 @@ export default function Comments({ searchString, category }) { `/api/v1/admin/event-users?page=${page - 1}&search=${searchString}&field=${category}&size=15`, ) .then((res) => { - console.log(category); return res; }) .catch((e) => { From b74cb3ec664b451333aa557731919574dea85a92 Mon Sep 17 00:00:00 2001 From: darkdulgi Date: Fri, 23 Aug 2024 13:34:52 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[feat]=20=EC=96=B4=EB=93=9C=EB=AF=BC=20?= =?UTF-8?q?=EC=9C=A0=EC=A0=80=20=EA=B2=80=EC=83=89=20=EC=BF=BC=EB=A6=AC?= =?UTF-8?q?=EB=A5=BC=20=EB=9D=BC=EC=9A=B0=ED=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/adminPage/src/App.jsx | 2 +- packages/adminPage/src/features/users/Users.jsx | 7 +++---- packages/adminPage/src/features/users/index.jsx | 6 +++++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/adminPage/src/App.jsx b/packages/adminPage/src/App.jsx index 32c60e5b..6f2a14d1 100644 --- a/packages/adminPage/src/App.jsx +++ b/packages/adminPage/src/App.jsx @@ -30,8 +30,8 @@ function App() { } /> } /> } /> - } /> } /> + } /> } /> } /> diff --git a/packages/adminPage/src/features/users/Users.jsx b/packages/adminPage/src/features/users/Users.jsx index e5aee4e3..69c5f6bd 100644 --- a/packages/adminPage/src/features/users/Users.jsx +++ b/packages/adminPage/src/features/users/Users.jsx @@ -3,14 +3,13 @@ import { fetchServer } from "@common/dataFetch/fetchServer.js"; import Pagination from "@admin/components/Pagination"; import { useState } from "react"; -export default function Comments({ searchString, category }) { - searchString; +export default function Comments({ searchParams }) { const [page, setPage] = useState(1); const data = useQuery( "admin-users", () => fetchServer( - `/api/v1/admin/event-users?page=${page - 1}&search=${searchString}&field=${category}&size=15`, + `/api/v1/admin/event-users?page=${page - 1}&search=${searchParams.get("search") ?? ""}&field=${searchParams.get("field") ?? "userName"}&size=15`, ) .then((res) => { return res; @@ -20,7 +19,7 @@ export default function Comments({ searchString, category }) { console.log(e); return { users: [] }; }), - [page, searchString], + [page, searchParams], ); return ( diff --git a/packages/adminPage/src/features/users/index.jsx b/packages/adminPage/src/features/users/index.jsx index f6ddd519..7705508c 100644 --- a/packages/adminPage/src/features/users/index.jsx +++ b/packages/adminPage/src/features/users/index.jsx @@ -2,15 +2,19 @@ import Suspense from "@common/components/Suspense"; import Loading from "./Loading.jsx"; import Users from "./Users.jsx"; import { useState } from "react"; +import { useSearchParams } from "react-router-dom"; export default function AdminCommentID() { const [formString, setFormString] = useState(""); const [searchString, setSearchString] = useState(""); const [category, setCategory] = useState("userName"); + const [searchParams, setSearchParams] = useSearchParams(); + function searchComment(e) { e.preventDefault(); setSearchString(formString); + setSearchParams({ search: formString, field: category }); } return ( @@ -58,7 +62,7 @@ export default function AdminCommentID() { }> - + );