diff --git a/src/App.js b/src/App.js index caf74b1c3e9b6d7d500c24b981f94e705b8a1c61..a144ab28ef1eadd319cebe88d4a5140dfd629e0c 100644 --- a/src/App.js +++ b/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" diff --git a/src/components/infiniteScroll.js b/src/components/infiniteScroll.js index ca906d62222aa63947d22c3c3c16e7f0e9116f00..ca53b8f3bfa4b18818e4f4b3280169fb9bca1d36 100644 --- a/src/components/infiniteScroll.js +++ b/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) { diff --git a/src/components/recruit/deleteComment.js b/src/components/recruit/deleteComment.js index 5cd79b24923d799d477c721658e479b451ccdbcd..79b941390cb1269a53bc8e633f0a1e0c9a40c499 100644 --- a/src/components/recruit/deleteComment.js +++ b/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('삭제를 실패했습니다.'); } diff --git a/src/components/recruit/recruitDetail.js b/src/components/recruit/recruitDetail.js index f6f168c4f6c8de9cf1dd02d67dbeb8d3d135deae..39c789e5fb4c5a7c09eb310cb463b3103d3e21c2 100644 --- a/src/components/recruit/recruitDetail.js +++ b/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}> diff --git a/src/components/recruit/recruitDetail.module.css b/src/components/recruit/recruitDetail.module.css index c7d8c811a8f30c9145b5c1df7f608de316a0fb99..ff7bd9b7c2966baa7180c3c5c56d151462c4ccec 100644 --- a/src/components/recruit/recruitDetail.module.css +++ b/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; } diff --git a/src/components/recruit/recruitList.module.css b/src/components/recruit/recruitList.module.css index 7e6aa539fb69a380b2216d0c1995453e0a40d20b..3a627effeedc357cad086ce44b37975da49080c2 100644 --- a/src/components/recruit/recruitList.module.css +++ b/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; } diff --git a/src/components/search.js b/src/components/search.js index ecf1275a2acbb948bff818b78ed02655dfada424..f97949dab5a627e29163236a6a083fd3b18463fd 100644 --- a/src/components/search.js +++ b/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 diff --git a/src/pages/join.module.css b/src/pages/join.module.css index 4f1f6e12ad7798958e2134b8cd477c1609ce8f0a..283f96218282b232534c3197e5bbc2837e82e3a2 100644 --- a/src/pages/join.module.css +++ b/src/pages/join.module.css @@ -34,7 +34,6 @@ } .checkId, .checkNickname{ - position: relative; width: 60px; height: 30px; margin-left: 240px;