Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
32a9726
feat: 베이스 모달
Glyph8 Nov 17, 2025
7fdd9a3
feat: 확인용, 선택용 컴포넌트로 분리
Glyph8 Nov 17, 2025
f03228b
feat: header, title, body, footer 베이스와 alert, confirm 2개로 분리 작성 완료
Glyph8 Nov 18, 2025
c8274bc
refactor: Alert, ConfirmModal 중복 코드 분리
Glyph8 Nov 18, 2025
2d4a268
refactor: 계좌 관리 페이지 모달 적용
Glyph8 Nov 18, 2025
0bfa4d5
feat: confirm modal의 버튼 디자인에 맞게 수정
Glyph8 Nov 18, 2025
0789bd7
refactor: @modal 명시된 모달 대체완료
Glyph8 Nov 18, 2025
451ca53
chore: storybook 작성
Glyph8 Nov 18, 2025
54e7001
Merge branch 'feature/#180/chat-menu' of https://github.com/CHA-CALL/…
Glyph8 Nov 19, 2025
0a0a6a4
feat: 리뷰 반영 - CommonLayout과 Modal 병합
Glyph8 Nov 20, 2025
c4b2e61
feat: 리뷰 반영 - CommonLayout과 Modal 병합
Glyph8 Nov 20, 2025
ad4963c
fix: 잘못된 merge reset, Alert, Confirm 모달 폴더 분리
Glyph8 Nov 21, 2025
b46f611
chore: 린트 오류 해결 및 모달 폴더 대신 바텀시트로 이름 변경
Glyph8 Nov 21, 2025
de6e2bb
chore: 이름 변경으로 인한 경로 린트 오류 해결
Glyph8 Nov 21, 2025
680d1fb
Merge branch 'refactor/#179/common-modal' of https://github.com/CHA-C…
Glyph8 Dec 8, 2025
56c98f1
chore: pull develop 충돌 해결
Glyph8 Dec 24, 2025
4fe9635
refactor: acount saveAccountModal 제거
Glyph8 Dec 25, 2025
ac1d417
Merge branch 'refactor/#179/common-modal' of https://github.com/CHA-C…
Glyph8 Dec 25, 2025
f92476c
refactor: OnBoardingModal, MenuDeleteModal 공통 컴포넌트 모달 적용
Glyph8 Dec 25, 2025
00646a0
fix: 버튼 반대인 문제 해결 및 속성 이름 left, right로 변경
Glyph8 Dec 29, 2025
73d7556
refactor: AccountForm 모달들 1개 파일로 분리, 자잘한 console 경고 해결
Glyph8 Dec 29, 2025
a40c86e
rename: @modal로 폴더 이름 변경
Glyph8 Dec 29, 2025
0e86036
fix: 작성 중 내용 나가기 버튼 위치 수정
Glyph8 Dec 30, 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

This file was deleted.

This file was deleted.

This file was deleted.

83 changes: 83 additions & 0 deletions src/pages/@owner/account/@modal/AccountModals.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
import ConfirmModal from '@components/ui/modal-confirm/ConfirmModal';
import type { AccountFormData } from '@pages/@owner/account/schemas/account.schema';

interface ModalHandler {
isOpen: boolean;
handleClose: () => void;
handleConfirm: () => void;
handleCancel: () => void;
}

interface AccountPageModalsProps {
formData: AccountFormData;
exitModal: ModalHandler;
saveModal: ModalHandler;
deleteModal: ModalHandler;
}

