Skip to content
Closed
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
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import showToast from 'utils/ts/showToast';
import styles from './ReportForm.module.scss';

const options = [
{ value: '1', label: '주제와 맞지 않음', subtitle: '분실물과 관련 없는 내용입니다.' },
{ value: '1', label: '주제에 맞지 않음', subtitle: '분실물과 관련 없는 글입니다.' },
{ value: '2', label: '스팸', subtitle: '홍보성 글입니다.' },
{ value: '3', label: '욕설', subtitle: '비방, 모욕 등이 포함된 글입니다.' },
{ value: '4', label: '개인정보', subtitle: '개인정보가 포함된 글입니다.' },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export default function FormDate({
useEscapeKeyDown({ onEscape: closeCalendar });

const dateLabel = type === 'FOUND' ? '습득 일자' : '분실 일자';
const placeholderText = type === 'FOUND' ? '습득 일자를 선택해주세요.' : '분실 일자를 선택해주세요.';
const placeholderText = type === 'FOUND' ? '습득 일자를 입력해주세요.' : '분실 일자를 입력해주세요.';
const warningText = type === 'FOUND' ? '습득 일자가 입력되지 않았습니다.' : '분실 일자가 입력되지 않았습니다.';

return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export default function FormFoundPlace({ foundPlace, setFoundPlace, isFoundPlace
};

const placeLabel = type === 'FOUND' ? '습득 장소' : '분실 장소';
const placeholderText = type === 'FOUND' ? '습득 장소를 선택해주세요.' : '예상되는 분실 장소가 있다면 입력해주세요.';
const placeholderText = type === 'FOUND' ? '습득 장소를 입력해주세요.' : '예상되는 분실 장소가 있다면 입력해주세요.';

return (
<div className={styles['found-place']}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import styles from './Complete.module.scss';

const TITLE = '비밀번호 변경 완료';
const SUB_TITLE = [
{ key: 'line1', text: '비밀번호가 변경되었습니다.' },
{ key: 'line2', text: '새로운 비밀번호로 로그인 부탁드립니다.' },
{ key: 'line1', text: '비밀번호 변경이 완료되었습니다.' },
{ key: 'line2', text: '홈페이지에서 바로 로그인이 가능합니다.' },
];

function CompletePage() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export const passwordValidationReducer = (
case 'SPACING':
return { message: '비밀번호에 공백은 허용되지 않습니다.', isValid: false };
case 'MISMATCH':
return { message: '입력하신 비밀번호가 일치하지 않습니다.', isValid: false };
return { message: '비밀번호가 일치하지 않습니다.', isValid: false };
case 'CONFIRM_EMPTY':
return { message: '비밀번호 확인을 입력해주세요.', isValid: false };
case 'VALID':
Expand Down
8 changes: 5 additions & 3 deletions apps/web/src/components/Auth/SignupPage/Steps/Terms/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export default function Terms({ onNext }: TermsProps) {
{...register('privacy_policy_agreement')}
/>
<span className={styles.term__title}>
{isMobile ? '개인정보 이용약관(필수)' : '[필수] 개인정보 이용약관'}
{isMobile ? '개인정보 이용약관 (필수)' : '[필수] 개인정보 이용약관'}
</span>
</label>
<textarea className={styles.term__content} readOnly defaultValue={privacy} />
Expand All @@ -77,7 +77,7 @@ export default function Terms({ onNext }: TermsProps) {
checked={watch('koin_terms_agreement')}
{...register('koin_terms_agreement')}
/>
<span className={styles.term__title}>{isMobile ? '코인 이용약관(필수)' : '[필수] 코인 이용약관'}</span>
<span className={styles.term__title}>{isMobile ? '코인 이용약관 (필수)' : '[필수] 코인 이용약관'}</span>
</label>
<textarea className={styles.term__content} readOnly defaultValue={koin} />
<label
Expand All @@ -92,7 +92,9 @@ export default function Terms({ onNext }: TermsProps) {
checked={watch('marketing_notification_agreement')}
{...register('marketing_notification_agreement', { required: false })}
/>
<span className={styles.term__title}>{isMobile ? '마케팅 수신 동의(선택)' : '[선택] 마케팅 수신 동의'}</span>
<span className={styles.term__title}>
{isMobile ? '마케팅 수신 동의약관 (선택)' : '[선택] 마케팅 수신 동의'}
</span>
</label>
<textarea className={styles.term__content} readOnly defaultValue={marketing} />
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ export default function MobileView({ formData, setFormData, openModal, isEdit, s
[styles['form__text-input--error']]: formData.location.length === 0 && isTried,
})}
value={formData.location}
placeholder="동아리 방 위치를 입력하세요(필수)"
placeholder="동아리 방 위치를 입력해주세요.(필수)"
onChange={(e) => setFormData({ ...formData, location: e.target.value })}
/>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ export default function PCView({ formData, setFormData, openModal, isEdit, setTy
type="text"
value={formData.location}
onChange={(e) => setFormData({ ...formData, location: e.target.value })}
placeholder="동아리 방 위치를 입력하세요(필수)"
placeholder="동아리 방 위치를 입력해주세요.(필수)"
maxLength={20}
/>
{!formData.location && isTried && <ClubInputErrorCondition />}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export default function DesktopStoreList(storeListProps: StoreListProps) {
<div className={styles['store-list__rate']}>{`${store.average_rate.toFixed(1)}`}</div>
<div className={styles['store-list__review--text']}>
&#40;&nbsp;
{`총 리뷰 ${store?.review_count > 10 ? '10+' : store?.review_count}개`}
{`리뷰 ${store?.review_count > 10 ? '10+' : store?.review_count}개`}
&nbsp;&#41;
</div>
</>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export default function MobileStoreList(mobileStoreListProps: MobileStoreListPro
<div className={styles['store-list__rate']}>{`${store.average_rate.toFixed(1)}`}</div>
<div className={styles['store-list__review--text']}>
&#40;&nbsp;
{`총 리뷰 ${store?.review_count > 10 ? '10+' : store?.review_count}개`}
{`리뷰 ${store?.review_count > 10 ? '10+' : store?.review_count}개`}
&nbsp;&#41;
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export default function ApplicationStep({ mode, onBack, onSubmit, isSubmitting,
label="보유기술 / 자격증"
description="기술 / 자격증은 항목별로 하나씩 작성해주세요."
addButtonLabel="기술 / 자격증 추가"
placeholder="기술 / 자격증을 작성해주세요."
placeholder="기술 또는 자격증을 입력해주세요."
onAppend={() =>
actionEventClick({
team: 'CAMPUS',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ export default function BasicInfoStep({ onNext }: BasicInfoStepProps) {
label="보유기술 / 자격증"
description="기술 / 자격증은 항목별로 하나씩 작성해주세요."
addButtonLabel="기술 / 자격증 추가"
placeholder="기술 / 자격증을 작성해주세요."
placeholder="기술 또는 자격증을 입력해주세요."
error={errors.skills?.message}
onAppend={() =>
actionEventClick({
Expand Down
14 changes: 7 additions & 7 deletions apps/web/src/components/Team/utils/getNotificationTitle.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import type { TeamRecruitmentNotification, TeamRecruitmentNotificationType } from 'api/team/entity';

const NOTIFICATION_TITLE: Record<TeamRecruitmentNotificationType, string> = {
NEW_APPLICATION: '팀원모집 새 지원',
APPLICATION_ACCEPTED: '팀원모집 지원 승인',
APPLICATION_REJECTED: '팀원모집 지원 거절',
RECRUITMENT_CLOSED: '팀원모집 기간 종료',
RECRUITMENT_DELETED: '팀원모집 글 삭제',
NEW_CHAT_MESSAGE: '팀원모집 새 메시지',
NEW_APPLICATION: '팀원 모집 새 지원',
APPLICATION_ACCEPTED: '팀원 모집 지원 승인',
APPLICATION_REJECTED: '팀원 모집 지원 거절',
RECRUITMENT_CLOSED: '팀원 모집기간 종료',
RECRUITMENT_DELETED: '팀원 모집글 삭제',
NEW_CHAT_MESSAGE: '팀원 모집 새 메시지',
};

const getNotificationTitle = (notification: TeamRecruitmentNotification) => {
if (notification.type === 'NEW_CHAT_MESSAGE' && notification.sender_nickname) {
return `팀원모집 ${notification.sender_nickname}님의 메시지`;
return `팀원 모집 ${notification.sender_nickname}님의 메시지`;
}

return NOTIFICATION_TITLE[notification.type];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ export default function SoldoutReportModal({ initialPlace, variantLabel, onClose
</div>

<div className={styles.section}>
<span className={styles.section__label}>품절 코너 선택</span>
<span className={styles.section__label}>품절 코스 선택</span>
<div className={styles.chips}>
{SOLDOUT_REPORT_PLACES.map((place) => {
const isSoldout = soldoutPlaces.includes(place);
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/routes/auth.modifyinfo.index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ const PasswordForm = React.forwardRef<ICustomFormInput | null, ICustomFormInputP
}

if (password !== passwordConfirmValue) {
valid = '입력하신 비밀번호가 일치하지 않습니다.';
valid = '비밀번호가 일치하지 않습니다.';
} else if (password.length < 6 || password.length > 18) {
valid = '비밀번호는 6자 이상 18자 이하여야 합니다.';
} else if (password.includes(' ') || passwordConfirmValue.includes(' ')) {
Expand Down
11 changes: 10 additions & 1 deletion apps/web/src/routes/auth.signup.$id.index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,15 @@ type UserType = '학생' | '외부인';
const mobileSteps: StepTitle[] = ['약관동의', '본인인증', '회원유형선택', '정보입력', '완료'];
const desktopSteps: StepTitle[] = ['약관동의', '본인인증', '정보입력', '완료'];

// 단계 이름은 단계 전환 키로도 쓰이므로 화면에 보이는 이름만 따로 둔다.
const STEP_LABEL: Record<StepTitle, string> = {
약관동의: '약관 동의',
본인인증: '본인 인증',
회원유형선택: '회원 유형 선택',
정보입력: '정보 입력',
완료: '완료',
};

function SignupPage() {
const sessionLogger = useSessionLogger();
const isMobile = useMediaQuery();
Expand Down Expand Up @@ -117,7 +126,7 @@ function SignupPage() {
)}

{currentStep !== '완료' && (
<ProgressBar steps={activeSteps.map((title) => ({ title }))} currentIndex={currentIndex} />
<ProgressBar steps={activeSteps.map((step) => ({ title: STEP_LABEL[step] }))} currentIndex={currentIndex} />
)}
<FormProvider {...methods}>
<Step name="약관동의">
Expand Down
Loading