From 6ff36166df23d715eb16c4e35150d1655bee3b83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9E=A5=EB=8F=99=EA=B7=A0?=
 <57230590+dongkyun-dev@users.noreply.github.com>
Date: Thu, 15 Feb 2024 01:03:26 +0900
Subject: [PATCH] =?UTF-8?q?[Bug/BAR-234]=20=EB=B0=B0=ED=8F=AC=20=EC=98=A4?=
 =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20=ED=97=A4=EB=8D=94?=
 =?UTF-8?q?=20=EC=B6=94=EA=B0=80=20(#62)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: icon 경로 수정

* feat: 테스트를 위해 브랜치 수정

* fix: 헤더 추가

* fix: 헤더 추가

* feat: 브랜치 원복
---
 src/api/http.ts                                      |  2 ++
 src/assets/icons/{Google2.svg => googleProfile.svg}  |  0
 src/assets/icons/{Kakao2.svg => kakaoProfile.svg}    |  0
 src/assets/icons/{Naver2.svg => naverProfile.svg}    |  0
 src/constants/icon.ts                                | 12 ++++++------
 .../components/Form/index.tsx"                       |  6 +++---
 tsconfig.json                                        |  1 -
 7 files changed, 11 insertions(+), 10 deletions(-)
 rename src/assets/icons/{Google2.svg => googleProfile.svg} (100%)
 rename src/assets/icons/{Kakao2.svg => kakaoProfile.svg} (100%)
 rename src/assets/icons/{Naver2.svg => naverProfile.svg} (100%)

diff --git a/src/api/http.ts b/src/api/http.ts
index 1559c37d..df4e82f1 100644
--- a/src/api/http.ts
+++ b/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,
   },
 });
 
diff --git a/src/assets/icons/Google2.svg b/src/assets/icons/googleProfile.svg
similarity index 100%
rename from src/assets/icons/Google2.svg
rename to src/assets/icons/googleProfile.svg
diff --git a/src/assets/icons/Kakao2.svg b/src/assets/icons/kakaoProfile.svg
similarity index 100%
rename from src/assets/icons/Kakao2.svg
rename to src/assets/icons/kakaoProfile.svg
diff --git a/src/assets/icons/Naver2.svg b/src/assets/icons/naverProfile.svg
similarity index 100%
rename from src/assets/icons/Naver2.svg
rename to src/assets/icons/naverProfile.svg
diff --git a/src/constants/icon.ts b/src/constants/icon.ts
index 2a69c1e2..26e51246 100644
--- a/src/constants/icon.ts
+++ b/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,
diff --git "a/src/domain/\352\263\204\354\240\225\354\204\244\354\240\225/components/Form/index.tsx" "b/src/domain/\352\263\204\354\240\225\354\204\244\354\240\225/components/Form/index.tsx"
index 8a11f36a..4136ca2a 100644
--- "a/src/domain/\352\263\204\354\240\225\354\204\244\354\240\225/components/Form/index.tsx"
+++ "b/src/domain/\352\263\204\354\240\225\354\204\244\354\240\225/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;
     }
diff --git a/tsconfig.json b/tsconfig.json
index a36765f1..adb451c4 100644
--- a/tsconfig.json
+++ b/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/*"],