export default function AccountModals({
formData,
exitModal,
saveModal,
deleteModal,
}: AccountPageModalsProps) {
return (
<>
{/* 이탈 방지 모달*/}
<ConfirmModal
isOpen={exitModal.isOpen}
handleClose={exitModal.handleClose}
title={'정말 나가시겠어요?'}
description={`작성 중인 내용은 저장되지 않으며,\n나가면 모두 삭제됩니다.`}
leftLabel='나가기'
rightLabel='취소'
handleClickLeft={exitModal.handleConfirm}
handleClickRight={exitModal.handleCancel}
/>
{/* 저장 전 확인 모달 */}
<ConfirmModal
isOpen={saveModal.isOpen}
handleClose={saveModal.handleClose}
title='저장정보 확인'
description={
<>
<div className='bg-grayscale-100 my-[1rem] h-[0.1rem] w-full' />
<div className='flex flex-col gap-[1rem]'>
<div className='flex items-center justify-between'>
<p className='title-sb-12 text-grayscale-500'>은행</p>
<p className='caption-m-12 text-grayscale-900'>
{formData.bankName}
</p>
</div>
<div className='flex items-center justify-between'>
<p className='title-sb-12 text-grayscale-500'>예금주</p>
<p className='caption-m-12 text-grayscale-900'>
{formData.accountHolderName}
</p>
</div>
<div className='flex items-center justify-between'>
<p className='title-sb-12 text-grayscale-500'>계좌번호</p>
<p className='caption-m-12 text-grayscale-900'>
{formData.accountNumber}
</p>
</div>
</div>
</>
}
rightLabel='저장'
handleClickRight={saveModal.handleConfirm}
handleClickLeft={saveModal.handleCancel}
/>
{/* 계좌 삭제 재확인 모달 */}
<ConfirmModal
isOpen={deleteModal.isOpen}
handleClose={deleteModal.handleClose}
title='이 계좌를 삭제할까요?'
description='삭제 후에는 되돌릴 수 없습니다.'
rightLabel='삭제'
handleClickRight={deleteModal.handleConfirm}
handleClickLeft={deleteModal.handleCancel}
/>
</>
);
}
4 changes: 0 additions & 4 deletions src/pages/@owner/account/@modal/index.ts

This file was deleted.

41 changes: 12 additions & 29 deletions src/pages/@owner/account/AccountForm.tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
import Button from '@ui/button/Button';
import Information from '@components/information/Information';
import Navigation from '@layout/navigation/Navigation';
import Input from '@ui/input/Input';
import { Icon } from '@icon/Icon';
import { cn } from '@utils/cn';
import FormFieldLayout from '@components/layout/form/FormFieldLayout';
import ErrorText from '@form/error-text/ErrorText';
import { Icon } from '@icon/Icon';
import Loading from '@layout/loading/Loading';
import Navigation from '@layout/navigation/Navigation';
import SelectBankBottomSheet from '@pages/@owner/account/@bottom-sheet/SelectBankBottomSheet';
import { useAccountPage } from '@pages/@owner/account/hooks/use-account-page';
import {
SelectBankBottomSheet,
ConfirmExitModal,
SaveAccountModal,
ConfirmDeleteModal,
} from '@pages/@owner/account/@modal';
import FormFieldLayout from '@components/layout/form/FormFieldLayout';
import Button from '@ui/button/Button';
import Input from '@ui/input/Input';
import { cn } from '@utils/cn';
import AccountModals from './@modal/AccountModals';

export default function Account() {
const {
Expand Down Expand Up @@ -51,24 +47,11 @@ export default function Account() {
handleChange={bankModal.handleChange}
bank={formData.bankName}
/>
<ConfirmExitModal
isOpen={exitModal.isOpen}
handleClose={exitModal.handleClose}
handleClickConfirm={exitModal.handleConfirm}
handleClickCancel={exitModal.handleCancel}
/>
<SaveAccountModal
isOpen={saveModal.isOpen}
handleClose={saveModal.handleClose}
handleConfirm={saveModal.handleConfirm}
handleCancel={saveModal.handleCancel}
<AccountModals
formData={formData}
/>
<ConfirmDeleteModal
isOpen={deleteModal.isOpen}
handleClose={deleteModal.handleClose}
handleClickConfirm={deleteModal.handleConfirm}
handleClickCancel={deleteModal.handleCancel}
exitModal={exitModal}
saveModal={saveModal}
deleteModal={deleteModal}
/>
<Navigation
centerContent={isEditMode ? '계좌 수정' : '계좌 등록'}
Expand Down

This file was deleted.

Loading