diff --git a/src/components/Modal/customs/LoginRequireModal.jsx b/src/components/Modal/customs/LoginRequireModal.jsx index 9e02a3b..69b70c3 100644 --- a/src/components/Modal/customs/LoginRequireModal.jsx +++ b/src/components/Modal/customs/LoginRequireModal.jsx @@ -2,9 +2,10 @@ import { Modal } from 'components'; import { useCallback } from 'react'; import { useNavigate } from 'react-router-dom'; import theme from 'styles/theme'; - -const MODAL_TITLE_LOGIN_REQUIRED = '로그인이 필요한 서비스입니다.'; -const MODAL_DESCRIPTION_LOGIN_REQUIRED = '로그인 화면으로 이동하시겠어요?'; +import { + MODAL_TITLE_LOGIN_REQUIRED, + MODAL_DESCRIPTION_LOGIN_REQUIRED, +} from 'utils/constants/messages'; const LoginRequireModal = ({ visible, onClose }) => { const navigate = useNavigate(); diff --git a/src/pages/LoginPage/index.jsx b/src/pages/LoginPage/index.jsx index 5b64a69..dfe933e 100644 --- a/src/pages/LoginPage/index.jsx +++ b/src/pages/LoginPage/index.jsx @@ -4,6 +4,7 @@ import { useNavigate } from 'react-router-dom'; import { useState } from 'react'; import { useUserContext } from 'contexts/UserContext'; import { PageWrapper, LoginForm, Modal, Logo } from 'components'; +import { MODAL_LOGIN_FAIL_TITLE, MODAL_LOGIN_FAIL_DESCRIPTION } from 'utils/constants/messages'; const LoginWrapper = styled.div` width: 100%; @@ -54,8 +55,8 @@ const LoginPage = () => { 확인 diff --git a/src/pages/MyInfoEditPage/index.jsx b/src/pages/MyInfoEditPage/index.jsx index 0a0eda8..7f3a20e 100644 --- a/src/pages/MyInfoEditPage/index.jsx +++ b/src/pages/MyInfoEditPage/index.jsx @@ -4,6 +4,7 @@ import { Text, PageWrapper, Input, Modal } from 'components'; import { useNavigate } from 'react-router-dom'; import { useState } from 'react'; import theme from 'styles/theme'; +import { MODAL_CHANGE_PASSWORD_TITLE } from 'utils/constants/messages'; const MyInfoEditPage = () => { const { onChangePassword } = useUserContext(); @@ -102,7 +103,7 @@ const MyInfoEditPage = () => { {isModal && ( - + { onClose(); diff --git a/src/pages/MyInfoPage/UserDetails.jsx b/src/pages/MyInfoPage/UserDetails.jsx index 9af8856..969d056 100644 --- a/src/pages/MyInfoPage/UserDetails.jsx +++ b/src/pages/MyInfoPage/UserDetails.jsx @@ -5,6 +5,7 @@ import { LOGOUT, KEY } from 'utils/constants/icons/names'; import { useUserContext } from 'contexts/UserContext'; import theme from 'styles/theme'; import { useNavigate } from 'react-router-dom'; +import { MODAL_LOGOUT_DESCRIPTION, MODAL_LOGOUT_TITLE } from 'utils/constants/messages'; const UserDetails = () => { const navigate = useNavigate(); @@ -70,8 +71,8 @@ const UserDetails = () => { {isLogoutModal && ( { } if (!defaultImg && !BinaryImg) { - setModalMessage('이미지를 등록해 주세요!'); + setModalMessage(MODAL_UPLOAD_IMAGE_TITLE); setIsModal(true); return; } if (!content) { - setModalMessage('게시글을 작성해 주세요!'); + setModalMessage(MODAL_UPLOAD_POST_TITLE); setIsModal(true); return; } diff --git a/src/pages/SignupPage/index.jsx b/src/pages/SignupPage/index.jsx index 48590cb..16fb6f5 100644 --- a/src/pages/SignupPage/index.jsx +++ b/src/pages/SignupPage/index.jsx @@ -3,6 +3,15 @@ import styled from '@emotion/styled'; import { useNavigate } from 'react-router-dom'; import { useState } from 'react'; import useLocalStorage from 'hooks/useLocalStorage'; +import { + MODAL_SIGNUP_TITLE, + MODAL_SIGNUP_DESCRIPTION, + MODAL_SIGNUP_FAIL_TITLE, + MODAL_SIGNUP_FAIL_DESCRIPTION, + MODAL_SIGNUP_FAIL_NETWORK, + MODAL_SIGNUP_FAIL_EMAIL, +} from 'utils/constants/messages'; + import { useUserContext } from 'contexts/UserContext'; const SignupWrapper = styled.div` @@ -49,9 +58,9 @@ const SignupPage = () => { } catch (e) { e.message = 'SignupError'; if (e.code === 'ERR_BAD_REQUEST') { - setDescription('이미 가입된 이메일입니다.'); + setDescription(MODAL_SIGNUP_FAIL_EMAIL); } else if (e.code === 'ERR_NETWORK') { - setDescription('네트워크 연결이 불안정합니다.'); + setDescription(MODAL_SIGNUP_FAIL_NETWORK); } setShowModal(true); throw e; @@ -64,16 +73,16 @@ const SignupPage = () => { 확인 확인 diff --git a/src/pages/UserPage/UserData.jsx b/src/pages/UserPage/UserData.jsx index 0485485..474cc75 100644 --- a/src/pages/UserPage/UserData.jsx +++ b/src/pages/UserPage/UserData.jsx @@ -15,6 +15,12 @@ import { UserDetail, NickName, } from './style'; +import { + MODAL_FOLLOW_DESCRIPTION, + MODAL_FOLLOW_TITLE, + MODAL_UNFOLLOW_DESCRIPTION, + MODAL_UNFOLLOW_TITLE, +} from 'utils/constants/messages'; const UserData = ({ user, pageUserId, userLevel }) => { const { currentUser, onFollow, onUnfollow } = useUserContext(); @@ -137,8 +143,8 @@ const UserData = ({ user, pageUserId, userLevel }) => { 확인 @@ -146,8 +152,8 @@ const UserData = ({ user, pageUserId, userLevel }) => {