Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fix] 최종 QA 반영 #281

Merged
merged 6 commits into from
Jul 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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