feat(FE) : firebase 링크 추가(#164)

softeerbootcamp · Feb 20, 2023 · 24160f0 · 24160f0
1 parent 5fbe9ba
commit 24160f0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/client/src/apis/firebase.js b/client/src/apis/firebase.js
@@ -1,7 +1,7 @@
 import client from './client';
 
 export const fcmToken = (tokens) => {
-  const response = client.post('/fcm/token', { token: tokens });
+  const response = client.post('fcm/token', { token: tokens });
 
   return response.data;
 };
diff --git a/client/src/components/auth/login.js b/client/src/components/auth/login.js
@@ -66,7 +66,7 @@ const login = () => {
           vapidKey:
             'BPTfJAoUaJeyzryOu29dcccPl_1Db8OC4I_yBCC4qRTn_CfSHa_F10PoafMgkUkc7ynARCpU1RGyWRb-kAoDN4Q',
         }).then((tokens) => {
-          fcmToken('/fcm/token', tokens);
+          fcmToken(tokens);
         });
       }
       if (res === 'denied') window.alert('알림을 받으시려면 알림을 허용해주세요');

diff --git a/client/src/components/common/header.js b/client/src/components/common/header.js
@@ -98,12 +98,19 @@ const header = (props) => {
       $.el,
       (fragment) => $.prepend(fragment, $.qs('#root')),
       handleEvent);
+<<<<<<< HEAD
 
     // color === 'mint' && _.go(
     //   sideMenu(),
     //   () => $.qs('.trigger'),
     //   $.on('click', openMenuEvent));
   }
+=======
+  // () => sideMenu()(),
+  // () => $.qs('.trigger'));
+  // $.on('click', openMenuEvent));
+  // () => modal("로그아웃", "logout")());
+>>>>>>> 137215d (feat(FE) : firebase 링크 추가(#164))
 
   return appendHeader;
 };