[fix] 시간 표시 수정 완료 #54

42wekey · Apr 23, 2023 · b9e5692 · b9e5692
1 parent c9b2ad3
commit b9e5692
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 17 deletions.
diff --git a/src/components/RecentComment/RecentComment.tsx b/src/components/RecentComment/RecentComment.tsx
@@ -44,9 +44,8 @@ export default function RecentComment() {
               </div>
               <div className={styles.comment}>{data.comment}</div>
               <div className={styles.dateTime}>
-                <>
                 {getTime(data.time)}
-                {data.time}</></div>
+                </div>
             </div>
           ))}
         </div>

diff --git a/src/db/data.json b/src/db/data.json
@@ -13,7 +13,7 @@
       "subject": "libft",
       "star_rating": "5",
       "comment": "꾸르르르르르ㅡㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋzㅋ ㅇㄴㅇ ㅁㄴㅇ ㅋㅋㅋㅋㅋㅋ ㅋ     ㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋ   ㅋ   ㅋㅋㅋㅋㅋㅋㅋ ㅋ ㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋ르르르잼",
-      "time": "2023-04-21T06:52:50.622+0000"
+      "time": "2023-04-10T06:28:50.622+0000"
     },
     {
       "subject": "get_next_line",

diff --git a/src/hooks/ConvertTime.tsx b/src/hooks/ConvertTime.tsx
@@ -2,27 +2,33 @@ import moment from "moment";
 import { useEffect } from "react";
 
 interface Time {
-	title: string;
-	time: string;
+  title: string;
+  time: string;
 }
 
 export function ConvertTime(isoTime: Time) {
   const now = moment();
   const time = moment(isoTime.time);
-  const diffMinutes = now.diff(time, "minutes");
-
-//   useEffect(()=>{
-// 	if (diffMinutes)
-// 		console.log(diffMinutes);
-//   },[diffMinutes])
-  console.log(diffMinutes, isoTime.time);
-
-    if (diffMinutes < 1) {
-    return '방금 전';
-  } else if (diffMinutes < 10) {
+  let diffMinutes = now.diff(time, "minutes");
+
+  //   useEffect(()=>{
+  // 	if (diffMinutes)
+  // 		console.log(diffMinutes);
+  //   },[diffMinutes])
+  if (isoTime.title === "myPage") {
+    return time.format("YYYY. MM. DD.");
+  } else if (diffMinutes < 3) {
+    return "방금 전";
+  } else if (diffMinutes < 60) {
     return `${diffMinutes}분 전`;
+  } else if (diffMinutes < 1440) {
+    diffMinutes = now.diff(time, "hour");
+    return `${diffMinutes}시간 전`;
+  } else if (diffMinutes < 10080) {
+    diffMinutes = now.diff(time, "day");
+    return `${diffMinutes}일 전`;
   } else {
-    return time.format('YYYY년 MM월 DD일 HH:mm:ss');
+    return time.format("YYYY. MM. DD.");
   }
 }