Merge pull request #284 from HA-SEUNG-JEONG/fix/haseung

Fix/haseung
Team-Coverflow · May 4, 2024 · cc3eb33 · cc3eb33
2 parents 6f3dd28 + 95b842a
commit cc3eb33
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 16 deletions.
diff --git a/src/asset/image/leaf.svg b/src/asset/image/leaf.svg
diff --git a/src/asset/sass/pages/postPage/questionDetailPage.scss b/src/asset/sass/pages/postPage/questionDetailPage.scss
@@ -93,6 +93,7 @@ $job-keeper: '현직자';
   margin-right: 7%;
   span {
     width: 100%;
+    color: #ff8d1d;
   }
 }
 

diff --git a/src/asset/sass/pages/postPage/questionWritePage.scss b/src/asset/sass/pages/postPage/questionWritePage.scss
@@ -117,7 +117,6 @@ select {
   left: 5rem;
   margin-top: 5%;
   span {
-    overflow-wrap: break-word;
     font-weight: 900;
     font-family: 'Pretendard-ExtraBold';
     font-size: 3.5rem;
@@ -155,15 +154,16 @@ select {
 }
 
 .finger-image {
-  width: 0.9rem;
-  height: 1.2rem;
+  width: 1.8rem;
+  height: 1.8rem;
 }
 
 .tag-select-wrapper {
   display: flex;
   flex-wrap: wrap-reverse;
   justify-content: center;
   row-gap: 10px;
+  margin-bottom: 4rem;
 }
 
 .tag-select {
@@ -180,7 +180,6 @@ select {
   letter-spacing: -1px;
 
   span {
-    width: 12rem;
     display: flex;
     justify-content: center;
     overflow-wrap: break-word;

diff --git a/src/components/pages/postPage/questionDetailPage.tsx b/src/components/pages/postPage/questionDetailPage.tsx
@@ -8,6 +8,7 @@ import Answer from '../../ui/question/answer.tsx';
 import TabBar from '../../ui/tabBar/tabBar';
 import { BASE_URL } from '../../global/constants';
 import Tree from '../../../asset/image/nature-ecology-tree-3--tree-plant-cloud-shape-park.svg';
+import Leaf from '../../../asset/image/leaf.svg';
 import Reward from '../../../asset/image/reward.svg';
 import Dot from '../../../asset/image/dots-vertical.svg';
 import '../../../asset/sass/etc/header/userInfoHeader.scss';
@@ -49,7 +50,7 @@ const QuestionTitle = styled.div`
 `;
 
 const QuestionContent = styled.div`
-  margin: 3% 0% 2% 4%;
+  margin: 3% 0% 2% 4.5%;
   letter-spacing: -1.5px;
   font-size: 2rem;
   color: #000000;
@@ -269,7 +270,7 @@ function QuestionDetailPage() {
 
       <div className="question-detail-container">
         <div className="job-info">
-          <img src={Tree} alt="" />
+          <img src={questionerTag === '취준생' ? Tree : Leaf} alt="" />
           <span>
             {questionerTag === '취준생'
               ? `${questionerTag}이 남긴 질문이에요`

diff --git a/src/components/pages/searchPage/searchResultPage.tsx b/src/components/pages/searchPage/searchResultPage.tsx
@@ -152,23 +152,14 @@ function SearchResultPage() {
   const {
     state: { searchResults, totalCompany, totalPages },
   } = useLocation() as SearchResultProps;
-  // console.log('searchResults', searchResults);
+
   const [searchData, setSearchData] =
     useState<SearchDataProps[]>(searchResults);
   const [companyCnt, setCompanyCnt] = useState(totalCompany);
   const [pageCnt, setPageCnt] = useState(totalPages);
 
-  // const keyword = queryParams.get('keyword');
-
   const [currentPage, setCurrentPage] = useState(0);
 
-  // const indexOfLastItem = currentPage * itemsPerPage;
-  // const indexOfFirstItem = indexOfLastItem - itemsPerPage;
-  // const currentItems = Array.from(searchResults)?.slice(
-  //   indexOfFirstItem,
-  //   indexOfLastItem,
-  // );
-
   const handleGoBack = () => {
     navigate('/search-company');
   };