Merge branch 'master' of http://git.choozmo.com:3000/choozmo/AI_Anchor_2

html/script_eng.js

@@ -22,9 +22,9 @@ function checkRoute() {
      }
   }).then(res => {
     console.log(res.data);
-    if(res.status !== 200) {
-      window.location.replace("login.html");
-    }
+    // if(res.status !== 200) {
+    //   window.location.replace("login.html");
+    // }
     var userName='';
     userName+=' <h2 class="user-name text-white mt-4 fw-bold">Hi '+res.data.user_info.userName+'</h2>';
     $('.userName').html(userName);

html/script_profile.js

@@ -59,9 +59,9 @@ function renderView() {
     }).then(res => {
         console.log(res.data);
         let userInfo = res.data;
-        if(!userInfo.user_info) {
-          window.location.replace("login.html");
-        }
+        // if(!userInfo.user_info) {
+        //    window.location.replace("login.html");
+        // }
         localStorage.setItem('user_profile', JSON.stringify(res.data));
           if(userInfo.user_info.left_sec < 20){
             let title = "剩餘秒數不足";
@@ -169,7 +169,7 @@ function renderView() {
             $('.card-profile').html(str);
     }).catch(err => {
         console.log(err);
-        window.location.replace("login.html");
+        //window.location.replace("login.html");
     })
 }
 

html/static/script_slides.js

@@ -20,9 +20,9 @@ function checkRoute() {
      }
   }).then(res => {
     console.log(res.data);
-    if(res.status !== 200) {
-      window.location.replace("login.html");
-    }
+    // if(res.status !== 200) {
+    //   window.location.replace("login.html");
+    // }
     var userName='';
     userName+=' <h2 class="user-name text-white mt-lg-3 mt-xl-1 fw-bold">Hi '+res.data.user_info.userName+'</h2>';
     $('.userName').html(userName);

html/static/script_slides_eng.js

@@ -22,9 +22,9 @@ function checkRoute() {
      }
   }).then(res => {
     console.log(res.data);
-    if(res.status !== 200) {
-      window.location.replace("login.html");
-    }
+    // if(res.status !== 200) {
+    //   window.location.replace("login.html");
+    // }
     var userName='';
     userName+=' <h2 class="user-name text-white mt-lg-3 mt-xl-1 fw-bold">Hi '+res.data.user_info.userName+'</h2>';
     $('.userName').html(userName);

html/static/script_util.js

@@ -10,9 +10,9 @@ if(userBasics !== [] && typeof(userBasics) !== 'string'){
 
 function checkRoute() {
   let jwt_token = get_jwt_token();
-  if(jwt_token == undefined) {
-    window.location.replace("login.html");
-  }
+  // if(jwt_token == undefined) {
+  //   window.location.replace("login.html");
+  // }
   axios({
     method: 'post',
     url: 'https://www.choozmo.com:8887/user_profile',
@@ -31,7 +31,7 @@ function checkRoute() {
   }).catch(err => {
     console.log(err);
     window.location.replace("login.html");
-  });
+  }); 
 }
 
 const btnLoginPage = document.querySelector('.btn-login');