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.

Sign up for GitHub

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

Jump to bottom

[FE] pr안 올렸을 때 보여주는 화면(#589) #590

Merged
merged 1 commit into from
Oct 12, 2024
Merged

[FE] pr안 올렸을 때 보여주는 화면(#589) #590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion frontend/src/@types/roomInfo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ export type Classification = "ALL" | "FRONTEND" | "BACKEND" | "ANDROID";

export type RoomStatus = "OPEN" | "CLOSE" | "PROGRESS" | "FAIL";

export type ParticipationStatus = "NOT_PARTICIPATED" | "PARTICIPATED" | "MANAGER";
export type ParticipationStatus =
| "NOT_PARTICIPATED"
| "PARTICIPATED"
| "MANAGER"
| "PULL_REQUEST_NOT_SUBMITTED";

export type Role = "BOTH" | "REVIEWER" | "REVIEWEE" | "NONE";

Expand Down
6 changes: 5 additions & 1 deletion frontend/src/components/roomDetailPage/myReviewee/MyReviewee.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,11 @@ const MyReviewee = ({ roomInfo }: MyReviewerProps) => {
if (roomInfo.roomStatus === "CLOSE" && revieweeData.length === 0) {
return (
<S.GuidanceWrapper>
<p className="process-paused">{MESSAGES.GUIDANCE.FAIL_MATCHED}</p>
<p className="process-paused">
{roomInfo.participationStatus === "PULL_REQUEST_NOT_SUBMITTED"
? MESSAGES.GUIDANCE.PULL_REQUEST_NOT_SUBMITTED
: MESSAGES.GUIDANCE.FAIL_MATCHED}
</p>
</S.GuidanceWrapper>
);
}
Expand Down
6 changes: 5 additions & 1 deletion frontend/src/components/roomDetailPage/myReviewer/MyReviewer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,11 @@ const MyReviewer = ({ roomInfo }: MyReviewerProps) => {
if (roomInfo.roomStatus === "CLOSE" && reviewerData.length === 0) {
return (
<S.GuidanceWrapper>
<p className="process-paused">{MESSAGES.GUIDANCE.FAIL_MATCHED}</p>
<p className="process-paused">
{roomInfo.participationStatus === "PULL_REQUEST_NOT_SUBMITTED"
? MESSAGES.GUIDANCE.PULL_REQUEST_NOT_SUBMITTED
: MESSAGES.GUIDANCE.FAIL_MATCHED}
</p>
</S.GuidanceWrapper>
);
}
Expand Down
1 change: 1 addition & 0 deletions frontend/src/constants/message.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ const GUIDANCE_MESSAGES = {
EMPTY_PARTICIPANTS: "참여자 목록은 매칭이 시작된 이후 공개됩니다.",
ZERO_PARTICIPANTS: "이 방의 참여자가 없습니다.",
ONLY_REVIEWER: "리뷰어로만 참여 중입니다!",
PULL_REQUEST_NOT_SUBMITTED: "PR을 제출하지 않아 매칭되지 않았습니다.",
};

const ERROR_MESSAGES = {
Expand Down
Loading