Merge pull request #108 from CheckIt-v3/fix/#107

[Fix/#107] 무한 스크롤 에러 수정
CheckIt-v3 · Sep 24, 2024 · b4c72d2 · b4c72d2
2 parents 935672d + bba65cb
commit b4c72d2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/src/components/Header/MyHeader.tsx b/src/components/Header/MyHeader.tsx
@@ -29,6 +29,7 @@ const MyHeader: FC<{ onSearch: (query: string) => void }> = ({ onSearch }) => {
           // 서버에서 로그아웃이 성공하면 로컬 스토리지에서 토큰을 삭제하고 홈페이지로 이동
           localStorage.removeItem('accessToken')
           localStorage.removeItem('refreshToken')
+          localStorage.removeItem('userName')
           navigate('/')
         } else {
           // 서버에서 로그아웃이 실패하면 에러 처리

diff --git a/src/components/Tab/Pannels/WishList.tsx b/src/components/Tab/Pannels/WishList.tsx
@@ -22,7 +22,7 @@ const WishList = () => {
   const [hasMore, setHasMore] = useState<boolean>(true)
   const access = localStorage.getItem('accessToken')
   const { setSelectedBook } = useMyContext()
-  const [isLoading, _] = useState(true)
+  const [isLoading, setIsLoading] = useState(true)
   const navigate = useNavigate()
 
   const Toast = Swal.mixin({
@@ -37,23 +37,22 @@ const WishList = () => {
     },
   })
 
-  // 찜한 책 api 요청
-  useEffect(() => {
-    getWishList()
-  }, [])
-
+  // 책 목록 가져오기
   const getWishList = async () => {
     try {
       const response = await baseInstance.get(`/readings?pageNumber=${page}&status=LIKE`, {
         headers: { Authorization: `Bearer ${access}` },
       })
       const wishBooks = response.data.bookInfos.content
-      if (response.data.bookInfos.empty) {
+      // console.log(wishBooks);
+
+      if (response.data.bookInfos.last) {
         setHasMore(false)
-      } else {
-        const newBooks = wishBooks.map((book: any) => ({ ...book, isLiked: true }))
-        setBooks((prevBooks) => [...prevBooks, ...newBooks])
+        setIsLoading(false)
       }
+      const newBooks = wishBooks.map((book: any) => ({ ...book, isLiked: true }))
+      setBooks((prevBooks) => [...prevBooks, ...newBooks])
+      console.log(books)
     } catch (error) {
       console.log(error)
     }
@@ -66,6 +65,7 @@ const WishList = () => {
 
   const setTarget = useInfiniteScroll({ hasMore, onLoadMore: loadMore })
 
+  // 좋아요 토글
   const toggleWhishList = async (book: BookType) => {
     setSelectedBook(book)
 
@@ -97,7 +97,7 @@ const WishList = () => {
 
   return (
     <div className="w-full">
-      {books.length === 0 && isLoading ? (
+      {books.length === 0 ? (
         <div className="w-full mt-10 flex flex-col justify-center items-center h-dvh">
           <Lottie
             animationData={Empty}