From 0a3da41e19935975b4cb98d799167ca43d0f6505 Mon Sep 17 00:00:00 2001 From: Lee sang Yeop Date: Wed, 23 Oct 2024 15:15:33 +0900 Subject: [PATCH 01/12] =?UTF-8?q?design:=20=ED=94=BC=EB=93=9C=EB=B0=B1=20?= =?UTF-8?q?=EC=9E=91=EC=84=B1=20=EB=AA=A8=EB=8B=AC=20=EB=94=94=EC=9E=90?= =?UTF-8?q?=EC=9D=B8=20=EB=B0=98=EC=98=81=20=EC=95=88=EB=90=9C=EB=B6=80?= =?UTF-8?q?=EB=B6=84=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feedbackForm/RevieweeFeedbackForm.tsx | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/frontend/src/components/feedback/feedbackForm/RevieweeFeedbackForm.tsx b/frontend/src/components/feedback/feedbackForm/RevieweeFeedbackForm.tsx index 8abba73b8..f3204ccba 100644 --- a/frontend/src/components/feedback/feedbackForm/RevieweeFeedbackForm.tsx +++ b/frontend/src/components/feedback/feedbackForm/RevieweeFeedbackForm.tsx @@ -31,10 +31,8 @@ const RevieweeFeedbackForm = ({ formState, onChange, modalType }: RevieweeFeedba return ( - - 리뷰이의 개발 역량 향상을 위해 코드를 평가 해주세요. - *필수입력 - + 리뷰이의 개발 역량 향상을 위해 코드를 평가 해주세요. + *필수입력 onChange("evaluationPoint", value)} @@ -43,10 +41,8 @@ const RevieweeFeedbackForm = ({ formState, onChange, modalType }: RevieweeFeedba - - 위와 같이 선택한 이유를 알려주세요. (1개 이상 선택) - *필수입력 - + 위와 같이 선택한 이유를 알려주세요. (1개 이상 선택) + *필수입력 onChange("feedbackKeywords", value)} @@ -57,10 +53,8 @@ const RevieweeFeedbackForm = ({ formState, onChange, modalType }: RevieweeFeedba - - 리뷰이의 코드를 추천하시나요? (비공개 항목) - *필수입력 - + 리뷰이의 코드를 추천하시나요? (비공개 항목) + *필수입력 onChange("recommendationPoint", value)} From 94e6032d2b4d865a6f79b123a2ad47ca6f211dee Mon Sep 17 00:00:00 2001 From: Lee sang Yeop Date: Wed, 23 Oct 2024 15:46:27 +0900 Subject: [PATCH 02/12] =?UTF-8?q?fix:=20=EB=B0=A9=20=EC=B0=B8=EC=97=AC?= =?UTF-8?q?=EC=9E=90=20=EC=9A=94=EC=B2=AD=20=EC=BF=BC=EB=A6=AC=EB=AC=B8?= =?UTF-8?q?=EC=9D=98=20staleTime=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/hooks/queries/useFetchRooms.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/frontend/src/hooks/queries/useFetchRooms.ts b/frontend/src/hooks/queries/useFetchRooms.ts index b23e55127..9c9b6bd72 100644 --- a/frontend/src/hooks/queries/useFetchRooms.ts +++ b/frontend/src/hooks/queries/useFetchRooms.ts @@ -50,7 +50,5 @@ export const useFetchParticipantList = (roomId: number, isOpenStatus: boolean) = } return getParticipantList(roomId); }, - staleTime: 5 * 60 * 1000, - gcTime: Infinity, }); }; From 470944a41534f6e8eb6900915db69f5175f95d2a Mon Sep 17 00:00:00 2001 From: Lee sang Yeop Date: Wed, 23 Oct 2024 15:49:12 +0900 Subject: [PATCH 03/12] =?UTF-8?q?style:=20=EC=82=AC=EC=9D=B4=EB=93=9C?= =?UTF-8?q?=EB=B0=94=20radius=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/common/header/SideNavBar.style.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frontend/src/components/common/header/SideNavBar.style.ts b/frontend/src/components/common/header/SideNavBar.style.ts index d0bab79af..671eb4918 100644 --- a/frontend/src/components/common/header/SideNavBar.style.ts +++ b/frontend/src/components/common/header/SideNavBar.style.ts @@ -43,6 +43,10 @@ export const SideNavBarContainer = styled.div<{ $isOpen: boolean; $isClosing: bo width: 60%; height: 100vh; + border-radius: 10px 0 0 10px; + + overflow: hidden auto; + background-color: ${({ theme }) => theme.COLOR.white}; ${({ $isOpen, $isClosing }) => css` From cf8bc256c85c6313c16a1e0864a2672477c8fea9 Mon Sep 17 00:00:00 2001 From: Lee sang Yeop Date: Wed, 23 Oct 2024 16:37:16 +0900 Subject: [PATCH 04/12] =?UTF-8?q?feat:=20=EC=95=88=EB=93=9C=EB=A1=9C?= =?UTF-8?q?=EC=9D=B4=EB=93=9C=20=EC=BD=94=EB=93=9C=20=EA=B0=80=EC=9D=B4?= =?UTF-8?q?=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/pages/guide/GuidePage.tsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/frontend/src/pages/guide/GuidePage.tsx b/frontend/src/pages/guide/GuidePage.tsx index 4fd536dae..4f6e50259 100644 --- a/frontend/src/pages/guide/GuidePage.tsx +++ b/frontend/src/pages/guide/GuidePage.tsx @@ -20,7 +20,14 @@ const guidePageOptions = [ title: "BACKEND", link: "https://code-review-area.notion.site/v-1-0-b2ea7761e0e949e396c3bdd45860d270?pvs=4", }, - { title: "FRONTEND", link: "http://code-review-area.notion.site" }, + { + title: "FRONTEND", + link: "https://code-review-area.notion.site/v-1-0-a2f03dd6258a4789aba38722125da514", + }, + { + title: "ANDROID", + link: "https://kangdabin.notion.site/v-1-0-128cd3aed24b80c29c9bfd145e341361", + }, ]; const GuidePage = () => { From 6e356063146a59f77222be40517d557cad6c88cb Mon Sep 17 00:00:00 2001 From: Lee sang Yeop Date: Wed, 23 Oct 2024 16:38:44 +0900 Subject: [PATCH 05/12] =?UTF-8?q?fix:=20PR=20=EB=A7=81=ED=81=AC=20?= =?UTF-8?q?=ED=81=B4=EB=A6=AD=20=EC=8B=9C=20=ED=95=B4=EB=8B=B9=20=EB=A7=81?= =?UTF-8?q?=ED=81=AC=EB=A1=9C=20=EC=9D=B4=EB=8F=99=ED=95=98=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EB=8D=98=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roomDetailPage/participantList/ParticipantList.tsx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/frontend/src/components/roomDetailPage/participantList/ParticipantList.tsx b/frontend/src/components/roomDetailPage/participantList/ParticipantList.tsx index 0f430751c..16a0907c5 100644 --- a/frontend/src/components/roomDetailPage/participantList/ParticipantList.tsx +++ b/frontend/src/components/roomDetailPage/participantList/ParticipantList.tsx @@ -67,11 +67,7 @@ const ParticipantList = ({ roomInfo }: ParticipantListProps) => { {participant.username} - + PR 링크 From 42ecbecbaba580f44de9c21f052b86d67a09afaf Mon Sep 17 00:00:00 2001 From: Lee sang Yeop Date: Wed, 23 Oct 2024 16:40:53 +0900 Subject: [PATCH 06/12] =?UTF-8?q?style:=20=EC=82=AC=EC=9D=B4=EB=93=9C?= =?UTF-8?q?=EB=B0=94=20=EC=97=B4=EB=A0=B8=EC=9D=84=20=EB=95=8C=20hover=20?= =?UTF-8?q?=EC=8B=9C=20radius=20=EC=8A=A4=ED=83=80=EC=9D=BC=EB=A7=81=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/common/header/SideNavBar.style.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/components/common/header/SideNavBar.style.ts b/frontend/src/components/common/header/SideNavBar.style.ts index 671eb4918..135440156 100644 --- a/frontend/src/components/common/header/SideNavBar.style.ts +++ b/frontend/src/components/common/header/SideNavBar.style.ts @@ -124,6 +124,7 @@ export const NavItem = styled.li` &:hover, &:focus { background-color: ${({ theme }) => theme.COLOR.grey0}; + border-radius: 5px; } a { From af859682f83ddde339fea3c4bd759d5c0332e4aa Mon Sep 17 00:00:00 2001 From: Lee sang Yeop Date: Wed, 23 Oct 2024 16:45:46 +0900 Subject: [PATCH 07/12] =?UTF-8?q?feat:=20=EB=82=B4=20=EB=A6=AC=EB=B7=B0?= =?UTF-8?q?=EC=9D=B4=20=EB=A7=A4=EC=B9=AD=EC=97=90=20=EB=8C=80=ED=95=9C=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=EC=A0=95=EB=B3=B4=EB=A5=BC=20=ED=85=8C?= =?UTF-8?q?=EC=9D=B4=EB=B8=94=20=EC=95=84=EB=9E=98=EC=97=90=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roomDetailPage/myReviewee/MyReviewee.style.ts | 7 +++++++ .../components/roomDetailPage/myReviewee/MyReviewee.tsx | 1 + 2 files changed, 8 insertions(+) diff --git a/frontend/src/components/roomDetailPage/myReviewee/MyReviewee.style.ts b/frontend/src/components/roomDetailPage/myReviewee/MyReviewee.style.ts index af6f918b3..d88688f64 100644 --- a/frontend/src/components/roomDetailPage/myReviewee/MyReviewee.style.ts +++ b/frontend/src/components/roomDetailPage/myReviewee/MyReviewee.style.ts @@ -108,3 +108,10 @@ export const GuidanceWrapper = styled.div` color: ${({ theme }) => theme.COLOR.grey3}; } `; + +export const ExtraInformation = styled.span` + display: flex; + justify-content: flex-end; + font: ${({ theme }) => theme.TEXT.xSmall}; + color: ${({ theme }) => theme.COLOR.grey2}; +`; diff --git a/frontend/src/components/roomDetailPage/myReviewee/MyReviewee.tsx b/frontend/src/components/roomDetailPage/myReviewee/MyReviewee.tsx index 5c3241583..d2b012e29 100644 --- a/frontend/src/components/roomDetailPage/myReviewee/MyReviewee.tsx +++ b/frontend/src/components/roomDetailPage/myReviewee/MyReviewee.tsx @@ -166,6 +166,7 @@ const MyReviewee = ({ roomInfo }: MyReviewerProps) => { ))} + ※선호하는 리뷰이 인원 수보다 적게 매칭될 수 있습니다. ); }; From f6e57a1b530bcf1f9ea66fa238c00debc527cf53 Mon Sep 17 00:00:00 2001 From: Lee sang Yeop Date: Wed, 23 Oct 2024 16:54:17 +0900 Subject: [PATCH 08/12] =?UTF-8?q?fix:=20=EB=B0=A9=20=EC=A0=9C=EB=AA=A9?= =?UTF-8?q?=EC=9D=B4=20=EA=B8=B8=EB=A9=B4=20=EB=A0=88=EC=9D=B4=EC=95=84?= =?UTF-8?q?=EC=9B=83=EC=9D=B4=20=EA=BA=A0=EC=A7=80=EB=8A=94=20=EB=AC=B8?= =?UTF-8?q?=EC=A0=9C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roomDetailPage/roomInfoCard/RoomInfoCard.style.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/roomDetailPage/roomInfoCard/RoomInfoCard.style.ts b/frontend/src/components/roomDetailPage/roomInfoCard/RoomInfoCard.style.ts index f057abcaa..fff772500 100644 --- a/frontend/src/components/roomDetailPage/roomInfoCard/RoomInfoCard.style.ts +++ b/frontend/src/components/roomDetailPage/roomInfoCard/RoomInfoCard.style.ts @@ -57,7 +57,7 @@ export const RoomInfoCardContent = styled.div` export const RoomHeaderWrapper = styled.div` display: flex; - flex-direction: row; + flex-flow: row wrap; align-items: flex-start; justify-content: space-between; @@ -75,7 +75,9 @@ export const RoomHeaderWrapper = styled.div` `; export const RoomTitle = styled.span` + max-width: calc(100% - 160px); font: ${({ theme }) => theme.TEXT.large_bold}; + line-height: 2.5rem; color: ${({ theme }) => theme.COLOR.black}; `; From 26a87b91ae3c5f68fda3d0bb73c2ccc78dc2c20e Mon Sep 17 00:00:00 2001 From: Lee sang Yeop Date: Wed, 23 Oct 2024 17:05:59 +0900 Subject: [PATCH 09/12] =?UTF-8?q?fix:=20=EB=B0=A9=20=EC=83=81=ED=83=9C?= =?UTF-8?q?=EA=B0=80=20=EC=97=AC=EB=9F=AC=EA=B0=9C=EC=9D=B8=20=EA=B2=BD?= =?UTF-8?q?=EC=9A=B0=20=EB=A0=88=EC=9D=B4=EC=95=84=EC=9B=83=EC=9D=B4=20?= =?UTF-8?q?=EA=BA=A0=EC=A7=80=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4?= =?UTF-8?q?=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/shared/roomCard/RoomCard.style.ts | 7 +++++++ frontend/src/components/shared/roomCard/RoomCard.tsx | 8 +++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/shared/roomCard/RoomCard.style.ts b/frontend/src/components/shared/roomCard/RoomCard.style.ts index a324d98a5..c0958d29c 100644 --- a/frontend/src/components/shared/roomCard/RoomCard.style.ts +++ b/frontend/src/components/shared/roomCard/RoomCard.style.ts @@ -146,5 +146,12 @@ export const StyledDday = styled.span` export const LabelWrapper = styled.div` display: flex; + flex-wrap: wrap; gap: 0.5rem; + height: 53px; +`; + +export const EtcWrapper = styled.div` + display: flex; + justify-content: space-between; `; diff --git a/frontend/src/components/shared/roomCard/RoomCard.tsx b/frontend/src/components/shared/roomCard/RoomCard.tsx index 8a743da60..f078bd07f 100644 --- a/frontend/src/components/shared/roomCard/RoomCard.tsx +++ b/frontend/src/components/shared/roomCard/RoomCard.tsx @@ -94,13 +94,15 @@ const RoomCard = React.memo(({ roomInfo }: RoomCardProps) => { {DisplayLabel(roomInfo)} + + + + {DisplayLeftTime(roomInfo)} {roomInfo.currentParticipants}/{roomInfo.limitedParticipants} - - - {DisplayLeftTime(roomInfo)} + From b3338231b734960c52e63e061c2084cd35688ee0 Mon Sep 17 00:00:00 2001 From: Lee sang Yeop Date: Wed, 23 Oct 2024 17:13:19 +0900 Subject: [PATCH 10/12] =?UTF-8?q?design:=20=EB=AA=A8=EB=B0=94=EC=9D=BC=20?= =?UTF-8?q?=ED=96=84=EB=B2=84=EA=B1=B0=20=EB=B0=94=20=ED=81=B4=EB=A6=AD=20?= =?UTF-8?q?=EC=8B=9C=20nav=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/common/header/SideNavBar.style.ts | 7 ++++--- frontend/src/components/common/header/SideNavBar.tsx | 6 +++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/frontend/src/components/common/header/SideNavBar.style.ts b/frontend/src/components/common/header/SideNavBar.style.ts index 135440156..692a52902 100644 --- a/frontend/src/components/common/header/SideNavBar.style.ts +++ b/frontend/src/components/common/header/SideNavBar.style.ts @@ -69,7 +69,7 @@ export const TopSection = styled.div` padding: 1rem; - background-color: ${({ theme }) => theme.COLOR.primary2}; + background: linear-gradient(to right, rgb(255 250 245 / 100%), rgb(230 230 255 / 100%)); `; export const ProfileWrapper = styled.div` @@ -83,7 +83,7 @@ export const ProfileInfo = styled.div` display: flex; flex-direction: column; gap: 0.4rem; - color: ${({ theme }) => theme.COLOR.white}; + color: ${({ theme }) => theme.COLOR.black}; strong { font: ${({ theme }) => theme.TEXT.medium_bold}; @@ -123,7 +123,8 @@ export const NavItem = styled.li` &:hover, &:focus { - background-color: ${({ theme }) => theme.COLOR.grey0}; + /* background-color: ${({ theme }) => theme.COLOR.primary1}; */ + border: 1px solid ${({ theme }) => theme.COLOR.grey1}; border-radius: 5px; } diff --git a/frontend/src/components/common/header/SideNavBar.tsx b/frontend/src/components/common/header/SideNavBar.tsx index 4307cb389..8daf40ab2 100644 --- a/frontend/src/components/common/header/SideNavBar.tsx +++ b/frontend/src/components/common/header/SideNavBar.tsx @@ -80,7 +80,11 @@ const SideNavBar = ({ isOpen, onClose, isLoggedIn }: SideNavBarProps) => { {isLoggedIn ? ( <> - From fd7c2786573a352f8de48faa69b7e55ecccb9f1a Mon Sep 17 00:00:00 2001 From: Lee sang Yeop Date: Wed, 23 Oct 2024 17:16:54 +0900 Subject: [PATCH 11/12] =?UTF-8?q?fix:=20=EB=AA=A8=EB=B0=94=EC=9D=BC=20?= =?UTF-8?q?=ED=99=98=EA=B2=BD=EC=97=90=EC=84=9C=20=EB=B0=A9=20=EC=B9=B4?= =?UTF-8?q?=EB=93=9C=20=EC=A0=95=EB=B3=B4=EC=97=90=20=EB=B1=83=EC=A7=80?= =?UTF-8?q?=EA=B0=80=20=EC=A0=9C=EB=AA=A9=EC=9D=84=20=EA=B0=80=EB=A6=AC?= =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roomDetailPage/roomInfoCard/RoomInfoCard.style.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/frontend/src/components/roomDetailPage/roomInfoCard/RoomInfoCard.style.ts b/frontend/src/components/roomDetailPage/roomInfoCard/RoomInfoCard.style.ts index fff772500..41f9166e4 100644 --- a/frontend/src/components/roomDetailPage/roomInfoCard/RoomInfoCard.style.ts +++ b/frontend/src/components/roomDetailPage/roomInfoCard/RoomInfoCard.style.ts @@ -53,6 +53,10 @@ export const RoomInfoCardContent = styled.div` width: 100%; height: 100%; padding: 2rem 1rem; + + ${media.small` + padding: 3rem 1rem; + `} `; export const RoomHeaderWrapper = styled.div` @@ -79,6 +83,10 @@ export const RoomTitle = styled.span` font: ${({ theme }) => theme.TEXT.large_bold}; line-height: 2.5rem; color: ${({ theme }) => theme.COLOR.black}; + + ${media.small` + max-width: 100%; + `} `; export const RepositoryLink = styled.div` From f2bcf2db7062af0be08672459b74d1d5597ea193 Mon Sep 17 00:00:00 2001 From: Lee sang Yeop Date: Wed, 23 Oct 2024 17:18:31 +0900 Subject: [PATCH 12/12] =?UTF-8?q?chore:=20=EB=B0=A9=20=EC=83=81=EC=84=B8?= =?UTF-8?q?=20=ED=8E=98=EC=9D=B4=EC=A7=80=EC=9D=98=20=ED=95=A8=EA=BB=98?= =?UTF-8?q?=ED=95=98=EB=8A=94=20=EC=B0=B8=EC=97=AC=EC=9E=90=20=EC=A0=9C?= =?UTF-8?q?=EB=AA=A9=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/pages/roomDetail/RoomDetailPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/pages/roomDetail/RoomDetailPage.tsx b/frontend/src/pages/roomDetail/RoomDetailPage.tsx index 4dbce2304..e75ca3d05 100644 --- a/frontend/src/pages/roomDetail/RoomDetailPage.tsx +++ b/frontend/src/pages/roomDetail/RoomDetailPage.tsx @@ -118,7 +118,7 @@ const RoomDetailPage = () => { - + 해당 방에 같이 참여중인 인원 중 6명을 랜덤으로 보여줍니다. 새로고침 버튼을 통해 새로운 리스트를 확인할 수 있습니다.