diff --git a/backend/src/main/resources/config b/backend/src/main/resources/config index 67e2f74c5..def24d1c0 160000 --- a/backend/src/main/resources/config +++ b/backend/src/main/resources/config @@ -1 +1 @@ -Subproject commit 67e2f74c50936b5ae7957abea404716627245d13 +Subproject commit def24d1c08db6f212881692268cf7023c9346ed9 diff --git a/frontend/src/@types/roomInfo.ts b/frontend/src/@types/roomInfo.ts index f658ba474..d2be31de3 100644 --- a/frontend/src/@types/roomInfo.ts +++ b/frontend/src/@types/roomInfo.ts @@ -34,7 +34,8 @@ export interface SubmitRoomInfo extends BaseRoomInfo { export interface RoomInfo extends BaseRoomInfo { id: number; manager: string; - currentParticipants: number; + reviewerCount: number; + bothCount: number; roomStatus: RoomStatus; participationStatus: ParticipationStatus; memberRole: Role; diff --git a/frontend/src/assets/index.ts b/frontend/src/assets/index.ts index d7fc49472..aecef3c92 100644 --- a/frontend/src/assets/index.ts +++ b/frontend/src/assets/index.ts @@ -28,7 +28,8 @@ export { default as puzzle_with_people_color } from "@/assets/intro/puzzle_with_ export { default as step1_pic } from "@/assets/intro/step1_pic.webp"; export { default as step2_pic } from "@/assets/intro/step2_pic.webp"; export { default as step3_pic } from "@/assets/intro/step3_pic.webp"; -export { default as step4_pic } from "@/assets/intro/step4_pic.webp"; +export { default as step41_pic } from "@/assets/intro/step41_pic.webp"; +export { default as step42_pic } from "@/assets/intro/step42_pic.webp"; export { default as step5_pic } from "@/assets/intro/step5_pic.webp"; export { default as mainLogo } from "@/assets/coreaLogo/coreaMainLogo.svg"; diff --git a/frontend/src/assets/intro/step3_pic.webp b/frontend/src/assets/intro/step3_pic.webp index 0a8bf4974..c3c447a66 100644 Binary files a/frontend/src/assets/intro/step3_pic.webp and b/frontend/src/assets/intro/step3_pic.webp differ diff --git a/frontend/src/assets/intro/step41_pic.webp b/frontend/src/assets/intro/step41_pic.webp new file mode 100644 index 000000000..00efe2b30 Binary files /dev/null and b/frontend/src/assets/intro/step41_pic.webp differ diff --git a/frontend/src/assets/intro/step42_pic.webp b/frontend/src/assets/intro/step42_pic.webp new file mode 100644 index 000000000..7cd218e80 Binary files /dev/null and b/frontend/src/assets/intro/step42_pic.webp differ diff --git a/frontend/src/assets/intro/step4_pic.webp b/frontend/src/assets/intro/step4_pic.webp deleted file mode 100644 index fc45d1503..000000000 Binary files a/frontend/src/assets/intro/step4_pic.webp and /dev/null differ diff --git a/frontend/src/assets/intro/step5_pic.webp b/frontend/src/assets/intro/step5_pic.webp index 48e3a17b2..52647dd3d 100644 Binary files a/frontend/src/assets/intro/step5_pic.webp and b/frontend/src/assets/intro/step5_pic.webp differ diff --git a/frontend/src/components/common/carousel/Carousel.tsx b/frontend/src/components/common/carousel/Carousel.tsx index a1e8e49c5..37d432f55 100644 --- a/frontend/src/components/common/carousel/Carousel.tsx +++ b/frontend/src/components/common/carousel/Carousel.tsx @@ -1,4 +1,4 @@ -import React, { Children, ReactNode, isValidElement, useEffect, useState } from "react"; +import React, { Children, ReactNode, isValidElement, useState } from "react"; import * as S from "@/components/common/carousel/Carousel.style"; import Icon from "@/components/common/icon/Icon"; @@ -18,6 +18,11 @@ const Carousel = ({ children }: CarouselProps) => { return ( + + {validChildren.map((child, index) => ( + {child} + ))} + { > - - {validChildren.map((child, index) => ( - {child} - ))} - ); }; diff --git a/frontend/src/components/feedback/feedbackCard/FeedbackCard.style.ts b/frontend/src/components/feedback/feedbackCard/FeedbackCard.style.ts index bf0b0d152..50b64d9ea 100644 --- a/frontend/src/components/feedback/feedbackCard/FeedbackCard.style.ts +++ b/frontend/src/components/feedback/feedbackCard/FeedbackCard.style.ts @@ -9,7 +9,7 @@ export const FeedbackCardContainer = styled.div<{ $isTypeDevelop: boolean }>` gap: 3rem; width: 40%; - height: 600px; + height: 700px; padding: 1rem; border: 3px solid @@ -106,8 +106,6 @@ export const FeedbackDetailContainer = styled.div` display: flex; flex-direction: column; gap: 1.6rem; - - height: 200px; `; export const FeedbackDetail = styled.p` diff --git a/frontend/src/components/feedback/feedbackCard/FeedbackCard.tsx b/frontend/src/components/feedback/feedbackCard/FeedbackCard.tsx index 3cc737daf..32b783eee 100644 --- a/frontend/src/components/feedback/feedbackCard/FeedbackCard.tsx +++ b/frontend/src/components/feedback/feedbackCard/FeedbackCard.tsx @@ -66,8 +66,8 @@ const FeedbackCard = ({ 세부 피드백