From 713d72d36cf2ce6c49a06cbffcf7e2c451b3c5e8 Mon Sep 17 00:00:00 2001 From: hojin Date: Wed, 12 Jun 2024 18:34:13 +0900 Subject: [PATCH] =?UTF-8?q?fix=20=EC=98=A4=EB=A5=98=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../home/weekSchedule/WeekScheduleItem.tsx | 115 +++++++++--------- src/pages/signup/index.tsx | 2 +- 2 files changed, 59 insertions(+), 58 deletions(-) diff --git a/src/components/home/weekSchedule/WeekScheduleItem.tsx b/src/components/home/weekSchedule/WeekScheduleItem.tsx index 033b542..ef17fab 100644 --- a/src/components/home/weekSchedule/WeekScheduleItem.tsx +++ b/src/components/home/weekSchedule/WeekScheduleItem.tsx @@ -85,72 +85,73 @@ const WeekScheduleItem = ({ ) : ( <> - {data.slice(0, 3).map((item: todayListData, index: number) => { - if (item.spaceType == 'MEETINGROOM') { - return ( -
-
- {/* 고정 */} -
-
-
-
- {item?.reservationName} -
-
-
- {item?.branchName} {item?.spaceName} ({item?.spaceFloor}층) + {data.length > 0 && + data.slice(0, 3).map((item: todayListData, index: number) => { + if (item.spaceType == 'MEETINGROOM') { + return ( +
+
+ {/* 고정 */} +
+
+
+
+ {item?.reservationName}
-
- {format(item?.startAt, 'HH:mm')} -{' '} - {format(item?.endAt, 'HH:mm')} +
+
+ {item?.branchName} {item?.spaceName} ({item?.spaceFloor}층) +
+
+ {format(item?.startAt, 'HH:mm')} -{' '} + {format(item?.endAt, 'HH:mm')} +
-
-
-
- {item?.memberType == 'REPRESENTATIVE' ? ( -
- 호스트 -
- ) : ( -
- 참석자 -
- )} +
+
+ {item?.memberType == 'REPRESENTATIVE' ? ( +
+ 호스트 +
+ ) : ( +
+ 참석자 +
+ )} +
+ {renderUserImg(item.memberImageUrls)}
- {renderUserImg(item.memberImageUrls)}
-
- ); - } else if (item.spaceType == 'FOCUSDESK') { - return ( -
-
- 개인 좌석 -
-
- {renderTime(item.startAt)} ~ |{' '} - {item.spaceName} -
-
- ); - } else { - return ( -
-
- 개인 휴식 + ); + } else if (item.spaceType == 'FOCUSDESK') { + return ( +
+
+ 개인 좌석 +
+
+ {renderTime(item.startAt)} ~ |{' '} + {item.spaceName} +
-
- {renderTime(item.startAt)} - {renderTime(item.endAt)} |{' '} - {item.spaceName} + ); + } else { + return ( +
+
+ 개인 휴식 +
+
+ {renderTime(item.startAt)} - {renderTime(item.endAt)} |{' '} + {item.spaceName} +
-
- ); - } - })} + ); + } + })} )}
diff --git a/src/pages/signup/index.tsx b/src/pages/signup/index.tsx index ce443b4..ce87439 100644 --- a/src/pages/signup/index.tsx +++ b/src/pages/signup/index.tsx @@ -11,7 +11,7 @@ import { useMutation } from 'react-query'; const SignUpPage = () => { const [applyValues, setApplyValues] = useState>({ - step: 2 + step: 0 }); const { mutateAsync: signUpReq } = useMutation(