From cfc7d56886e550f751bb13160d32387248874497 Mon Sep 17 00:00:00 2001 From: llddang Date: Fri, 13 Sep 2024 14:49:50 +0900 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=EB=A7=88=EC=9D=BC=EC=8A=A4?= =?UTF-8?q?=ED=86=A4=20=EC=8B=A4=EC=A0=81=20=EB=93=B1=EB=A1=9D=20=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=97=90=EC=84=9C=20=EC=A3=BC=EC=9A=94=20?= =?UTF-8?q?=EA=B3=B5=EC=9D=B8=20=EC=98=81=EC=96=B4=20=EC=8B=9C=ED=97=98=20?= =?UTF-8?q?=EA=B0=84=20=EC=84=B1=EC=A0=81=20=ED=99=98=EC=82=B0=ED=91=9C=20?= =?UTF-8?q?=EB=A7=81=ED=81=AC=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20=EC=83=88?= =?UTF-8?q?=ED=83=AD=EC=9C=BC=EB=A1=9C=20=EC=97=B4=EB=A6=AC=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #204 --- .../my-page/milestone/register/write/page.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/frontend/src/app/(client)/(withSidebar)/my-page/milestone/register/write/page.tsx b/frontend/src/app/(client)/(withSidebar)/my-page/milestone/register/write/page.tsx index d65abdc4..c52afed1 100644 --- a/frontend/src/app/(client)/(withSidebar)/my-page/milestone/register/write/page.tsx +++ b/frontend/src/app/(client)/(withSidebar)/my-page/milestone/register/write/page.tsx @@ -174,12 +174,13 @@ const Page = () => {
  • 영어성적은 부산대학교 학생지원시스템에 접속하여{' '} - {'<주요 공인 영어 시험 간 성적 환산표>'} - + 에 따라 TOEIC 점수로 환산하여 입력
  • From 2204bef04c3037cbc983b4c816526d567ff9ce39 Mon Sep 17 00:00:00 2001 From: llddang Date: Fri, 13 Sep 2024 15:54:31 +0900 Subject: [PATCH 2/3] =?UTF-8?q?design:=20=EB=A7=88=EC=9D=BC=EC=8A=A4?= =?UTF-8?q?=ED=86=A4=20=EC=8B=A4=EC=A0=81=20=EB=93=B1=EB=A1=9D=EC=97=90=20?= =?UTF-8?q?=EB=8F=84=EC=9B=80=EB=A7=90=20=EB=93=B1=EB=A1=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #204 --- .../MilestoneHistoryStatusLabel/index.tsx | 2 +- .../my-page/milestone/register/write/page.tsx | 2 ++ .../components/Formik/TextInput/index.tsx | 15 +++++++++++++-- .../src/components/Formik/DatePicker/index.tsx | 17 +++++++++++++++-- 4 files changed, 31 insertions(+), 5 deletions(-) diff --git a/frontend/src/app/(client)/(withSidebar)/my-page/components/MilestoneHistoryStatusLabel/index.tsx b/frontend/src/app/(client)/(withSidebar)/my-page/components/MilestoneHistoryStatusLabel/index.tsx index 04a68877..764ec6e3 100644 --- a/frontend/src/app/(client)/(withSidebar)/my-page/components/MilestoneHistoryStatusLabel/index.tsx +++ b/frontend/src/app/(client)/(withSidebar)/my-page/components/MilestoneHistoryStatusLabel/index.tsx @@ -17,7 +17,7 @@ const MilestoneHistoryStatusLabel = ({ status, rejectReason }: MilestoneHistoryS
    반려 -
    +
    {rejectReason}
    diff --git a/frontend/src/app/(client)/(withSidebar)/my-page/milestone/register/write/page.tsx b/frontend/src/app/(client)/(withSidebar)/my-page/milestone/register/write/page.tsx index c52afed1..6584ae34 100644 --- a/frontend/src/app/(client)/(withSidebar)/my-page/milestone/register/write/page.tsx +++ b/frontend/src/app/(client)/(withSidebar)/my-page/milestone/register/write/page.tsx @@ -141,6 +141,7 @@ const Page = () => { name="description" label="등록 상세 제목" placeholder="예) 제 5회 창의융합해커톤 수상" + tooltip="해당 마일스톤 실적의 핵심 내용을 간단명료하게 입력해주세요." type="text" value={values.description} onChange={handleChange} @@ -151,6 +152,7 @@ const Page = () => { type="date" name="activatedAt" label="활동 인정일" + tooltip="마일스톤 실적이 공식적으로 인정된 날짜를 선택해주세요.\n ex) 대회 수상일, 자격증 취득일, 프로젝트 완료일." value={values.activatedAt} onChange={handleChange} onBlur={handleBlur} diff --git a/frontend/src/app/(client)/components/Formik/TextInput/index.tsx b/frontend/src/app/(client)/components/Formik/TextInput/index.tsx index fe03ce5c..13bc6742 100644 --- a/frontend/src/app/(client)/components/Formik/TextInput/index.tsx +++ b/frontend/src/app/(client)/components/Formik/TextInput/index.tsx @@ -1,3 +1,5 @@ +import { VscInfo } from '@react-icons/all-files/vsc/VscInfo'; + type BuiltInTextInputProps = React.DetailedHTMLProps, HTMLInputElement>; interface CustomTextInputProps { @@ -5,6 +7,7 @@ interface CustomTextInputProps { label: string; isRequired?: boolean; errorText?: string; + tooltip?: string; onKeyDownEnter?(): void; onChangeText?(text: string): void; } @@ -12,12 +15,20 @@ interface CustomTextInputProps { export type TextInputProps = BuiltInTextInputProps & CustomTextInputProps; export const TextInput = ({ isRequired = false, ...props }: TextInputProps) => { - const { label, errorText, onKeyDownEnter, onChangeText, ...inputProps } = props; + const { label, errorText, tooltip, onKeyDownEnter, onChangeText, ...inputProps } = props; const hasError = errorText !== undefined; return (
    -