From e1279e8fa7fbd72177f0cbb3f8a26f6fd4163040 Mon Sep 17 00:00:00 2001 From: chaerin <dbcofls6961@ajou.ac.kr> Date: Sun, 10 Dec 2023 13:58:39 +0900 Subject: [PATCH] design: modify css --- src/App.js | 2 +- src/components/infiniteScroll.js | 1 + src/components/recruit/recruitDetail.js | 7 ++++++- .../recruit/recruitDetail.module.css | 16 ++++++++++++---- src/components/recruit/recruitList.module.css | 18 ++++++++++++------ src/components/search.js | 4 ++-- src/pages/join.module.css | 1 - 7 files changed, 34 insertions(+), 15 deletions(-) diff --git a/src/App.js b/src/App.js index caf74b1..a144ab2 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 eadc30b..2265f5e 100644 --- a/src/components/infiniteScroll.js +++ b/src/components/infiniteScroll.js @@ -50,6 +50,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/recruitDetail.js b/src/components/recruit/recruitDetail.js index f6f168c..39c789e 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 254ed07..ca2295b 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 c64f81f..3a627ef 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{ @@ -74,7 +77,7 @@ align-items: center; /* 세로 방향에서 가운데 정렬. */ justify-content: center; - width: 67px; + width: 90px; height: 33px; margin-left: auto; @@ -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 128eae7..93f9fe7 100644 --- a/src/components/search.js +++ b/src/components/search.js @@ -66,7 +66,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}`; } @@ -112,7 +112,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 4f1f6e1..283f962 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; -- GitLab