diff --git a/gongjakso/src/pages/Portfolio/MakePortfolio.jsx b/gongjakso/src/pages/Portfolio/MakePortfolio.jsx index 716ba6aa..83a9d8c3 100644 --- a/gongjakso/src/pages/Portfolio/MakePortfolio.jsx +++ b/gongjakso/src/pages/Portfolio/MakePortfolio.jsx @@ -24,8 +24,8 @@ const MakePortfolio = ({ portfolioId }) => { { id: uuidv4(), schoolName: '', - gradeStatus: '1학년', - state: '재학 중', + gradeStatus: '', + state: '', }, ]); const [careerSections, setCareerSections] = useState([ @@ -38,7 +38,7 @@ const MakePortfolio = ({ portfolioId }) => { }, ]); const [activitySections, setActivitySections] = useState([ - { id: uuidv4(), activityName: '', activityStatus: '활동 중' }, + { id: uuidv4(), activityName: '', activityStatus: '' }, ]); const [awardSections, setAwardSections] = useState([ { id: uuidv4(), competitionName: '', award: '' }, @@ -138,16 +138,16 @@ const MakePortfolio = ({ portfolioId }) => { portfolioData.educationList.length ? portfolioData.educationList.map(section => ({ schoolName: section.school || '', - gradeStatus: section.grade || '1학년', - state: section.state || '재학 중', + gradeStatus: section.grade || '', + state: section.state || '', id: uuidv4(), })) : [ { id: uuidv4(), schoolName: '', - gradeStatus: '1학년', - state: '재학 중', + gradeStatus: '', + state: '', }, ], ); @@ -187,7 +187,7 @@ const MakePortfolio = ({ portfolioId }) => { { id: uuidv4(), activityName: '', - activityStatus: '활동 중', + activityStatus: '', }, ], ); @@ -369,10 +369,7 @@ const MakePortfolio = ({ portfolioId }) => { { const updatedSections = [ @@ -389,9 +386,7 @@ const MakePortfolio = ({ portfolioId }) => { { const updatedSections = [ @@ -569,8 +564,7 @@ const MakePortfolio = ({ portfolioId }) => { id={`Activitystatus-${index}`} selectOptions={activityStatus_options} placeholder={ - section.activityStatus || - activityStatus_options[0] + section.activityStatus || '활동 상태' } value={section.activityStatus || ''} onChange={value => { diff --git a/gongjakso/src/pages/Portfolio/UsePortfolio.jsx b/gongjakso/src/pages/Portfolio/UsePortfolio.jsx index d97d955c..d70a9383 100644 --- a/gongjakso/src/pages/Portfolio/UsePortfolio.jsx +++ b/gongjakso/src/pages/Portfolio/UsePortfolio.jsx @@ -28,9 +28,8 @@ const UsePortfolio = () => { const fileData = fileResponse?.data?.data; const notionData = notionResponse?.data?.data; - // 파일과 노션 데이터 상태에 저장 - if (fileData) { + if (fileData && fileData.fileUri) { const fileName = fileData.fileUri .split('/') .pop() @@ -41,9 +40,10 @@ const UsePortfolio = () => { uri: fileData.fileUri, }); } - - if (notionData) { + if (notionData && notionData.notionUri) { setSnsLink(notionData.notionUri || ''); + } else { + console.log('No Notion URI found'); } } catch (error) { console.error( @@ -52,8 +52,9 @@ const UsePortfolio = () => { ); } }; - - fetchPortfolio(); + if (id) { + fetchPortfolio(); + } getMyInfo().then(response => { setProfileData(response?.data); }); @@ -192,7 +193,9 @@ const UsePortfolio = () => { setSnsLink(e.target.value)} /> diff --git a/gongjakso/src/pages/ProfilePage/ProfilePage.jsx b/gongjakso/src/pages/ProfilePage/ProfilePage.jsx index e71ccc85..903dd1ec 100644 --- a/gongjakso/src/pages/ProfilePage/ProfilePage.jsx +++ b/gongjakso/src/pages/ProfilePage/ProfilePage.jsx @@ -547,7 +547,7 @@ const ProfilePage = () => { )} - 내가 모집 중인 팀 + 나의 모집 기록 {postContent1?.map(post => ( { - 내가 지원한 팀 + 나의 지원 기록 @@ -580,7 +580,7 @@ const ProfilePage = () => { - 내가 참여한 공모전 + 나의 참여 기록