From 666d05554c74f0d844a2882536555dbe184415db Mon Sep 17 00:00:00 2001
From: Youjiiin <yujinjang24@gmail.com>
Date: Tue, 27 Aug 2024 22:53:57 +0900
Subject: [PATCH 1/6] fix

---
 src/components/headerRefactor/SubHeader.js                | 2 +-
 src/components/studyPostWrite/PostInput.js                | 8 +++++++-
 .../studyPostWrite/studyRequirement/StudyLink.js          | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/components/headerRefactor/SubHeader.js b/src/components/headerRefactor/SubHeader.js
index 6ad4120c..deed475a 100644
--- a/src/components/headerRefactor/SubHeader.js
+++ b/src/components/headerRefactor/SubHeader.js
@@ -11,7 +11,7 @@ export const SubHeader = ({ text }) => {
 
   const handleUserClick = () => {
     if (token) {
-      navigate('/my-page'); // 유저 아이콘 클릭 시 /my-page로 이동
+      navigate('/mypage'); // 유저 아이콘 클릭 시 /my-page로 이동
     } else {
       navigate('/login'); // 로그인 텍스트 클릭 시 /login-page로 이동
     }
diff --git a/src/components/studyPostWrite/PostInput.js b/src/components/studyPostWrite/PostInput.js
index e9ac03e3..e56a7573 100644
--- a/src/components/studyPostWrite/PostInput.js
+++ b/src/components/studyPostWrite/PostInput.js
@@ -1,10 +1,16 @@
 import style from './PostInput.module.css';
 import usePostStore from '../../pages/study/studyPostWrite/usePostStore';
+
 const PostInput = () => {
   const { content, setContent } = usePostStore();
+
   const handleContentChange = e => {
-    setContent(e.target.value);
+    const newValue = e.target.value;
+    if (newValue.length <= 1000) {
+      setContent(newValue);
+    }
   };
+
   return (
     <div className={style.textContainer}>
       <textarea
diff --git a/src/components/studyPostWrite/studyRequirement/StudyLink.js b/src/components/studyPostWrite/studyRequirement/StudyLink.js
index b16b774c..4f8582ee 100644
--- a/src/components/studyPostWrite/studyRequirement/StudyLink.js
+++ b/src/components/studyPostWrite/studyRequirement/StudyLink.js
@@ -7,7 +7,7 @@ const StudyLink = () => {
   };
   return (
     <div className={style.openChatBox}>
-      <p>신청 수락 시, 오픈채팅 링크(카카오ID)가 신청자에게 전달됩니다.</p>
+      <p>모집 마감 시, 오픈채팅 링크(카카오ID)가 신청자에게 전달됩니다.</p>
       <input
         onChange={handleLinkChange}
         value={studyLink}

From 364ea01c3a64bd09c4592e723278d386e1d5370b Mon Sep 17 00:00:00 2001
From: Youjiiin <yujinjang24@gmail.com>
Date: Sun, 1 Sep 2024 16:13:44 +0900
Subject: [PATCH 2/6] fix

---
 .../studyPostWrite/studyRequirement/Title.js  |   9 +-
 src/pages/buddy/accept/BuddyAccept.js         |   4 +-
 src/pages/study/studyList/StudyList.js        |   2 +-
 .../study/studyPostDetail/StudyPostDetail.js  | 107 +++++++-----------
 4 files changed, 52 insertions(+), 70 deletions(-)

diff --git a/src/components/studyPostWrite/studyRequirement/Title.js b/src/components/studyPostWrite/studyRequirement/Title.js
index cb6a2c9c..6c637f24 100644
--- a/src/components/studyPostWrite/studyRequirement/Title.js
+++ b/src/components/studyPostWrite/studyRequirement/Title.js
@@ -2,12 +2,17 @@ import style from '../StudyRequirement.module.css';
 import usePostStore from '../../../pages/study/studyPostWrite/usePostStore';
 const Title = () => {
   const { title, setTitle } = usePostStore();
+
   const handleChange = e => {
-    setTitle(e.target.value);
+    const newValue = e.target.value;
+    if (newValue.length <= 50) {
+      setTitle(newValue);
+    }
   };
+
   return (
     <input
-      placeholder="제목"
+      placeholder="제목(50자 이하)"
       className={style.titleInput}
       type="text"
       value={title}
diff --git a/src/pages/buddy/accept/BuddyAccept.js b/src/pages/buddy/accept/BuddyAccept.js
index 6242cefa..da84638d 100644
--- a/src/pages/buddy/accept/BuddyAccept.js
+++ b/src/pages/buddy/accept/BuddyAccept.js
@@ -61,7 +61,8 @@ const BuddyAccept = () => {
       isAccept: accept,
     };
 
-    fetch(process.env.REACT_APP_BACK_SERVER + '/buddyMatching/status', {
+
+    fetch(process.env.REACT_APP_BACK_SERVER + '/buddy/matching/status', {
       method: 'POST',
       body: JSON.stringify(acceptInfo),
       headers: {
@@ -72,6 +73,7 @@ const BuddyAccept = () => {
     })
       .then(response => response.json())
       .then(data => {
+        console.log(data)
         if (accept) {
           toast.success(
             '매칭이 수락되었습니다! \n상대방이 매칭을 수락할 때까지 기다려주세요.'
diff --git a/src/pages/study/studyList/StudyList.js b/src/pages/study/studyList/StudyList.js
index 3434d27a..81905485 100644
--- a/src/pages/study/studyList/StudyList.js
+++ b/src/pages/study/studyList/StudyList.js
@@ -134,7 +134,7 @@ const StudyList = () => {
           {category === 0 ? (
             <p style={{
               fontSize: '14px',
-            }}>스터디</p>
+            }}>카테고리</p>
           ) : (
             <p
               style={{
diff --git a/src/pages/study/studyPostDetail/StudyPostDetail.js b/src/pages/study/studyPostDetail/StudyPostDetail.js
index ad94d7c2..0e91a338 100644
--- a/src/pages/study/studyPostDetail/StudyPostDetail.js
+++ b/src/pages/study/studyPostDetail/StudyPostDetail.js
@@ -21,6 +21,7 @@ import {
   fetchScrapCount,
   deletePostHandler,
 } from './api';
+
 const StudyListPostDetail = () => {
   const {
     studyData,
@@ -32,6 +33,7 @@ const StudyListPostDetail = () => {
     setScrapped,
     setScrapCount,
   } = useStore();
+
   const {
     isPopupVisible,
     popupMessage,
@@ -42,66 +44,61 @@ const StudyListPostDetail = () => {
   } = usePopupStroe();
 
   const { studyId } = useParams();
-
   const navigate = useNavigate();
+
+  const [isImgOpen, setImgOpen] = useState(false);
+  const [selectedImage, setSelectedImage] = useState(null);
+  const [isWriter, setIsWriter] = useState(false);
+  const [ismodalOpen, setIsmodalOpen] = useState(false);
+
   const modifyHandler = () => {
     navigate(`/study/modify/${studyId}`);
   };
 
-  const [isImgOpen, setImgOpen] = useState();
-  const [selectedImage, setSelectedImage] = useState(null);
-
   const handleImageClick = image => {
     setSelectedImage(image);
     setImgOpen(true);
   };
 
-  // 게시글 삭제
   const deleteHandler = async () => {
     try {
-      const data = await deletePostHandler(studyId);
-      console.log(data);
+      await deletePostHandler(studyId);
       toast.success('게시글이 삭제되었습니다!');
       navigate('/study');
     } catch (error) {
-      console.error('Error fetching study data:', error);
+      toast.error('게시글 삭제 실패!', error);
     }
   };
 
-  const [ismodalOpen, setIsmodalOpen] = useState(false);
-
-  // 스크랩
   useEffect(() => {
     const fetchData = async () => {
       try {
         const data = await fetchStudyData(studyId);
         setStudyData(data);
 
+        // 스크랩 여부 로컬 스토리지에서 불러오기 또는 서버 데이터 사용
         const scrapped = localStorage.getItem(`isScrapped_${studyId}`);
         setScrapped(scrapped ? JSON.parse(scrapped) : data.data.isScrapped);
 
+        // 지원 여부 로컬 스토리지에서 불러오기 또는 서버 데이터 사용
         const appliedStatus = localStorage.getItem(`isApplied_${studyId}`);
-        if (appliedStatus) {
-          setApplied(JSON.parse(appliedStatus));
-        }
+        setApplied(
+          appliedStatus ? JSON.parse(appliedStatus) : data.data.isApplied
+        );
 
-        // fetchScrapCount 함수에서 올바른 데이터를 받고 있는지 확인합니다.
+        // 스크랩 카운트 설정
         const scrapData = await fetchScrapCount(studyId);
-        console.log('scrapData:', scrapData); // 콘솔에 스크랩 데이터 출력
         setScrapCount(scrapData.data);
       } catch (error) {
-        console.error(error);
+        toast.error('스터디 데이터를 가져오는데 실패했습니다!', error);
       }
     };
 
     fetchData();
   }, [studyId, setStudyData, setScrapped, setApplied, setScrapCount]);
 
-  // 작성자 확인
-  const [isWriter, setIsWriter] = useState(false);
   useEffect(() => {
     const getNick = localStorage.getItem('nickname');
-
     if (studyData && getNick === studyData.data.writerNickname) {
       setIsWriter(true);
     } else {
@@ -109,10 +106,6 @@ const StudyListPostDetail = () => {
     }
   }, [studyData]);
 
-  if (!studyData) {
-    return <div>Loading..</div>;
-  }
-
   const togglePopup = message => {
     setPopupMessage(message);
     setPopupVisible(!isPopupVisible);
@@ -122,7 +115,6 @@ const StudyListPostDetail = () => {
     setPopupVisible(false);
   };
 
-  // 지원하기
   const applyForStudyHandler = async () => {
     try {
       if (isApplied) {
@@ -130,18 +122,16 @@ const StudyListPostDetail = () => {
         if (response.status === 200) {
           toast.success('지원 취소 완료');
           setApplied(false);
-          localStorage.setItem(`isApplied_${studyId}`, false);
+          localStorage.setItem(`isApplied_${studyId}`, JSON.stringify(false));
         } else {
           console.error('Failed to cancel study application:', response);
         }
       } else {
         const response = await applyForStudy(studyId);
         if (response.status === 201) {
-          toast.success(
-            '지원 완료! 모집자가 수락 후, 모집인원이 다 차거나 마감일이 되면 메시지로 오픈채팅 링크가 전달됩니다.'
-          );
+          toast.success('지원 완료!');
           setApplied(true);
-          localStorage.setItem(`isApplied_${studyId}`, true);
+          localStorage.setItem(`isApplied_${studyId}`, JSON.stringify(true));
         } else {
           console.error('Failed to apply for study:', response);
         }
@@ -149,16 +139,13 @@ const StudyListPostDetail = () => {
     } catch (error) {
       if (error.response && error.response.status === 409) {
         toast.error('이미 신청한 스터디입니다!');
-
         setApplied(true);
-        localStorage.setItem(`isApplied_${studyId}`, true);
+        localStorage.setItem(`isApplied_${studyId}`, JSON.stringify(true));
+      } else if (error.response.status === 403) {
+        toast.error('1시간 패널티 부과 중입니다!');
       } else {
         console.error('Error applying for study:', error);
       }
-
-      if (error.response.status === 403) {
-        toast.error('1시간 패널티 부과 중입니다!');
-      }
     }
   };
 
@@ -168,7 +155,10 @@ const StudyListPostDetail = () => {
       if (response.status === 200) {
         const newScrappedStatus = !isScrapped;
         setScrapped(newScrappedStatus);
-        localStorage.setItem(`isScrapped_${studyId}`, newScrappedStatus);
+        localStorage.setItem(
+          `isScrapped_${studyId}`,
+          JSON.stringify(newScrappedStatus)
+        );
 
         if (newScrappedStatus) {
           toast.success('스크랩에 추가합니다!');
@@ -180,40 +170,37 @@ const StudyListPostDetail = () => {
           setScrapCount(scrapCount - 1);
         }
       } else {
-        console.error('스크랩 실패:', response);
+        console.error('Failed to toggle scrap:', response);
       }
     } catch (error) {
       if (error.response && error.response.status === 403) {
         toast.error('권한이 없음.');
       } else {
-        console.error('스크랩 실패:', error);
+        console.error('Failed to toggle scrap:', error);
       }
     }
   };
 
+  if (!studyData) {
+    return <div>Loading..</div>;
+  }
+
   return (
     <Container>
       <SubHeader text="세종스터디" />
       <Wrapper>
         <Title>
           {studyData.data.title}
-          {isWriter ? (
+          {isWriter && (
             <img
               src={more}
-              style={{
-                width: '24px',
-                height: '24px',
-              }}
+              style={{ width: '24px', height: '24px' }}
               alt="more"
-              onClick={() => {
-                setIsmodalOpen(!ismodalOpen);
-              }}
+              onClick={() => setIsmodalOpen(!ismodalOpen)}
             />
-          ) : (
-            <></>
           )}
         </Title>
-        {ismodalOpen ? (
+        {ismodalOpen && (
           <MoreModal>
             <div
               style={{
@@ -247,8 +234,6 @@ const StudyListPostDetail = () => {
               삭제하기
             </p>
           </MoreModal>
-        ) : (
-          <></>
         )}
         <FlexContainer>
           <Title2>{studyData.data.writerMajor}</Title2>
@@ -258,7 +243,7 @@ const StudyListPostDetail = () => {
           <ApplicationPeriod>지원기간</ApplicationPeriod>
           <ApplicationPeriod2>
             {studyData.data.recruitmentStart}
-          </ApplicationPeriod2>
+          </ApplicationPeriod2>{' '}
           ~
           <ApplicationPeriod3>
             {studyData.data.recruitmentEnd}
@@ -278,7 +263,6 @@ const StudyListPostDetail = () => {
           <Tag>
             <TagText>{studyData.data.categoryName}</TagText>
           </Tag>
-
           {studyData.data.tags.map((tag, index) => (
             <Tag2 key={index}>
               <TagText2>{tag}</TagText2>
@@ -291,11 +275,7 @@ const StudyListPostDetail = () => {
           {studyData.data.imgUrlList &&
             studyData.data.imgUrlList.map(image => (
               <img
-                style={{
-                  width: '100px',
-                  height: '100px',
-                  borderRadius: '8px',
-                }}
+                style={{ width: '100px', height: '100px', borderRadius: '8px' }}
                 key={image.imageId}
                 src={image.imgUrl}
                 alt={`Image ${image.imageId}`}
@@ -331,10 +311,7 @@ const StudyListPostDetail = () => {
               {`신청현황 보기 (${studyData.data.participantCount} / ${studyData.data.totalRecruitmentCount})`}
             </ApplyButton>
           ) : (
-            <ApplyButton 
-              onClick={applyForStudyHandler} 
-              // isApplied={isApplied}
-            >
+            <ApplyButton onClick={applyForStudyHandler}>
               {isApplied
                 ? '지원취소'
                 : `지원하기 (${studyData.data.participantCount} / ${studyData.data.totalRecruitmentCount})`}
@@ -345,9 +322,7 @@ const StudyListPostDetail = () => {
           <Popup
             title={popupTitle}
             message={popupMessage}
-            message2={
-              '*스터디 신청 후 취소할 시, 취소한 스터디의 지원에 1시간 제한이 생깁니다.'
-            }
+            message2="*스터디 신청 후 취소할 시, 취소한 스터디의 지원에 1시간 제한이 생깁니다."
             onClose={closePopup}
           />
         )}

From 5a1457a44cc7e20e24d78a53c36a23d30f43ea41 Mon Sep 17 00:00:00 2001
From: Youjiiin <yujinjang24@gmail.com>
Date: Mon, 2 Sep 2024 22:29:35 +0900
Subject: [PATCH 3/6] =?UTF-8?q?feat:=20[54]=20=EA=B2=8C=EC=8B=9C=EB=AC=BC?=
 =?UTF-8?q?=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EB=AA=A8=EC=A7=91=EC=99=84?=
 =?UTF-8?q?=EB=A3=8C=20=EC=8B=9C=20=EB=94=94=EC=9E=90=EC=9D=B8=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jsconfig.json                                 |   8 +-
 public/index.html                             |  39 +++---
 src/App.js                                    |   4 +-
 src/assets/image/searchWhite.png              | Bin 0 -> 1348 bytes
 src/components/headerRefactor/SubHeader.js    |  18 ++-
 src/components/modal/BottomModal.module.css   |   6 +-
 src/components/studyMyPost/studyMyPost.js     |  75 ++++++++----
 src/pages/buddy/accept/BuddyAccept.js         |   2 +
 src/pages/buddy/accept/BuddyAccept.module.css |   2 -
 src/pages/buddy/info/BuddyStart.module.css    |   5 +-
 src/pages/buddy/info/BuddyStart2.js           |   8 +-
 .../buddy/matching/css/B_Container.module.css |   2 +-
 src/pages/buddy/waiting/BuddyWaiting.js       |   2 +-
 src/pages/honbob/info/HonbobStart.module.css  |  20 ++-
 src/pages/honbob/matching/js/H_Gender.js      |   2 +-
 src/pages/honbob/matching/js/H_Menu.js        |   2 +-
 src/pages/honbob/success/HonbobSuccess.js     |   2 +-
 src/pages/honbob/waiting/HonbobWaiting.js     |   2 +-
 src/pages/login/signUp/Agree.js               |   4 +-
 src/pages/myPage/modify/Modify.module.css     |   2 -
 src/pages/myPage/mypage/AppliedStudy.js       |  53 +++++---
 src/pages/myPage/mypage/MyPage.module.css     |  15 +--
 src/pages/study/studyList/Filter_Field.js     |  12 +-
 src/pages/study/studyList/StudyList.js        |   1 +
 src/pages/study/studyList/StudyListPost.js    |  13 ++
 src/pages/study/studyList/api.js              |  61 +++++-----
 .../study/studyPostDetail/StudyPostDetail.js  | 115 ++++++++----------
 src/pages/study/studyPostDetail/api.js        |  45 +++----
 .../study/studyPostWrite/StudyPostWrite.js    |  39 +++---
 .../studyPostField/StudyPostField.js          |  65 ++++++++--
 30 files changed, 352 insertions(+), 272 deletions(-)
 create mode 100644 src/assets/image/searchWhite.png

diff --git a/jsconfig.json b/jsconfig.json
index fa882341..5875dc5b 100644
--- a/jsconfig.json
+++ b/jsconfig.json
@@ -1,8 +1,6 @@
 {
   "compilerOptions": {
-    "baseUrl": "src",
-    "paths": {
-      "@/components/*": ["components/*"]
-    }
-  }
+    "baseUrl": "src"
+  },
+  "include": ["src"]
 }
diff --git a/public/index.html b/public/index.html
index ee243502..6b0047c3 100644
--- a/public/index.html
+++ b/public/index.html
@@ -2,35 +2,32 @@
 <html lang="en">
 
 <head>
- <meta charset="utf-8" />
-    <link rel="icon" href= "/public/favicon.ico" type="image/x-icon"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <script src="https://developers.kakao.com/sdk/js/kakao.min.js"></script>
-    <!-- <script async src="https://www.googletagmanager.com/gtag/js?id=G-92C8223FVZ"></script>
+  <meta charset="utf-8" />
+  <link rel="icon" href="/public/favicon.ico" type="image/x-icon" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <script src="https://developers.kakao.com/sdk/js/kakao.min.js"></script>
+  <!-- <script async src="https://www.googletagmanager.com/gtag/js?id=G-92C8223FVZ"></script>
     <script>
       window.dataLayer = window.dataLayer || [];
       function gtag(){dataLayer.push(arguments);}
       gtag('js', new Date());
       gtag('config', 'G-92C8223FVZ');
     </script> -->
-    <link rel="stylesheet" as="style" crossorigin href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard@v1.3.6/dist/web/static/pretendard.css" />
-    <title>Sejong Peer</title>
-  <!-- Google Tag Manager -->
-  <script>(function (w, d, s, l, i) {
-      w[l] = w[l] || []; w[l].push({
-        'gtm.start':
-          new Date().getTime(), event: 'gtm.js'
-      }); var f = d.getElementsByTagName(s)[0],
-        j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : ''; j.async = true; j.src =
-          'https://www.googletagmanager.com/gtm.js?id=' + i + dl; f.parentNode.insertBefore(j, f);
-    })(window, document, 'script', 'dataLayer', 'GTM-W6DNXKNB');</script>
-  <!-- <!— End Google Tag Manager —> -->
+  <link rel="stylesheet" as="style" crossorigin
+    href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard@v1.3.6/dist/web/static/pretendard.css" />
+  <title>Sejong Peer</title>
+  <!-- Google tag (gtag.js) -->
+  <script async src="https://www.googletagmanager.com/gtag/js?id=G-S9XVPFEXQZ"></script>
+  <script>
+    window.dataLayer = window.dataLayer || [];
+    function gtag() { dataLayer.push(arguments); }
+    gtag('js', new Date());
+
+    gtag('config', 'G-S9XVPFEXQZ');
+  </script>
 </head>
+
 <body>
-  <!-- Google Tag Manager (noscript) -->
-<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-W6DNXKNB"
-  height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
-  <!-- <!— End Google Tag Manager (noscript) —> -->
   <div id="root"></div>
   <div id="modal-root"></div>
 </body>
diff --git a/src/App.js b/src/App.js
index b4ce0177..c468df71 100644
--- a/src/App.js
+++ b/src/App.js
@@ -48,7 +48,7 @@ import AppliedStudy from './pages/myPage/mypage/AppliedStudy';
 
 // 스터디
 import StudyList from '../src/pages/study/studyList/StudyList.js';
-import StudyPostDeatil from '../src/pages/study/studyPostDetail/StudyPostDetail.js';
+import StudyPostDetail from '../src/pages/study/studyPostDetail/StudyPostDetail.js';
 import StudyPostWrite from './pages/study/studyPostWrite/StudyPostWrite.js';
 import StudyFilter from '../src/pages/study/studyFilterPage/StudyFIlterPage.js';
 import StudyModify from './pages/study/studyModify/studyModify.js';
@@ -212,7 +212,7 @@ const App = () => {
               <Route path="/study" element={<StudyList />} />
               <Route
                 path="/study/post/:studyId"
-                element={<StudyPostDeatil />}
+                element={<StudyPostDetail />}
               />
               <Route path="/study/post" element={<StudyPostWrite />} />
               <Route path="/study/filter" element={<StudyFilter />} />
diff --git a/src/assets/image/searchWhite.png b/src/assets/image/searchWhite.png
new file mode 100644
index 0000000000000000000000000000000000000000..69f0ea87b55655bda97102b3183223cadc9f1ec9
GIT binary patch
literal 1348
zcmV-K1-tr*P)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h00009a7bBm001mY
z001mY0i`{bsQ>@~0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1ldVMK~#7F?VN#C
z+b|G@k4`{0@CL8}W&=jZ2G9veCxA`>8$c%@OhA~x-hgz1zY>xk6iV*oNV4SI_nuzf
zLne`R(&?nr9g(6ailQirqA2^u0Tm8_L-TR$%aQ-Ie``KG+WWFG<<XS&!NI|blyGdP
zn{sB#gDEc<kNw{}Qx>G~_>RBCZk_%Wohdh_G^G4X;*S3xmnsMkoT|yy@$c!d&#DP-
z)L&tGY#R<~pD-`nnDT^j=rEB=%5H}G7k!}5X5`fLrkonnwWo|^6~K<2zcS_7f38j0
zn9kbx?;Z99w%C2bi773G)6)b($O4?&=@5opoR=7(qy6tKM*L=nxmieX3vL(C3AW=e
zC=w$CVb`bmEX)YAcCJ&rJlu@94QR&|%>lU4Cnegb-_o9ofcBhG%|NdAt;%UB6Xv&$
zA=~`fXX;f&a9e%}$CMc>aADh)R3mVsUqW)Vv!#s^byVjpfIE5QxS@%GTl6`WR2$%R
zzpZa*V&F_<Zat`L7C>hCET|A5Q$_VyL~vfHZFE!^;Ag=D)q>z<7E~B;M;_a#Lk&S@
z-ZfMhaBBfaOOg3T@!@RxRf(sK{$zE<JQjVwl0pC{O#LI3%QI7dM3G4$08US?sa#e}
zeHAmHVd{G-7jAGwUxcH3#OzANJo0_;WR-@ua$dGQW7;0I&$0_3_6x)&cl%SQASHn8
z0w{SiGez4{2%u-`OWsX3Onpz0Ng)7kfz9rG37}!>dx}g70dSj{mdb@29DgV>DFndT
z($RO55#e_6D=Hn~VO(+R0Aw!ImLijC25{@ZWPac+v`qb`nvf^B(4uX;P+@>~q25yh
zQtbnNG4=NBy_i`5=OAjB$C3yj38=`?4cX<fWG>VsGr%9Vv9rLGOPU_rhK6}&MYSQE
z1;Dfyv(6!-p&9}2=pJY(GjR7qB`m2{Add^MGbP&*1>9amGCMoe9;^WuhAJh;^>nG)
zu`Fl~Kz9Ff;06gs9m2z6uW2s$mk$X`?GSPF!HxQmVDJueiyg+eAiWOmo@qmYV0`+6
z4jJ`+ZDFdfX=uo&ruh)2I;6EZ@t-Y)(^KX!RSndBqo)aCgtPmE{R^H_S@(nNteR(l
z_E&fv9bz4&B1u?mHDFvcdkpO2Tu;zNO5iLc>9IwOjvtl&VD{iGn!Q7OwBtj7Q%!f+
zJ!#(q+;K>e9bbIfN(<a+>0sl(Pfhclo}4e*S~So8b6x61U`0_BMM<^@e^@w&e9yI*
zfOg^TeR<7Om+DehQ~`KX@0{Gtx4GHdJ-HLvpT(USp`0YFxwt_ozG8%Xo904?2wuCL
zR1jQZyAm(j=H%L_q#rbrQ38O|^><WuutiP=e?suCd#nJSsO(UqDX^B(Y2g2ad&Ioj
z(a!%&i`2PB5takgG8_Th#x+z4a8{jd^EJYc#?!2c2)kBdpKEC*Ak1r*=Gr}ESr9F=
z^syq$haFcHL7oG2Nizp>*J->#2-)bL&s|Ce<jyq;Sq{*>@wGyB?LJN*B4lyD3)(Y;
z{nB#ZBiRSEOufCMc}shSKc3z>FNQ<_Txx;ew7+nHh%Hku5<tV$-_!oGV(Qtv7%>FE
zCFhtkJyXvbChTFHT}ifnLE$;zQltH&D2k#eilQh=D1QM3>>|n|ro$Bg0000<MNUMn
GLSTZ$(Roh*

literal 0
HcmV?d00001

diff --git a/src/components/headerRefactor/SubHeader.js b/src/components/headerRefactor/SubHeader.js
index 5b0845e7..5ec8ed60 100644
--- a/src/components/headerRefactor/SubHeader.js
+++ b/src/components/headerRefactor/SubHeader.js
@@ -4,6 +4,7 @@ import COLORS from 'theme';
 
 import backArrow from '../../assets/image/backArrow.png';
 import user from '../../assets/image/user.png';
+import searchWhite from 'assets/image/searchWhite.png';
 
 export const SubHeader = ({ text }) => {
   const token = localStorage.getItem('accessToken');
@@ -27,9 +28,12 @@ export const SubHeader = ({ text }) => {
         <GoBack src={backArrow} onClick={handleGoBack} alt="Go Back" />
         <Text>{text}</Text>
       </Container2>
-      <Login src={user} onClick={handleUserClick} alt="User Icon" />
+      <RightContainer>
+        <Search src={searchWhite} />
+        {/* <Login src={user} onClick={handleUserClick} alt="User Icon" /> */}
+      </RightContainer>
     </Container>
-  ); 
+  );
 };
 
 const Container = styled.div`
@@ -67,3 +71,13 @@ const Login = styled.img`
   height: 24px;
   cursor: pointer;
 `;
+
+const RightContainer = styled.div`
+  display: flex;
+  gap: 10px;
+`;
+const Search = styled.img`
+  width: 24px;
+  height: 24px;
+  cursor: pointer;
+`;
diff --git a/src/components/modal/BottomModal.module.css b/src/components/modal/BottomModal.module.css
index 429f4a5d..abb7492c 100644
--- a/src/components/modal/BottomModal.module.css
+++ b/src/components/modal/BottomModal.module.css
@@ -1,13 +1,13 @@
 @media (min-width: 768px) {
   .modal {
-    width: 100vw;
+    max-width: 400px;
     height: 100vh;
     position: absolute;
     top: 0;
     left: 0;
   }
   .container {
-    width: 100vw;
+    width: 400px;
     max-height: 100px;
     background-color: #ffffff;
     border-radius: 16px 16px 0px 0px;
@@ -26,7 +26,7 @@
 
   .backdrop {
     position: fixed;
-    width: 100vw;
+    width: 400px;
     height: 100%;
     z-index: 10;
     background: rgba(0, 0, 0, 0.35);
diff --git a/src/components/studyMyPost/studyMyPost.js b/src/components/studyMyPost/studyMyPost.js
index 92b8cc92..6d9c2760 100644
--- a/src/components/studyMyPost/studyMyPost.js
+++ b/src/components/studyMyPost/studyMyPost.js
@@ -18,8 +18,8 @@ const StudyMyPost = () => {
   const [externals, setExternals] = useState([]);
   const [lectures, setLectures] = useState([]);
   const [isEndBtnClick, setIsEndBtnClick] = useState(false);
-  const [isClickBtn, setIsClickBtn] = useState(false);
   const { state } = useMypostStore();
+  const [clickType, setClickType] = useState(null);
   const {
     isPopupVisible,
     popupMessage,
@@ -29,6 +29,22 @@ const StudyMyPost = () => {
     setPopupTitle,
   } = usePopupStroe();
 
+  //데이터 로드
+  const loadPosts = async () => {
+    try {
+      const fetchedPosts = await fetchMyPost();
+      console.log(fetchedPosts);
+      setExternals(fetchedPosts.external);
+      setLectures(fetchedPosts.lecture);
+    } catch (error) {
+      console.error('Error fetching posts:', error);
+    }
+  };
+  useEffect(() => {
+    loadPosts();
+  }, []);
+
+  //토글 handling
   const togglePopup = ({ message, title }) => {
     setPopupTitle(title);
     setPopupMessage(message);
@@ -38,7 +54,12 @@ const StudyMyPost = () => {
   const closePopup = () => {
     setPopupVisible(false);
     setIsEndBtnClick(false);
+    if (clickType === 'error') {
+      console.log('state:', clickType);
+      loadPosts();
+    }
   };
+
   useEffect(() => {}, [isEndBtnClick]);
 
   useEffect(() => {
@@ -47,21 +68,6 @@ const StudyMyPost = () => {
     setPostType(type || 'lecture');
   }, [state]);
 
-  useEffect(() => {
-    const loadPosts = async () => {
-      try {
-        const fetchedPosts = await fetchMyPost();
-        console.log(fetchedPosts);
-        setExternals(fetchedPosts.external);
-        setLectures(fetchedPosts.lecture);
-      } catch (error) {
-        console.error('Error fetching posts:', error);
-      }
-    };
-
-    loadPosts();
-  }, []);
-
   const updateStudyMatchingStatus = (
     externalIndex,
     applicantIndex,
@@ -70,17 +76,22 @@ const StudyMyPost = () => {
     const updateState = setStateFunction => {
       setStateFunction(prevState => {
         const newState = [...prevState];
+
         console.log(newState[externalIndex].applicants);
 
-        const updatedApplicants = [...newState[externalIndex].applicants]; // applicant 배열의 얕은 복사본 생성
+        const updatedApplicants = [...newState[externalIndex].applicants];
 
         updatedApplicants[applicantIndex] = {
           ...updatedApplicants[applicantIndex],
           studyMatchingStatus: newStatus,
         };
-
+        console.log(newState[externalIndex]);
         newState[externalIndex] = {
           ...newState[externalIndex],
+          participantsCount:
+            newStatus === 'ACCEPT'
+              ? newState[externalIndex].participantsCount + 1
+              : newState[externalIndex].participantsCount,
           applicants: updatedApplicants,
         };
 
@@ -102,6 +113,7 @@ const StudyMyPost = () => {
     nickname,
     value
   ) => {
+    setClickType('error');
     const patchData = {
       studyId: studyId,
       applicantNickname: nickname,
@@ -109,12 +121,30 @@ const StudyMyPost = () => {
     };
     try {
       const response = await applicantSelection(patchData);
-      console.log(index);
+      console.log(response);
+      const accState = value === true ? 'ACCEPT' : 'REJECT';
+      updateStudyMatchingStatus(studyIndex, appIndex, accState);
     } catch (error) {
-      console.log(error);
+      const errClass = error.response.data.data.errorClassName;
+
+      if (errClass === 'INVALID_STUDY_MATHCING_STATUS_UPDATE_CONDITION') {
+        setIsEndBtnClick(true);
+        const popUpData = {
+          title: '',
+          message: '지원을 취소한 지원자입니다.',
+        };
+        togglePopup(popUpData);
+      } else if (errClass === 'STUDY_APPLICANT_CANNOT_BE_ACCEPTED') {
+        setIsEndBtnClick(true);
+        const popUpData = {
+          title: '',
+          message: '모집이 완료 되었습니다.',
+        };
+        togglePopup(popUpData);
+      }
+      console.log(error.response.data.data);
     }
-    const state = value === true ? 'ACCEPT' : 'REJECT';
-    updateStudyMatchingStatus(studyIndex, appIndex, state);
+
     const msg = value === true ? '수락' : '거절';
     toast.info(`${msg}되었습니다`);
   };
@@ -128,6 +158,7 @@ const StudyMyPost = () => {
         title: '스터디 마감 완료',
         message: '수락한 지원자들에겐 오픈채팅방 링크가 전달됩니다.',
       };
+
       togglePopup(popUpData);
     } catch (error) {
       console.log(error);
diff --git a/src/pages/buddy/accept/BuddyAccept.js b/src/pages/buddy/accept/BuddyAccept.js
index da84638d..fc8fbff8 100644
--- a/src/pages/buddy/accept/BuddyAccept.js
+++ b/src/pages/buddy/accept/BuddyAccept.js
@@ -5,6 +5,7 @@ import findBuddy from '../../../assets/image/findBuddy.png';
 
 import style from './BuddyAccept.module.css';
 import { toast } from 'sonner';
+import { SubHeader } from 'components/headerRefactor/SubHeader';
 
 const BuddyAccept = () => {
   const [isAccept, setIsAccept] = useState('');
@@ -108,6 +109,7 @@ const BuddyAccept = () => {
 
   return (
     <div className={style.container}>
+      <SubHeader text="세종버디" />
       <p className={style.title}>버디를 찾았습니다!</p>
       <img className={style.find_buddy} src={findBuddy} alt="findBuddy" />
 
diff --git a/src/pages/buddy/accept/BuddyAccept.module.css b/src/pages/buddy/accept/BuddyAccept.module.css
index 7f40ecab..56ad0efa 100644
--- a/src/pages/buddy/accept/BuddyAccept.module.css
+++ b/src/pages/buddy/accept/BuddyAccept.module.css
@@ -1,8 +1,6 @@
 .container {
-  margin-top: 8vh;
   display: flex;
   flex-direction: column;
-  height: 90%;
   background-color: #fafafa;
   align-items: center;
   justify-content: center;
diff --git a/src/pages/buddy/info/BuddyStart.module.css b/src/pages/buddy/info/BuddyStart.module.css
index 4b36f023..eb550b23 100644
--- a/src/pages/buddy/info/BuddyStart.module.css
+++ b/src/pages/buddy/info/BuddyStart.module.css
@@ -20,6 +20,7 @@
   flex-direction: column;
   align-items: center;
   padding: 12px 16px;
+  margin-top: 40px;
 }
 
 .btn1 {
@@ -28,7 +29,6 @@
   width: 100%;
   height: 56px;
   max-height: 56px;
-  margin: 8px;
   border-radius: 40px;
   background-color: #ff4b4b;
   border: none;
@@ -141,9 +141,12 @@
   font-size: 16px;
   /* font-weight: 600; */
   color: #555555;
+  margin: 0px;
+  margin-top: 10px;
 }
 
 .wrapper {
+  width: 100%;
 }
 .title {
   font-size: 24px;
diff --git a/src/pages/buddy/info/BuddyStart2.js b/src/pages/buddy/info/BuddyStart2.js
index 191db89f..54dafcef 100644
--- a/src/pages/buddy/info/BuddyStart2.js
+++ b/src/pages/buddy/info/BuddyStart2.js
@@ -24,13 +24,15 @@ const BuddyStart2 = () => {
         <div className={style.wrapper}>
           <p className={style.title}>세종버디란?</p>
           <p className={style.text}>세종버디(Buddy)는</p>
-          <p className={style.text}>
+          <p className={style.text} style={{ marginTop: '10px' }}>
             <span className={style.text_red}>맞춤형 캠퍼스 짝꿍</span>을 찾는
             서비스입니다.
           </p>
           <p className={style.text2}>
-            한명의 학우와 한 학기 동안 버디로 매칭 되며, 다음 학기에 새로운
-            버디를 찾을 수 있습니다.
+            한명의 학우와 한 학기 동안 버디로 매칭 되며,
+          </p>
+          <p className={style.text2}>
+            다음 학기에 새로운 버디를 찾을 수 있습니다.
           </p>
         </div>
       </div>
diff --git a/src/pages/buddy/matching/css/B_Container.module.css b/src/pages/buddy/matching/css/B_Container.module.css
index 42a05d24..99b762f2 100644
--- a/src/pages/buddy/matching/css/B_Container.module.css
+++ b/src/pages/buddy/matching/css/B_Container.module.css
@@ -87,7 +87,7 @@ html {
     flex-direction: column;
     align-items: center;
     position: relative;
-    /* margin-top: 40px; */
+    margin-top: 20px;
     overflow-y: scroll;
   }
 
diff --git a/src/pages/buddy/waiting/BuddyWaiting.js b/src/pages/buddy/waiting/BuddyWaiting.js
index 11427054..53bb7ecf 100644
--- a/src/pages/buddy/waiting/BuddyWaiting.js
+++ b/src/pages/buddy/waiting/BuddyWaiting.js
@@ -17,7 +17,7 @@ const BuddyWaiting = () => {
     }
   }, []);
   const moveToMain = () => {
-    navigate('/buddy/accept');
+    navigate('/main');
   };
   const countBuddyHandler = async () => {
     try {
diff --git a/src/pages/honbob/info/HonbobStart.module.css b/src/pages/honbob/info/HonbobStart.module.css
index 25cdaa9c..cd48bfd2 100644
--- a/src/pages/honbob/info/HonbobStart.module.css
+++ b/src/pages/honbob/info/HonbobStart.module.css
@@ -2,32 +2,29 @@
 @media (min-width: 768px) {
   .Container {
     width: 100vw;
-    /* height: 90vh; */
-    display: flex;
-    flex-direction: column;
   }
 
   .InnerContainer {
-    /* width: 450px; */
-    width: 28vw;
     height: 100vh;
-    /* background-color: aliceblue; */
+    width: 400px;
     background-color: transparent;
     overflow: hidden;
+    margin: auto;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
   }
 
   .top {
-    margin-top: 10vh;
-    width: 28vw;
     height: 6vh;
     display: flex;
     flex-direction: row;
-    align-items: center;
-    justify-content: end;
+    width: 100%;
+    margin-top: 30px;
   }
 
   .informBtn {
-    margin-right: 1vw;
+    margin-left: auto;
     border-radius: 24px;
     width: 20vh;
     height: 5vh;
@@ -51,7 +48,6 @@
   }
 
   .middle {
-    width: 28vw;
     height: 75vh;
     margin-top: 3vh;
     background-color: transparent;
diff --git a/src/pages/honbob/matching/js/H_Gender.js b/src/pages/honbob/matching/js/H_Gender.js
index 1ce6c1bb..19fd5cae 100644
--- a/src/pages/honbob/matching/js/H_Gender.js
+++ b/src/pages/honbob/matching/js/H_Gender.js
@@ -38,7 +38,7 @@ const H_Gender = props => {
           className={clickDontCareBtnColor}
           onClick={clickDontCareBtnHandler}
         >
-          이성
+          상관없음
         </button>
       </div>
       {/* <div className={con.fightImg}></div> */}
diff --git a/src/pages/honbob/matching/js/H_Menu.js b/src/pages/honbob/matching/js/H_Menu.js
index 7b4bc6da..ffccbeb7 100644
--- a/src/pages/honbob/matching/js/H_Menu.js
+++ b/src/pages/honbob/matching/js/H_Menu.js
@@ -31,7 +31,7 @@ const H_Menu = props => {
 
   return (
     <div className={con.container}>
-      <p className={con.title}>원하는 축제 액티비티를 선택해주세요!</p>
+      <p className={con.title}>원하는 식사 종류를 선택해주세요!</p>
       <div className={style.menuContainer}>
         {menu.map((val, index) => (
           <button
diff --git a/src/pages/honbob/success/HonbobSuccess.js b/src/pages/honbob/success/HonbobSuccess.js
index 4f549ed2..6be80367 100644
--- a/src/pages/honbob/success/HonbobSuccess.js
+++ b/src/pages/honbob/success/HonbobSuccess.js
@@ -53,7 +53,7 @@ const HonbobSuccess = () => {
 
   return (
     <div className={style.container}>
-      <div className={style.Text}>동지 매칭 성공!</div>
+      <div className={style.Text}>밥짝꿍 매칭 성공!</div>
       <div className={style.imgBox} />
       <div className={style.informBox}>
         <div className={style.innerBox}>
diff --git a/src/pages/honbob/waiting/HonbobWaiting.js b/src/pages/honbob/waiting/HonbobWaiting.js
index 92e25385..478bf766 100644
--- a/src/pages/honbob/waiting/HonbobWaiting.js
+++ b/src/pages/honbob/waiting/HonbobWaiting.js
@@ -99,7 +99,7 @@ const HonbobWaiting = () => {
       <SubHeader text="혼밥탈출" />
       <div className={style.TextBox}>
         <img src={honbobWaitingLogo} className={style.honbobWaitingImg} />
-        <p className={style.Text1}>밥짝꿍 동지 찾는 중{dots}</p>
+        <p className={style.Text1}>밥짝꿍 찾는 중{dots}</p>
         <p className={style.Text2}>
           <span className={style.Text2_span1}>*</span>
           <span className={style.Text2_span2}>
diff --git a/src/pages/login/signUp/Agree.js b/src/pages/login/signUp/Agree.js
index 7c318d93..8d59cfeb 100644
--- a/src/pages/login/signUp/Agree.js
+++ b/src/pages/login/signUp/Agree.js
@@ -97,7 +97,7 @@ const Agree = () => {
           <div className={box.flex}>
             <div className={box.left}>
               <p className={box.essential}>[필수]</p>
-              <Link to={'/personalinfo2'} className={box.link} target="_blank">
+              <Link to={'/personalinfo'} className={box.link} target="_blank">
                 개인정보 수집 동의 &gt;
               </Link>
             </div>
@@ -113,7 +113,7 @@ const Agree = () => {
           <div className={box.flex}>
             <div className={box.left}>
               <p className={box.essential}>[필수]</p>
-              <Link to={'/useinfo'} className={box.link} target="_blank">
+              <Link to={'/personalinfo2'} className={box.link} target="_blank">
                 이용약관 동의 &gt;
               </Link>
             </div>
diff --git a/src/pages/myPage/modify/Modify.module.css b/src/pages/myPage/modify/Modify.module.css
index f5118878..dde6b53b 100644
--- a/src/pages/myPage/modify/Modify.module.css
+++ b/src/pages/myPage/modify/Modify.module.css
@@ -170,7 +170,6 @@
 
   .ContainerBox {
     width: 100vw;
-    /* margin-top: 7.3vh; */
     padding: 1vw 2vw 0 2vw;
     background-color: #fbe4e4;
     border: 1px solid #e5e5e5;
@@ -178,7 +177,6 @@
     flex-direction: column;
     justify-content: flex-start;
     align-items: center;
-    height: 100vh;
   }
 
   .container {
diff --git a/src/pages/myPage/mypage/AppliedStudy.js b/src/pages/myPage/mypage/AppliedStudy.js
index 9707c475..5c16f714 100644
--- a/src/pages/myPage/mypage/AppliedStudy.js
+++ b/src/pages/myPage/mypage/AppliedStudy.js
@@ -1,5 +1,5 @@
 import React, { useEffect, useState, useRef } from 'react';
-import { toggleScrap } from '../../study/studyPostDetail/api';
+import { addScrap, deleteScrap } from '../../study/studyPostDetail/api';
 import { fetchAppliedStudies } from './api';
 import styled from 'styled-components';
 import COLORS from '../../../theme';
@@ -45,21 +45,44 @@ const AppliedStudy = () => {
 
   const handleScrapToggle = async (studyId, currentStatus, index) => {
     try {
-      const response = await toggleScrap(studyId, currentStatus);
-      if (response.status === 200) {
-        const newScrappedStatus = !currentStatus;
-        const updatedStudies = [...appliedStudies];
-        updatedStudies[index] = {
-          ...updatedStudies[index],
-          isScrapped: newScrappedStatus,
-          scrapCount: newScrappedStatus
-            ? updatedStudies[index].scrapCount + 1
-            : updatedStudies[index].scrapCount - 1,
-        };
-        setAppliedStudies(updatedStudies);
-        localStorage.setItem(`isScrapped_${studyId}`, newScrappedStatus);
+      if (currentStatus) {
+        // 스크랩 삭제 로직
+        const scrapId = localStorage.getItem(`scrapId_${studyId}`);
+        if (!scrapId) {
+          throw new Error('스크랩 ID가 없음!');
+        }
+
+        const response = await deleteScrap(scrapId);
+        if (response.status === 200) {
+          const updatedStudies = [...appliedStudies];
+          updatedStudies[index] = {
+            ...updatedStudies[index],
+            isScrapped: false,
+            scrapCount: updatedStudies[index].scrapCount - 1,
+          };
+          setAppliedStudies(updatedStudies);
+          localStorage.removeItem(`isScrapped_${studyId}`);
+          localStorage.removeItem(`scrapId_${studyId}`);
+        } else {
+          console.error('Failed to delete scrap:', response);
+        }
       } else {
-        console.error('Failed to toggle scrap status:', response);
+        // 스크랩 추가 로직
+        const response = await addScrap(studyId);
+        if (response.status === 200) {
+          const newScrapId = response.data.scrapId; // scrapId를 서버 응답에서 받아옴
+          const updatedStudies = [...appliedStudies];
+          updatedStudies[index] = {
+            ...updatedStudies[index],
+            isScrapped: true,
+            scrapCount: updatedStudies[index].scrapCount + 1,
+          };
+          setAppliedStudies(updatedStudies);
+          localStorage.setItem(`isScrapped_${studyId}`, 'true');
+          localStorage.setItem(`scrapId_${studyId}`, newScrapId);
+        } else {
+          console.error('Failed to add scrap:', response);
+        }
       }
     } catch (error) {
       console.error('Error toggling scrap status:', error);
diff --git a/src/pages/myPage/mypage/MyPage.module.css b/src/pages/myPage/mypage/MyPage.module.css
index 75dbb9b2..77b163c5 100644
--- a/src/pages/myPage/mypage/MyPage.module.css
+++ b/src/pages/myPage/mypage/MyPage.module.css
@@ -1,7 +1,6 @@
 @media (min-width: 768px) {
   .Container {
     width: 100vw;
-    height: 112vh;
     background-color: #fbe4e4;
     display: flex;
     flex-direction: column;
@@ -9,17 +8,13 @@
   }
 
   .container {
-    width: 28vw;
-    /* background-color: #FBE4E4;
-    border: 1px solid #e5e5e5; */
+    width: 400px;
     display: flex;
     flex-direction: column;
     align-items: center;
   }
 
   .outerContainer {
-    width: 28vw;
-    margin-top: 7.7vh;
     padding: 1vw 2vw 0 2vw;
     background-color: #fbe4e4;
     border: 1px solid #e5e5e5;
@@ -31,12 +26,10 @@
 
   .container1 {
     background-color: #ffffff;
-    width: 28vw;
     display: flex;
     flex-direction: column;
     align-items: center;
     justify-content: center;
-    margin-top: 95%;
   }
 
   .informTitleBox {
@@ -87,7 +80,7 @@
     flex-direction: column;
     align-items: self-start;
     /* justify-content: left; */
-    width: 12vw; /* 너비를 넓혔습니다 */
+    width: 80%; /* 너비를 넓혔습니다 */
     gap: 1vh;
   }
 
@@ -96,11 +89,11 @@
     font-size: 2vh;
     color: #ff4b4b;
     height: 2vh;
-    width: 7vw;
+    width: 100%;
   }
 
   .checkWord {
-    width: 12vw; /* 너비를 넓혔습니다 */
+    width: 100%;
     text-align: left;
   }
 
diff --git a/src/pages/study/studyList/Filter_Field.js b/src/pages/study/studyList/Filter_Field.js
index 59676eb5..94d6d2ae 100644
--- a/src/pages/study/studyList/Filter_Field.js
+++ b/src/pages/study/studyList/Filter_Field.js
@@ -122,28 +122,22 @@ const Filter_Field = ({ deleteHandler }) => {
       const filterValues = { category, member, recruiting };
       const data = await searchHandler(filterValues);
       setPosts(data[0].data);
-
     } catch (error) {
       console.error('Error during submit:', error);
     }
   };
-
+  const searchText = () => {};
   return (
     <div className={style.container}>
       <header className={style.header}>
         {selectingState > 0 ? (
-          <img
-            className={style.backImg}
-            src={back}
-            alt="back"
-            onClick={clickBack}
-          />
+          <img className={style.backImg} src={back} alt="back" />
         ) : null}
         <span>학교수업 스터디</span>
       </header>
       <div className={style.search_container}>
         <div className={style.search_wrapper}>
-          <img src={search} alt="search" />
+          <img src={search} alt="search" onClick={searchText} />
           <input
             className={style.search_input}
             type="text"
diff --git a/src/pages/study/studyList/StudyList.js b/src/pages/study/studyList/StudyList.js
index 81905485..c86bb1c1 100644
--- a/src/pages/study/studyList/StudyList.js
+++ b/src/pages/study/studyList/StudyList.js
@@ -1,6 +1,7 @@
 import { useEffect, useState, useRef } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { fetchPosts } from './api';
+
 import StudyListPost from './StudyListPost';
 import BottomModal from '../../../components/modal/BottomModal';
 import Filter_now from './Filter_now';
diff --git a/src/pages/study/studyList/StudyListPost.js b/src/pages/study/studyList/StudyListPost.js
index e7474151..f4a10831 100644
--- a/src/pages/study/studyList/StudyListPost.js
+++ b/src/pages/study/studyList/StudyListPost.js
@@ -15,6 +15,7 @@ const StudyListPost = ({ post }) => {
     tags,
     totalRecruitmentCount,
     participantCount,
+    recruitmentStatus
   } = post;
   const isScrapped = localStorage.getItem(`isScrapped_${id}`) === 'true'; // 스크랩 상태 확인
 
@@ -57,9 +58,13 @@ const StudyListPost = ({ post }) => {
           <Title>{title}</Title>
           {hasImage && <ImageIcon src={picture} alt="hasImage" />}
         </PostMiddle>
+        {recruitmentStatus === '모집 중'? 
         <Count>
           {participantCount} / {totalRecruitmentCount}
         </Count>
+        :
+        <Finish>모집완료</Finish>
+        }
       </div>
 
       <PostBottom>
@@ -141,6 +146,14 @@ const Count = styled.div`
   font-size: 16px;
   margin: 0px;
 `;
+const Finish = styled.div`
+  display: flex;
+  align-items: center;
+  color: ${COLORS.font4};
+  font-weight: 600;
+  font-size: 16px;
+  margin: 0px;
+`;
 
 const Title = styled.p`
   font-weight: 600;
diff --git a/src/pages/study/studyList/api.js b/src/pages/study/studyList/api.js
index d7140c23..c245e1a5 100644
--- a/src/pages/study/studyList/api.js
+++ b/src/pages/study/studyList/api.js
@@ -11,7 +11,7 @@ export const fetchPosts = async () => {
   }
 
   const response = await axios.get(
-    'https://www.api-sejongpeer.shop/api/v1/study/post',
+    `${process.env.REACT_APP_BACK_SERVER}/study/post`,
     {
       params: {
         studyType: studyType.toUpperCase(), // 'LECTURE' 또는 'EXTERNAL_ACTIVITY'
@@ -25,7 +25,7 @@ export const fetchPosts = async () => {
       withCredentials: true,
     }
   );
-  //console.log(response.data.data);
+  console.log(response.data.data);
   //console.log(response.data.data.content[0].id);
   return response.data.data.content;
 };
@@ -51,11 +51,11 @@ export const searchHandler = async ({ category, member, recruiting }) => {
   const studyType = localStorage.getItem('studyType');
   const studyTypeUpper = studyType ? studyType.toUpperCase() : null;
 
-  let page = 1;  // 시작 페이지 번호
-  let allData = [];  // 모든 데이터를 저장할 배열
-  console.log("인원 수 " + member);
-  console.log("모집 중 " + recruiting);
-  console.log("카테고리 " + category);
+  let page = 1; // 시작 페이지 번호
+  let allData = []; // 모든 데이터를 저장할 배열
+  console.log('인원 수 ' + member);
+  console.log('모집 중 ' + recruiting);
+  console.log('카테고리 ' + category);
 
   const filterData = {
     studyType: studyTypeUpper,
@@ -66,36 +66,35 @@ export const searchHandler = async ({ category, member, recruiting }) => {
     recruitmentPersonnel: member === 0 ? null : member,
   };
 
-  console.log(filterData)
+  console.log(filterData);
 
   try {
     // while(true) {
-      const response = await axios.get(
-        `${process.env.REACT_APP_BACK_SERVER}/study/post/search`,
-        {
-          params: filterData,
-          headers: getAuthHeaders(),
-        }
-      );
-      const data = response.data;
-      console.log(data);
-  
-      // 응답 데이터가 빈 배열이면, 더 이상 데이터가 없다는 뜻이므로 루프를 종료합니다.
-      // if (data.data.length === 0) {
-      //   break;
-      // }
-  
-      // 받아온 데이터를 allData 배열에 추가합니다.
-      allData = allData.concat(data);
-  
-      // 페이지 번호를 증가시킵니다.
-      page += 1;
+    const response = await axios.get(
+      `${process.env.REACT_APP_BACK_SERVER}/study/post/search`,
+      {
+        params: filterData,
+        headers: getAuthHeaders(),
+      }
+    );
+    const data = response.data;
+    console.log(data);
+
+    // 응답 데이터가 빈 배열이면, 더 이상 데이터가 없다는 뜻이므로 루프를 종료합니다.
+    // if (data.data.length === 0) {
+    //   break;
     // }
-    console.log('All data fetched:', allData);
-    return allData;  // 모든 페이지의 데이터를 반환합니다.
 
+    // 받아온 데이터를 allData 배열에 추가합니다.
+    allData = allData.concat(data);
+
+    // 페이지 번호를 증가시킵니다.
+    page += 1;
+    // }
+    console.log('All data fetched:', allData);
+    return allData; // 모든 페이지의 데이터를 반환합니다.
   } catch (error) {
     console.error('Error during search:', error);
     throw error;
   }
-};
\ No newline at end of file
+};
diff --git a/src/pages/study/studyPostDetail/StudyPostDetail.js b/src/pages/study/studyPostDetail/StudyPostDetail.js
index 0e91a338..66893675 100644
--- a/src/pages/study/studyPostDetail/StudyPostDetail.js
+++ b/src/pages/study/studyPostDetail/StudyPostDetail.js
@@ -17,9 +17,9 @@ import {
   fetchStudyData,
   applyForStudy,
   cancelStudyApplication,
-  toggleScrap,
-  fetchScrapCount,
   deletePostHandler,
+  addScrap,
+  deleteScrap, // 추가: 스크랩 삭제 함수 가져오기
 } from './api';
 
 const StudyListPostDetail = () => {
@@ -40,7 +40,6 @@ const StudyListPostDetail = () => {
     popupTitle,
     setPopupVisible,
     setPopupMessage,
-    setPopupTitle,
   } = usePopupStroe();
 
   const { studyId } = useParams();
@@ -74,21 +73,13 @@ const StudyListPostDetail = () => {
     const fetchData = async () => {
       try {
         const data = await fetchStudyData(studyId);
-        setStudyData(data);
+        console.log(data.data.isScraped);
+        setStudyData(data.data);
 
-        // 스크랩 여부 로컬 스토리지에서 불러오기 또는 서버 데이터 사용
-        const scrapped = localStorage.getItem(`isScrapped_${studyId}`);
-        setScrapped(scrapped ? JSON.parse(scrapped) : data.data.isScrapped);
-
-        // 지원 여부 로컬 스토리지에서 불러오기 또는 서버 데이터 사용
-        const appliedStatus = localStorage.getItem(`isApplied_${studyId}`);
-        setApplied(
-          appliedStatus ? JSON.parse(appliedStatus) : data.data.isApplied
-        );
-
-        // 스크랩 카운트 설정
-        const scrapData = await fetchScrapCount(studyId);
-        setScrapCount(scrapData.data);
+        // 서버에서 지원 여부 상태 가져오기
+        setApplied(data.data.isApplied); // 서버 응답의 isApplied 상태로 설정
+        setScrapped(data.data.isScraped); // 서버에서 받은 isScrapped 상태로 설정
+        setScrapCount(data.data.scrapCount); // 서버에서 받은 scrapCount 설정
       } catch (error) {
         toast.error('스터디 데이터를 가져오는데 실패했습니다!', error);
       }
@@ -99,7 +90,7 @@ const StudyListPostDetail = () => {
 
   useEffect(() => {
     const getNick = localStorage.getItem('nickname');
-    if (studyData && getNick === studyData.data.writerNickname) {
+    if (studyData && getNick === studyData.writerNickname) {
       setIsWriter(true);
     } else {
       setIsWriter(false);
@@ -121,8 +112,7 @@ const StudyListPostDetail = () => {
         const response = await cancelStudyApplication(studyId);
         if (response.status === 200) {
           toast.success('지원 취소 완료');
-          setApplied(false);
-          localStorage.setItem(`isApplied_${studyId}`, JSON.stringify(false));
+          setApplied(false); // 지원 취소 응답에 따라 상태 업데이트
         } else {
           console.error('Failed to cancel study application:', response);
         }
@@ -130,8 +120,7 @@ const StudyListPostDetail = () => {
         const response = await applyForStudy(studyId);
         if (response.status === 201) {
           toast.success('지원 완료!');
-          setApplied(true);
-          localStorage.setItem(`isApplied_${studyId}`, JSON.stringify(true));
+          setApplied(true); // 지원 완료 응답에 따라 상태 업데이트
         } else {
           console.error('Failed to apply for study:', response);
         }
@@ -139,8 +128,7 @@ const StudyListPostDetail = () => {
     } catch (error) {
       if (error.response && error.response.status === 409) {
         toast.error('이미 신청한 스터디입니다!');
-        setApplied(true);
-        localStorage.setItem(`isApplied_${studyId}`, JSON.stringify(true));
+        setApplied(true); // 이미 신청한 상태로 설정
       } else if (error.response.status === 403) {
         toast.error('1시간 패널티 부과 중입니다!');
       } else {
@@ -149,35 +137,33 @@ const StudyListPostDetail = () => {
     }
   };
 
-  const toggleScrapHandler = async () => {
+  const handleScrapToggle = async () => {
     try {
-      const response = await toggleScrap(studyId, isScrapped);
-      if (response.status === 200) {
-        const newScrappedStatus = !isScrapped;
-        setScrapped(newScrappedStatus);
-        localStorage.setItem(
-          `isScrapped_${studyId}`,
-          JSON.stringify(newScrappedStatus)
-        );
-
-        if (newScrappedStatus) {
-          toast.success('스크랩에 추가합니다!');
-          localStorage.setItem(`scrapId_${studyId}`, response.data.data);
-          setScrapCount(scrapCount + 1);
-        } else {
-          toast.error('스크랩에서 제거합니다!');
-          localStorage.removeItem(`scrapId_${studyId}`);
+      if (isScrapped) {
+        // 스크랩 삭제 로직
+        const response = await deleteScrap(studyId);
+        if (response.status === 200) {
+          toast.success('스크랩에서 제거되었습니다!');
+          setScrapped(false); // 스크랩 삭제 후 상태 업데이트
           setScrapCount(scrapCount - 1);
+        } else {
+          toast.error('스크랩에 실패했습니다!', response);
         }
       } else {
-        console.error('Failed to toggle scrap:', response);
+        // 스크랩 추가 로직
+        const response = await addScrap(studyId);
+        if (response.data.status === 201) {
+          const newScrapId = response.data.data.scrapId; // scrapId를 서버 응답에서 받아옴
+          toast.success('스크랩에 추가되었습니다!');
+          setScrapped(true); // 스크랩 추가 후 상태 업데이트
+          setScrapCount(scrapCount + 1);
+        } else {
+          toast.error('스크랩에 실패했습니다!', response);
+        }
       }
     } catch (error) {
-      if (error.response && error.response.status === 403) {
-        toast.error('권한이 없음.');
-      } else {
-        console.error('Failed to toggle scrap:', error);
-      }
+      console.error(error);
+      toast.error('스크랩 처리 중 오류가 발생했습니다.');
     }
   };
 
@@ -190,7 +176,7 @@ const StudyListPostDetail = () => {
       <SubHeader text="세종스터디" />
       <Wrapper>
         <Title>
-          {studyData.data.title}
+          {studyData.title}
           {isWriter && (
             <img
               src={more}
@@ -236,44 +222,41 @@ const StudyListPostDetail = () => {
           </MoreModal>
         )}
         <FlexContainer>
-          <Title2>{studyData.data.writerMajor}</Title2>
-          <Nickname>{studyData.data.writerNickname}</Nickname>
+          <Title2>{studyData.writerMajor}</Title2>
+          <Nickname>{studyData.writerNickname}</Nickname>
         </FlexContainer>
         <FlexContainer>
           <ApplicationPeriod>지원기간</ApplicationPeriod>
           <ApplicationPeriod2>
-            {studyData.data.recruitmentStart}
+            {studyData.recruitmentStart}
           </ApplicationPeriod2>{' '}
-          ~
-          <ApplicationPeriod3>
-            {studyData.data.recruitmentEnd}
-          </ApplicationPeriod3>
+          ~<ApplicationPeriod3>{studyData.recruitmentEnd}</ApplicationPeriod3>
         </FlexContainer>
         <FlexContainer>
           <Title2>방식</Title2>
           <StudyMethod>
-            {studyData.data.studyFrequency} • {studyData.data.studyMethod}
+            {studyData.studyFrequency} • {studyData.studyMethod}
           </StudyMethod>
         </FlexContainer>
         <FlexContainer>
           <Title2>문의</Title2>
-          <StudyMethod>{studyData.data.questionKakaoLink}</StudyMethod>
+          <StudyMethod>{studyData.questionKakaoLink}</StudyMethod>
         </FlexContainer>
         <FlexContainer2>
           <Tag>
-            <TagText>{studyData.data.categoryName}</TagText>
+            <TagText>{studyData.categoryName}</TagText>
           </Tag>
-          {studyData.data.tags.map((tag, index) => (
+          {studyData.tags.map((tag, index) => (
             <Tag2 key={index}>
               <TagText2>{tag}</TagText2>
             </Tag2>
           ))}
         </FlexContainer2>
         <Line />
-        <Content>{studyData.data.content}</Content>
+        <Content>{studyData.content}</Content>
         <TagContainer>
-          {studyData.data.imgUrlList &&
-            studyData.data.imgUrlList.map(image => (
+          {studyData.imgUrlList &&
+            studyData.imgUrlList.map(image => (
               <img
                 style={{ width: '100px', height: '100px', borderRadius: '8px' }}
                 key={image.imageId}
@@ -302,22 +285,23 @@ const StudyListPostDetail = () => {
         </Modal>
 
         <CommentContainer>
-          <ScrapButton onClick={toggleScrapHandler}>
+          <ScrapButton onClick={handleScrapToggle}>
             <ScrapImage src={isScrapped ? filledHeart : heart} alt="heart" />
             <ScrapCount>{scrapCount}</ScrapCount>
           </ScrapButton>
           {isWriter ? (
             <ApplyButton onClick={() => navigate('/mypost')}>
-              {`신청현황 보기 (${studyData.data.participantCount} / ${studyData.data.totalRecruitmentCount})`}
+              {`신청현황 보기 (${studyData.participantCount} / ${studyData.totalRecruitmentCount})`}
             </ApplyButton>
           ) : (
             <ApplyButton onClick={applyForStudyHandler}>
               {isApplied
                 ? '지원취소'
-                : `지원하기 (${studyData.data.participantCount} / ${studyData.data.totalRecruitmentCount})`}
+                : `지원하기 (${studyData.participantCount} / ${studyData.totalRecruitmentCount})`}
             </ApplyButton>
           )}
         </CommentContainer>
+
         {isPopupVisible && (
           <Popup
             title={popupTitle}
@@ -447,7 +431,6 @@ const Content = styled.div`
   line-height: 24px;
   letter-spacing: -0.333px;
   text-align: left;
-  word-break: break-all;
 `;
 
 const TagContainer = styled.div`
diff --git a/src/pages/study/studyPostDetail/api.js b/src/pages/study/studyPostDetail/api.js
index 144f28fb..786e722f 100644
--- a/src/pages/study/studyPostDetail/api.js
+++ b/src/pages/study/studyPostDetail/api.js
@@ -7,7 +7,6 @@ const getAuthHeaders = () => {
   const refreshToken = localStorage.getItem('refreshToken');
 
   if (!accessToken || !refreshToken) {
-    toast.error('재로그인 해야합니다!');
     toast.error('재로그인 해야합니다!');
     throw new Error('토큰이 없음!');
   }
@@ -26,6 +25,7 @@ export const fetchStudyData = async studyId => {
       headers: getAuthHeaders(),
     }
   );
+  console.log(response.data);
   return response.data;
 };
 
@@ -50,43 +50,30 @@ export const cancelStudyApplication = async studyId => {
   return response;
 };
 
-export const toggleScrap = async (studyId, isScrapped) => {
-  const scrapId = localStorage.getItem(`scrapId_${studyId}`);
-
-  if (isScrapped) {
-    if (!scrapId) {
-      throw new Error('스크랩 ID가 없음!');
+// 스터디 스크랩 추가 함수
+export const addScrap = async studyId => {
+  const response = await axios.post(
+    `${process.env.REACT_APP_BACK_SERVER}/scraps/study/${studyId}`,
+    {},
+    {
+      headers: getAuthHeaders(),
     }
-    const response = await axios.delete(
-      `${process.env.REACT_APP_BACK_SERVER}/scraps/${scrapId}`,
-      {
-        headers: getAuthHeaders(),
-      }
-    );
-    return response;
-  } else {
-    const response = await axios.post(
-      `${process.env.REACT_APP_BACK_SERVER}/scraps/study/${studyId}`,
-      {},
-      {
-        headers: getAuthHeaders(),
-      }
-    );
-    return response;
-  }
+  );
+  return response;
 };
 
-export const fetchScrapCount = async studyId => {
-  const response = await axios.get(
-    `${process.env.REACT_APP_BACK_SERVER}/scraps/study/${studyId}`,
+// 스터디 스크랩 삭제 함수
+export const deleteScrap = async scrapId => {
+  const response = await axios.delete(
+    `${process.env.REACT_APP_BACK_SERVER}/scraps/${scrapId}`,
     {
       headers: getAuthHeaders(),
     }
   );
-  return response.data;
+  return response;
 };
 
-//게시글 삭제 함수
+// 게시글 삭제 함수
 // 단건 게시물 별 스크랩 수 조회
 export const deletePostHandler = async studyId => {
   const accessToken = localStorage.getItem('accessToken');
diff --git a/src/pages/study/studyPostWrite/StudyPostWrite.js b/src/pages/study/studyPostWrite/StudyPostWrite.js
index 00409c9a..44da0dff 100644
--- a/src/pages/study/studyPostWrite/StudyPostWrite.js
+++ b/src/pages/study/studyPostWrite/StudyPostWrite.js
@@ -75,19 +75,19 @@ const StudyPostWrite = props => {
   } = usePopupStroe();
   const studyType = localStorage.getItem('studyType');
   const { setTableInfos, setFilteredInfos, setShowData } = useTimeTableStore();
-  console.log(
-    title,
-    category,
-    startDate,
-    endDate,
-    memberNum,
-    selectedWay,
-    selectedFrequency,
-    questionLink,
-    content,
-    studyLink,
-    tags
-  );
+  // console.log(
+  //   title,
+  //   category,
+  //   startDate,
+  //   endDate,
+  //   memberNum,
+  //   selectedWay,
+  //   selectedFrequency,
+  //   questionLink,
+  //   content,
+  //   studyLink,
+  //   tags
+  // );
   // 게시글 초기화
   const reset = usePostStore(state => state.reset);
   const resetCategory = useTimeTableStore(state => state.reset);
@@ -253,14 +253,11 @@ const StudyPostWrite = props => {
     }
 
     if (imgFiles.length > 0) {
-      console.log('11111111111111111111111111111111');
-      try {
-        await imgUpload(studyId);
-        console.log(await imgUpload(studyId));
-      } catch (err) {
-        togglePopup(`이미지 용량 혹은 형식을 확인하세요`);
-        return;
-      }
+        const result = await imgUpload(props.studyId);
+        if (result === 'imgError') {
+          togglePopup(`이미지 용량 혹은 형식을 확인하세요`);
+          return;
+        }
     }
     const formStartDate = format(startDate, 'yyyy-MM-dd HH:mm:ss');
     const formEndDate = format(endDate, 'yyyy-MM-dd HH:mm:ss');
diff --git a/src/pages/study/studyPostWrite/studyPostField/StudyPostField.js b/src/pages/study/studyPostWrite/studyPostField/StudyPostField.js
index 664f9c1f..eab7185a 100644
--- a/src/pages/study/studyPostWrite/studyPostField/StudyPostField.js
+++ b/src/pages/study/studyPostWrite/studyPostField/StudyPostField.js
@@ -1,4 +1,4 @@
-import { useState, useEffect, useContext } from 'react';
+import { useState, useEffect, useContext, useRef } from 'react';
 import style from './StudyPostField.module.css';
 import search from '../../../../assets/image/search_gray.png';
 
@@ -8,6 +8,7 @@ import usePostStore from '../usePostStore';
 import { MyContext } from '../../../../App';
 
 import back from '../../../../assets/image/back_black.png';
+import { type } from '@testing-library/user-event/dist/type';
 const StudyPostField = () => {
   const {
     tableInfos,
@@ -21,6 +22,7 @@ const StudyPostField = () => {
   const [selectingState, setSelectingState] = useState(0); //0->단과대,1->학과,2->과목이 띄워짐
   const [college, setCollege] = useState(null);
   const [department, setDepartment] = useState(null);
+  const [isSearch, setIsSearch] = useState(false);
 
   //모달 닫기
   const { setModalOpen } = useContext(MyContext);
@@ -63,15 +65,23 @@ const StudyPostField = () => {
       });
       setFilteredInfos(newTableInfo);
       setShowData(
-        Array.from(
-          new Set(newTableInfo.map(row => [row[3], row[4]]).filter(Boolean))
+        Array.from(new Set(newTableInfo.map(row => [row[3], row[4]]))).filter(
+          Boolean
         )
       );
+
       setDepartment(item);
       setSelectingState(s => s + 1);
     } else if (state === 2) {
       const newTableInfo = tableInfos.filter(row => {
         if (
+          college === null &&
+          department === null &&
+          row[3] === item[0] &&
+          row[4] === item[1]
+        ) {
+          return row;
+        } else if (
           row[1] === college &&
           row[2] === department &&
           row[3] === item[0] &&
@@ -98,9 +108,9 @@ const StudyPostField = () => {
     }
   };
 
-  useEffect(() => {
-    console.log(selectingState);
-  }, [selectingState]);
+  // useEffect(() => {
+  //   console.log(selectingState);
+  // }, [selectingState]);
 
   const clickBack = () => {
     //다음값 데이터 초기화
@@ -115,6 +125,46 @@ const StudyPostField = () => {
 
     //이전 단계로 돌아가기
     setSelectingState(s => s - 1);
+    if (isSearch) {
+      filteringBefore(0);
+      console.log('selectingState:', selectingState);
+      setSelectingState(0);
+    }
+  };
+
+  const inputRef = useRef(null);
+
+  const handleSearchClick = () => {
+    if (inputRef.current) {
+      setCollege(null);
+      setDepartment(null);
+      const item = inputRef.current.value + '';
+      if (item) {
+        const newTableInfo = tableInfos.filter(row => {
+          return (
+            (row[3] && row[3].includes(item)) ||
+            (row[4] && row[4].includes(item))
+          );
+        });
+        setFilteredInfos(newTableInfo);
+        setShowData(
+          Array.from(
+            new Set(newTableInfo.map(row => [row[3], row[4]]).filter(Boolean))
+          )
+        );
+
+        const filteredArray = Array.from(
+          new Set(
+            newTableInfo
+              .map(row => [row[3], row[4]])
+              .filter(([value1, value2]) => value1 !== '' && value2 !== '')
+          )
+        );
+
+        setSelectingState(2);
+        setIsSearch(true);
+      }
+    }
   };
   return (
     <div className={style.container}>
@@ -131,11 +181,12 @@ const StudyPostField = () => {
       </header>
       <div className={style.search_container}>
         <div className={style.search_wrapper}>
-          <img src={search} alt="search" />
+          <img src={search} alt="search" onClick={handleSearchClick} />
           <input
             className={style.search_input}
             type="text"
             placeholder="검색어 입력 (과목명 또는 교수명)"
+            ref={inputRef}
           />
         </div>
       </div>

From a26e1a1af834ace5cf94e4c20b899bc0cec11177 Mon Sep 17 00:00:00 2001
From: Youjiiin <yujinjang24@gmail.com>
Date: Mon, 2 Sep 2024 23:21:59 +0900
Subject: [PATCH 4/6] =?UTF-8?q?feat:=20[54]=20=EB=AA=A8=EC=A7=91=EC=99=84?=
 =?UTF-8?q?=EB=A3=8C=20=EC=8B=9C=20=EA=B2=8C=EC=8B=9C=EA=B8=80=20=EB=8B=A8?=
 =?UTF-8?q?=EA=B1=B4=EC=A1=B0=ED=9A=8C=20=EB=B2=84=ED=8A=BC=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD=20/=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=97=85?=
 =?UTF-8?q?=EB=A1=9C=EB=93=9C=20=EC=98=A4=EB=A5=98=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../studyRequirement/RecruitDate.js           |  7 ----
 src/pages/study/studyList/StudyListPost.js    |  5 ++-
 .../study/studyPostDetail/StudyPostDetail.js  | 38 +++++++++++++++++--
 .../study/studyPostWrite/StudyPostWrite.js    | 16 ++++----
 4 files changed, 47 insertions(+), 19 deletions(-)

diff --git a/src/components/studyPostWrite/studyRequirement/RecruitDate.js b/src/components/studyPostWrite/studyRequirement/RecruitDate.js
index e52a2583..a57938fe 100644
--- a/src/components/studyPostWrite/studyRequirement/RecruitDate.js
+++ b/src/components/studyPostWrite/studyRequirement/RecruitDate.js
@@ -23,13 +23,6 @@ const ReucruitDate = ({ handleDatePickerFocus }) => {
     // console.log(start, ',', end);
   };
 
-  useEffect(() => {
-    console.log('Start: ', startDate);
-  }, [startDate]);
-  useEffect(() => {
-    console.log('EndDate: ', endDate);
-  }, [endDate]);
-
   const [dateRange, setDateRange] = useState({
     startDate: startDate,
     endDate: endDate,
diff --git a/src/pages/study/studyList/StudyListPost.js b/src/pages/study/studyList/StudyListPost.js
index f4a10831..19b3f664 100644
--- a/src/pages/study/studyList/StudyListPost.js
+++ b/src/pages/study/studyList/StudyListPost.js
@@ -15,7 +15,8 @@ const StudyListPost = ({ post }) => {
     tags,
     totalRecruitmentCount,
     participantCount,
-    recruitmentStatus
+    recruitmentStatus,
+    recruitmentEndAt
   } = post;
   const isScrapped = localStorage.getItem(`isScrapped_${id}`) === 'true'; // 스크랩 상태 확인
 
@@ -44,7 +45,7 @@ const StudyListPost = ({ post }) => {
             <TagText1 key={index}>{tag}</TagText1>
           ))}
         </PostTop>
-        <DateText>~{formatDate(createdAt)}</DateText>
+        <DateText>~{formatDate(recruitmentEndAt)}</DateText>
       </div>
       <div
         style={{
diff --git a/src/pages/study/studyPostDetail/StudyPostDetail.js b/src/pages/study/studyPostDetail/StudyPostDetail.js
index 66893675..66d91694 100644
--- a/src/pages/study/studyPostDetail/StudyPostDetail.js
+++ b/src/pages/study/studyPostDetail/StudyPostDetail.js
@@ -49,6 +49,16 @@ const StudyListPostDetail = () => {
   const [selectedImage, setSelectedImage] = useState(null);
   const [isWriter, setIsWriter] = useState(false);
   const [ismodalOpen, setIsmodalOpen] = useState(false);
+  const [isFinished, setIsFinished] = useState(false);
+
+  useEffect(() => {
+    if (studyData) {
+      console.log(studyData.recruitmentStatus);
+      if (studyData.recruitmentStatus === '마감') {
+        setIsFinished(true);
+      }
+    }
+  }, [studyData])
 
   const modifyHandler = () => {
     navigate(`/study/modify/${studyId}`);
@@ -289,7 +299,10 @@ const StudyListPostDetail = () => {
             <ScrapImage src={isScrapped ? filledHeart : heart} alt="heart" />
             <ScrapCount>{scrapCount}</ScrapCount>
           </ScrapButton>
-          {isWriter ? (
+          {isFinished ? 
+          <FinishedButon>모집완료</FinishedButon>
+          :
+          (isWriter ? (
             <ApplyButton onClick={() => navigate('/mypost')}>
               {`신청현황 보기 (${studyData.participantCount} / ${studyData.totalRecruitmentCount})`}
             </ApplyButton>
@@ -299,7 +312,8 @@ const StudyListPostDetail = () => {
                 ? '지원취소'
                 : `지원하기 (${studyData.participantCount} / ${studyData.totalRecruitmentCount})`}
             </ApplyButton>
-          )}
+          ))
+          }
         </CommentContainer>
 
         {isPopupVisible && (
@@ -534,13 +548,31 @@ const ApplyButton = styled.button`
   border: none;
 `;
 
+const FinishedButon = styled.button`
+  width: 287px;
+  height: 52px;
+  flex-shrink: 0;
+  border-radius: 28px;
+  background-color: ${COLORS.line2};
+  color: #FFF;
+  text-align: center;
+  font-size: 18px;
+  font-style: normal;
+  font-weight: 700;
+  line-height: 24px;
+  letter-spacing: -0.333px;
+  margin-top: 15px;
+  cursor: pointer;
+  border: none;
+`;
+
 const MoreModal = styled.div`
   width: 84px;
   height: 72px;
   border-radius: 12px;
   position: absolute;
   right: 16px;
-  top: 20px;
+  top: 85px;
   display: flex;
   flex-direction: column;
   align-items: center;
diff --git a/src/pages/study/studyPostWrite/StudyPostWrite.js b/src/pages/study/studyPostWrite/StudyPostWrite.js
index 44da0dff..e89b1806 100644
--- a/src/pages/study/studyPostWrite/StudyPostWrite.js
+++ b/src/pages/study/studyPostWrite/StudyPostWrite.js
@@ -252,13 +252,6 @@ const StudyPostWrite = props => {
       return;
     }
 
-    if (imgFiles.length > 0) {
-        const result = await imgUpload(props.studyId);
-        if (result === 'imgError') {
-          togglePopup(`이미지 용량 혹은 형식을 확인하세요`);
-          return;
-        }
-    }
     const formStartDate = format(startDate, 'yyyy-MM-dd HH:mm:ss');
     const formEndDate = format(endDate, 'yyyy-MM-dd HH:mm:ss');
     const tagSplit =
@@ -318,6 +311,15 @@ const StudyPostWrite = props => {
       const text = await response.text();
       const data = text ? JSON.parse(text) : {};
       const studyId = data.data.id;
+
+      if (imgFiles.length > 0) {
+        const result = await imgUpload(studyId);
+        if (result === 'imgError') {
+          togglePopup(`이미지 용량 혹은 형식을 확인하세요`);
+          return;
+        }
+      }
+      
       toast.success('게시글 작성 완료');
 
       setTimeout(() => {

From 72228996939bc18a1267851297a6007f48e3b3f9 Mon Sep 17 00:00:00 2001
From: Youjiiin <yujinjang24@gmail.com>
Date: Mon, 2 Sep 2024 23:45:05 +0900
Subject: [PATCH 5/6] =?UTF-8?q?feat:=20[54]=20=EC=8A=A4=ED=84=B0=EB=94=94?=
 =?UTF-8?q?=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=B9=B4=ED=85=8C=EA=B3=A0?=
 =?UTF-8?q?=EB=A6=AC=20=EA=B2=80=EC=83=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/study/studyList/Filter_Field.js     | 69 +++++++++++++++++--
 src/pages/study/studyList/Filter_Field2.js    | 10 ---
 .../study/studyPostWrite/StudyPostWrite.js    |  3 +-
 3 files changed, 64 insertions(+), 18 deletions(-)

diff --git a/src/pages/study/studyList/Filter_Field.js b/src/pages/study/studyList/Filter_Field.js
index 94d6d2ae..1564fe3e 100644
--- a/src/pages/study/studyList/Filter_Field.js
+++ b/src/pages/study/studyList/Filter_Field.js
@@ -1,10 +1,11 @@
-import { useState, useEffect } from 'react';
+import { useState, useRef, useContext } from 'react';
 import { searchHandler } from './api';
 
 //zustand
 import useTimeTableStore from './useTimetableStore';
 import useFilterStore from './useFilterStore';
 import useStudyStore from './useStudyStore';
+import { MyContext } from 'App';
 
 import style from './Filter_Field.module.css';
 import search from '../../../assets/image/search_gray.png';
@@ -13,6 +14,7 @@ import back from '../../../assets/image/back_black.png';
 const Filter_Field = ({ deleteHandler }) => {
   const {
     tableInfos,
+    setTableInfos,
     setFilteredInfos,
     showData,
     setShowData,
@@ -21,10 +23,14 @@ const Filter_Field = ({ deleteHandler }) => {
 
   const { setPosts } = useStudyStore();
 
-  const { category, setCategory } = useFilterStore();
+  const { setCategory } = useFilterStore();
   const [selectingState, setSelectingState] = useState(0); //0->단과대,1->학과,2->과목이 띄워짐
   const [college, setCollege] = useState(null);
   const [department, setDepartment] = useState(null);
+  const [isSearch, setIsSearch] = useState(false);
+
+  //모달 닫기
+  const { setModalOpen } = useContext(MyContext);
 
   //이전 값으로 초기화
   const filteringBefore = state => {
@@ -73,6 +79,13 @@ const Filter_Field = ({ deleteHandler }) => {
     } else if (state === 2) {
       const newTableInfo = tableInfos.filter(row => {
         if (
+          college === null &&
+          department === null &&
+          row[3] === item[0] &&
+          row[4] === item[1]
+        ) {
+          return row;
+        } else if (
           row[1] === college &&
           row[2] === department &&
           row[3] === item[0] &&
@@ -113,6 +126,11 @@ const Filter_Field = ({ deleteHandler }) => {
 
     //이전 단계로 돌아가기
     setSelectingState(s => s - 1);
+    if (isSearch) {
+      filteringBefore(0);
+      console.log('selectingState:', selectingState);
+      setSelectingState(0);
+    }
   };
 
   // 검색 핸들러
@@ -126,22 +144,61 @@ const Filter_Field = ({ deleteHandler }) => {
       console.error('Error during submit:', error);
     }
   };
-  const searchText = () => {};
+
+  const inputRef = useRef(null);
+
+  const handleSearchClick = () => {
+    if (inputRef.current) {
+      setCollege(null);
+      setDepartment(null);
+      const item = inputRef.current.value + '';
+      if (item) {
+        const newTableInfo = tableInfos.filter(row => {
+          return (
+            (row[3] && row[3].includes(item)) ||
+            (row[4] && row[4].includes(item))
+          );
+        });
+        setFilteredInfos(newTableInfo);
+        setShowData(
+          Array.from(
+            new Set(newTableInfo.map(row => [row[3], row[4]]).filter(Boolean))
+          )
+        );
+
+        const filteredArray = Array.from(
+          new Set(
+            newTableInfo
+              .map(row => [row[3], row[4]])
+              .filter(([value1, value2]) => value1 !== '' && value2 !== '')
+          )
+        );
+
+        setSelectingState(2);
+        setIsSearch(true);
+      }
+    }
+  };
   return (
     <div className={style.container}>
       <header className={style.header}>
         {selectingState > 0 ? (
-          <img className={style.backImg} src={back} alt="back" />
+          <img 
+          className={style.backImg} 
+          src={back} 
+          alt="back" 
+          onClick={clickBack}/>
         ) : null}
         <span>학교수업 스터디</span>
       </header>
       <div className={style.search_container}>
         <div className={style.search_wrapper}>
-          <img src={search} alt="search" onClick={searchText} />
+          <img src={search} alt="search" onClick={handleSearchClick} />
           <input
             className={style.search_input}
             type="text"
-            placeholder="과목명 입력"
+            placeholder="과목명 입력 (과목명 또는 교수명)"
+            ref={inputRef}
           />
         </div>
       </div>
diff --git a/src/pages/study/studyList/Filter_Field2.js b/src/pages/study/studyList/Filter_Field2.js
index 9bb85991..74c5d409 100644
--- a/src/pages/study/studyList/Filter_Field2.js
+++ b/src/pages/study/studyList/Filter_Field2.js
@@ -53,16 +53,6 @@ const Filter_Field2 = ({ deleteHandler }) => {
       <header className={style.header}>
         <span>스터디 선택</span>
       </header>
-      <div className={style.search_container}>
-        <div className={style.search_wrapper}>
-          <img src={search} alt="search" />
-          <input
-            className={style.search_input}
-            type="text"
-            placeholder="검색어 입력"
-          />
-        </div>
-      </div>
       <div className={style.filter_study}>
         {datas &&
           datas.map(data => (
diff --git a/src/pages/study/studyPostWrite/StudyPostWrite.js b/src/pages/study/studyPostWrite/StudyPostWrite.js
index e89b1806..b1222d72 100644
--- a/src/pages/study/studyPostWrite/StudyPostWrite.js
+++ b/src/pages/study/studyPostWrite/StudyPostWrite.js
@@ -196,7 +196,6 @@ const StudyPostWrite = props => {
         }
       );
 
-      console.log('error???????????????' + response.status);
       if (response.status === 413) {
         return 'imgError';
       }
@@ -319,7 +318,7 @@ const StudyPostWrite = props => {
           return;
         }
       }
-      
+
       toast.success('게시글 작성 완료');
 
       setTimeout(() => {

From 8d512663effbe5f77b607b2985f4dcccfac1a11f Mon Sep 17 00:00:00 2001
From: Youjiiin <yujinjang24@gmail.com>
Date: Mon, 2 Sep 2024 23:48:18 +0900
Subject: [PATCH 6/6] =?UTF-8?q?feat:=20[54]=20pull=20=EB=B3=91=ED=95=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/study/studyList/StudyListPost.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/study/studyList/StudyListPost.js b/src/pages/study/studyList/StudyListPost.js
index 19b3f664..9a38a798 100644
--- a/src/pages/study/studyList/StudyListPost.js
+++ b/src/pages/study/studyList/StudyListPost.js
@@ -8,7 +8,6 @@ import COLORS from '../../../theme';
 const StudyListPost = ({ post }) => {
   const {
     title,
-    createdAt,
     hasImage,
     categoryName,
     id,