release: frontend v2.1 (#397)

* fix: 회원 탈퇴 관련 오류 해결 * fix: popuup 두개 동시에 뜨는 에러 해결 --------- Co-authored-by: turtle601 <[email protected]>
woowacourse-teams · Aug 17, 2023 · 3dd2e83 · 3dd2e83
1 parent 366873f
commit 3dd2e83
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/frontend/src/components/RestaurantCard/RestaurantCard.tsx b/frontend/src/components/RestaurantCard/RestaurantCard.tsx
@@ -7,10 +7,9 @@ import { FONT_SIZE, truncateText } from '~/styles/common';
 
 import type { Celeb } from '~/@types/celeb.types';
 import type { Restaurant } from '~/@types/restaurant.types';
-import useToggleRestaurantLike from '~/hooks/server/useToggleRestaurantLike';
-import PopUpContainer from '~/components/PopUpContainer';
 import { Modal, ModalContent } from '~/components/@common/Modal';
 import LoginModalContent from '~/components/LoginModalContent';
+import useToggleLikeNotUpdate from '~/hooks/server/useToggleLikeNotUpdate';
 
 interface RestaurantCardProps {
   restaurant: Restaurant;
@@ -22,7 +21,7 @@ interface RestaurantCardProps {
 
 function RestaurantCard({ restaurant, celebs, size, type = 'list', setHoveredId = () => {} }: RestaurantCardProps) {
   const { id, images, name, roadAddress, category, phoneNumber } = restaurant;
-  const { isModalOpen, closeModal, toggleRestaurantLike } = useToggleRestaurantLike(restaurant);
+  const { isModalOpen, closeModal, toggleRestaurantLike, isLiked } = useToggleLikeNotUpdate(restaurant);
 
   const onMouseEnter = () => setHoveredId(restaurant.id);
   const onMouseLeave = () => setHoveredId(null);
@@ -49,7 +48,7 @@ function RestaurantCard({ restaurant, celebs, size, type = 'list', setHoveredId
         <StyledImageViewer>
           <ImageCarousel images={images} type={type} />
           <LikeButton aria-label="좋아요" type="button" onClick={toggle}>
-            <Love width={20} fill={restaurant.isLiked ? 'red' : '#000'} fillOpacity={0.8} aria-hidden="true" />
+            <Love width={20} fill={isLiked ? 'red' : '#000'} fillOpacity={0.8} aria-hidden="true" />
           </LikeButton>
         </StyledImageViewer>
         <section>
@@ -62,7 +61,6 @@ function RestaurantCard({ restaurant, celebs, size, type = 'list', setHoveredId
           <StyledProfileImageSection>
             {celebs && <ProfileImageList celebs={celebs} size={size} />}
           </StyledProfileImageSection>
-          <PopUpContainer isShowImg />
         </section>
       </StyledContainer>
       <Modal>

diff --git a/frontend/src/hooks/server/useDeleteUser.tsx b/frontend/src/hooks/server/useDeleteUser.tsx
@@ -44,11 +44,11 @@ const useDeleteUser = () => {
     }
 
     close();
-    navigator('/');
+    window.location.href = '/';
   }, []);
 
   const onCancelDeleteUser = useCallback(() => {
-    navigator('/');
+    navigator(-1);
   }, []);
 
   return { onCancelDeleteUser, deleteUser };

diff --git a/frontend/src/pages/MainPage.tsx b/frontend/src/pages/MainPage.tsx
@@ -18,6 +18,7 @@ import type { RestaurantCategory } from '~/@types/restaurant.types';
 import type { RestaurantListData } from '~/@types/api.types';
 import useBottomSheetStatus from '~/hooks/store/useBottomSheetStatus';
 import useMapState from '~/hooks/store/useMapState';
+import PopUpContainer from '~/components/PopUpContainer';
 
 function MainPage() {
   const isBottomSheetOpen = useBottomSheetStatus(state => state.isOpen);
@@ -120,6 +121,7 @@ function MainPage() {
               />
             </StyledRightSide>
           </StyledLayout>
+          <PopUpContainer isShowImg />
           <Footer />
         </>
       )}

diff --git a/frontend/src/pages/RestaurantDetail.tsx b/frontend/src/pages/RestaurantDetail.tsx
@@ -250,7 +250,7 @@ function RestaurantDetail() {
               }}
             />
           </StyledMainLinkContainer>
-          <PopUpContainer />
+          <PopUpContainer isShowImg />
         </StyledMobileBottomSheet>
       )}
     </>

diff --git a/frontend/src/pages/WishListPage.tsx b/frontend/src/pages/WishListPage.tsx
@@ -4,6 +4,7 @@ import styled, { css } from 'styled-components';
 
 import Footer from '~/components/@common/Footer';
 import Header from '~/components/@common/Header';
+import PopUpContainer from '~/components/PopUpContainer';
 import RestaurantWishList from '~/components/RestaurantWishList';
 import useTokenState from '~/hooks/store/useTokenState';
 
@@ -32,6 +33,7 @@ function WishListPage() {
         </StyledMobileLayout>
       </div>
       <Footer />
+      <PopUpContainer isShowImg />
     </StyledWishListPageWrapper>
   );
 }