Merge branch 'main' into feature/BAR-231

src/api/http.ts

@@ -11,6 +11,8 @@ const instance = axios.create({
   baseURL: process.env.NEXT_PUBLIC_SERVER_URL,
   headers: {
     'content-type': 'application/json',
+    'Access-Control-Allow-Origin': '*',
+    'Access-Control-Allow-Credentials': true,
   },
 });
 

src/constants/icon.ts

@@ -18,15 +18,15 @@ import Complete from '@assets/icons/complete.svg';
 import Copy from '@assets/icons/copy.svg';
 import Error from '@assets/icons/error.svg';
 import Google from '@assets/icons/google.svg';
-import Google2 from '@assets/icons/Google2.svg';
+import GoogleProfile from '@assets/icons/googleProfile.svg';
 import Instagram from '@assets/icons/instagram.svg';
 import Kakao from '@assets/icons/kakao.svg';
-import Kakao2 from '@assets/icons/Kakao2.svg';
+import KakaoProfile from '@assets/icons/kakaoProfile.svg';
 import Logo32 from '@assets/icons/logo32.svg';
 import Logout from '@assets/icons/logout.svg';
 import Menu from '@assets/icons/menu.svg';
 import Naver from '@assets/icons/naver.svg';
-import Naver2 from '@assets/icons/Naver2.svg';
+import NaverProfile from '@assets/icons/naverProfile.svg';
 import PencilActive from '@assets/icons/pencil-active.svg';
 import PencilDefault from '@assets/icons/pencil-default.svg';
 import Picture from '@assets/icons/picture.svg';
@@ -63,15 +63,15 @@ export const iconFactory = {
   checkBoxActive: CheckBoxActive,
   error: Error,
   google: Google,
-  google2: Google2,
+  googleProfile: GoogleProfile,
   instagram: Instagram,
   kakao: Kakao,
-  kakao2: Kakao2,
+  kakaoProfile: KakaoProfile,
   logo32: Logo32,
   logout: Logout,
   menu: Menu,
   naver: Naver,
-  naver2: Naver2,
+  naverProfile: NaverProfile,
   pencilActive: PencilActive,
   pencilDefault: PencilDefault,
   profile: Profle,

src/domain/계정설정/components/Form/index.tsx

@@ -34,11 +34,11 @@ const ProfileForm = ({ name, nickname, authType, email }: ProfileFormProps) => {
   const authTypeIcon = useMemo(() => {
     switch (authType) {
       case 'kakao':
-        return <Icon icon="kakao2" width={32} height={32} />;
+        return <Icon icon="kakaoProfile" width={32} height={32} />;
       case 'naver':
-        return <Icon icon="naver2" width={32} height={32} />;
+        return <Icon icon="naverProfile" width={32} height={32} />;
       case 'google':
-        return <Icon icon="google2" width={32} height={32} />;
+        return <Icon icon="googleProfile" width={32} height={32} />;
       default:
         return null;
     }

tsconfig.json

@@ -19,7 +19,6 @@
       "~types/*": ["./types/*"],
       "@api/*": ["./src/api/*"],
       "@assets/*": ["./src/assets/*"],
-      "@api/*": ["./src/api/*"],
       "@components/*": ["./src/components/*"],
       "@constants/*": ["./src/constants/*"],
       "@domain/*": ["./src/domain/*"],