From 8c480eda3fdd9dc8549da672a80a643c9fd021b2 Mon Sep 17 00:00:00 2001 From: HA-SEUNG-JEONG Date: Sat, 4 May 2024 19:32:34 +0900 Subject: [PATCH 1/2] =?UTF-8?q?Style=20:=20=EC=B7=A8=EC=A4=80=EC=83=9D=20?= =?UTF-8?q?=ED=98=84=EC=97=85=EC=9E=90=20=EB=A1=9C=EA=B3=A0=20=EA=B5=AC?= =?UTF-8?q?=EB=B6=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/asset/image/leaf.svg | 12 ++++++++++++ src/components/pages/postPage/questionDetailPage.tsx | 5 +++-- 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 src/asset/image/leaf.svg diff --git a/src/asset/image/leaf.svg b/src/asset/image/leaf.svg new file mode 100644 index 00000000..9ae4a031 --- /dev/null +++ b/src/asset/image/leaf.svg @@ -0,0 +1,12 @@ +'' + + + + + + + + + + + diff --git a/src/components/pages/postPage/questionDetailPage.tsx b/src/components/pages/postPage/questionDetailPage.tsx index 5b8b5859..0f0ce699 100644 --- 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() {
- + {questionerTag === '취준생' ? `${questionerTag}이 남긴 질문이에요` From 95b842a395da1305e0266985f8f33aefc2c91d6c Mon Sep 17 00:00:00 2001 From: HA-SEUNG-JEONG Date: Sat, 4 May 2024 19:32:44 +0900 Subject: [PATCH 2/2] =?UTF-8?q?Fix=20:=20UI=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/asset/sass/pages/postPage/questionDetailPage.scss | 1 + src/asset/sass/pages/postPage/questionWritePage.scss | 7 +++---- src/components/pages/searchPage/searchResultPage.tsx | 11 +---------- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/asset/sass/pages/postPage/questionDetailPage.scss b/src/asset/sass/pages/postPage/questionDetailPage.scss index af7fc1dd..1fb40f2c 100644 --- 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 index 542b0138..09b0e5a6 100644 --- 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,8 +154,8 @@ select { } .finger-image { - width: 0.9rem; - height: 1.2rem; + width: 1.8rem; + height: 1.8rem; } .tag-select-wrapper { @@ -164,6 +163,7 @@ select { 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/searchPage/searchResultPage.tsx b/src/components/pages/searchPage/searchResultPage.tsx index 06c5a69a..52399bee 100644 --- a/src/components/pages/searchPage/searchResultPage.tsx +++ b/src/components/pages/searchPage/searchResultPage.tsx @@ -145,23 +145,14 @@ function SearchResultPage() { const { state: { searchResults, totalCompany, totalPages }, } = useLocation() as SearchResultProps; - // console.log('searchResults', searchResults); + const [searchData, setSearchData] = useState(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'); };