Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 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
2 changes: 1 addition & 1 deletion src/pages/match/components/match-tab-pannel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const MatchTabPanel = ({ cards, filter, onCardClick }: MatchTabPanelProps) => {
};

return (
<div className="flex-col gap-[0.8rem] px-[1.6rem]">
<div className="z-[var(--z-under-header-section)] flex-col gap-[1.2rem] px-[1.6rem]">
{filteredCards.length === 0 ? (
<EmptyView
iconName="empty"
Expand Down
3 changes: 2 additions & 1 deletion src/pages/match/create/components/button-section.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
7 changes: 6 additions & 1 deletion src/pages/result/components/matching-agree-view.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,12 @@ const MatchingAgreeView = ({ matchId }: MatchingAgreeViewProps) => {
</p>
</div>
<div className="w-full flex-row-center gap-[0.8rem] p-[1.6rem]">
<Button label="매칭 현황 보기" onClick={() => navigate(ROUTES.MATCH)} />
<Button
label="매칭 현황 보기"
onClick={() =>
navigate(`${ROUTES.MATCH}?tab=${cardType === 'group' ? '그룹' : '1:1'}&filter=전체`)
}
/>
</div>
</div>
);
Expand Down
5 changes: 4 additions & 1 deletion src/pages/result/components/sent-view.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
<div className="h-full flex-col-between">
Expand Down
2 changes: 1 addition & 1 deletion src/pages/result/constants/matching-result.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ export const MATCHING_HEADER_MESSAGE = {
description: '매칭 요청이 도착했어요!',
group: {
subDescription:
'모든 그룹원이 수락하면 그룹원이 돼요. 진행 과정은 ‘매칭 현황’에서 확인할 수 있어요!',
'모든 그룹원이 수락하면 그룹원이 돼요.\n진행 과정은 ‘매칭 현황’에서 확인할 수 있어요!',
},
single: {
subDescription: '상대의 정보를 확인하고, 매칭을 이어가 보세요.',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]',
Expand Down