Merge branch 'main' of https://git.ajou.ac.kr/plan-puzzle/client

src/App.js

@@ -42,7 +42,7 @@ function App() {
     <AuthContext.Provider value={contextValue}>
       <BrowserRouter>
         <Routes>
-          <Route path="/" element={<Navigate to="/schedules" />} />
+          <Route path="/" element={<Navigate to="/users/login" />} />
 
           <Route
             path="/schedules"

src/components/infiniteScroll.js

@@ -49,6 +49,7 @@ function InfiniteScroll(props){
                     setItems(prevItem => [...prevItem, ...components]);
                 }
             }  else{
+                console.log(`/api/${page}${queryString1}`);
                 setMinId(jsonData['minId']);
                 const newData = jsonData['recruits'];
                 if(newData.length > 0) {    

src/components/recruit/deleteComment.js

@@ -14,7 +14,8 @@ const DeleteComment=({isOpen, onClose, id, setCount})=>{
         
             if (response.ok){
                 alert('삭제되었습니다.');
-                setCount(prev => (prev + 1));
+                setCount((prev) => prev + 1);
+                onClose();
             }else{
                 alert('삭제를 실패했습니다.');
             }

src/components/recruit/recruitDetail.js

@@ -83,7 +83,12 @@ const RecruitDetail = ({ isOpen, onClose, data }) => {
             <button className={recruitDetailStyles.x} onClick={onClose}>X</button>
             <div className={recruitDetailStyles.info}>
               <div className={recruitDetailStyles.imgContainer}>
-                <img className={recruitDetailStyles.img} src={data.imagePath} alt='recruit img' />
+                <img 
+                  className={recruitDetailStyles.img} 
+                  src={data.imagePath} 
+                  alt='recruit img'
+                  style={{ width: '258px', height: '338px' }}
+                />
               </div>
 
               <div className={recruitDetailStyles.notImgContainer}>

src/components/recruit/recruitDetail.module.css

@@ -62,6 +62,9 @@
 .notImgContainer{
     display: flex;
     flex-direction: column;
+
+    width: 659px;
+    height: 338px;
 }
 
 .img{
@@ -75,13 +78,14 @@
 }
 
 .title{
-    width: 500px;
+    width: 490px;
     height: 35px;
 
     font-weight: 600;
     font-size: 27px;
     line-height: 30x;
     
+    margin-left: 10px;
     color: #000000;
 }
 
@@ -162,12 +166,14 @@
 }
 
 .region{
-    width: 500px;
+    width: 490px;
     height: 31px;
 
     font-size: 18px;
     line-height: 38px;
 
+    margin-left: 10px;
+
     color: #000000;
 }
 
@@ -193,12 +199,14 @@
 }
 
 .content{
-    width: 500px;
+    width: 490px;
     height: 200px;
 
     font-size: 22px;
     line-height: 33px;
 
+    margin-left: 10px;
+
     color: #000000;
 }
 

src/components/recruit/recruitList.module.css

@@ -23,7 +23,8 @@
     display: flex;
     flex-direction: column;
 
-    width: 670px;
+    width: 685px;
+    height: 194px;
 }
 
 .top, .middle, .bottom{
@@ -44,12 +45,14 @@
 }
 
 .title{
-    width: 500px;
-    height: 50px;
+    width: 490px;
+    height: 40px;
 
     font-weight: 600;
     font-size: 23px;
     line-height: 23px;
+
+    margin-left: 10px;
 }
 
 .tbd{
@@ -124,13 +127,16 @@
 }
 
 .content{
-    width: 500px;
-    height: 100px;
+    width: 490px;
+    height: 90px;
 
     font-weight: 400;
     font-size: 17px;
     line-height: 23px;
 
+    margin-left: 10px;
+    margin-top: 10px;
+
     color: #000000;
 }
 

src/components/search.js

@@ -76,7 +76,7 @@ function Search({ currentPage, onUrlGenerated, onFirstQueryString, onSecondQuery
         } else if (searchType === 'writer') {
             firstQueryString += `writer=${searchTerm}`;
             secondQueryString += `writer=${searchTerm}`;
-        } else if (searchType === 'title&content') {
+        } else if (searchType === 'double') {
             firstQueryString += `title=${searchTerm}&content=${searchTerm}`;
             secondQueryString += `title=${searchTerm}&content=${searchTerm}`;
         }
@@ -122,7 +122,7 @@ function Search({ currentPage, onUrlGenerated, onFirstQueryString, onSecondQuery
                     >
                         <option value="title">제목</option>
                         <option value="content">내용</option>
-                        <option value="title&content ">제목 + 내용 (OR)</option>
+                        <option value="double">제목+내용</option>
                         <option value="writer">작성자</option>
                     </select>
                     <select 

src/pages/join.module.css

@@ -34,7 +34,6 @@
 }  
 
 .checkId, .checkNickname{
-    position: relative;
     width: 60px;
     height: 30px;
     margin-left: 240px;