diff --git a/src/components/home/OfficeNotice.tsx b/src/components/home/OfficeNotice.tsx index 4d806f2..059c55e 100644 --- a/src/components/home/OfficeNotice.tsx +++ b/src/components/home/OfficeNotice.tsx @@ -36,7 +36,7 @@ const OfficeNotice: React.FC = () => { return ( <> -
+
diff --git a/src/components/layout/footer/Footer.tsx b/src/components/layout/footer/Footer.tsx index 4fdfb60..53a6f95 100644 --- a/src/components/layout/footer/Footer.tsx +++ b/src/components/layout/footer/Footer.tsx @@ -41,7 +41,7 @@ const Footer = () => { )}
- 예약/일정 + 예약
diff --git a/src/components/reservation/meetingRoom/DatePickerModal.tsx b/src/components/reservation/meetingRoom/DatePickerModal.tsx index 68b8224..e665dcb 100644 --- a/src/components/reservation/meetingRoom/DatePickerModal.tsx +++ b/src/components/reservation/meetingRoom/DatePickerModal.tsx @@ -330,11 +330,12 @@ const DatePickerModal: React.FC = ({ )}
- +
diff --git a/src/components/reservation/meetingRoom/MeetingRoomInfo.tsx b/src/components/reservation/meetingRoom/MeetingRoomInfo.tsx index 51894a1..6c04326 100644 --- a/src/components/reservation/meetingRoom/MeetingRoomInfo.tsx +++ b/src/components/reservation/meetingRoom/MeetingRoomInfo.tsx @@ -210,295 +210,188 @@ const MeetingRoomInfo = () => { return
No meeting room data
; } - return ( -
-
- +
+ +
+ meetingRoomImage -
- meetingRoomImage -
-
-
- {meetingRoom.branchName} -
-
-
- 지점 상세보기 +
+
+
+ {meetingRoom.branchName} +
+
+
지점 상세보기
+ arrow +
- arrow -
-
-
-
- {meetingRoom.meetingRoomName} -
-
- floor -
- {meetingRoom.meetingRoomFloor < 0 - ? `B${Math.abs(meetingRoom.meetingRoomFloor)}` - : `${meetingRoom.meetingRoomFloor}`} - 층 +
+
{meetingRoom.meetingRoomName}
+
+ floor +
+ {meetingRoom.meetingRoomFloor < 0 ? `B${Math.abs(meetingRoom.meetingRoomFloor)}` : `${meetingRoom.meetingRoomFloor}`}층 +
+ capacity +
+ 최대 {meetingRoom.meetingRoomCapacity}명 +
+ check +
+ {meetingRoom.equipments.join(', ')} +
+
- capacity -
- 최대 {meetingRoom.meetingRoomCapacity}명 +
+
- check -
- {meetingRoom.equipments.join(', ')} +
+
console.log("Edit clicked")}> + setEventName(e.target.value)} + ref={inputRef} + className="w-full h-full outline-none bg-transparent" + placeholder="일정명을 작성하세요." + /> + edit
-
-
-
-
-
console.log('Edit clicked')}> - setEventName(e.target.value)} - ref={inputRef} - className="w-full h-full outline-none bg-transparent" - placeholder="일정명을 작성하세요." - /> - edit -
-
-
-
-
- 일정 -
-
-
- {storedGetTime ? `${storedGetTime}` : '시간을 선택해주세요'}
-
-
-
-
-
setShowSearch(!showSearch)}> -
-
- 참석 멤버 -
- {!showSearch && ( - <> - {addedMembers.length > 0 && ( -
-
- {addedMembers.length === 1 - ? addedMembers[0].memberName - : `${addedMembers[0].memberName} 외 ${addedMembers.length - 1}인`} -
+
+
+
+
+
일정
+
+
+ {storedGetTime ? ( + `${storedGetTime}` + ) : ( + '시간을 선택해주세요' + )}
- )} - - )} +
- {showSearch ? ( - arrow - ) : ( - arrow - )} -
- {showSearch && ( - <> - {addedMembers.length > 0 && ( -
-
- {addedMembers.map((member) => ( -
-
-
- {member.memberName} -
- delete user handleRemoveMember(member)} - /> +
+
+
+
+
setShowSearch(!showSearch)}> +
+
+ 참석 멤버
-
- ))} -
+ {!showSearch && ( + <> + {addedMembers.length > 0 && ( +
+
+ {addedMembers.length === 1 + ? addedMembers[0].memberName + : `${addedMembers[0].memberName} 외 ${addedMembers.length - 1}인`} +
+
+ )} + + )} +
+ {showSearch ? ( + arrow + ) : ( + arrow + )}
- )} -
- - search -
- {(inviteableMembers.length > 0 || nonInviteableMembers.length > 0) && ( -
    - {inviteableMembers.map((member) => ( -
  • -
    - member image -
    -
    - {member.memberName} - - {member.memberEmail} - -
    - {invitedMemberIds.includes(member.memberId) ? ( - invited user - ) : ( - invite user handleAddMember(member)} - /> - )} -
  • - ))} - {nonInviteableMembers.map((member) => ( -
  • - member image -
    -
    - {member.memberName} - ExclamationMark + {showSearch && ( + <> + {addedMembers.length > 0 && ( +
    +
    + {addedMembers.map(member => ( +
    +
    +
    + {member.memberName} +
    + delete user handleRemoveMember(member)} /> +
    +
    + ))} +
    - - {member.memberEmail} - -
    - invite user -
  • - ))} -
- )} - - )} -
-
- Location -

- 일정이 이미 있는 사용자는 참석 멤버로 등록할 수 없어요! 일정을 조정한 뒤 - 추가할 수 있습니다. -

-
-
- + )} +
+ + search +
+ {(inviteableMembers.length > 0 || nonInviteableMembers.length > 0) && ( +
    + {inviteableMembers.map((member) => ( +
  • +
    + member image +
    +
    + {member.memberName} + {member.memberEmail} +
    + {invitedMemberIds.includes(member.memberId) ? ( + invited user + ) : ( + invite user handleAddMember(member)} /> + )} +
  • + ))} + {nonInviteableMembers.map((member) => ( +
  • + member image +
    +
    + {member.memberName} + ExclamationMark +
    + {member.memberEmail} +
    + invite user +
  • + ))} +
+ )} + + )} +
+
+ Location +

일정이 이미 있는 사용자는 참석 멤버로 등록할 수 없어요! 일정을 조정한 뒤 추가할 수 있습니다.

+
+