-
Notifications
You must be signed in to change notification settings - Fork 1
[Refactor/#179] 모달 공통 컴포넌트화 #183
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.
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
Merged
Changes from all commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
32a9726
feat: 베이스 모달
Glyph8 7fdd9a3
feat: 확인용, 선택용 컴포넌트로 분리
Glyph8 f03228b
feat: header, title, body, footer 베이스와 alert, confirm 2개로 분리 작성 완료
Glyph8 c8274bc
refactor: Alert, ConfirmModal 중복 코드 분리
Glyph8 2d4a268
refactor: 계좌 관리 페이지 모달 적용
Glyph8 0bfa4d5
feat: confirm modal의 버튼 디자인에 맞게 수정
Glyph8 0789bd7
refactor: @modal 명시된 모달 대체완료
Glyph8 451ca53
chore: storybook 작성
Glyph8 54e7001
Merge branch 'feature/#180/chat-menu' of https://github.com/CHA-CALL/…
Glyph8 0a0a6a4
feat: 리뷰 반영 - CommonLayout과 Modal 병합
Glyph8 c4b2e61
feat: 리뷰 반영 - CommonLayout과 Modal 병합
Glyph8 ad4963c
fix: 잘못된 merge reset, Alert, Confirm 모달 폴더 분리
Glyph8 b46f611
chore: 린트 오류 해결 및 모달 폴더 대신 바텀시트로 이름 변경
Glyph8 de6e2bb
chore: 이름 변경으로 인한 경로 린트 오류 해결
Glyph8 680d1fb
Merge branch 'refactor/#179/common-modal' of https://github.com/CHA-C…
Glyph8 56c98f1
chore: pull develop 충돌 해결
Glyph8 4fe9635
refactor: acount saveAccountModal 제거
Glyph8 ac1d417
Merge branch 'refactor/#179/common-modal' of https://github.com/CHA-C…
Glyph8 f92476c
refactor: OnBoardingModal, MenuDeleteModal 공통 컴포넌트 모달 적용
Glyph8 00646a0
fix: 버튼 반대인 문제 해결 및 속성 이름 left, right로 변경
Glyph8 73d7556
refactor: AccountForm 모달들 1개 파일로 분리, 자잘한 console 경고 해결
Glyph8 a40c86e
rename: @modal로 폴더 이름 변경
Glyph8 0e86036
fix: 작성 중 내용 나가기 버튼 위치 수정
Glyph8 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
File renamed without changes.
47 changes: 0 additions & 47 deletions
47
src/pages/@owner/account/@modal/(.)confirm-delete-modal/ConfirmDeleteModal.tsx
This file was deleted.
Oops, something went wrong.
47 changes: 0 additions & 47 deletions
47
src/pages/@owner/account/@modal/(.)confirm-exit-modal/ConfirmExitModal.tsx
This file was deleted.
Oops, something went wrong.
65 changes: 0 additions & 65 deletions
65
src/pages/@owner/account/@modal/(.)save-account-modal/SaveAccountModal.tsx
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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} | ||
| /> | ||
| </> | ||
| ); | ||
| } | ||
This file was deleted.
Oops, something went wrong.
Glyph8 marked this conversation as resolved.
Show resolved
Hide resolved
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
45 changes: 0 additions & 45 deletions
45
...ruck-management/@modal/(.)delete-food-truck-confirm-modal/DeleteFoodTruckConfirmModal.tsx
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.