From e4b034de922f9e505feeae02fc157c0f9d6591ed Mon Sep 17 00:00:00 2001 From: Seunghyo Date: Thu, 23 May 2024 20:32:13 +0900 Subject: [PATCH 1/6] =?UTF-8?q?feat:=20=EA=B3=B5=EA=B3=A0=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20warning=20svg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/JD/JDEditModal.tsx | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/components/JD/JDEditModal.tsx b/src/components/JD/JDEditModal.tsx index 1a00c7e..896c5b6 100644 --- a/src/components/JD/JDEditModal.tsx +++ b/src/components/JD/JDEditModal.tsx @@ -1,6 +1,6 @@ import React, { FC } from "react"; import styled from "styled-components"; -import warning from "../../assets/icons/icon_warning.svg"; +import warning from "../../assets/icons/icon_delete_warning.svg"; import { useNavigate } from "react-router-dom"; interface ModalProps { @@ -21,12 +21,7 @@ const JDEditModal: FC = ({ isOpen, onClose, jdId }) => { warning
이전 페이지로 돌아가시겠어요?
-
- 저장하지 않으면 -
- 입력한 내용은 복원할 수 없어요! -
-
+
작성하던 공고가 저장되지 않아요!
 @@ -96,7 +91,7 @@ const MainWrapper = styled.div` font-weight: 500; line-height: 1.25rem; letter-spacing: -0.02rem; - margin-top: 1.25rem; + margin-top: 10px; span{ color: var(--main-500, #7D82FF); font-size: 1.2rem; From 28f51c6fa06f9f33b4c58faab26ec5aa4b8d62c7 Mon Sep 17 00:00:00 2001 From: Seunghyo Date: Thu, 23 May 2024 20:34:17 +0900 Subject: [PATCH 2/6] =?UTF-8?q?feat:=20=EA=B3=B5=EA=B3=A0=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20warning=20css?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/JD/JDEditModal.tsx | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/components/JD/JDEditModal.tsx b/src/components/JD/JDEditModal.tsx index 896c5b6..734c7df 100644 --- a/src/components/JD/JDEditModal.tsx +++ b/src/components/JD/JDEditModal.tsx @@ -76,7 +76,7 @@ const MainWrapper = styled.div` .maintext { color: var(--neutral-700, #343A5D); text-align: center; - font-size: 1.375rem; + font-size: 22px; font-style: normal; font-weight: 600; line-height: 1.625rem; @@ -86,17 +86,13 @@ const MainWrapper = styled.div` .subtext { color: var(--neutral-500, #A6AAC0); text-align: center; - font-size: 1rem; + font-size: 16px; font-style: normal; - font-weight: 500; - line-height: 1.25rem; - letter-spacing: -0.02rem; + font-weight: 400; + line-height: 22px; margin-top: 10px; - span{ - color: var(--main-500, #7D82FF); - font-size: 1.2rem; - font-weight: 600; - } + letter-spacing: -0.64px; + margin-bottom: 40px; } `; From 95c19c462021ee81a77acdc9249ec732ab90dda0 Mon Sep 17 00:00:00 2001 From: Seunghyo Date: Thu, 23 May 2024 22:25:03 +0900 Subject: [PATCH 3/6] =?UTF-8?q?feat:=20book=20mark=20=ED=83=AD=20alert=20?= =?UTF-8?q?=EC=B0=BD=20=EC=97=86=EC=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/JD/Experience.tsx | 4 ++-- src/components/JD/ExperienceList.tsx | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/components/JD/Experience.tsx b/src/components/JD/Experience.tsx index 2263bb5..0592036 100644 --- a/src/components/JD/Experience.tsx +++ b/src/components/JD/Experience.tsx @@ -74,8 +74,8 @@ const Experience: React.FC = ({ handleApi!(jdId, user.token); } } catch (error) { - console.error(error); - alert(JSON.stringify(error)); + // console.error(error); + // alert(JSON.stringify(error)); } }; diff --git a/src/components/JD/ExperienceList.tsx b/src/components/JD/ExperienceList.tsx index 65431b0..893bb8e 100644 --- a/src/components/JD/ExperienceList.tsx +++ b/src/components/JD/ExperienceList.tsx @@ -23,6 +23,7 @@ import { useParams } from "react-router-dom"; import { formatDateRange } from "../../pages/JDListPage"; import { KeywordType } from "../../types/experience"; import { getKeywords } from "../../services/Experience/keywordApi"; +import { select } from "d3"; type TabType = "basic" | "my"; @@ -259,6 +260,12 @@ const ExperienceList: React.FC = ({ } }, [searchText]); + useEffect(() => { + if (jdId) { + getExperienceList(jdId, user.token); + } + }, [selectedTab]); + // My 역량 키워드 조회 useEffect(() => { if (user?.token) { From 3d8cc9f90356f8ee7ce81c52801048a201549995 Mon Sep 17 00:00:00 2001 From: Seunghyo Date: Thu, 23 May 2024 22:32:40 +0900 Subject: [PATCH 4/6] =?UTF-8?q?feat:=20book=20marked=20error=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=EC=8B=9C=EB=8F=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/JD/Experience.tsx | 1 - src/components/JD/ExperienceList.tsx | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/JD/Experience.tsx b/src/components/JD/Experience.tsx index 0592036..e6d9d56 100644 --- a/src/components/JD/Experience.tsx +++ b/src/components/JD/Experience.tsx @@ -69,7 +69,6 @@ const Experience: React.FC = ({ ) => { try { const response = await bookmarkpatch(token, jobId, expId); - console.log(response); if (jdId && user.token) { handleApi!(jdId, user.token); } diff --git a/src/components/JD/ExperienceList.tsx b/src/components/JD/ExperienceList.tsx index 893bb8e..b815d9a 100644 --- a/src/components/JD/ExperienceList.tsx +++ b/src/components/JD/ExperienceList.tsx @@ -261,6 +261,10 @@ const ExperienceList: React.FC = ({ }, [searchText]); useEffect(() => { + setSearchText(""); + setMainTag({ id: "", name: "" }); + setSubTag({ id: "", name: "" }); + setCheckedKeywords([]); if (jdId) { getExperienceList(jdId, user.token); } From cbf9d1a16b4252f34141306b9a1fceb346ea87e5 Mon Sep 17 00:00:00 2001 From: Seunghyo Date: Thu, 23 May 2024 22:43:00 +0900 Subject: [PATCH 5/6] =?UTF-8?q?feat:=20jd=20=EB=93=B1=EB=A1=9D=EC=8B=9C=20?= =?UTF-8?q?jd=20detail=20page?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/JDPlusPage.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/JDPlusPage.tsx b/src/pages/JDPlusPage.tsx index 7db3963..5740f9b 100644 --- a/src/pages/JDPlusPage.tsx +++ b/src/pages/JDPlusPage.tsx @@ -128,8 +128,9 @@ const JDPlusPage: React.FC = () => { }, token ); + console.log(response.data.jobDescriptionId); console.log(job.endedAt); - nav("/jd"); + nav(`/jd/${response.data.jobDescriptionId}`); } catch (error) { console.error(error); alert(JSON.stringify(error)); From b958d24d2f23e77ef04c22e22612bd05eae58d1a Mon Sep 17 00:00:00 2001 From: Seunghyo Date: Thu, 23 May 2024 23:01:47 +0900 Subject: [PATCH 6/6] =?UTF-8?q?feat:=20book=20marked=20handleApi=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/JD/Experience.tsx | 16 +++++++++++++++- src/components/JD/ExperienceList.tsx | 1 + 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/components/JD/Experience.tsx b/src/components/JD/Experience.tsx index e6d9d56..a66bda7 100644 --- a/src/components/JD/Experience.tsx +++ b/src/components/JD/Experience.tsx @@ -10,6 +10,7 @@ import { QuestionType } from "../../types/experience"; import { bookmarkpatch } from "../../services/JD/bookmarkApi"; import { getCookie } from "../../services/cookie"; import { useParams } from "react-router-dom"; +import { getAllExperienceList } from "../../services/JD/ExperienceApi"; interface ExpProps { type?: "card" | "section"; @@ -26,7 +27,7 @@ interface ExpProps { detail?: QuestionType[]; checkedKeywords?: string[]; onClick?: () => void; - handleApi?: (jdid: string, token: string) => void; + handleApi?: (jdId: string, token: string) => Promise; } const Experience: React.FC = ({ @@ -52,6 +53,19 @@ const Experience: React.FC = ({ // 카드 타입, 섹션 타입 구분 const isSection = type === "section"; + const getExperienceList = async (jdId: string, token: string) => { + try { + const response = await getAllExperienceList(jdId, token); + //console.log(response); + if (handleApi) { + handleApi(jdId, user.token); + } + } catch (error) { + console.error(error); + alert(JSON.stringify(error)); + } + }; + // 경험의 선택된 질문 답변 const answer = detail?.[(question || 1) - 1]?.answer; diff --git a/src/components/JD/ExperienceList.tsx b/src/components/JD/ExperienceList.tsx index b815d9a..7168f00 100644 --- a/src/components/JD/ExperienceList.tsx +++ b/src/components/JD/ExperienceList.tsx @@ -504,6 +504,7 @@ const ExperienceList: React.FC = ({ (item: KeywordType) => item.name )} onClick={() => setshowDetail(true)} + handleApi={getExperienceList} /> ))}