Skip to content

[Fix] 장소 미정이면 미정 텍스트 보여주기, 취소 모달 description 추가 #639

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

Merged
rtttr1 merged 2 commits into from
Dec 23, 2025
Merged

[Fix] 장소 미정이면 미정 텍스트 보여주기, 취소 모달 description 추가 #639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97365f4
fix: 장소 미정일때 미정 글자 보여주기
rtttr1 Dec 23, 2025
1d3f74b
fix: 취소 모달 description 추가
rtttr1 Dec 23, 2025
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
3 changes: 2 additions & 1 deletion src/pages/mypage/components/CancelConfirmPage/CancelConfirmPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { useGetMyPage } from '@/pages/mypage/apis/queries';
import { useCancelReservation } from '@/pages/mypage/components/CancelConfirmPage/apis/query/useCancelReservation';
import * as styles from '@/pages/mypage/components/CancelConfirmPage/cancelConfirmPage.css';
import { useGetReservationsDetail } from '@/pages/mypage/components/mypageReservationDetail/apis/queries';
import { CANCEL_CONFIRM_MESSAGE } from '@/pages/mypage/constants/modalMessage';
import { CANCEL_CONFIRM_DESCRIPTION, CANCEL_CONFIRM_MESSAGE } from '@/pages/mypage/constants/modalMessage';
import ApplicantInfo from '@/pages/reservation/components/ApplicantInfo/ApplicantInfo';
import ClassInfo from '@/pages/reservation/components/ClassInfo/ClassInfo';
import Modal from '@/common/components/Modal/Modal';
Expand Down Expand Up @@ -99,6 +99,7 @@ const CancelConfirmPage = () => {
openModal(({ close }) => (
<Modal
content={CANCEL_CONFIRM_MESSAGE}
description={CANCEL_CONFIRM_DESCRIPTION}
type="single"
onClose={close}
onClickHandler={() => {
Expand Down
3 changes: 2 additions & 1 deletion src/pages/mypage/constants/modalMessage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
export const CANCEL_CONFIRM_MESSAGE = '클래스 신청이 취소됐어요. 취소된 클래스는 신청 내역에서 확인할 수 있어요.';
export const CANCEL_CONFIRM_MESSAGE = '클래스 신청이 취소됐어요.';
export const CANCEL_CONFIRM_DESCRIPTION = '취소된 클래스는 신청 내역에서 확인할 수 있어요.';
19 changes: 9 additions & 10 deletions src/shared/components/ClassCard/ClassCardBody.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,15 @@ const ClassCardBody = ({
</Text>
</div>
)}
{location && (
<div className={sprinkles({ display: 'flex', gap: 8, alignItems: 'center' })}>
<Text tag="c1_sb" color="gray7">
장소
</Text>
<Text tag="c1_r" color="gray9">
{location || '미정'}
</Text>
</div>
)}

<div className={sprinkles({ display: 'flex', gap: 8, alignItems: 'center' })}>
<Text tag="c1_sb" color="gray7">
장소
</Text>
<Text tag="c1_r" color="gray9">
{location || '미정'}
</Text>
</div>
</div>
</div>
</div>
Expand Down