Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FE] 콜리네 서비스 제공 전 QA - 모달, 마이페이지(#563) #577

Merged
merged 4 commits into from
Oct 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@ import styled from "styled-components";
import media from "@/styles/media";

export const RoomCardModalContainer = styled.div`
display: flex;
flex-direction: column;
gap: 2rem;
`;

export const HeaderContainer = styled.div`
display: flex;
flex-wrap: wrap;
gap: 2rem;
Expand Down Expand Up @@ -51,8 +57,10 @@ export const MainContainer = styled.div`

export const ManagerContainer = styled.div`
display: flex;
gap: 0.5rem;
flex-wrap: wrap;
gap: 0.8rem;
align-items: center;

font: ${({ theme }) => theme.TEXT.small};
`;

Expand All @@ -67,7 +75,10 @@ export const ProfileContainer = styled.div`
}

span {
width: 168px;
font: ${({ theme }) => theme.TEXT.small};
text-overflow: ellipsis;
white-space: nowrap;
}
`;

Expand Down Expand Up @@ -155,7 +166,8 @@ export const InfoContent = styled.span`
export const DescriptionContainer = styled.div`
display: flex;
flex-direction: column;
gap: 0.5rem;
gap: 1rem;
width: 100%;
`;

export const KeywordsContainer = styled.div`
Expand Down Expand Up @@ -234,3 +246,9 @@ export const MatchingSizeContainer = styled.div`
padding: 0.2rem 0.6rem;
}
`;

export const ButtonWRapper = styled.div`
display: flex;
align-items: center;
justify-content: center;
`;
56 changes: 28 additions & 28 deletions frontend/src/components/shared/roomCardModal/RoomCardModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,32 +17,32 @@ const RoomCardModal = ({ isOpen, onClose, roomInfo }: RoomCardModalProps) => {
return (
<Modal isOpen={isOpen} onClose={onClose}>
<S.RoomCardModalContainer>
<S.RoomInfoThumbnail
as={ImageWithFallback}
src={roomInfo.thumbnailLink}
alt={roomInfo.title}
/>

<S.MainContainer>
<S.ManagerContainer>
<S.ProfileContainer>
<S.IconWrapper>
<Icon kind="person" />
</S.IconWrapper>
<span> {roomInfo.manager}</span>
</S.ProfileContainer>
<Label type={roomInfo.roomStatus} />
</S.ManagerContainer>

<S.TitleContainer>
<S.RoomTitle>{roomInfo.title}</S.RoomTitle>
<S.RepositoryLink href={roomInfo.repositoryLink} target="_blank">
<Icon kind="link" size="1.8rem" />
저장소 바로가기
</S.RepositoryLink>
</S.TitleContainer>
</S.MainContainer>
<S.HeaderContainer>
<S.RoomInfoThumbnail
as={ImageWithFallback}
src={roomInfo.thumbnailLink}
alt={roomInfo.title}
/>
<S.MainContainer>
<S.ManagerContainer>
<S.ProfileContainer>
<S.IconWrapper>
<Icon kind="person" />
</S.IconWrapper>
<span> {roomInfo.manager}</span>
</S.ProfileContainer>
<Label type={roomInfo.roomStatus} />
</S.ManagerContainer>

<S.TitleContainer>
<S.RoomTitle>{roomInfo.title}</S.RoomTitle>
<S.RepositoryLink href={roomInfo.repositoryLink} target="_blank">
<Icon kind="link" size="1.8rem" />
저장소 바로가기
</S.RepositoryLink>
</S.TitleContainer>
</S.MainContainer>
</S.HeaderContainer>
<S.EtcContainer>
<S.InfoRow>
<S.InfoTitle>모집 마감일</S.InfoTitle>
Expand All @@ -63,7 +63,6 @@ const RoomCardModal = ({ isOpen, onClose, roomInfo }: RoomCardModalProps) => {
</S.InfoContent>
</S.InfoRow>
</S.EtcContainer>

<S.DescriptionContainer>
<S.KeywordsContainer>
<S.KeywordWrapper>
Expand All @@ -74,8 +73,9 @@ const RoomCardModal = ({ isOpen, onClose, roomInfo }: RoomCardModalProps) => {
</S.KeywordsContainer>
<S.ContentContainer>{roomInfo.content}</S.ContentContainer>
</S.DescriptionContainer>

<RoomCardModalButton roomInfo={roomInfo} />
<S.ButtonWRapper>
<RoomCardModalButton roomInfo={roomInfo} />
</S.ButtonWRapper>
</S.RoomCardModalContainer>
</Modal>
);
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/constants/message.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,13 @@ const ERROR_MESSAGES = {
};

const SUCCESS_MESSAGES = {
POST_REVIEW_FEEDBACK: "피드백을 작성하였습니다.",
POST_REVIEW_COMPLETE: "정상적으로 코드리뷰를 완료했습니다.",
POST_REVIEW_FEEDBACK: "정상적으로 피드백을 작성하였습니다.",
POST_CREATE_ROOM: "정상적으로 방을 생성하였습니다.",
POST_PARTICIPATE_IN: "정상적으로 방에 참여하였습니다.",
DELETE_PARTICIPATE_IN: "정상적으로 방 참여를 취소하였습니다.",
DELETE_PARTICIPATED_ROOM: "정상적으로 방을 삭제하였습니다.",
PUT_REVIEW_FEEDBACK: "피드백을 수정하였습니다.",
PUT_REVIEW_FEEDBACK: "정상적으로 피드백을 수정하였습니다.",
};

const MESSAGES = {
Expand Down
5 changes: 5 additions & 0 deletions frontend/src/hooks/mutations/useMutateReview.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,22 @@
import useMutateHandlers from "./useMutateHandlers";
import { useMutation, useQueryClient } from "@tanstack/react-query";
import useToast from "@/hooks/common/useToast";
import QUERY_KEYS from "@/apis/queryKeys";
import { postReviewComplete } from "@/apis/reviews.api";
import MESSAGES from "@/constants/message";

const useMutateReviewComplete = (roomId: number) => {
const { handleMutateError } = useMutateHandlers();
const { openToast } = useToast("success");

const queryClient = useQueryClient();

const postReviewCompleteMutation = useMutation({
mutationFn: ({ roomId, revieweeId }: { roomId: number; revieweeId: number }) =>
postReviewComplete(roomId, revieweeId),
onSuccess: () => {
queryClient.invalidateQueries({ queryKey: [QUERY_KEYS.REVIEWEES, roomId] });
openToast(MESSAGES.SUCCESS.POST_REVIEW_COMPLETE);
Comment on lines +10 to +19
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

감사합니닷ㅠㅠ🙇‍♀️

},
onError: (error) => handleMutateError(error),
});
Expand Down
Loading