feat(FE) : 로그아웃오류 수정(#171)

softeerbootcamp · Feb 21, 2023 · f8669b4 · f8669b4
1 parent ba10ef2
commit f8669b4
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/client/src/components/auth/login.js b/client/src/components/auth/login.js
@@ -46,7 +46,7 @@ const login = () => {
 
     await loginU(userData);
     navigate('/card');
-    await notification('로그인', 'login')();
+    await notification('로그인 성공', 'login');
 
     const firebaseConfig = {
       apiKey: 'AIzaSyCsLBsvozvTnYlDH-5cS0A8X_AjV5o4jjM',

diff --git a/client/src/components/common/header.js b/client/src/components/common/header.js
@@ -68,16 +68,16 @@ const header = (props) => {
     logoutModal();
   };
 
-  const openMenuEvent = async () => {
+  const openMenuEvent = () => {
     const trigger = $.qs('.trigger');
     const menuTarget = $.qs('.menu-section');
-    await toggleActive(trigger);
+    toggleActive(trigger);
     toggleActive(menuTarget);
 
-    $.on('click', logoutEvent)($.qs('.modal-button'));
+    //$.on('click', logoutEvent)($.qs('.modal-button'));
   };
 
-  const toggleActive = async (target) => target.classList.toggle('active');
+  const toggleActive = (target) => target.classList.toggle('active');
 
   const navigatePath = (fragment, target, path) =>
     _.go(
@@ -99,10 +99,10 @@ const header = (props) => {
       (fragment) => $.prepend(fragment, $.qs('#root')),
       handleEvent);
 
-    // color === 'mint' && _.go(
-    //   sideMenu(),
-    //   () => $.qs('.trigger'),
-    //   $.on('click', openMenuEvent));
+    color === 'mint' && _.go(
+      sideMenu(),
+      () => $.qs('.trigger'),
+      $.on('click', openMenuEvent));
   }
   return appendHeader;
 };

diff --git a/client/src/components/common/modal.js b/client/src/components/common/modal.js
@@ -24,7 +24,8 @@ const logout = (label, classname) => {
     _.go(
       logoutTpl, 
       $.el, 
-      $.replace($.qs('.main-card-box')));
+      // $.replace($.qs('.main-card-box'))
+      $.append($.qs('.menu-section')));
 
   return renderLogoutModal;
 };

diff --git a/client/src/components/common/notification.js b/client/src/components/common/notification.js
@@ -4,7 +4,7 @@ import { _ } from '@/utils/customFx';
 const notification = (label, classname) => {
   const notificationTpl = `
         <div class='notification-container ${classname}'>
-            <p>${label} 되었습니다.</p>
+            <p>${label}</p>
         </div>
     `;