From b5953c1a9ffbdd25aa6c5bfcc85478126878c54f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=ED=9A=A8=EC=9B=90?= Date: Wed, 22 May 2024 18:09:05 +0900 Subject: [PATCH 1/8] =?UTF-8?q?fix:=20=EA=B2=BD=ED=97=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=ED=83=80=EC=9D=B4?= =?UTF-8?q?=ED=8B=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/ExperienceEditPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/ExperienceEditPage.tsx b/src/pages/ExperienceEditPage.tsx index 908180c..e1f150f 100644 --- a/src/pages/ExperienceEditPage.tsx +++ b/src/pages/ExperienceEditPage.tsx @@ -705,7 +705,7 @@ const ExperienceEditPage = () => { > - 경험 작성 + 경험 수정 저장 From 8d879e9bd3b26583ebc11315a6b3cef35c000750 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=ED=9A=A8=EC=9B=90?= Date: Wed, 22 May 2024 18:10:42 +0900 Subject: [PATCH 2/8] =?UTF-8?q?fix:=20=EA=B2=BD=ED=97=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=EB=8B=A4=EC=9D=B4=EC=96=BC=EB=A1=9C=EA=B7=B8=20?= =?UTF-8?q?=ED=85=8D=EC=8A=A4=ED=8A=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/ExperienceEditPage.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/ExperienceEditPage.tsx b/src/pages/ExperienceEditPage.tsx index e1f150f..42afded 100644 --- a/src/pages/ExperienceEditPage.tsx +++ b/src/pages/ExperienceEditPage.tsx @@ -723,12 +723,12 @@ const ExperienceEditPage = () => { image={airplane} title={ <> - 새로운 경험 작성이 + 경험 수정이
완료되었어요! } - buttons={["작성된 경험 확인하기"]} + buttons={["경험 확인하기"]} onConfirm={() => navigate(`/experience/detail/${expId}`)} isOpen={isModalOpen} onClose={closeModal} From 77e88ef77ce559aa15bc749520faf0505057b15b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=ED=9A=A8=EC=9B=90?= Date: Wed, 22 May 2024 18:18:44 +0900 Subject: [PATCH 3/8] =?UTF-8?q?fix:=20=EB=B2=84=ED=8A=BC=20=EC=BB=A4?= =?UTF-8?q?=EC=84=9C=20=ED=8F=AC=EC=9D=B8=ED=84=B0=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Experience/YearCircle.tsx | 4 +++- src/components/common/MainButton.tsx | 1 + src/components/common/Navbar.tsx | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/Experience/YearCircle.tsx b/src/components/Experience/YearCircle.tsx index c0ecee7..5f58c47 100644 --- a/src/components/Experience/YearCircle.tsx +++ b/src/components/Experience/YearCircle.tsx @@ -31,7 +31,8 @@ const YearCircle: React.FC = ({ const [selectedPrimeTag, setSelectedPrimeTag] = useRecoilState(primeTagState); const [isDelete, setIsDelete] = useRecoilState(deleteState); - const [selectedDeleteTag, setSelectedDeleteTag] = useRecoilState(deleteTagState); + const [selectedDeleteTag, setSelectedDeleteTag] = + useRecoilState(deleteTagState); const isSelectedYear = selectedYear === year; const isHoveredYear = hoveredYear === year; @@ -148,6 +149,7 @@ const YearCircleContainer = styled(motion.div)<{ isActive: boolean }>` : (props) => props.theme.colors.neutral200}; background-size: cover; top: -40px; + cursor: pointer; `; const YearText = styled(motion.div)<{ isActive: boolean }>` diff --git a/src/components/common/MainButton.tsx b/src/components/common/MainButton.tsx index a0462d5..f4a8048 100644 --- a/src/components/common/MainButton.tsx +++ b/src/components/common/MainButton.tsx @@ -20,6 +20,7 @@ const Button = styled.button` justify-content: center; ${(props) => props.theme.fonts.title4}; gap: 5px; + cursor: pointer; &:disabled { background: ${(props) => props.theme.colors.neutral500}; } diff --git a/src/components/common/Navbar.tsx b/src/components/common/Navbar.tsx index 51afb34..5d3c08a 100644 --- a/src/components/common/Navbar.tsx +++ b/src/components/common/Navbar.tsx @@ -87,6 +87,7 @@ const ItemContainer = styled.div` gap: 2.5rem; &.profile { gap: 0.5rem; + cursor: pointer; } `; From 591d2ab52d9c2de695b976cc9368b171d1573122 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=ED=9A=A8=EC=9B=90?= Date: Wed, 22 May 2024 18:24:22 +0900 Subject: [PATCH 4/8] =?UTF-8?q?fix:=20=EA=B2=BD=ED=97=98=20=EC=8B=9C?= =?UTF-8?q?=EA=B0=81=ED=99=94=20=EC=97=AD=EB=9F=89=20=ED=82=A4=EC=9B=8C?= =?UTF-8?q?=EB=93=9C=20=EA=B2=BD=ED=97=98=20=EB=AA=A9=EB=A1=9D=20=EA=B0=9C?= =?UTF-8?q?=EC=88=98=20=EA=B0=92=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Experience/KeywordTab.tsx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/components/Experience/KeywordTab.tsx b/src/components/Experience/KeywordTab.tsx index 87fc25b..ac081f9 100644 --- a/src/components/Experience/KeywordTab.tsx +++ b/src/components/Experience/KeywordTab.tsx @@ -33,9 +33,7 @@ import Experience from "../JD/Experience"; import ExpData from "../../services/JD/ExpData"; import editIcon from "../../assets/images/editIcon.png"; import { useNavigate } from "react-router-dom"; -import { - getPrimeTagYears, -} from "../../services/Experience/tagApi"; +import { getPrimeTagYears } from "../../services/Experience/tagApi"; import { getCookie } from "../../services/cookie"; import { ExperienceDetailType, @@ -423,7 +421,7 @@ const KeywordTab = ({ openDeleteModal }: KeywordTabProp) => { 총 
{checkedKeywords.length === 0 - ? ExpData.length + ? experiences?.length : filteredExpData.length} 개
From a68712dc8550bd8f37c3beea4db32e64797a2aa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=ED=9A=A8=EC=9B=90?= Date: Wed, 22 May 2024 19:02:49 +0900 Subject: [PATCH 5/8] =?UTF-8?q?fix:=20=EA=B2=BD=ED=97=98=20=EC=A0=80?= =?UTF-8?q?=EC=9E=A5=20=EB=B2=84=ED=8A=BC=20=ED=99=9C=EC=84=B1=ED=99=94=20?= =?UTF-8?q?=EC=A1=B0=EA=B1=B4=20=EC=B6=94=EA=B0=80=20&=20DatePicker=20date?= =?UTF-8?q?=20prop=20type=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/DatePicker.tsx | 2 +- src/components/common/Navbar.tsx | 8 +++++++- src/pages/ExperienceWritePage.tsx | 18 ++++++++++++------ 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/components/common/DatePicker.tsx b/src/components/common/DatePicker.tsx index 271175b..d3d2856 100644 --- a/src/components/common/DatePicker.tsx +++ b/src/components/common/DatePicker.tsx @@ -22,7 +22,7 @@ const StyledDatePicker = styled(DatePicker)<{ `; interface DatePickerProps { - date: Date; + date: Date | null; setDate: (date: Date) => void; style?: string; } diff --git a/src/components/common/Navbar.tsx b/src/components/common/Navbar.tsx index 5d3c08a..7fd81a7 100644 --- a/src/components/common/Navbar.tsx +++ b/src/components/common/Navbar.tsx @@ -18,7 +18,13 @@ const Navbar = () => { return ( - flight-logo + flight-logo navigate(`/experience`)} + /> { question: item.question, answer: "", })), - startedAt: new Date().toISOString(), - endedAt: new Date().toISOString(), + startedAt: "", + endedAt: "", }); const [primeTagItem, setPrimeTagItem] = React.useState({ id: "", @@ -118,6 +117,8 @@ const ExperienceWritePage = () => { lastMyKeywordIndex ); + const isSaveButtonDisabled = !expData.title || !primeTagItem.id || !subTagItem.id || !expData.startedAt || !expData.endedAt; + const handleSaveExperience = async () => { let experienceData = { ...expData }; // 상위 태그 생성 후 하위 태그 생성한 경우 @@ -384,7 +385,7 @@ const ExperienceWritePage = () => {
경험 기간
setExpData({ ...expData, startedAt: date.toISOString() }) } @@ -392,7 +393,7 @@ const ExperienceWritePage = () => { />  -  setExpData({ ...expData, endedAt: date.toISOString() }) } @@ -684,7 +685,12 @@ const ExperienceWritePage = () => { 경험 작성
- 저장 + + 저장 + Date: Wed, 22 May 2024 19:12:55 +0900 Subject: [PATCH 6/8] =?UTF-8?q?fix:=20=EC=97=AD=EB=9F=89=20=ED=82=A4?= =?UTF-8?q?=EC=9B=8C=EB=93=9C=20=EC=88=98=EC=A0=95=20=EC=9D=B4=EC=8A=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/ExperienceEditPage.tsx | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/src/pages/ExperienceEditPage.tsx b/src/pages/ExperienceEditPage.tsx index 42afded..04fc6a9 100644 --- a/src/pages/ExperienceEditPage.tsx +++ b/src/pages/ExperienceEditPage.tsx @@ -141,7 +141,7 @@ const ExperienceEditPage = () => { const subTagId = subTagRes.data.id; experienceData = { - ...expData, + ...experienceData, parentTagId: primeTagId, childTagId: subTagId, }; @@ -155,19 +155,20 @@ const ExperienceEditPage = () => { ); const subTagId = subTagRes.data.id; experienceData = { - ...expData, + ...experienceData, childTagId: subTagId, }; } - // 새로운 역량 키워드 있을 경우 + + const originStrongPointIds = checkedKeywords + .filter((item) => item.id !== item.name) + .map((item) => item.id); const newKeywordsNames = checkedKeywords .filter((item) => item.id === item.name) .map((item) => ({ name: item.name })); - if (newKeywordsNames.length !== 0) { - const originStrongPointIds = checkedKeywords - .filter((item) => item.id !== item.name) - .map((item) => item.id); + // 새로운 역량 키워드 있을 경우 + if (newKeywordsNames.length !== 0) { const newStrongPointsRes = await postKeyword( newKeywordsNames, user?.token @@ -180,14 +181,19 @@ const ExperienceEditPage = () => { ...newStrongPointIds, ]; experienceData = { - ...expData, + ...experienceData, strongPointIds: totalStrongPointIds, }; + } else { + experienceData = { + ...experienceData, + strongPointIds: originStrongPointIds, + }; } // 질문 수정 if (expId) { patchExperience(expId, experienceData, user?.token) - .then((res) => { + .then(() => { openModal(); }) .catch((err) => console.log(err)); From e7f7603a368a7c560ec1a87e6c224bd598e6451c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=ED=9A=A8=EC=9B=90?= Date: Wed, 22 May 2024 19:24:10 +0900 Subject: [PATCH 7/8] =?UTF-8?q?fix:=20=EA=B8=B0=EB=B3=B8=20=EC=97=AD?= =?UTF-8?q?=EB=9F=89=20=ED=82=A4=EC=9B=8C=EB=93=9C=20=EC=88=9C=EC=84=9C=20?= =?UTF-8?q?=EA=B0=80=EB=82=98=EB=8B=A4=EC=88=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/data/keywords.ts | 74 ++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/src/assets/data/keywords.ts b/src/assets/data/keywords.ts index 567c340..6c32eaf 100644 --- a/src/assets/data/keywords.ts +++ b/src/assets/data/keywords.ts @@ -1,82 +1,82 @@ export const basicKeywords = [ { - id: "018f99d1-cfd9-7991-8519-3c04e1ef6dab", - name: "프레젠테이션", - }, - { - id: "018f99d1-0061-7785-b066-c56ccb8e8929", - name: "문서화", + id: "018f99d0-7434-75d1-96af-66da7799a7e2", + name: "계획력", }, { id: "018f99d0-926b-7c84-99e8-f726538000e4", name: "글쓰기", }, { - id: "018f99d1-10d4-7fc7-afa3-20253ba5f1d3", - name: "문제 발견", - }, - { - id: "018f99d1-a0bb-76e3-a96c-4b25a30aec5b", - name: "탐구력", + id: "018f99d0-a5b0-7770-bb6c-690b8360f729", + name: "꼼꼼함", }, { id: "018f99d0-b6ef-7dcc-b149-146544946f03", name: "끈기", }, + { + id: "018f99d0-d52e-718e-ad09-018eefc42532", + name: "논리력", + }, + { + id: "018f99d0-effc-7252-9fd3-86844df0da46", + name: "리더십", + }, + { + id: "018f99d1-0061-7785-b066-c56ccb8e8929", + name: "문서화", + }, + { + id: "018f99d1-10d4-7fc7-afa3-20253ba5f1d3", + name: "문제 발견", + }, { id: "018f99d1-2134-7c2b-9bb1-ec87362cee1b", - name: "문제해결", + name: "문제 해결", }, { id: "018f99d1-3178-70c0-9105-ec3a62418bb4", name: "분석력", }, { - id: "018f99d0-7434-75d1-96af-66da7799a7e2", - name: "계획력", + id: "018f99d1-44b5-74ff-b0e3-d5ec54106584", + name: "아이디어", }, { - id: "018f99d1-af15-7eb9-9a8e-f480e5d51294", - name: "통찰력", + id: "018f99d1-56e2-7e15-9cb2-47b256a01def", + name: "인력 관리", }, { - id: "018f99d0-d52e-718e-ad09-018eefc42532", - name: "논리력", + id: "018f99d1-67aa-742f-837a-b3fa82e781b0", + name: "주도성", }, { - id: "018f99d1-e00c-7ef2-88c0-c8bd4e923ce0", - name: "협업", + id: "018f99d1-79cd-7a61-bb86-596239427394", + name: "책임감", }, { id: "018f99d1-9175-702f-854b-df51010040c2", name: "커뮤니케이션", }, { - id: "018f99d1-44b5-74ff-b0e3-d5ec54106584", - name: "아이디어", + id: "018f99d1-a0bb-76e3-a96c-4b25a30aec5b", + name: "탐구력", }, { - id: "018f99d0-effc-7252-9fd3-86844df0da46", - name: "리더십", + id: "018f99d1-af15-7eb9-9a8e-f480e5d51294", + name: "통찰력", }, { id: "018f99d1-c131-7ac2-92f7-2c95dbdce1d1", name: "프로젝트 관리", }, { - id: "018f99d1-56e2-7e15-9cb2-47b256a01def", - name: "인력 관리", - }, - { - id: "018f99d1-67aa-742f-837a-b3fa82e781b0", - name: "주도성", - }, - { - id: "018f99d1-79cd-7a61-bb86-596239427394", - name: "책임감", + id: "018f99d1-cfd9-7991-8519-3c04e1ef6dab", + name: "프레젠테이션", }, { - id: "018f99d0-a5b0-7770-bb6c-690b8360f729", - name: "꼼꼼함", + id: "018f99d1-e00c-7ef2-88c0-c8bd4e923ce0", + name: "협업", }, ]; From 4c5ce02813c3bfafdb3e8ea9565090e7290f0548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=ED=9A=A8=EC=9B=90?= Date: Wed, 22 May 2024 19:26:00 +0900 Subject: [PATCH 8/8] =?UTF-8?q?feat:=20=EA=B5=AC=EA=B8=80=20redirect=20uri?= =?UTF-8?q?=20=EB=B0=B0=ED=8F=AC=20url=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/SignInPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/SignInPage.tsx b/src/pages/SignInPage.tsx index e64d7dd..db119d7 100644 --- a/src/pages/SignInPage.tsx +++ b/src/pages/SignInPage.tsx @@ -67,7 +67,7 @@ const SignInPage = () => { code: codeResponse.code, client_id: process.env.REACT_APP_GOOGLE_CLIENT_ID, client_secret: process.env.REACT_APP_GOOGLE_CLIENT_SECRET, - redirect_uri: "http://localhost:3000", + redirect_uri: "https://gangflight.netlify.app", grant_type: "authorization_code", }; axios