From ce22ce7c986062d741dfc74becd703df17c799ab Mon Sep 17 00:00:00 2001 From: lydiacho <81505421+lydiacho@users.noreply.github.com> Date: Tue, 30 Jul 2024 16:22:51 +0900 Subject: [PATCH] =?UTF-8?q?[Fix]=20=EC=B5=9C=EC=A2=85=20QA=20=EB=B0=98?= =?UTF-8?q?=EC=98=81=20(#281)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: 이메일 인증번호 전송 라이팅 수정 * fix: 이전기수활동여부 해당사항없음 제거 * fix: 동아리를 알게된경로 제거 * fix: 지원서 헤더 배경영역 재지정 * fix: placeholer prop optional로 수정 * fix: 이메일 인증전송 라이팅 축약 --- .../Input/components/InputTheme/index.tsx | 4 ++-- .../components/ApplyHeader/style.css.ts | 4 ++-- .../components/BottomSection/index.tsx | 20 ++++++++++--------- .../components/DefaultSection/index.tsx | 2 +- src/views/ApplyPage/types.ts | 2 +- 5 files changed, 17 insertions(+), 15 deletions(-) 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/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; }