sdp-tech#559 fix : does not redirect to page one

youngsikkk · Nov 7, 2023 · 6dd8af8 · 6dd8af8
1 parent cc25559
commit 6dd8af8
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 2 deletions.
diff --git a/src/components/Community/CommunityList.jsx b/src/components/Community/CommunityList.jsx
@@ -111,6 +111,7 @@ export default function CommunityList({ board, format }) {
   const [tempSearch, setTempSearch] = useState('');
   const [searchParams, setSearchParams] = useSearchParams();
   const [page, setPage] = useState(1);
+  const [pageOneFlag, setPageOneFlag] = useState(false);
   const queryString = qs.parse(location.search, {
     ignoreQueryPrefix: true
   });
@@ -196,6 +197,9 @@ export default function CommunityList({ board, format }) {
       location.state.name = null;
     } else if ((page===1 && search)||page !== 1) {
       setSearchParams(params);
+      setPageOneFlag(true);
+    } else if (page === 1 && pageOneFlag) {
+      setSearchParams(params);
     }
   }, [tempSearch, page]);
   useEffect(() => {

diff --git a/src/components/Curation/components/CurationMoreView.jsx b/src/components/Curation/components/CurationMoreView.jsx
@@ -119,6 +119,7 @@ const CurationMoreView = () => {
       ignoreQueryPrefix: true
     });
   const [page, setPage] = useState(1);
+  const [pageOneFlag, setPageOneFlag] = useState(false);
   // const token = cookies.name; // 쿠키에서 id 를 꺼내기
   const token = localStorage.getItem("accessTK"); //localStorage에서 accesstoken꺼내기
   const request = Request(navigate);
@@ -163,6 +164,9 @@ const CurationMoreView = () => {
         location.state.name = null;
       } else if ((page===1 && search)||page !== 1) {
         setSearchParams(params);
+        setPageOneFlag(true);
+      } else if (page === 1 && pageOneFlag) {
+        setSearchParams(params);
       }
     }, [tempSearch, page]);
 

diff --git a/src/components/Curation/components/CurationUserMoreView.jsx b/src/components/Curation/components/CurationUserMoreView.jsx
@@ -117,6 +117,7 @@ const CurationUserMoreView = () => {
   const navigate = useNavigate();
   const location = useLocation();
   const [page, setPage] = useState(1);
+  const [pageOneFlag, setPageOneFlag] = useState(false);
   const token = localStorage.getItem("accessTK"); //localStorage에서 accesstoken꺼내기
   const request = Request(navigate);
   const queryString = qs.parse(location.search, {
@@ -173,6 +174,9 @@ const CurationUserMoreView = () => {
       location.state.name = null;
     } else if ((page===1 && search)||page !== 1) {
       setSearchParams(params);
+      setPageOneFlag(true);
+    } else if (page === 1 && pageOneFlag) {
+      setSearchParams(params);
     }
   }, [tempSearch, page]);
 

diff --git a/src/components/SpotMap/DataContainer.jsx b/src/components/SpotMap/DataContainer.jsx
@@ -53,6 +53,7 @@ export default function DataContainer({ Location }) {
     const [loading, setLoading] = useState(true);
     const navigate = useNavigate();
     const [page, setPage] = useState(1);
+    const [pageOneFlag, setPageOneFlag] = useState(false);
     const token = localStorage.getItem("accessTK"); //localStorage에서 accesstoken꺼내기
     const request = Request(navigate);
     const [placeData, setPlaceData] = useState({
@@ -122,6 +123,9 @@ export default function DataContainer({ Location }) {
         if (checkedList) params.checkedList = checkedList
         if ((page===1 && search||page===1 && checkedList)||page !== 1) {
           setSearchParams(params);
+          setPageOneFlag(true);
+        } else if (page===1 && pageOneFlag) {
+          setSearchParams(params);
         }
       }, [search, page, checkedList]);
 

diff --git a/src/components/Story/StoryListPage.jsx b/src/components/Story/StoryListPage.jsx
@@ -144,6 +144,7 @@ const StoryListPage = () => {
   const [tempSearch, setTempSearch] = useState("");
   const [search, setSearch] = useState("");
   const [toggleOpen, setToggleOpen] = useState(false);
+  const [pageOneFlag, setPageOneFlag] = useState(false);
   const [orderList, setOrderList] = useState(true);
   const [isSasmAdmin, setIsSasmAdmin] = useState(false);
   const navigate = useNavigate();
@@ -182,6 +183,9 @@ const StoryListPage = () => {
     location.state.name = null;
   } else if ((page===1 && search)||page !== 1) {
     setSearchParams(params);
+    setPageOneFlag(true);
+  } else if (page === 1 && pageOneFlag) {
+    setSearchParams(params);
   }
 }, [tempSearch, page]);
 

diff --git a/src/components/common/Pagination.jsx b/src/components/common/Pagination.jsx
@@ -37,7 +37,7 @@ function Pagination({ total, limit, page, setPage }) {
             &lt;&lt;
           </StyledLink>
           <StyledLink
-            onClick={()=>{setPage(page-1)}}
+            onClick={()=>{setPage(prev => prev-1)}}
             style={previousPage === 0 ? { display: "none" } : { display: "inline" }}
           >
             &lt;
@@ -55,7 +55,7 @@ function Pagination({ total, limit, page, setPage }) {
             );
           })}
           <StyledLink
