Merge pull request #441 from SejongPeer/JunYoung

QA 반영
SejongPeer · Sep 3, 2024 · 0fcb826 · 0fcb826
2 parents 8657739 + 86b8c07
commit 0fcb826
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 27 deletions.
diff --git a/src/assets/image/peerUse.png b/src/assets/image/peerUse.png
diff --git a/src/assets/image/sejongBuddycat.png b/src/assets/image/sejongBuddycat.png
diff --git a/src/components/headerRefactor/SubHeader.js b/src/components/headerRefactor/SubHeader.js
@@ -19,7 +19,7 @@ export const SubHeader = ({ text, customBackLink }) => {
     }
   };
 
- const handleGoBack = () => {
+  const handleGoBack = () => {
     // 커스텀 링크가 제공된 경우 해당 링크로 이동
     if (customBackLink) {
       navigate(customBackLink);

diff --git a/src/pages/buddy/info/BuddyStart.module.css b/src/pages/buddy/info/BuddyStart.module.css
@@ -20,7 +20,7 @@
   flex-direction: column;
   align-items: center;
   padding: 12px 16px;
-  margin-top: 40px;
+  /* margin-top: 40px; */
 }
 
 .btn1 {

diff --git a/src/pages/main/mainPage/MainPage.js b/src/pages/main/mainPage/MainPage.js
@@ -54,7 +54,7 @@ const MainPage = () => {
   const urls = [
     'https://sejonghonbab.simple.ink/', // 혼밥 이용방법
     'https://sejongbuddy.simple.ink/', // 세종버디 이용방법
-    'https://sejongpeer.simple.ink/', // FAQ
+    'https://sejongpeer.notion.site/bd0e00cbc146400ab78e0e2ee34c8edf?pvs=4/', // FAQ
   ];
 
   // 이미지 클릭 이벤트 핸들러, 인덱스에 해당하는 URL로 이동

diff --git a/src/pages/myPage/mypage/MyPage.js b/src/pages/myPage/mypage/MyPage.js
@@ -250,12 +250,12 @@ const MyPage = () => {
                   </p>
                 </div>
                 <div className={styles.matchingBox}>
-                  <button className={styles.matchingButton}>
+                  <button
+                    className={styles.matchingButton}
+                    onClick={handleAppliedStudy}
+                  >
                     <div className={styles.leftBox}>
-                      <div
-                        className={`${styles.redWord} ${styles.checkWord}`}
-                        onClick={handleAppliedStudy}
-                      >
+                      <div className={`${styles.redWord} ${styles.checkWord}`}>
                         지원한 스터디 확인
                       </div>
                       <div

diff --git a/src/pages/myPage/mypage/MyPage.module.css b/src/pages/myPage/mypage/MyPage.module.css
@@ -337,26 +337,27 @@
     font-size: 16px;
     color: #ff4b4b;
     height: 2vh;
-    width: 30vw;
+    /* width: 30vw; */
   }
 
   .checkWord {
-    width: 65vw; /* 너비를 넓혔습니다 */
     text-align: left;
   }
 
   .buddyImg,
   .honbobImg {
-    width: 7vh;
-    height: 7vh;
+    width: 64px;
+    height: 48px;
     margin-right: 0.2vw;
+    border: none;
   }
 
   .buddyImg {
     background-image: url('../../../assets/image/sejongBuddycat.png');
     background-repeat: no-repeat;
     background-position: center center;
-    background-size: cover;
+    background-size: contain;
+    border: none;
   }
 
   .honbobImg {

diff --git a/src/pages/myPage/mypage/api.js b/src/pages/myPage/mypage/api.js
@@ -46,7 +46,7 @@ export const fetchAppliedStudies = async () => {
       withCredentials: true,
     }
   );
-  // console.log(response);
+  console.log(response.data.data);
   return response.data;
 };
 

diff --git a/src/pages/study/studyList/StudyList.js b/src/pages/study/studyList/StudyList.js
@@ -155,7 +155,7 @@ const StudyList = () => {
 
   return (
     <Container>
-      <SubHeader text="세종스터디" customBackLink="/mypage" />
+      <SubHeader text="세종스터디" customBackLink="/main" />
       <FilterBox>
         {category === 0 ? (
           <Filter

diff --git a/src/pages/study/studyList/StudyListPost.js b/src/pages/study/studyList/StudyListPost.js
@@ -15,9 +15,9 @@ const StudyListPost = ({ post }) => {
     totalRecruitmentCount,
     participantCount,
     recruitmentStatus,
-    recruitmentEndAt
+    recruitmentEndAt,
+    isScraped,
   } = post;
-  const isScrapped = localStorage.getItem(`isScrapped_${id}`) === 'true'; // 스크랩 상태 확인
 
   const formatDate = dateString => {
     const date = new Date(dateString);
@@ -58,18 +58,18 @@ const StudyListPost = ({ post }) => {
           <Title>{title}</Title>
           {hasImage && <ImageIcon src={picture} alt="hasImage" />}
         </PostMiddle>
-        {recruitmentStatus === '모집 중'? 
-        <Count>
-          {participantCount} / {totalRecruitmentCount}
-        </Count>
-        :
-        <Finish>모집완료</Finish>
-        }
+        {recruitmentStatus === '모집 중' ? (
+          <Count>
+            {participantCount} / {totalRecruitmentCount}
+          </Count>
+        ) : (
+          <Finish>모집완료</Finish>
+        )}
       </div>
 
       <PostBottom>
         <Like>
-          <LikeIcon src={isScrapped ? filledHeart : heart} alt="like" />
+          <LikeIcon src={isScraped ? filledHeart : heart} alt="like" />
           <LikeNumber>{post.scrapCount}</LikeNumber>
         </Like>
       </PostBottom>
@@ -85,7 +85,7 @@ const PostWrapper = styled.div`
   flex-direction: column;
   border-bottom: 1px solid ${COLORS.line2};
   padding: 12px 16px;
-  background-color: ${({ $recruitmentStatus }) => 
+  background-color: ${({ $recruitmentStatus }) =>
     $recruitmentStatus === '모집 중' ? '#FFF' : '#EEEEEE'};
 `;
 
@@ -173,7 +173,7 @@ const PostBottom = styled.div`
   display: flex;
   align-items: center;
   margin-tozzzzzzzzp: 6px;
-  display: inline-block
+  display: inline-block;
 `;
 
 const Like = styled.div`