diff --git a/src/common/components/Input/components/InputTheme/index.tsx b/src/common/components/Input/components/InputTheme/index.tsx index dc2f304c..8617d2ad 100644 --- a/src/common/components/Input/components/InputTheme/index.tsx +++ b/src/common/components/Input/components/InputTheme/index.tsx @@ -167,9 +167,9 @@ export const TextBox이메일 = ({ {isActive && ( <> -

이메일이 전송되었어요.

+

이메일이 전송되었어요. 약 1분 정도 소요될 수 있어요.

- 네트워크 상황에 따라 약 1분 정도 소요될 수 있어요. + 메일이 오지 않는다면 스팸 메일함을 확인해주세요.

)} diff --git a/src/views/ApplyPage/components/ApplyHeader/style.css.ts b/src/views/ApplyPage/components/ApplyHeader/style.css.ts index 6b94ee58..0cf0cce1 100644 --- a/src/views/ApplyPage/components/ApplyHeader/style.css.ts +++ b/src/views/ApplyPage/components/ApplyHeader/style.css.ts @@ -7,10 +7,10 @@ export const headerContainer = style({ display: 'flex', justifyContent: 'space-between', alignItems: 'center', - padding: '24px 0 20px', + padding: '24px 360px 20px', position: 'sticky', top: 74, - width: 720, + width: 1440, margin: '60px auto 0px', boxShadow: `0 0 0 1px ${theme.color.white}`, backgroundColor: theme.color.white, diff --git a/src/views/ApplyPage/components/BottomSection/index.tsx b/src/views/ApplyPage/components/BottomSection/index.tsx index 1c3786ca..3341ae2c 100644 --- a/src/views/ApplyPage/components/BottomSection/index.tsx +++ b/src/views/ApplyPage/components/BottomSection/index.tsx @@ -21,15 +21,17 @@ const BottomSection = ({ isReview, knownPath }: BottomSectionProps) => { return (

- + {!isMakers && ( + + )}

{isMakers diff --git a/src/views/ApplyPage/components/CommonSection/index.tsx b/src/views/ApplyPage/components/CommonSection/index.tsx index 6816537d..5dce73d3 100644 --- a/src/views/ApplyPage/components/CommonSection/index.tsx +++ b/src/views/ApplyPage/components/CommonSection/index.tsx @@ -25,7 +25,7 @@ const CommonSection = ({ isReview, refCallback, questions, commonQuestionsDraft return (

공통 질문

- {questions?.map(({ urls, value, id, charLimit, isFile }) => { + {questions?.map(({ urls, value, id, charLimit, isFile, placeholder, optional }) => { const draftItem = commonQuestionsById?.[id]; const defaultValue = draftItem ? draftItem.answer.answer : ''; const defaultFile = { id, file: draftItem?.answer.file, fileName: draftItem?.answer.fileName }; @@ -39,9 +39,10 @@ const CommonSection = ({ isReview, refCallback, questions, commonQuestionsDraft defaultValue={defaultValue} maxCount={charLimit} placeholder={ - isFile + placeholder || + (isFile ? '링크로 제출할 경우, 이곳에 작성해주세요. (파일로 제출한 경우에는 ‘파일 제출’이라고 기재 후 제출해주세요.)' - : '' + : '') } extraInput={ isFile ? ( @@ -50,7 +51,7 @@ const CommonSection = ({ isReview, refCallback, questions, commonQuestionsDraft ) : null } - required + required={!optional} disabled={isReview}> {value} diff --git a/src/views/ApplyPage/components/DefaultSection/index.tsx b/src/views/ApplyPage/components/DefaultSection/index.tsx index 93390084..a07991be 100644 --- a/src/views/ApplyPage/components/DefaultSection/index.tsx +++ b/src/views/ApplyPage/components/DefaultSection/index.tsx @@ -238,7 +238,7 @@ const DefaultSection = ({ isMakers, isReview, refCallback, applicantDraft }: Def label="이전 기수 활동 여부 (제명 포함)" name="mostRecentSeason" placeholder="가장 최근에 활동했던 기수를 선택해주세요." - options={SELECT_OPTIONS.mostRecentSeason} + options={isMakers ? SELECT_OPTIONS.mostRecentSeason.slice(1) : SELECT_OPTIONS.mostRecentSeason} required size="lg" disabled={isReview} diff --git a/src/views/ApplyPage/types.ts b/src/views/ApplyPage/types.ts index 56684b89..4bd81590 100644 --- a/src/views/ApplyPage/types.ts +++ b/src/views/ApplyPage/types.ts @@ -30,7 +30,7 @@ export interface Questions { urls: string[]; charLimit: number; isFile: boolean; - placeholder: string; + placeholder?: string; optional: boolean; } diff --git a/src/views/email/complete.html b/src/views/email/complete.html index c93e363e..f2cd2c7f 100644 --- a/src/views/email/complete.html +++ b/src/views/email/complete.html @@ -4,20 +4,42 @@ 지원서 접수 확인 메일 + - +
- +
  
- + - + + + - + - + @@ -120,9 +173,9 @@
  
- sopt-logo +  
+
+ sopt-logo +
  
- 지원서 접수 확인 메일 + text-align: center; + " + class="title"> +
+ + 지원서 접수 확인 메일 +
  
- +
@@ -77,7 +125,6 @@ @@ -94,7 +143,6 @@ @@ -110,7 +160,10 @@ - + + + +
+ text-align: center; + " + class="text"> <%= userName %>님의 <%= term %>기 SOPT <%= part %>파트
+ text-align: center; + " + class="text"> 지원서가 성공적으로 접수되었습니다!
+ text-align: center; + " + class="text"> SOPT에 많은 관심을 주셔서 감사합니다.
  
 
- +
- + - +
   + " + class="small-text"> 본 메일은 발신전용 메일로, 문의 및 회신하실 경우 답변되지 않습니다.
   + " + class="small-text"> 메일내용에 대해 궁금한 사항이 있으시다면 ‘문의하기' 링크를 통해 문의해주시길 바랍니다. 문의하기