From ff613d57013ab418b9c7383c226be96619231048 Mon Sep 17 00:00:00 2001 From: bongtta Date: Sun, 7 Sep 2025 15:46:08 +0900 Subject: [PATCH 1/6] =?UTF-8?q?feat:=20=EC=A4=84=EB=B0=94=EA=BF=88=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20(#366)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/result/constants/matching-result.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/result/constants/matching-result.ts b/src/pages/result/constants/matching-result.ts index e2d0240d..5c38fb1d 100644 --- a/src/pages/result/constants/matching-result.ts +++ b/src/pages/result/constants/matching-result.ts @@ -2,7 +2,7 @@ export const MATCHING_HEADER_MESSAGE = { description: '매칭 요청이 도착했어요!', group: { subDescription: - '모든 그룹원이 수락하면 그룹원이 돼요. 진행 과정은 ‘매칭 현황’에서 확인할 수 있어요!', + '모든 그룹원이 수락하면 그룹원이 돼요.\n진행 과정은 ‘매칭 현황’에서 확인할 수 있어요!', }, single: { subDescription: '상대의 정보를 확인하고, 매칭을 이어가 보세요.', From c591477803c92bb67998e34d9a5749f15a9ccf9e Mon Sep 17 00:00:00 2001 From: bongtta Date: Sun, 7 Sep 2025 16:35:53 +0900 Subject: [PATCH 2/6] =?UTF-8?q?feat:=20=EA=B7=B8=EB=A3=B9=20=EB=A7=A4?= =?UTF-8?q?=EC=B9=AD=20=EC=99=84=EB=A3=8C=EC=8B=9C=20=EA=B7=B8=EB=A3=B9=20?= =?UTF-8?q?=EB=A7=A4=EC=B9=AD=20=ED=98=84=ED=99=A9=20=ED=83=AD=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=9D=B4=EB=8F=99=20(#366)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/match/create/components/button-section.tsx | 3 ++- src/pages/result/components/matching-agree-view.tsx | 7 ++++++- src/pages/result/components/sent-view.tsx | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/pages/match/create/components/button-section.tsx b/src/pages/match/create/components/button-section.tsx index d2f29054..51b6f57a 100644 --- a/src/pages/match/create/components/button-section.tsx +++ b/src/pages/match/create/components/button-section.tsx @@ -16,7 +16,8 @@ const ButtonSection = ({ matchType }: ButtonSectionProps) => { }; const handleGoToMatch = () => { - navigate(ROUTES.MATCH); + const tab = matchType === 'group' ? '그룹' : '1:1'; + navigate(`${ROUTES.MATCH}?tab=${tab}&filter=전체`); }; return ( diff --git a/src/pages/result/components/matching-agree-view.tsx b/src/pages/result/components/matching-agree-view.tsx index 952f0f73..ad1ccbff 100644 --- a/src/pages/result/components/matching-agree-view.tsx +++ b/src/pages/result/components/matching-agree-view.tsx @@ -39,7 +39,12 @@ const MatchingAgreeView = ({ matchId }: MatchingAgreeViewProps) => {

-
); diff --git a/src/pages/result/components/sent-view.tsx b/src/pages/result/components/sent-view.tsx index 21b9a7ba..c7f76705 100644 --- a/src/pages/result/components/sent-view.tsx +++ b/src/pages/result/components/sent-view.tsx @@ -15,7 +15,10 @@ const SentView = ({ isGroupMatching = true }: SentViewProps) => { const navigate = useNavigate(); const handleGoHome = () => navigate(ROUTES.HOME); - const handleGoMatch = () => navigate(ROUTES.MATCH); + const handleGoMatch = () => { + const tab = isGroupMatching ? '그룹' : '1:1'; + navigate(`${ROUTES.MATCH}?tab=${tab}&filter=전체`); + }; return (
From abcffa38b1035e4b710512b22fb3353f58aa47f2 Mon Sep 17 00:00:00 2001 From: bongtta Date: Sun, 7 Sep 2025 16:36:04 +0900 Subject: [PATCH 3/6] =?UTF-8?q?chore:=20=EC=A4=91=EB=B3=B5=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=82=AD=EC=A0=9C=20(#366)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/shared/components/button/button/styles/button-variants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/components/button/button/styles/button-variants.ts b/src/shared/components/button/button/styles/button-variants.ts index 92a5e5b2..4e0c7c44 100644 --- a/src/shared/components/button/button/styles/button-variants.ts +++ b/src/shared/components/button/button/styles/button-variants.ts @@ -11,7 +11,7 @@ export const buttonVariants = cva( white: 'bg-white text-gray-700', skyblueBorder: 'bg-main-200 text-main-900 outline outline-main-900', gray2: 'bg-background text-gray-700', - disabled: 'rounded-[0.8rem] bg-gray-100 bg-gray-100 text-gray-400', + disabled: 'rounded-[0.8rem] bg-gray-100 text-gray-400', }, size: { M: 'w-full px-[0.8rem] py-[1.2rem]', From 34612be44a3bd60d3e196051dc13afa093426b69 Mon Sep 17 00:00:00 2001 From: bongtta Date: Sun, 7 Sep 2025 16:37:21 +0900 Subject: [PATCH 4/6] =?UTF-8?q?fix:=20=EC=B9=B4=EB=93=9C=20=EA=B0=84=20?= =?UTF-8?q?=EA=B0=84=EA=B2=A9=20=EC=88=98=EC=A0=95=20(#366)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/match/components/match-tab-pannel.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/match/components/match-tab-pannel.tsx b/src/pages/match/components/match-tab-pannel.tsx index 4b4fe3a4..6e3f1dd9 100644 --- a/src/pages/match/components/match-tab-pannel.tsx +++ b/src/pages/match/components/match-tab-pannel.tsx @@ -56,7 +56,7 @@ const MatchTabPanel = ({ cards, filter, onCardClick }: MatchTabPanelProps) => { }; return ( -
+
{filteredCards.length === 0 ? ( Date: Sun, 7 Sep 2025 18:27:21 +0900 Subject: [PATCH 5/6] =?UTF-8?q?feat:=20z-index=20=EC=86=8D=EC=84=B1=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20(#366)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/match/components/match-tab-pannel.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/match/components/match-tab-pannel.tsx b/src/pages/match/components/match-tab-pannel.tsx index 6e3f1dd9..e50ce126 100644 --- a/src/pages/match/components/match-tab-pannel.tsx +++ b/src/pages/match/components/match-tab-pannel.tsx @@ -56,7 +56,7 @@ const MatchTabPanel = ({ cards, filter, onCardClick }: MatchTabPanelProps) => { }; return ( -
+
{filteredCards.length === 0 ? ( Date: Sun, 7 Sep 2025 18:50:38 +0900 Subject: [PATCH 6/6] =?UTF-8?q?fix:=20whitespace-pre-line=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20(#366)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/result/components/matching-receive-view.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/result/components/matching-receive-view.tsx b/src/pages/result/components/matching-receive-view.tsx index 69f76561..f262a9a1 100644 --- a/src/pages/result/components/matching-receive-view.tsx +++ b/src/pages/result/components/matching-receive-view.tsx @@ -91,7 +91,7 @@ const MatchingReceiveView = () => {

{MATCHING_HEADER_MESSAGE.description}

-

+

{isGroupMatching ? MATCHING_HEADER_MESSAGE.group.subDescription : MATCHING_HEADER_MESSAGE.single.subDescription}