Skip to content
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

[HOTFIX] 사물함 UI 및 라우터 로직 수정 (운영) #108

Merged
merged 2 commits into from
Mar 12, 2024
Merged

[HOTFIX] 사물함 UI 및 라우터 로직 수정 (운영) #108

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
0429c57
hotfix: 사물함 UI 및 라우터 로직 수정 (#87)
selfishAltruism Mar 12, 2024
d57acd5
Merge pull request #107 from CAUCSE/hotfix/#106
selfishAltruism Mar 12, 2024
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 README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@

## Dev Stack

<img src="https://img.shields.io/badge/html5-E34F26?style=for-the-badge&logo=html5&logoColor=white"> <img src="https://img.shields.io/badge/javascript-F7DF1E?style=for-the-badge&logo=javascript&logoColor=white"> <img src="https://img.shields.io/badge/typescript-3178C6?style=for-the-badge&logo=typescript&logoColor=white"> <img src="https://img.shields.io/badge/React-61DAFB?style=for-the-badge&logo=React&logoColor=white"> <br/> <img src="https://img.shields.io/badge/axios-5A29E4?style=for-the-badge&logo=axios&logoColor=white"> <img src="https://img.shields.io/badge/react router-CA4245?style=for-the-badge&logo=reactrouter&logoColor=white"> <img src="https://img.shields.io/badge/react hook form-EC5990?style=for-the-badge&logo=reacthookform&logoColor=white"> <br/> <img src="https://img.shields.io/badge/mobx-FF9955?style=for-the-badge&logo=mobx&logoColor=white"> <img src="https://img.shields.io/badge/playwright-2EAD33?style=for-the-badge&logo=playwright&logoColor=white">
<img src="https://img.shields.io/badge/typescript-3178C6?style=for-the-badge&logo=typescript&logoColor=white"> <img src="https://img.shields.io/badge/React-61DAFB?style=for-the-badge&logo=React&logoColor=white"> <br/> <img src="https://img.shields.io/badge/axios-5A29E4?style=for-the-badge&logo=axios&logoColor=white"> <img src="https://img.shields.io/badge/react router-CA4245?style=for-the-badge&logo=reactrouter&logoColor=white"> <img src="https://img.shields.io/badge/react hook form-EC5990?style=for-the-badge&logo=reacthookform&logoColor=white"> <br/> <img src="https://img.shields.io/badge/mobx-FF9955?style=for-the-badge&logo=mobx&logoColor=white"> <img src="https://img.shields.io/badge/playwright-2EAD33?style=for-the-badge&logo=playwright&logoColor=white">

<div>
3 changes: 1 addition & 2 deletions src/pages/locker/locations/components/LockerApplicationModal/LockerApplicationModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ export const LockerApplicationModal: React.FC = observer(() => {
<strong>{target?.lockerNumber}번</strong> 사물함을 신청하시겠습니까?
<br />
<br />
신청 후 즉시 반납 가능하지만, 재신청을 위해서는 <strong>24시간</strong>이 경과되어야
합니다.
신청 후 다른 사물함을 재신청하는 경우 원래 사물함 자동으로 반납 처리됩니다.
</ModalAlertMessage>
<ModalFooter>
<ModalFooterButton onClick={close}>취소</ModalFooterButton>
Expand Down
4 changes: 2 additions & 2 deletions src/pages/locker/locations/components/SubmitButton/SubmitButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ export const SubmitButton = observer(() => {
연장하기
</NavButton>
) : null} */}
<NavButton disabled={!target} onClick={handleClick(isSelectedMine, target)}>
{isSelectedMine ? '반환하기' : '신청하기'}
<NavButton disabled={!target || isSelectedMine} onClick={handleClick(isSelectedMine, target)}>
신청하기
</NavButton>
</PageFooter>
);
Expand Down