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.

Sign up for GitHub

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

Jump to bottom

refactor: [70] 폼 에러 메시지 디자인 수정 #79

Merged
merged 1 commit into from
Aug 28, 2024
Merged

refactor: [70] 폼 에러 메시지 디자인 수정 #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 18 additions & 0 deletions web/src/components/Survey/create-survey-page1.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ export const CreateSurveyPageContent = styled.section`
color: ${COLORS.Gray3};
}
}
.error {
border-color: #ff4848;
}

.textarea {
border: none;
Expand All @@ -71,10 +74,22 @@ export const CreateSurveyPageContent = styled.section`
color: ${COLORS.Gray2};
font-size: 0.875rem;
font-size: 400;
}

.date-label {
display: flex;
align-items: center;
margin-bottom: 0.625rem;
.error-text {
margin-left: 0.5rem;
font-size: 0.75rem;
font-weight: 400;
color: #ff4848;
}
}

.date-container {
position: relative;
height: 2.875rem;
display: flex;
align-items: center;
Expand All @@ -84,6 +99,9 @@ export const CreateSurveyPageContent = styled.section`
border-radius: 10px;
padding: 0.5rem 0.75rem;
}
.date-error {
border-color: #ff4848;
}
}

.button {
Expand Down
43 changes: 32 additions & 11 deletions web/src/components/Survey/create-survey-page1.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,16 +86,21 @@ export const CreateSurveyPageStep1 = () => {
<FormField
control={form.control}
name="title"
render={({ field }) => (
render={({ field, fieldState }) => (
<FormItem>
<FormControl>
<Input
placeholder="제목을 입력해주세요"
{...field}
className="input"
className={`input ${fieldState.error && 'error'}`}
/>
</FormControl>
<FormMessage />
<FormMessage
style={{
paddingTop: '4px',
paddingLeft: '10px',
}}
/>
</FormItem>
)}
/>
Expand All @@ -111,14 +116,26 @@ export const CreateSurveyPageStep1 = () => {
className="textarea"
/>
</FormControl>
<FormMessage />
<FormMessage
style={{
paddingLeft: '10px',
}}
/>
</FormItem>
)}
/>
</Box>
<Box className="box">
<Label>이벤트 진행 기간</Label>
<div className="date-container">
<div className="date-label">
<Label>이벤트 진행 기간</Label>
{(form.getFieldState('eventPeriod.startDate').error ||
form.getFieldState('eventPeriod.endDate').error) && (
<p className="error-text">이벤트 진행 기간을 입력해주세요</p>
)}
</div>
<div
className={`date-container ${(form.getFieldState('eventPeriod.endDate') || form.getFieldState('eventPeriod.startDate')) && 'date-error'}`}
>
<FormField
control={form.control}
name="eventPeriod.startDate"
Expand All @@ -134,7 +151,6 @@ export const CreateSurveyPageStep1 = () => {
minDate={startDate}
/>
</FormControl>
<FormMessage />
</FormItem>
);
}}
Expand All @@ -156,14 +172,20 @@ export const CreateSurveyPageStep1 = () => {
minDate={startDate}
/>
</FormControl>
<FormMessage />
</FormItem>
);
}}
/>
</div>
<Label style={{ marginTop: '1rem' }}>당첨자 발표일</Label>
<div className="date-container">
<div style={{ marginTop: '1rem' }} className="date-label">
<Label>당첨자 발표일</Label>
{form.getFieldState('announcementDate').error && (
<p className="error-text">당첨자 발표일시를 입력해주세요</p>
)}
</div>
<div
className={`date-container ${form.getFieldState('announcementDate') && 'date-error'}`}
>
<FormField
control={form.control}
name="announcementDate"
Expand All @@ -181,7 +203,6 @@ export const CreateSurveyPageStep1 = () => {
minDate={endDate}
/>
</FormControl>
<FormMessage />
</FormItem>
);
}}
Expand Down
9 changes: 5 additions & 4 deletions web/src/components/auth/sign-up1.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import styled from 'styled-components';
import { Subtitle } from '../common/Subtitle';

import { useNavigate } from 'react-router-dom';

import rightArrow from '@/assets/rightarrow.png';
import checkRound from '../../assets/checkRound.png';
import uncheckRound from '../../assets/uncheckRound.png';

Expand Down Expand Up @@ -60,7 +62,6 @@ export const SignUp1: React.FC = () => {
/>
<Label>(필수) 만 14세 이상입니다.</Label>
</TermContent>
{/* <img src={rightArrow} width="18px" height="18px" /> */}
</TermItem>
<TermItem>
<TermContent onClick={() => handleCheck('terms')}>
Expand All @@ -75,7 +76,7 @@ export const SignUp1: React.FC = () => {
href="https://phase-comic-d2b.notion.site/c77adc8b28934f1194b9787150a16364?pvs=4"
target="blank"
>
{/* <img src={rightArrow} width="18px" height="18px" /> */}
<img src={rightArrow} width={10} height={10} />
</a>
</TermItem>
<TermItem>
Expand All @@ -91,7 +92,7 @@ export const SignUp1: React.FC = () => {
href="https://phase-comic-d2b.notion.site/7ab3169dc4564272b42c0074d86e5806?pvs=4"
target="blank"
>
{/* <img src={rightArrow} width="18px" height="18px" /> */}
<img src={rightArrow} width={10} height={10} />
</a>
</TermItem>
<TermItem>
Expand All @@ -107,7 +108,7 @@ export const SignUp1: React.FC = () => {
href="https://phase-comic-d2b.notion.site/7b8c9c80568f4599acd1046c619425ee?pvs=4"
target="blank"
>
{/* <img src={rightArrow} width="18px" height="18px" /> */}
<img src={rightArrow} width={10} height={10} />
</a>
</TermItem>
</TermsContainer>
Expand Down
6 changes: 3 additions & 3 deletions web/src/components/common/form/form.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export const StyledFormDescription = styled.p`
`;

export const StyledFormMessage = styled.p`
font-size: 0.875rem;
font-weight: 500;
color: red;
font-size: 0.75rem;
font-weight: 400;
color: #ff4848;
`;
Loading