Skip to content

Commit e1fcbb2

Browse files
authored
Merge pull request #165 from Team-INSERT/style/ber
베르실 예약목록 페이지 퍼블리싱
2 parents 30c733a + c3275c3 commit e1fcbb2

File tree

1 file changed

+41
-17
lines changed

1 file changed

+41
-17
lines changed

Diff for: src/templates/ber/layouts/ReserveList.tsx

+41-17
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,27 @@ const ReserveList = ({ reserveList }: BerReserveListProps) => {
99
return (
1010
<Container>
1111
{reserveList.map((reserve) => (
12-
<BerReserveListItem>
13-
<BerReserveInformationText>
14-
베르 {reserve.berNumber}실 예약
15-
</BerReserveInformationText>
16-
<BerReserveInformationText>
17-
· {reserve.user.name}
18-
</BerReserveInformationText>
19-
<BerReserveInformationText>
20-
| {reserve.reservationUsersName}
21-
</BerReserveInformationText>
22-
{isBerReserverSameAsUser(reserve.user.id) && (
23-
<ReserveCancelButton
24-
onClick={() => handleBerReserveDeleteClick(reserve.id)}
25-
>
26-
예약 취소
27-
</ReserveCancelButton>
28-
)}
12+
<BerReserveListItem key={reserve.id}>
13+
<BerReserveInformationContainer>
14+
<BerReserveInformationText>
15+
베르 {reserve.berNumber}실 예약
16+
</BerReserveInformationText>
17+
<BerReserveInformationBox>
18+
<BerReserveInformationText>
19+
<UserNameText>{reserve.user.name}</UserNameText> 님 |
20+
</BerReserveInformationText>
21+
<BerReserveInformationText>
22+
<UserListText>{reserve.reservationUsersName} </UserListText>
23+
</BerReserveInformationText>
24+
{isBerReserverSameAsUser(reserve.user.id) && (
25+
<ReserveCancelButton
26+
onClick={() => handleBerReserveDeleteClick(reserve.id)}
27+
>
28+
예약 취소
29+
</ReserveCancelButton>
30+
)}
31+
</BerReserveInformationBox>
32+
</BerReserveInformationContainer>
2933
</BerReserveListItem>
3034
))}
3135
</Container>
@@ -45,13 +49,33 @@ const BerReserveListItem = styled.div`
4549
padding: 20px 30px;
4650
background-color: ${theme.white};
4751
display: flex;
52+
flex-direction: column;
53+
gap: 4px;
54+
`;
55+
56+
const BerReserveInformationContainer = styled.div`
57+
${flex.COLUMN_FLEX};
4858
gap: 4px;
4959
`;
5060

5161
const BerReserveInformationText = styled.div`
5262
${font.p2};
5363
`;
5464

65+
const BerReserveInformationBox = styled.div`
66+
${flex.FLEX};
67+
`;
68+
69+
const UserNameText = styled.span`
70+
${font.H5};
71+
font-weight: 600;
72+
`;
73+
74+
const UserListText = styled.div`
75+
width: 100%;
76+
margin-left: 1.5%;
77+
`;
78+
5579
const ReserveCancelButton = styled.button`
5680
margin-left: auto;
5781
width: fit-content;

0 commit comments

Comments
 (0)