Merge pull request #165 from Team-INSERT/style/ber

베르실 예약목록 페이지 퍼블리싱
Team-INSERT · Jan 27, 2024 · e1fcbb2 · e1fcbb2
2 parents 30c733a + c3275c3
commit e1fcbb2
Showing 1 changed file with 41 additions and 17 deletions.
diff --git a/src/templates/ber/layouts/ReserveList.tsx b/src/templates/ber/layouts/ReserveList.tsx
@@ -9,23 +9,27 @@ const ReserveList = ({ reserveList }: BerReserveListProps) => {
   return (
     <Container>
       {reserveList.map((reserve) => (
-        <BerReserveListItem>
-          <BerReserveInformationText>
-            베르 {reserve.berNumber}실 예약
-          </BerReserveInformationText>
-          <BerReserveInformationText>
-            · {reserve.user.name}님
-          </BerReserveInformationText>
-          <BerReserveInformationText>
-            | {reserve.reservationUsersName}
-          </BerReserveInformationText>
-          {isBerReserverSameAsUser(reserve.user.id) && (
-            <ReserveCancelButton
-              onClick={() => handleBerReserveDeleteClick(reserve.id)}
-            >
-              예약 취소
-            </ReserveCancelButton>
-          )}
+        <BerReserveListItem key={reserve.id}>
+          <BerReserveInformationContainer>
+            <BerReserveInformationText>
+              베르 {reserve.berNumber}실 예약
+            </BerReserveInformationText>
+            <BerReserveInformationBox>
+              <BerReserveInformationText>
+                <UserNameText>{reserve.user.name}</UserNameText> 님 |
+              </BerReserveInformationText>
+              <BerReserveInformationText>
+                <UserListText>{reserve.reservationUsersName} </UserListText>
+              </BerReserveInformationText>
+              {isBerReserverSameAsUser(reserve.user.id) && (
+                <ReserveCancelButton
+                  onClick={() => handleBerReserveDeleteClick(reserve.id)}
+                >
+                  예약 취소
+                </ReserveCancelButton>
+              )}
+            </BerReserveInformationBox>
+          </BerReserveInformationContainer>
         </BerReserveListItem>
       ))}
     </Container>
@@ -45,13 +49,33 @@ const BerReserveListItem = styled.div`
   padding: 20px 30px;
   background-color: ${theme.white};
   display: flex;
+  flex-direction: column;
+  gap: 4px;
+`;
+
+const BerReserveInformationContainer = styled.div`
+  ${flex.COLUMN_FLEX};
   gap: 4px;
 `;
 
 const BerReserveInformationText = styled.div`
   ${font.p2};
 `;
 
+const BerReserveInformationBox = styled.div`
+  ${flex.FLEX};
+`;
+
+const UserNameText = styled.span`
+  ${font.H5};
+  font-weight: 600;
+`;
+
+const UserListText = styled.div`
+  width: 100%;
+  margin-left: 1.5%;
+`;
+
 const ReserveCancelButton = styled.button`
   margin-left: auto;
   width: fit-content;