From 188a6112b4f0f28f08f9d0c7984b50285cc5bf9d Mon Sep 17 00:00:00 2001
From: USER <USER@DESKTOP-3V0A84G>
Date: Thu, 25 Aug 2022 16:19:53 +0900
Subject: [PATCH] =?UTF-8?q?=EB=9D=BC=EC=9A=B0=ED=84=B0=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/common/http-client.js      |  2 +-
 frontend/src/components/logoutModal.vue |  4 +++
 frontend/src/router.js                  | 44 ++++++++++++++++---------
 frontend/src/views/ErrorPage404.vue     |  2 +-
 frontend/src/views/ErrorPage500.vue     | 10 ++++--
 5 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/frontend/src/common/http-client.js b/frontend/src/common/http-client.js
index e661b66..132816a 100644
--- a/frontend/src/common/http-client.js
+++ b/frontend/src/common/http-client.js
@@ -39,7 +39,7 @@ const tokenInterceptor = config => {
   //   //config.headers.Authorization = tokenSvc.getToken();
   // }
   
-  console.log('http : ',sessionStorage.authToken);
+  // console.log('http : ',sessionStorage.authToken);
   if(sessionStorage.authToken != null) {
     config.headers.Authorization = 'Bearer '+ sessionStorage.authToken;
   }
diff --git a/frontend/src/components/logoutModal.vue b/frontend/src/components/logoutModal.vue
index 7507da3..755d997 100644
--- a/frontend/src/components/logoutModal.vue
+++ b/frontend/src/components/logoutModal.vue
@@ -37,6 +37,8 @@ export default {
       for (var i = 0; i < dimmed.length; i++) {
         dimmed[i].style.display = 'block';
       }
+      var headerDimmed = document.getElementsByClassName('headerDimmed');
+      headerDimmed[0].style.display = 'block';
     },
     // 모달 끄기(ok)
     logoutModalClose() {
@@ -71,6 +73,8 @@ export default {
       else{
         userBtn.classList.add(click);
       }
+
+      
     }
   }
 }
diff --git a/frontend/src/router.js b/frontend/src/router.js
index 6ccaf43..5999e84 100644
--- a/frontend/src/router.js
+++ b/frontend/src/router.js
@@ -58,7 +58,7 @@ const router = new Router({
         //{path: '*', name: 'error404'}
       ]
     },
-    //{path: '*', redirect: '/view/error/404'}    
+    {path: '*', redirect: '/view/error/404'}    
        
   ]
 });
@@ -72,14 +72,29 @@ router.beforeEach((to, from, next) => {
   }else{    
     var nextUrl = to.fullPath;        
     var fromUrl = from.fullPath;    
-    var menuUrls = store.getters['login/getMenuUrls'];
+    
+    var menuUrls = store.getters['login/getMenuUrls'];    
     if(menuUrls.length > 0){
-
       var moveFlag = false;
       for(var i=0; i<menuUrls.length; i++){
-        var targetUrl = menuUrls[i];        
-        if(nextUrl == targetUrl){
-          moveFlag = true;
+        var targetUrl = menuUrls[i]; 
+        if(nextUrl == targetUrl){                
+          moveFlag = true;          
+          if(fromUrl != '/' && fromUrl != '/view/error/404' && fromUrl != '/view/error/500'){      
+            if(nextUrl == '/view/error/404' || nextUrl == '/view/error/500' ){                                         
+              store.commit("login/isErrorPage", true);
+            }else{
+              store.commit("login/isErrorPage", false);              
+              if((nextUrl != '/login') && (nextUrl != '/view/login/auth') &&  (nextUrl != '/view/login/resetPassword') && (nextUrl != '/view/login/updatePassword')){
+                store.commit("login/isLogin", true);
+                store.commit("login/isAuthChk", true);
+              }
+              store.commit("login/saveBeforeUrl", nextUrl);
+            }
+          }else if(fromUrl == '/' && loggedIn){
+            store.commit("login/isErrorPage", false);            
+          }
+           
         }        
       }
       if((nextUrl == '/custMgt/memberList') || (nextUrl == '/custMgt/memberDetail')
@@ -90,7 +105,7 @@ router.beforeEach((to, from, next) => {
               moveFlag = true;
             }
           }                
-        }
+        }        
       // url Check 유치채널
       if((nextUrl == '/attractMgt/channelDetail')){
         for(var i=0; i<menuUrls.length; i++){
@@ -123,28 +138,26 @@ router.beforeEach((to, from, next) => {
           }
         }
       }
-        
+      
       if(!moveFlag){    
         if((fromUrl == '/login') || (fromUrl == '/view/login/auth') ||  (fromUrl == '/view/login/resetPassword')
         || (fromUrl == '/view/login/updatePassword')){
           return next('/login');
         }
-        store.commit("login/saveBeforeUrl", fromUrl);
+        // store.commit("login/isErrorPage", true);
         return next('/view/error/404');
       }
+
+
       if((nextUrl == '/view/login/auth') ||  (nextUrl == '/view/login/resetPassword')
-      || (nextUrl == '/view/login/updatePassword')
-      ){
+      || (nextUrl == '/view/login/updatePassword')){
         if(fromUrl != '/login'){
           return next('/login');
         }      
       }
 
-
       if(nextUrl == '/'){
-        console.log(store.getters);
         const rootUrl = store.getters['login/getRootUrl'];
-        console.log('rootUrl ',rootUrl);
         if(rootUrl == null){
           return next('/login');
         }      
@@ -155,10 +168,11 @@ router.beforeEach((to, from, next) => {
         const rootUrl = store.getters['login/getRootUrl'];
         if(rootUrl == null){
           return next('/login');
-        }      
+        }              
         return next(rootUrl);
       }
     }
+    
   }
   
   to.matched.some(record => {
diff --git a/frontend/src/views/ErrorPage404.vue b/frontend/src/views/ErrorPage404.vue
index 57cb00a..c741df8 100644
--- a/frontend/src/views/ErrorPage404.vue
+++ b/frontend/src/views/ErrorPage404.vue
@@ -45,7 +45,7 @@
         const rootUrl = this.$store.getters['login/getRootUrl'];
         this.$store.commit("login/isErrorPage", false);
         this.$router.push({ path: rootUrl }).catch(()=>{          
-        });;
+        });
       }
     }
   };
diff --git a/frontend/src/views/ErrorPage500.vue b/frontend/src/views/ErrorPage500.vue
index 2e07e69..3422684 100644
--- a/frontend/src/views/ErrorPage500.vue
+++ b/frontend/src/views/ErrorPage500.vue
@@ -9,7 +9,7 @@
     </span>
     
     <p class="error-btns">
-      <a href="#" @click="backGo()">이전 페이지로</a><a href="#" @click="goMain()">메인으로</a>
+      <a href="javascript:void(0);" @click="backGo()">이전 페이지로</a><a href="javascript:void(0);" @click="goMain()">메인으로</a>
     </p>
   </div>
 </template>
@@ -34,13 +34,17 @@
     methods: {
       // 이전 페이지
       backGo() {
+        const beforeUrl = this.$store.getters['login/getBeforeUrl'];
         this.$store.commit("login/isErrorPage", false);
-        this.$router.go(-1);
+        this.$router.push({ path: beforeUrl }).catch(()=>{          
+        });
       },
       // 메인 페이지
       goMain(){
+        const rootUrl = this.$store.getters['login/getRootUrl'];
         this.$store.commit("login/isErrorPage", false);
-        this.$router.push({ path: '/' });
+        this.$router.push({ path: rootUrl }).catch(()=>{          
+        });
       }
     }
   };