-            onClick={() => {setPage(page+1)}}
+            onClick={() => {setPage(prev => prev+ 1)}}
             style={nextPage === numPages + 1 ? { display: "none" } : { display: "inline" }}
           >
             &gt;

diff --git a/src/components/mypage/myInfo/FollowerList.jsx b/src/components/mypage/myInfo/FollowerList.jsx
@@ -118,6 +118,7 @@ const Follower = () => {
   const [limit, setLimit] = useState(5);
   const [total, setTotal] = useState(0);
   const [page, setPage] = useState(1);
+  const [pageOneFlag, setPageOneFlag] = useState(false);
   const [searchParams, setSearchParams] = useSearchParams();
   const nickname = localStorage.getItem('nickname');
   const queryString = qs.parse(location.search, {
@@ -159,6 +160,9 @@ const Follower = () => {
     if (searchQuery) params.search = searchQuery;
     if ((page===1 && searchQuery)||page !== 1) {
       setSearchParams(params);
+      setPageOneFlag(true);
+    } else if (page === 1 && pageOneFlag) {
+      setSearchParams(params);
     }
   }, [searchQuery, page]);
 

diff --git a/src/components/mypage/myInfo/FollowingList.jsx b/src/components/mypage/myInfo/FollowingList.jsx
@@ -130,6 +130,7 @@ const Following = () => {
   const [searchQuery, setSearchQuery] = useState('');
   const [refresh, setRefresh] = useState(false);
   const [page, setPage] = useState(1);
+  const [pageOneFlag, setPageOneFlag] = useState(false);
   const nickname = localStorage.getItem('nickname');
   const queryString = qs.parse(location.search, {
     ignoreQueryPrefix: true
@@ -178,6 +179,9 @@ const Following = () => {
     if (searchQuery) params.search = searchQuery;
     if ((page===1 && searchQuery)||page !== 1) {
       setSearchParams(params);
+      setPageOneFlag(true);
+    } else if (page === 1 && pageOneFlag) {
+      setSearchParams(params);
     }
   }, [searchQuery, page]);
 

diff --git a/src/components/mypick/mycuration/MyCuration.jsx b/src/components/mypick/mycuration/MyCuration.jsx
@@ -154,6 +154,7 @@ const MyCuration = (props) => {
   const navigate = useNavigate();
   const request = Request(navigate);
   const [page, setPage] = useState(1);
+  const [pageOneFlag, setPageOneFlag] = useState(false);
   const nickname = localStorage.getItem('nickname');
 
   const onCheckedElement = (checked, item) => {
@@ -187,6 +188,9 @@ const MyCuration = (props) => {
     if (search) params.search = search;
     if ((page===1 && search)||page !== 1) {
       setSearchParams(params);
+      setPageOneFlag(true);
+    } else if (page === 1 && pageOneFlag) {
+      setSearchParams(params);
     }
   }, [search, page]);
 

diff --git a/src/components/mypick/myplace/Myplace.jsx b/src/components/mypick/myplace/Myplace.jsx
@@ -149,6 +149,7 @@ const Myplace = () => {
   const location = useLocation();
   const [loading, setLoading] = useState(true);
   const [page, setPage] = useState(1);
+  const [pageOneFlag, setPageOneFlag] = useState(false);
   const [checkedList, setCheckedList] = useState('');
   const navigate = useNavigate();
   const request = Request(navigate);
@@ -187,6 +188,9 @@ const Myplace = () => {
     if (checkedList) params.checkedList = checkedList
     if ((page===1 && search||page===1 && checkedList)||page !== 1) {
       setSearchParams(params);
+      setPageOneFlag(true);
+    } else if (page === 1 && pageOneFlag) {
+      setSearchParams(params);
     }
   }, [search, page, checkedList]);
 

diff --git a/src/components/mypick/mystory/Mystory.jsx b/src/components/mypick/mystory/Mystory.jsx
@@ -153,6 +153,7 @@ const Mystory = () => {
   const navigate = useNavigate();
   const request = Request(navigate);
   const [page, setPage] = useState(1);
+  const [pageOneFlag, setPageOneFlag] = useState(false);
   const nickname = localStorage.getItem('nickname');
 
   // onChange함수를 사용하여 이벤트 감지, 필요한 값 받아오기
@@ -195,6 +196,9 @@ const Mystory = () => {
     if (checkedList) params.checkedList = checkedList
     if ((page===1 && search||page===1 && checkedList)||page !== 1) {
       setSearchParams(params);
+      setPageOneFlag(true);
+    } else if (page === 1 && pageOneFlag) {
+      setSearchParams(params);
     }
   }, [search, page, checkedList]);