Merge branch 'develop' of https://github.com/woowacourse-teams/2024-c…

…orea
woowacourse-teams · Sep 27, 2024 · c722855 · c722855
2 parents dad9575 + 0e2086c
commit c722855
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/frontend/src/components/common/label/Label.tsx b/frontend/src/components/common/label/Label.tsx
@@ -16,7 +16,7 @@ const Label = ({ text, type, size = "semiSmall", backgroundColor }: LabelProps)
     <S.LabelWrapper type={type} $size={size} $backgroundColor={backgroundColor}>
       {type === "KEYWORD" && `#${text}`}
       {type === "OPEN" && "모집 중"}
-      {type === "CLOSE" && "모집 완료"}
+      {type === "CLOSE" && "종료"}
       {type === "PROGRESS" && "진행 중"}
     </S.LabelWrapper>
   );

diff --git a/frontend/src/components/roomDetailPage/myReviewer/MyReviewer.tsx b/frontend/src/components/roomDetailPage/myReviewer/MyReviewer.tsx
@@ -80,7 +80,7 @@ const MyReviewer = ({ roomInfo }: MyReviewerProps) => {
                 <S.MyReviewerContent>{reviewer.username}</S.MyReviewerContent>
               </HoverStyledLink>
 
-              {reviewer.link.length !== 0 && (
+              {reviewer.link.length !== 0 ? (
                 <S.MyReviewerContent>
                   <S.PRLink href={reviewer.link}>
                     <S.IconWrapper>
@@ -89,6 +89,8 @@ const MyReviewer = ({ roomInfo }: MyReviewerProps) => {
                     바로가기
                   </S.PRLink>
                 </S.MyReviewerContent>
+              ) : (
+                "-"
               )}
 
               <S.MyReviewerContent>

diff --git a/frontend/src/components/shared/roomCardModal/RoomCardModalButton.tsx b/frontend/src/components/shared/roomCardModal/RoomCardModalButton.tsx
@@ -10,26 +10,38 @@ interface RoomCardModalButtonProps {
 const RoomCardModalButton = ({ roomInfo }: RoomCardModalButtonProps) => {
   const navigate = useNavigate();
   const { postParticipateInMutation } = useMutateRoom();
+  const isLoggedIn = !!localStorage.getItem("accessToken");
 
   const handleParticipateRoomClick = () => {
     postParticipateInMutation.mutate(roomInfo.id, {
       onSuccess: () => navigate(`/rooms/${roomInfo.id}`),
     });
   };
 
+  if (!isLoggedIn) {
+    return (
+      <Button variant="disable" size="medium" disabled>
+        로그인 후 참여 가능
+      </Button>
+    );
+  }
+
   if (roomInfo.participationStatus !== "NOT_PARTICIPATED") {
     return (
       <Button variant="disable" size="small" disabled>
         참여중
       </Button>
     );
-  } else if (roomInfo.roomStatus === "CLOSE") {
+  }
+
+  if (roomInfo.roomStatus !== "OPEN") {
     return (
       <Button variant="disable" size="small" disabled>
         모집 완료
       </Button>
     );
   }
+
   return (
     <Button variant="primary" size="small" onClick={handleParticipateRoomClick}>
       참여하기

diff --git a/frontend/src/hooks/mutations/useMutateAuth.ts b/frontend/src/hooks/mutations/useMutateAuth.ts
@@ -1,8 +1,9 @@
 import useMutateHandlers from "./useMutateHandlers";
-import { useMutation } from "@tanstack/react-query";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { useNavigate } from "react-router-dom";
 import { UserInfo } from "@/@types/userInfo";
 import { postLogin, postLogout } from "@/apis/auth.api";
+import QUERY_KEYS from "@/apis/queryKeys";
 
 interface UserInfoResponse {
   accessToken: string;
@@ -12,6 +13,7 @@ interface UserInfoResponse {
 const useMutateAuth = () => {
   const navigate = useNavigate();
   const { handleMutateError } = useMutateHandlers();
+  const queryClient = useQueryClient();
 
   const postLoginMutation = useMutation({
     mutationFn: (code: string) => postLogin(code),
@@ -29,6 +31,10 @@ const useMutateAuth = () => {
   const postLogoutMutation = useMutation({
     mutationFn: () => postLogout(),
     onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: [QUERY_KEYS.PARTICIPATED_ROOM_LIST] });
+      queryClient.invalidateQueries({ queryKey: [QUERY_KEYS.PROGRESS_ROOM_LIST] });
+      queryClient.invalidateQueries({ queryKey: [QUERY_KEYS.OPENED_ROOM_LIST] });
+      queryClient.invalidateQueries({ queryKey: [QUERY_KEYS.CLOSED_ROOM_LIST] });
       localStorage.clear();
       navigate("/");
     },