Skip to content

Commit

Permalink
[Fix] 최종 QA 반영 (#281)
Browse files Browse the repository at this point in the history
* fix: 이메일 인증번호 전송 라이팅 수정

* fix: 이전기수활동여부 해당사항없음 제거

* fix: 동아리를 알게된경로 제거

* fix: 지원서 헤더 배경영역 재지정

* fix: placeholer prop optional로 수정

* fix: 이메일 인증전송 라이팅 축약
  • Loading branch information
lydiacho authored Jul 30, 2024
1 parent 6c1431c commit ce22ce7
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 15 deletions.
4 changes: 2 additions & 2 deletions src/common/components/Input/components/InputTheme/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,9 @@ export const TextBox이메일 = ({
</InputLine>
{isActive && (
<>
<p className={success}>이메일이 전송되었어요.</p>
<p className={success}>이메일이 전송되었어요. 약 1분 정도 소요될 수 있어요.</p>
<p className={success} style={{ marginTop: '-8px' }}>
네트워크 상황에 따라 약 1분 정도 소요될 수 있어요.
메일이 오지 않는다면 스팸 메일함을 확인해주세요.
</p>
</>
)}
Expand Down
4 changes: 2 additions & 2 deletions src/views/ApplyPage/components/ApplyHeader/style.css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
20 changes: 11 additions & 9 deletions src/views/ApplyPage/components/BottomSection/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,17 @@ const BottomSection = ({ isReview, knownPath }: BottomSectionProps) => {
return (
<section className={sectionContainer}>
<hr className={line} />
<SelectBox
label="동아리를 알게 된 경로"
name="knownPath"
defaultValue={knownPath}
placeholder="지원 경로를 선택해 주세요."
options={SELECT_OPTIONS.knownPath}
required
disabled={isReview}
/>
{!isMakers && (
<SelectBox
label="동아리를 알게 된 경로"
name="knownPath"
defaultValue={knownPath}
placeholder="지원 경로를 선택해 주세요."
options={SELECT_OPTIONS.knownPath}
required
disabled={isReview}
/>
)}
<div id="check-necessary" className={doubleLineCheck}>
<p className={label}>
{isMakers
Expand Down
2 changes: 1 addition & 1 deletion src/views/ApplyPage/components/DefaultSection/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion src/views/ApplyPage/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export interface Questions {
urls: string[];
charLimit: number;
isFile: boolean;
placeholder: string;
placeholder?: string;
optional: boolean;
}

Expand Down

0 comments on commit ce22ce7

Please sign in to comment.