From 9c47ba7e1104b7e4b1f438efef22afcbbdea2f62 Mon Sep 17 00:00:00 2001 From: lydiacho Date: Tue, 30 Jul 2024 14:42:33 +0900 Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=EC=9D=B4=EB=A9=94=EC=9D=BC=20?= =?UTF-8?q?=EC=9D=B8=EC=A6=9D=EB=B2=88=ED=98=B8=20=EC=A0=84=EC=86=A1=20?= =?UTF-8?q?=EB=9D=BC=EC=9D=B4=ED=8C=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/components/Input/components/InputTheme/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/components/Input/components/InputTheme/index.tsx b/src/common/components/Input/components/InputTheme/index.tsx index dc2f304c..245af7e9 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분 정도 소요될 수 있어요. + 약 1분 이후 메일이 오지 않는다면 스팸 메일함을 확인해주세요.

)} From e3c4992eb8f4794d301d188494ce4e7c7bcb5319 Mon Sep 17 00:00:00 2001 From: lydiacho Date: Tue, 30 Jul 2024 14:46:43 +0900 Subject: [PATCH 2/6] =?UTF-8?q?fix:=20=EC=9D=B4=EC=A0=84=EA=B8=B0=EC=88=98?= =?UTF-8?q?=ED=99=9C=EB=8F=99=EC=97=AC=EB=B6=80=20=ED=95=B4=EB=8B=B9?= =?UTF-8?q?=EC=82=AC=ED=95=AD=EC=97=86=EC=9D=8C=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ApplyPage/components/DefaultSection/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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} From 399e3c26e860396a9d8a58447f813334f9bdba54 Mon Sep 17 00:00:00 2001 From: lydiacho Date: Tue, 30 Jul 2024 14:48:13 +0900 Subject: [PATCH 3/6] =?UTF-8?q?fix:=20=EB=8F=99=EC=95=84=EB=A6=AC=EB=A5=BC?= =?UTF-8?q?=20=EC=95=8C=EA=B2=8C=EB=90=9C=EA=B2=BD=EB=A1=9C=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/BottomSection/index.tsx | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) 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 From 89caca71b4b745a359c16a98810563e0fe4f093d Mon Sep 17 00:00:00 2001 From: lydiacho Date: Tue, 30 Jul 2024 14:58:02 +0900 Subject: [PATCH 4/6] =?UTF-8?q?fix:=20=EC=A7=80=EC=9B=90=EC=84=9C=20?= =?UTF-8?q?=ED=97=A4=EB=8D=94=20=EB=B0=B0=EA=B2=BD=EC=98=81=EC=97=AD=20?= =?UTF-8?q?=EC=9E=AC=EC=A7=80=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ApplyPage/components/ApplyHeader/style.css.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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, From f3c2746e090f357fe97d219410dbb6a21e1ae5b9 Mon Sep 17 00:00:00 2001 From: lydiacho Date: Tue, 30 Jul 2024 15:03:21 +0900 Subject: [PATCH 5/6] =?UTF-8?q?fix:=20placeholer=20prop=20optional?= =?UTF-8?q?=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/views/ApplyPage/types.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } From fc27ac2c112a5b900808d8279703025d20c4cf9a Mon Sep 17 00:00:00 2001 From: lydiacho Date: Tue, 30 Jul 2024 16:05:35 +0900 Subject: [PATCH 6/6] =?UTF-8?q?fix:=20=EC=9D=B4=EB=A9=94=EC=9D=BC=20?= =?UTF-8?q?=EC=9D=B8=EC=A6=9D=EC=A0=84=EC=86=A1=20=EB=9D=BC=EC=9D=B4?= =?UTF-8?q?=ED=8C=85=20=EC=B6=95=EC=95=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/components/Input/components/InputTheme/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/components/Input/components/InputTheme/index.tsx b/src/common/components/Input/components/InputTheme/index.tsx index 245af7e9..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분 정도 소요될 수 있어요.

- 약 1분 이후 메일이 오지 않는다면 스팸 메일함을 확인해주세요. + 메일이 오지 않는다면 스팸 메일함을 확인해주세요.

)}