Merge pull request #38 from keepgoingLikelion/develop

main merge
keepgoingLikelion · Feb 16, 2024 · 78aaf30 · 78aaf30
2 parents 947240b + 3804e2a
commit 78aaf30
Show file tree

Hide file tree

Showing 10 changed files with 135 additions and 65 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,8 +8,6 @@ pnpm-debug.log*
 lerna-debug.log*
 
 node_modules
-dist
-dist-ssr
 *.local
 
 # Editor directories and files

diff --git a/dist/assets/index-C4OwTf7q.js b/dist/assets/index-C4OwTf7q.js
diff --git a/dist/assets/index-Dp3BWuEh.css b/dist/assets/index-Dp3BWuEh.css
diff --git a/dist/assets/login-button-DjNwLZBs.svg b/dist/assets/login-button-DjNwLZBs.svg
diff --git a/dist/index.html b/dist/index.html
@@ -0,0 +1,24 @@
+<!doctype html>
+<html lang="ko">
+  <head>
+    <style>
+      html, body, #root {
+        height: 100%;
+        width: 100%;
+      }
+      * {
+        box-sizing: border-box;
+        margin: 0;
+        padding: 0;
+      }
+    </style>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>머랭?!</title>
+    <script type="module" crossorigin src="/assets/index-C4OwTf7q.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-Dp3BWuEh.css">
+  </head>
+  <body>
+    <div id="root"></div>
+  </body>
+</html>
diff --git a/src/components/Calendar/Body.tsx b/src/components/Calendar/Body.tsx
@@ -17,7 +17,7 @@ function CalBody() {
     currentDate, weekCalendarList, postings,
   } = useCalendarStore();
 
-  const handleDateClick = (clickedDate: Date, postId?: number) => {
+  const handleDateClick = (postId?: number) => {
     if (postId) {
       navigate(`/post/${postId}`);
     }
@@ -62,7 +62,7 @@ function CalBody() {
                 type="button"
                 className={`${s.days}`}
                 style={day === 0 ? { visibility: 'hidden' } : {}}
-                onClick={() => handleDateClick(clickedDate, post?.postId)}
+                onClick={() => handleDateClick(post?.postId)}
                 key={dayIndex}
               >
                 <div className="days">

diff --git a/src/components/CheckBox/CheckBox.tsx b/src/components/CheckBox/CheckBox.tsx
diff --git a/src/components/CheckBox/CheckBoxList.tsx b/src/components/CheckBox/CheckBoxList.tsx
diff --git a/src/components/EmotionList/EmotionList.tsx b/src/components/EmotionList/EmotionList.tsx
@@ -1,29 +1,25 @@
 // import { useState } from 'react';
 import { QueryClient, QueryClientProvider } from 'react-query';
 import { Link } from 'react-router-dom';
+import { useEffect, useState } from 'react';
 import s from './EmotionList.module.css';
 import GetEmotionIcon from '../../utils/GetEmotionIcon.tsx';
-import useLikedPosts from '../LikedPostsList/useLikedPosts';
 import instance from '../../interface/instance.ts';
-import { useEffect, useState } from 'react';
 
 const queryClient = new QueryClient();
 
-interface Props {
-  emotionType: number;
-}
 type LikedPostCounts = number[];
 
 function EmotionList() {
-  const [countList, setCountList] = useState<LikedPostCounts| null>(null);
+  const [countList, setCountList] = useState<LikedPostCounts | null>(null);
   const emotions = [1, 2, 3, 4, 5, 6];
 
   useEffect(() => {
     const fetchList = async () => {
-      try{
+      try {
         const res: { data: LikedPostCounts } = await instance.get('/post/myLikeCountList');
         setCountList(res.data);
-      } catch(error){
+      } catch (error) {
         console.error('Error fetching: ', error);
       }
     };
@@ -36,10 +32,10 @@ function EmotionList() {
         {emotions.map((emotionType) => (
           <Link to={`/myLog/${emotionType}`} key={emotionType} className={s.button}>
             <GetEmotionIcon type={emotionType} />
-            {countList && <span className={s.count} style={{fontSize: '12px', color: '#51372B', marginTop: '3px'}}>{countList[emotionType - 1]}</span>}
+            {countList && <span className={s.count} style={{ fontSize: '12px', color: '#51372B', marginTop: '3px' }}>{countList[emotionType - 1]}</span>}
           </Link>
         ))}
-        
+
       </div>
     </QueryClientProvider>
   );

diff --git a/src/components/UserTextCard/UserTextCard.tsx b/src/components/UserTextCard/UserTextCard.tsx
@@ -4,18 +4,11 @@ import { PostSDTO } from '../../interface/postInterface.ts';
 import Happy from '../../assets/moodIcons/happy.svg';
 import { getCategoryImg } from '../../functions/getCategory.ts';
 
-const getDateToString = (date: Date) => {
-  const currentDate = new Date(date.toString());
-  const m = currentDate.getMonth() + 1;
-  const d = currentDate.getDate();
-  return `${currentDate.getFullYear()}.${m >= 10 ? m : `0${m}`}.${d >= 10 ? d : `0${d}`}`;
-};
-
 export default function UserTextCard({ data }: { data: PostSDTO }) {
   const navigation = useNavigate();
   const onClickCard = () => {
-    navigation(`/post/${data.postId}`)
-  }
+    navigation(`/post/${data.postId}`);
+  };
   return (
     <div className={styles.wrap} onClick={onClickCard}>
       <div className={styles.profile}>
@@ -27,7 +20,9 @@ export default function UserTextCard({ data }: { data: PostSDTO }) {
           </div>
         </div>
         <div className={styles.commentCount}>
-          <div style={{ color: 'red', display: 'inline' }}>❤</div> {data.emojiCount}
+          <div style={{ color: 'red', display: 'inline' }}>❤</div>
+          {' '}
+          {data.emojiCount}
         </div>
       </div>
       <div className={styles.content}>