From d9f665f44e01d4eb43b5b94f4738329f14d9c152 Mon Sep 17 00:00:00 2001 From: yunjjeongjo Date: Wed, 20 Jul 2022 13:44:05 +0900 Subject: [PATCH 1/8] =?UTF-8?q?refactor:=20modal=20message=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/constants/messages.js | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 src/utils/constants/messages.js diff --git a/src/utils/constants/messages.js b/src/utils/constants/messages.js new file mode 100644 index 0000000..5a40295 --- /dev/null +++ b/src/utils/constants/messages.js @@ -0,0 +1,21 @@ +export const MODAL_LOGOUT_TITLE = '로그아웃 하시겠어요?'; +export const MODAL_LOGOUT_DESCRIPTION = '로그아웃 시 로그인 화면으로 이동됩니다.'; +export const MODAL_CHANGE_PASSWORD_TITLE = '비밀번호가 변경됐어요!'; +export const MODAL_FOLLOW_TITLE = '팔로우 성공!'; +export const MODAL_FOLLOW_DESCRIPTION = '성공적으로 팔로잉 했어요'; +export const MODAL_FOLLOW_FAIL_TITLE = '팔로우에 실패 했어요!'; +export const MODAL_FOLLOW_FAIL_DESCRIPTION = '이미 팔로우하고 있는 사용자입니다.'; +export const MODAL_UNFOLLOW_TITLE = '언팔하시겠어요?'; +export const MODAL_UNFOLLOW_DESCRIPTION = '언팔하시면 팔로잉 목록에서 사용자가 사라져요'; +export const MODAL_UPLOAD_IMAGE_TITLE = '이미지를 등록해 주세요!'; +export const MODAL_UPLOAD_IMAGE_DESCRIPTION = + '2MB 이하의 jpg, jpeg, gif, png 파일만 등록가능합니다.'; +export const MODAL_UPLOAD_POST_TITLE = '게시글을 작성해 주세요!'; +export const MODAL_LOGIN_FAIL_TITLE = '로그인에 실패했어요!'; +export const MODAL_LOGIN_FAIL_DESCRIPTION = '이메일 및 비밀번호를 다시 확인해 주세요.'; +export const MODAL_SIGNUP_TITLE = '회원가입에 성공했어요!'; +export const MODAL_SIGNUP_DESCRIPTION = '자동 로그인되어 메인 페이지로 이동합니다.'; +export const MODAL_SIGNUP_FAIL_TITLE = '회원가입에 실패했어요!'; +export const MODAL_SIGNUP_FAIL_DESCRIPTION = '이메일 및 비밀번호를 다시 확인해 주세요.'; +export const MODAL_SIGNUP_FAIL_NETWORK = '네트워크 연결이 불안정합니다.'; +export const MODAL_SIGNUP_FAIL_EMAIL = '이미 가입된 이메일입니다.'; From 642a4d0600f6af43a307403263e681b880a4669c Mon Sep 17 00:00:00 2001 From: yunjjeongjo Date: Wed, 20 Jul 2022 13:44:37 +0900 Subject: [PATCH 2/8] =?UTF-8?q?refactor:=20UserPage=20modal=20message=20?= =?UTF-8?q?=EC=83=81=EC=88=98=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/UserPage/UserData.jsx | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) 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 }) => { Date: Wed, 20 Jul 2022 13:44:52 +0900 Subject: [PATCH 3/8] =?UTF-8?q?refactor:=20SignupPage=20modal=20message=20?= =?UTF-8?q?=EC=83=81=EC=88=98=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/SignupPage/index.jsx | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) 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 = () => { 확인 확인 From 0424cc3eef81c9c1ab7677afbb0acad80e6600b3 Mon Sep 17 00:00:00 2001 From: yunjjeongjo Date: Wed, 20 Jul 2022 13:45:13 +0900 Subject: [PATCH 4/8] =?UTF-8?q?refactor:=20PostEditPage=20modal=20message?= =?UTF-8?q?=20=EC=83=81=EC=88=98=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/PostEditPage/index.jsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pages/PostEditPage/index.jsx b/src/pages/PostEditPage/index.jsx index a050775..701cdb8 100644 --- a/src/pages/PostEditPage/index.jsx +++ b/src/pages/PostEditPage/index.jsx @@ -7,6 +7,7 @@ import useLocalToken from 'hooks/useLocalToken'; import { imageToFile } from 'utils/functions/converter'; import theme from 'styles/theme'; import { useUserContext } from 'contexts/UserContext'; +import { MODAL_UPLOAD_IMAGE_TITLE, MODAL_UPLOAD_POST_TITLE } from 'utils/constants/messages'; const { headerHeight } = theme.value; @@ -85,13 +86,13 @@ const PostEditPage = () => { } if (!defaultImg && !BinaryImg) { - setModalMessage('이미지를 등록해 주세요!'); + setModalMessage(MODAL_UPLOAD_IMAGE_TITLE); setIsModal(true); return; } if (!content) { - setModalMessage('게시글을 작성해 주세요!'); + setModalMessage(MODAL_UPLOAD_POST_TITLE); setIsModal(true); return; } From dd36e323eac2b7e1ed01e9b6e8f85bdd0153564e Mon Sep 17 00:00:00 2001 From: yunjjeongjo Date: Wed, 20 Jul 2022 13:45:35 +0900 Subject: [PATCH 5/8] =?UTF-8?q?refactor:=20MyInfoPage=20modal=20message=20?= =?UTF-8?q?=EC=83=81=EC=88=98=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/MyInfoPage/UserDetails.jsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 && ( Date: Wed, 20 Jul 2022 13:46:03 +0900 Subject: [PATCH 6/8] =?UTF-8?q?refactor:=20MyInfoEditPage=20modal=20messag?= =?UTF-8?q?e=20=EC=83=81=EC=88=98=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/MyInfoEditPage/index.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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(); From 011af9b0f43f33306c0e3edf26be23aa239a198b Mon Sep 17 00:00:00 2001 From: yunjjeongjo Date: Wed, 20 Jul 2022 13:46:19 +0900 Subject: [PATCH 7/8] =?UTF-8?q?refactor:=20LoginPage=20modal=20message=20?= =?UTF-8?q?=EC=83=81=EC=88=98=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/LoginPage/index.jsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 = () => { 확인 From 282929d3401bd6d7bce0fb9bd1aeeaa79e00d7a6 Mon Sep 17 00:00:00 2001 From: yunjjeongjo Date: Wed, 20 Jul 2022 14:06:48 +0900 Subject: [PATCH 8/8] =?UTF-8?q?refactor:=20LoginRequireModal=20modal=20mes?= =?UTF-8?q?sage=20=EC=83=81=EC=88=98=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Modal/customs/LoginRequireModal.jsx | 7 ++++--- src/utils/constants/messages.js | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) 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/utils/constants/messages.js b/src/utils/constants/messages.js index 5a40295..98956be 100644 --- a/src/utils/constants/messages.js +++ b/src/utils/constants/messages.js @@ -19,3 +19,5 @@ export const MODAL_SIGNUP_FAIL_TITLE = '회원가입에 실패했어요!'; export const MODAL_SIGNUP_FAIL_DESCRIPTION = '이메일 및 비밀번호를 다시 확인해 주세요.'; export const MODAL_SIGNUP_FAIL_NETWORK = '네트워크 연결이 불안정합니다.'; export const MODAL_SIGNUP_FAIL_EMAIL = '이미 가입된 이메일입니다.'; +export const MODAL_TITLE_LOGIN_REQUIRED = '로그인이 필요한 서비스입니다.'; +export const MODAL_DESCRIPTION_LOGIN_REQUIRED = '로그인 화면으로 이동하시겠어요?';