🚀 ver3.0.1

변경사항 모임카드 시간 표시 포멧 수정 진행중인 모임 리스트 표시 분기 처리
karrotmvp · Dec 14, 2021 · 874ba09 · 874ba09
2 parents 8d5ca11 + 259b23f
commit 874ba09
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 17 deletions.
diff --git a/src/components/LandingPage/components/MeetingCard/MeetingCard.tsx b/src/components/LandingPage/components/MeetingCard/MeetingCard.tsx
@@ -152,7 +152,12 @@ function MeetingCard({ idx, data, setMeetings }: Props): ReactElement {
       <ContentsWrapper className="meeting-card__contents">
         <InfoWrapper>
           <MeetingTime className="body3 meeting-card__time">
-            {getStartTimeForm(data.start_time, data.live_status, true)}
+            {getStartTimeForm(
+              data.date,
+              data.start_time,
+              data.live_status,
+              true,
+            )}
           </MeetingTime>
 
           <MeetingTitle className="title3 meeting-card__title">

diff --git a/src/components/LandingPage/index.tsx b/src/components/LandingPage/index.tsx
@@ -109,7 +109,7 @@ const LandingPage: React.FC = () => {
         </CreateBtn>
       </CreateBtnWrapper>
       {meetings.length === 0 && <SkeletonCard />}
-      {meetings.filter(el => el.live_status === 'live') && (
+      {meetings.filter(el => el.live_status === 'live').length !== 0 && (
         <div>
           <CurrMeetingList
             className="landing__current"
@@ -118,19 +118,18 @@ const LandingPage: React.FC = () => {
           <Divider className="landing__divider" size="1rem" />
         </div>
       )}
-      {
-        <div>
-          <MeetingList
-            className="landing__upoming"
-            meetings={meetings.filter(
-              el => el.live_status !== 'live' && el.live_status !== 'finish',
-            )}
-            hasMeetings={meetings.length !== 0}
-            setMeetings={setMeetings}
-          />
-          <Divider className="landing__divider" size="1rem" />
-        </div>
-      }
+
+      <div>
+        <MeetingList
+          className="landing__upoming"
+          meetings={meetings.filter(
+            el => el.live_status !== 'live' && el.live_status !== 'finish',
+          )}
+          hasMeetings={meetings.length !== 0}
+          setMeetings={setMeetings}
+        />
+        <Divider className="landing__divider" size="1rem" />
+      </div>
     </PageWrapper>
   );
 };

diff --git a/src/util/utils.ts b/src/util/utils.ts
@@ -71,16 +71,21 @@ export const getDateToText = (start_time: string) => {
 };
 
 export const getStartTimeForm = (
+  date: string,
   start_time: string,
   live_status: LiveStatus,
   head_text?: boolean,
 ) => {
   let text = '';
-  const startTimeArr = start_time.split(':');
+  const startDate = dayjs(
+    `${date} ${start_time}`,
+    'YYYY-MM-DD HH:mm:ss',
+  ).format('a hh:mm');
 
   if (head_text && live_status === 'tomorrow') text += '내일 ';
   else if (head_text && live_status === 'today') text += '오늘 ';
-  text += getTimeText(parseInt(startTimeArr[0]), parseInt(startTimeArr[1]));
+
+  text += startDate;
   return text;
 };