Skip to content

Commit

Permalink
Merge pull request #42 from 4bujak-4bujak/feature/meetingroomQA
Browse files Browse the repository at this point in the history
design: 모바일에서 초대 이미지 안보이는 부분 이미지 변경
  • Loading branch information
jiohjung98 authored Jun 9, 2024
2 parents f8f32f9 + 991708d commit 7fd3558
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 19 deletions.
Binary file added public/reservation/CanInviteUser.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 15 additions & 19 deletions src/components/reservation/meetingRoom/MeetingRoomInfo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -313,25 +313,21 @@ const MeetingRoomInfo = () => {
{showSearch && (
<>
{addedMembers.length > 0 && (
<div className="mt-4 flex w-full overflow-x-auto">
<div className="flex flex-nowrap">
{addedMembers.map(member => (
<div key={member.memberId} className="flex items-center mr-2.5 flex-shrink-0">
<div className='px-2.5 py-1 rounded-xl border border-zinc-400 justify-start items-center inline-flex'>
<div className="text-neutral-400 text-sm font-medium font-['Pretendard'] mt-[2px] whitespace-nowrap mr-2 flex-shrink-0">
{member.memberName}
<div className="mt-4 flex w-full overflow-x-auto">
<div className="flex flex-nowrap">
{addedMembers.map(member => (
<div key={member.memberId} className="flex items-center mr-2.5 flex-shrink-0">
<div className='px-2.5 py-1 rounded-xl border border-zinc-400 justify-start items-center inline-flex'>
<div className="text-neutral-400 text-sm font-medium font-['Pretendard'] mt-[2px] whitespace-nowrap mr-2 flex-shrink-0">
{member.memberName}
</div>
<Image src={'/reservation/deleteBtn.svg'} width={10} height={10} alt="delete user" className="cursor-pointer flex-shrink-0" onClick={() => handleRemoveMember(member)} />
</div>
</div>
))}
</div>
</div>
<Image src={'/reservation/deleteBtn.svg'} width={10} height={10} alt="delete user" className="cursor-pointer flex-shrink-0" onClick={() => handleRemoveMember(member)} />
</div>
</div>
))}
</div>
</div>
)}




)}
<div className="relative w-full mt-[20px]">
<input
type="text"
Expand All @@ -356,7 +352,7 @@ const MeetingRoomInfo = () => {
{invitedMemberIds.includes(member.memberId) ? (
<Image src="/reservation/InvitedUser.svg" width={28} height={28} alt="invited user" className="ml-auto rounded-full cursor-not-allowed" />
) : (
<Image src="/reservation/InviteUser.svg" width={28} height={28} alt="invite user" className="ml-auto rounded-full cursor-pointer" onClick={() => handleAddMember(member)} />
<Image src="/reservation/CanInviteUser.png" width={28} height={28} alt="invite user" className="ml-auto rounded-full cursor-pointer" onClick={() => handleAddMember(member)} />
)}
</li>
))}
Expand Down

0 comments on commit 7fd3558

Please sign in to comment.