�마지 후 버그 수정 (#181)

* Setting 버그 수정 (#175)

* feat: text 관련 상수

* feat: message 관련 상수

* fix: rules, input import 지정 오류

* fix: import 지정 오류, rotuer 반환 오류 수정

* getme Hooks 관련 버그 (#174)

* fix: 이름, 로직 변경으로인한 수정

* fix: 컴포넌트 이름 수정

* fix: 컴포넌트 이름 변경 적용

Author: MINJE-98

constants/text/desc.ts

@@ -0,0 +1,25 @@
+import LANGUAGE from "@Library/language/constant";
+
+import { LanguageInterface } from "@Library/language/interface";
+
+export const POSITION_DESC: LanguageInterface = {
+  [LANGUAGE.ko]: `현재 회사에서 일하는 포지션 또는 희망하는 포지션을 입력해주세요.`,
+  [LANGUAGE.en]: `Please enter the position you are currently working for or the position you want.`,
+};
+export const EMAIL_DESC: LanguageInterface = {
+  [LANGUAGE.ko]: `연락할 이메일을 입력하세요.`,
+  [LANGUAGE.en]: `Please enter an e-mail to be contacted.
+    `,
+};
+export const INTRO_MSG_DESC: LanguageInterface = {
+  [LANGUAGE.ko]: `자신을 한줄로 표현해주세요. 
+    개인 블로그에 표시됩니다.`,
+  [LANGUAGE.en]: `Please introduction yourself in one line.
+    Appears on your personal blog.`,
+};
+export const DISPLAY_NAME_DESC: LanguageInterface = {
+  [LANGUAGE.ko]: `틸로그에서 사용할 닉네임을 지정해주세요. 
+    블로그이름, 개인블로그에서 사용되는 이름입니다.`,
+  [LANGUAGE.en]: `Please specify a nickname to use in the TILog. 
+    The name of the blog, the name used by the private blog.`,
+};

constants/text/summit.ts

@@ -0,0 +1,10 @@
+import LANGUAGE from "@Library/language/constant";
+
+import { LanguageInterface } from "@Library/language/interface";
+
+const SUMMIT: LanguageInterface = {
+  [LANGUAGE.ko]: "저장",
+  [LANGUAGE.en]: "Save",
+};
+
+export default SUMMIT;

constants/text/title.ts

@@ -0,0 +1,20 @@
+import LANGUAGE from "@Library/language/constant";
+
+import { LanguageInterface } from "@Library/language/interface";
+
+export const POSITION_TITLE: LanguageInterface = {
+  [LANGUAGE.ko]: "포지션",
+  [LANGUAGE.en]: "Position",
+};
+export const EMAIL_TITLE: LanguageInterface = {
+  [LANGUAGE.ko]: "이메일",
+  [LANGUAGE.en]: "Email",
+};
+export const INTRO_MSG_TITLE: LanguageInterface = {
+  [LANGUAGE.ko]: "소개",
+  [LANGUAGE.en]: "Introduction",
+};
+export const DISPLAY_NAME_TITLE: LanguageInterface = {
+  [LANGUAGE.ko]: "닉네임",
+  [LANGUAGE.en]: "NickName",
+};

lib/messages/constants/success/save.ts

@@ -0,0 +1,9 @@
+import LANGUAGE from "@Library/language/constant";
+
+import { LanguageInterface } from "@Library/language/interface";
+
+const SAVE_MESSAGE: LanguageInterface = {
+  [LANGUAGE.ko]: "성공적으로 저장하였습니다.",
+  [LANGUAGE.en]: "Successfully saved.",
+};
+export default SAVE_MESSAGE;

src/components/molecules/button/hooks/useLogin.ts

@@ -1,9 +1,9 @@
 import { useEffect } from "react";
 
-import useGetMe from "@Hooks/react-query/useGetMe";
+import useGetMeQuery from "@Hooks/react-query/user/useGetMeQuery";
 
 const useLogin = () => {
-  const { refetch } = useGetMe();
+  const { refetch } = useGetMeQuery();
   useEffect(() => {
     window.addEventListener(
       "message",

src/components/molecules/button/hooks/useLogout.ts

@@ -1,9 +1,9 @@
-import useGetMe from "@Hooks/react-query/useGetMe";
+import useGetMeQuery from "@Hooks/react-query/user/useGetMeQuery";
 import api from "@Library/api";
 import httpClient from "@Library/api/httpClient";
 
 const useLogout = () => {
-  const { refetch } = useGetMe();
+  const { refetch } = useGetMeQuery();
   return () => {
     api.authService.deleteRefreshToken();
     refetch();

src/components/molecules/input/settings/DisplayNameInput.tsx

@@ -3,8 +3,8 @@ import { useFormContext } from "react-hook-form";
 import SettingInput from "@Components/atom/input/SettingInput";
 import Desc from "@Components/atom/text/Desc";
 import Title from "@Components/atom/text/Title";
+import { displayNameRules } from "@Components/molecules/input/rules/index";
 import InputSettingsBox from "@Components/molecules/input/settings/InputSettingsBox";
-import { displayNameRules } from "@Components/organisms/form/settings/rules";
 import { DISPLAY_NAME_DESC } from "@Constants/text/desc";
 import { DISPLAY_NAME_TITLE } from "@Constants/text/title";
 

src/components/molecules/input/settings/EmailInput.tsx

@@ -3,8 +3,8 @@ import { useFormContext } from "react-hook-form";
 import SettingInput from "@Components/atom/input/SettingInput";
 import Desc from "@Components/atom/text/Desc";
 import Title from "@Components/atom/text/Title";
+import { emailRules } from "@Components/molecules/input/rules/index";
 import InputSettingsBox from "@Components/molecules/input/settings/InputSettingsBox";
-import { emailRules } from "@Components/organisms/form/settings/rules";
 import { EMAIL_DESC } from "@Constants/text/desc";
 import { EMAIL_TITLE } from "@Constants/text/title";
 

src/components/molecules/input/settings/IntroductionInput.tsx

@@ -3,8 +3,8 @@ import { useFormContext } from "react-hook-form";
 import SettingInput from "@Components/atom/input/SettingInput";
 import Desc from "@Components/atom/text/Desc";
 import Title from "@Components/atom/text/Title";
+import { introMsgRules } from "@Components/molecules/input/rules/index";
 import InputSettingsBox from "@Components/molecules/input/settings/InputSettingsBox";
-import { introMsgRules } from "@Components/organisms/form/settings/rules";
 import { INTRO_MSG_DESC } from "@Constants/text/desc";
 import { INTRO_MSG_TITLE } from "@Constants/text/title";
 

src/components/molecules/input/settings/PositionInput.tsx

@@ -3,8 +3,8 @@ import { useFormContext } from "react-hook-form";
 import SettingInput from "@Components/atom/input/SettingInput";
 import Desc from "@Components/atom/text/Desc";
 import Title from "@Components/atom/text/Title";
+import { positionRules } from "@Components/molecules/input/rules/index";
 import InputSettingsBox from "@Components/molecules/input/settings/InputSettingsBox";
-import { positionRules } from "@Components/organisms/form/settings/rules";
 import { POSITION_DESC } from "@Constants/text/desc";
 import { POSITION_TITLE } from "@Constants/text/title";
 

src/components/molecules/profile/dropbox/DropdownProfile.tsx

@@ -3,18 +3,18 @@ import LinkTo from "@Components/molecules/LinkTo";
 import CREATE_POST from "@Constants/text/createPost";
 import MY_BLOG from "@Constants/text/myBlog";
 import SETTINGS from "@Constants/text/settings";
-import useGetMe from "@Hooks/react-query/useGetMe";
+import useGetMeQuery from "@Hooks/react-query/user/useGetMeQuery";
 
 // TODO: i18n 적용.
 const DropdownProfile = () => {
-  const { data } = useGetMe();
+  const { data } = useGetMeQuery();
   if (!data) return null;
   return (
     <div className="relative z-50 inline-block text-left">
       <ol className="absolute right-0 w-40 mt-2 bg-white divide-y divide-gray-100 rounded-md shadow-lg ">
         <li className="py-1" role="none">
           <LinkTo
-            href={`/blog/${data.data.name}`}
+            href={`/blog/${data.name}`}
             className="block px-4 py-2 text-lg text-gray-700 font-eng-sub-font-1"
           >
             {MY_BLOG.ko}

src/components/molecules/profile/header/index.tsx renamed to src/components/molecules/profile/header/HeaderProfile.tsx

@@ -1,13 +1,13 @@
 import NoUserImage from "@Components/atom/images/user/NoUserImage";
 import LoginButton from "@Components/molecules/button/LoginButton";
 import LoggedInUserProfile from "@Components/molecules/profile/header/LoggedInUserProfile";
-import useGetMe from "@Hooks/react-query/useGetMe";
+import useGetMeQuery from "@Hooks/react-query/user/useGetMeQuery";
 
 interface HeaderProfileProps {
   className?: string;
 }
 const HeaderProfile = ({ className }: HeaderProfileProps) => {
-  const { isLoading, isError } = useGetMe();
+  const { isLoading, isError } = useGetMeQuery();
   if (isLoading) {
     return <NoUserImage className={className} />;
   }

src/components/molecules/profile/header/LoggedInUserProfile.tsx

@@ -4,20 +4,20 @@ import NoUserImage from "@Components/atom/images/user/NoUserImage";
 import UserImage from "@Components/atom/images/user/UserImage";
 import DropdownProfile from "@Components/molecules/profile/dropbox/DropdownProfile";
 import useOutsideClickListener from "@Components/molecules/profile/dropbox/hooks/useOutsideClickListener";
-import useGetMe from "@Hooks/react-query/useGetMe";
+import useGetMeQuery from "@Hooks/react-query/user/useGetMeQuery";
 
 const LoggedInUserProfile = ({ className }: { className?: string }) => {
-  const { data } = useGetMe();
+  const { data } = useGetMeQuery();
   const { ref, isOpen, setIsOpen } = useOutsideClickListener();
 
   if (!data) return null;
   return (
     <div ref={ref}>
       <button type="button" onClick={() => setIsOpen(!isOpen)}>
-        {!data.data.avatar ? (
+        {!data.avatar ? (
           <NoUserImage className={className} />
         ) : (
-          <UserImage className={className} cursor avatar={data.data.avatar} />
+          <UserImage className={className} cursor avatar={data.avatar} />
         )}
       </button>
 

src/components/organisms/Header.tsx

@@ -1,6 +1,6 @@
 import HeaderBox from "@Components/box/HeaderBox";
 import Logo from "@Components/molecules/Logo";
-import HeaderProfile from "@Components/molecules/profile/header";
+import HeaderProfile from "@Components/molecules/profile/header/HeaderProfile";
 
 const Header = () => {
   return (

src/components/organisms/form/settings/UserSettingForm.tsx

@@ -2,12 +2,10 @@ import { FormProvider, SubmitHandler } from "react-hook-form";
 import toast from "react-hot-toast";
 
 import SummitInput from "@Components/atom/input/SummitInput";
-import {
-  DisplayNameInput,
-  EmailInput,
-  IntroductionInput,
-  PositionInput,
-} from "@Components/molecules/input/settings";
+import DisplayNameInput from "@Components/molecules/input/settings/DisplayNameInput";
+import EmailInput from "@Components/molecules/input/settings/EmailInput";
+import IntroductionInput from "@Components/molecules/input/settings/IntroductionInput";
+import PositionInput from "@Components/molecules/input/settings/PositionInput";
 import useSettingForm from "@Components/organisms/form/settings/hooks/useSettingForm";
 import SUMMIT from "@Constants/text/summit";
 import useSetUserSetting from "@Hooks/react-query/userSetting/useSetUserSetting";

src/pages/settings.tsx

@@ -1,14 +1,14 @@
 import { NextPage } from "next";
+import { useRouter } from "next/router";
 
-import UserSettingsForm from "@Components/organisms/form/settings/UserSettingsForm";
+import UserSettingsForm from "@Components/organisms/form/settings/UserSettingForm";
 import Header from "@Components/organisms/Header";
 import useGetMeQuery from "@Hooks/react-query/user/useGetMeQuery";
-import { useRouter } from "next/router";
 
 const SettingPage: NextPage = () => {
   const router = useRouter();
   const userInfo = useGetMeQuery();
-  if (userInfo.isError) return router.push("/login");
+  if (userInfo.isError) router.push("/login");
   if (userInfo.isLoading) return null;
 
   return (