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

html/index.html

@@ -28,7 +28,7 @@
     <!-- navbar -->
     <nav class="navbar navbar-expand-lg navbar-light">
         <div class="container-fluid">
-            <a class="navbar-brand" href="./index.html">AI Spokesgirl</a>
+            <a class="navbar-brand" href="index.html">AI Spokesgirl</a>
             <button class="navbar-toggler" type="button" data-bs-toggle="collapse"
                 data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false"
                 aria-label="Toggle navigation">
@@ -37,13 +37,13 @@
             <div class="collapse navbar-collapse" id="navbarSupportedContent">
                 <ul class="navbar-nav me-auto mb-2 mb-lg-0">
                     <li class="nav-item">
-                        <a class="nav-link active btn-gocreate text-white me-2" aria-current="page" href="./make_video.html" set-lan="html:make_video">製作影片</a>
+                        <a class="nav-link active btn-gocreate text-white me-2" aria-current="page" href="make_video.html" set-lan="html:make_video">製作影片</a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link active btn-gocreate text-white" aria-current="page" href="./make_video_slide.html" set-lan="html:make_slides">SLIDE製作影片</a>                        
+                        <a class="nav-link active btn-gocreate text-white" aria-current="page" href="make_video_slide.html" set-lan="html:make_slides">SLIDE製作影片</a>                        
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link active btn-gocreate text-white" aria-current="page" href="./make_video_long.html" set-lan="html:make_slides">製作長影片</a>                        
+                        <a class="nav-link active btn-gocreate text-white" aria-current="page" href="make_video_long.html" set-lan="html:make_slides">製作長影片</a>                        
                     </li>
                 </ul>
                 
@@ -58,13 +58,13 @@
                         </ul>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link active btn-login" aria-current="page" href="./login.html" set-lan="html:login">登入</a>
+                        <a class="nav-link active btn-login" aria-current="page" href="login.html" set-lan="html:login">登入</a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link btn-userProfile" aria-current="page" href="./user_profile.html" set-lan="html:user_profile">會員資料</a>
+                        <a class="nav-link btn-userProfile" aria-current="page" href="user_profile.html" set-lan="html:user_profile">會員資料</a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link btn-logout" aria-current="page" href="./logout.html" set-lan="html:logout">登出</a>
+                        <a class="nav-link btn-logout" aria-current="page" set-lan="html:logout">登出</a>
                     </li>
                 </ul>
             </div>
@@ -76,7 +76,6 @@
     <!-- ================================================================= -->
     <!-- content -->
     <div class="container px-0">
-        <div class="text-center">首頁(前後端分離版本)</div>
         <div class="text-center p-5">
             <a href="login.html">
                 <img class="img-fluid" src="static/img/intro.png"></img>
@@ -100,6 +99,7 @@
     <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11.0.18/dist/sweetalert2.all.min.js"></script>
     <script src="static/owl.carousel.min.js"></script>
     <script type="text/javascript" src="static/lan.js"></script>
+    <script src="static/common.js"></script>
     <script>
         const btnLoginPage = document.querySelector('.btn-login');
         const btnUserProfile = document.querySelector('.btn-userProfile');

html/login.html

@@ -28,7 +28,7 @@
     <!-- navbar -->
     <nav class="navbar navbar-expand-lg navbar-light">
         <div class="container-fluid">
-            <a class="navbar-brand" href="./index.html">AI Spokesgirl</a>
+            <a class="navbar-brand" href="index.html">AI Spokesgirl</a>
             <button class="navbar-toggler" type="button" data-bs-toggle="collapse"
                 data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false"
                 aria-label="Toggle navigation">
@@ -37,13 +37,13 @@
             <div class="collapse navbar-collapse" id="navbarSupportedContent">
                 <ul class="navbar-nav me-auto mb-2 mb-lg-0">
                     <li class="nav-item">
-                        <a class="nav-link active btn-gocreate text-white me-2" aria-current="page" href="./make_video.html" set-lan="html:make_video">製作影片</a>
+                        <a class="nav-link active btn-gocreate text-white me-2" aria-current="page" href="make_video.html" set-lan="html:make_video">製作影片</a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link active btn-gocreate text-white" aria-current="page" href="./make_video_slide.html" set-lan="html:make_slides">SLIDE製作影片</a>                        
+                        <a class="nav-link active btn-gocreate text-white" aria-current="page" href="make_video_slide.html" set-lan="html:make_slides">SLIDE製作影片</a>                        
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link active btn-gocreate text-white" aria-current="page" href="./make_video_long.html" set-lan="html:make_slides">製作長影片</a>                        
+                        <a class="nav-link active btn-gocreate text-white" aria-current="page" href="make_video_long.html" set-lan="html:make_slides">製作長影片</a>                        
                     </li>
                 </ul>
                 
@@ -58,13 +58,13 @@
                         </ul>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link active btn-login" aria-current="page" href="./login.html" set-lan="html:login">登入</a>
+                        <a class="nav-link active btn-login" aria-current="page" href="login.html" set-lan="html:login">登入</a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link btn-userProfile" aria-current="page" href="./user_profile.html" set-lan="html:user_profile">會員資料</a>
+                        <a class="nav-link btn-userProfile" aria-current="page" href="user_profile.html" set-lan="html:user_profile">會員資料</a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link btn-logout" aria-current="page" href="./logout.html" set-lan="html:logout">登出</a>
+                        <a class="nav-link btn-logout" aria-current="page" set-lan="html:logout">登出</a>
                     </li>
                 </ul>
             </div>
@@ -128,7 +128,7 @@
                                 </div>
                                 <div class="mb-3">
                                     <input type="checkbox" id="privacy" name="privacy" checked required>
-                                    <label for="privacy"><a href="./privacy.html" class="link_privacy" target="_blank" set-lan="html:privacy_term">同意隱私政策及使用條款</a></label>
+                                    <label for="privacy"><a href="privacy.html" class="link_privacy" target="_blank" set-lan="html:privacy_term">同意隱私政策及使用條款</a></label>
                                 </div>
                                 <div class="d-flex justify-content-center">
                                     <button type="button" class="btn btn-primary align-items-center btn-register">Register</button>
@@ -165,6 +165,7 @@
     <script src="static/owl.carousel.min.js"></script>
     <script src="script_index.js"></script>
     <script type="text/javascript" src="static/lan.js"></script>
+    <script src="static/common.js"></script>
 </body>
 
 </html>

html/make_video.html

@@ -28,7 +28,7 @@
     <!-- navbar -->
     <nav class="navbar navbar-expand-lg navbar-light">
         <div class="container-fluid">
-            <a class="navbar-brand" href="./index.html">AI Spokesgirl</a>
+            <a class="navbar-brand" href="index.html">AI Spokesgirl</a>
             <button class="navbar-toggler" type="button" data-bs-toggle="collapse"
                 data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false"
                 aria-label="Toggle navigation">
@@ -37,13 +37,13 @@
             <div class="collapse navbar-collapse" id="navbarSupportedContent">
                 <ul class="navbar-nav me-auto mb-2 mb-lg-0">
                     <li class="nav-item">
-                        <a class="nav-link active btn-gocreate text-white me-2" aria-current="page" href="./make_video.html" set-lan="html:make_video">製作影片</a>
+                        <a class="nav-link active btn-gocreate text-white me-2" aria-current="page" href="make_video.html" set-lan="html:make_video">製作影片</a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link active btn-gocreate text-white" aria-current="page" href="./make_video_slide.html" set-lan="html:make_slides">SLIDE製作影片</a>                        
+                        <a class="nav-link active btn-gocreate text-white" aria-current="page" href="make_video_slide.html" set-lan="html:make_slides">SLIDE製作影片</a>                        
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link active btn-gocreate text-white" aria-current="page" href="./make_video_long.html" set-lan="html:make_slides">製作長影片</a>                        
+                        <a class="nav-link active btn-gocreate text-white" aria-current="page" href="make_video_long.html" set-lan="html:make_slides">製作長影片</a>                        
                     </li>
                 </ul>
                 
@@ -58,13 +58,13 @@
                         </ul>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link active btn-login" aria-current="page" href="./login.html" set-lan="html:login">登入</a>
+                        <a class="nav-link active btn-login" aria-current="page" href="login.html" set-lan="html:login">登入</a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link btn-userProfile" aria-current="page" href="./user_profile.html" set-lan="html:user_profile">會員資料</a>
+                        <a class="nav-link btn-userProfile" aria-current="page" href="user_profile.html" set-lan="html:user_profile">會員資料</a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link btn-logout" aria-current="page" href="./logout.html" set-lan="html:logout">登出</a>
+                        <a class="nav-link btn-logout" aria-current="page" set-lan="html:logout">登出</a>
                     </li>
                 </ul>
             </div>
@@ -79,7 +79,7 @@
         <div class="container-fluid">
             <div id="mySidenav" class="sidenav">
                 <!-- <a href="javascript:void(0)" class="closebtn" onclick="closeNav()">&times;</a> -->
-                <h2 class="go_title" href="./index.html"><a class="nav-link active" aria-current="page" href="./index.html">AI Spokesgirl</a></h2>
+                <h2 class="go_title" href="index.html"><a class="nav-link active" aria-current="page" href="index.html">AI Spokesgirl</a></h2>
                 <ul class="nav-list">
                     <li class="nav-list-item pb-1 mb-3" data-bs-toggle="modal" data-bs-target="#howto"><i class="fas fa-book-open me-2"></i><lan set-lan="html:usage_intro">使用說明</lan></li>
                     <li class="nav-list-item pb-1" data-bs-toggle="modal" data-bs-target="#history" onclick="openNav()"><i class="fas fa-history me-2"></i><lan set-lan="html:history">歷史紀錄</lan></li>
@@ -88,7 +88,6 @@
             </div>
             <!-- <span style="font-size:30px;cursor:pointer" onclick="openNav()">&#9776; 過去紀錄</span> -->
             <div class="content ms-auto">
-                <div class="text-center">製作影片(前後端分離版本)</div>
                 <form id="msform">
                     <div class="linker__box">
                         <p set-lan="html:preview_videos">預覽影片</p>
@@ -251,6 +250,7 @@
     <script src="static/script_util.js"></script>
     <script src="script_index.js"></script>
     <script type="text/javascript" src="static/lan.js"></script>
+    <script src="static/common.js"></script>
 </body>
 
 </html>

html/make_video_long.html

@@ -28,7 +28,7 @@
     <!-- navbar -->
     <nav class="navbar navbar-expand-lg navbar-light">
         <div class="container-fluid">
-            <a class="navbar-brand" href="./index.html">AI Spokesgirl</a>
+            <a class="navbar-brand" href="index.html">AI Spokesgirl</a>
             <button class="navbar-toggler" type="button" data-bs-toggle="collapse"
                 data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false"
                 aria-label="Toggle navigation">
@@ -37,13 +37,13 @@
             <div class="collapse navbar-collapse" id="navbarSupportedContent">
                 <ul class="navbar-nav me-auto mb-2 mb-lg-0">
                     <li class="nav-item">
-                        <a class="nav-link active btn-gocreate text-white me-2" aria-current="page" href="./make_video.html" set-lan="html:make_video">製作影片</a>
+                        <a class="nav-link active btn-gocreate text-white me-2" aria-current="page" href="make_video.html" set-lan="html:make_video">製作影片</a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link active btn-gocreate text-white" aria-current="page" href="./make_video_slide.html" set-lan="html:make_slides">SLIDE製作影片</a>                        
+                        <a class="nav-link active btn-gocreate text-white" aria-current="page" href="make_video_slide.html" set-lan="html:make_slides">SLIDE製作影片</a>                        
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link active btn-gocreate text-white" aria-current="page" href="./make_video_long.html" set-lan="html:make_slides">製作長影片</a>                        
+                        <a class="nav-link active btn-gocreate text-white" aria-current="page" href="make_video_long.html" set-lan="html:make_slides">製作長影片</a>                        
                     </li>
                 </ul>
                 
@@ -58,13 +58,13 @@
                         </ul>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link active btn-login" aria-current="page" href="./login.html" set-lan="html:login">登入</a>
+                        <a class="nav-link active btn-login" aria-current="page" href="login.html" set-lan="html:login">登入</a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link btn-userProfile" aria-current="page" href="./user_profile.html" set-lan="html:user_profile">會員資料</a>
+                        <a class="nav-link btn-userProfile" aria-current="page" href="user_profile.html" set-lan="html:user_profile">會員資料</a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link btn-logout" aria-current="page" href="./logout.html" set-lan="html:logout">登出</a>
+                        <a class="nav-link btn-logout" aria-current="page" set-lan="html:logout">登出</a>
                     </li>
                 </ul>
             </div>
@@ -79,7 +79,7 @@
         <div class="container-fluid">
             <div id="mySidenav" class="sidenav">
                 <!-- <a href="javascript:void(0)" class="closebtn" onclick="closeNav()">&times;</a> -->
-                <h2 class="go_title" href="./index.html"><a class="nav-link active" aria-current="page" href="./index.html">AI Spokesgirl</a></h2>
+                <h2 class="go_title" href="index.html"><a class="nav-link active" aria-current="page" href="index.html">AI Spokesgirl</a></h2>
                 <ul class="nav-list">
                     <li class="nav-list-item pb-1 mb-3" data-bs-toggle="modal" data-bs-target="#howto"><i class="fas fa-book-open me-2"></i><lan set-lan="html:usage_intro">使用說明</lan></li>
                     <li class="nav-list-item pb-1" data-bs-toggle="modal" data-bs-target="#history" onclick="openNav()"><i class="fas fa-history me-2"></i><lan set-lan="html:history">歷史紀錄</lan></li>
@@ -88,7 +88,6 @@
             </div>
             <!-- <span style="font-size:30px;cursor:pointer" onclick="openNav()">&#9776; 過去紀錄</span> -->
             <div class="content ms-auto">
-                <div class="text-center">製作長影片(前後端分離版本)</div>
                 <form id="msform">
                 <div class="linker__box">
                     <p set-lan="html:preview_videos">預覽影片</p>
@@ -251,6 +250,7 @@
     <script src="static/script_util.js"></script>
     <script src="script_index.js"></script>
     <script type="text/javascript" src="static/lan.js"></script>
+    <script src="static/common.js"></script>
 </body>
 
 </html>

html/make_video_slide.html

@@ -28,7 +28,7 @@
     <!-- navbar -->
     <nav class="navbar navbar-expand-lg navbar-light">
         <div class="container-fluid">
-            <a class="navbar-brand" href="./index.html">AI Spokesgirl</a>
+            <a class="navbar-brand" href="index.html">AI Spokesgirl</a>
             <button class="navbar-toggler" type="button" data-bs-toggle="collapse"
                 data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false"
                 aria-label="Toggle navigation">
@@ -37,13 +37,13 @@
             <div class="collapse navbar-collapse" id="navbarSupportedContent">
                 <ul class="navbar-nav me-auto mb-2 mb-lg-0">
                     <li class="nav-item">
-                        <a class="nav-link active btn-gocreate text-white me-2" aria-current="page" href="./make_video.html" set-lan="html:make_video">製作影片</a>
+                        <a class="nav-link active btn-gocreate text-white me-2" aria-current="page" href="make_video.html" set-lan="html:make_video">製作影片</a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link active btn-gocreate text-white" aria-current="page" href="./make_video_slide.html" set-lan="html:make_slides">SLIDE製作影片</a>                        
+                        <a class="nav-link active btn-gocreate text-white" aria-current="page" href="make_video_slide.html" set-lan="html:make_slides">SLIDE製作影片</a>                        
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link active btn-gocreate text-white" aria-current="page" href="./make_video_long.html" set-lan="html:make_slides">製作長影片</a>                        
+                        <a class="nav-link active btn-gocreate text-white" aria-current="page" href="make_video_long.html" set-lan="html:make_slides">製作長影片</a>                        
                     </li>
                 </ul>
                 
@@ -58,13 +58,13 @@
                         </ul>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link active btn-login" aria-current="page" href="./login.html" set-lan="html:login">登入</a>
+                        <a class="nav-link active btn-login" aria-current="page" href="login.html" set-lan="html:login">登入</a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link btn-userProfile" aria-current="page" href="./user_profile.html" set-lan="html:user_profile">會員資料</a>
+                        <a class="nav-link btn-userProfile" aria-current="page" href="user_profile.html" set-lan="html:user_profile">會員資料</a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link btn-logout" aria-current="page" href="./logout.html" set-lan="html:logout">登出</a>
+                        <a class="nav-link btn-logout" aria-current="page" set-lan="html:logout">登出</a>
                     </li>
                 </ul>
             </div>
@@ -79,7 +79,7 @@
         <div class="container-fluid">
             <div id="mySidenav" class="sidenav">
                 <!-- <a href="javascript:void(0)" class="closebtn" onclick="closeNav()">&times;</a> -->
-                <h2 class="go_title" href="./index.html"><a class="nav-link active" aria-current="page" href="./index.html">AI Spokes Girl</a></h2>
+                <h2 class="go_title" href="index.html"><a class="nav-link active" aria-current="page" href="index.html">AI Spokes Girl</a></h2>
                 <ul class="nav-list">
                     <li class="nav-list-item pb-1 mb-3" data-bs-toggle="modal" data-bs-target="#howto"><i class="fas fa-book-open me-2"></i>使用說明</li>
                     <li class="nav-list-item pb-1" data-bs-toggle="modal" data-bs-target="#history" onclick="openNav()"><i class="fas fa-history me-2"></i>歷史紀錄</li>
@@ -89,7 +89,6 @@
       
             <!-- <span style="font-size:30px;cursor:pointer" onclick="openNav()">&#9776; 過去紀錄</span> -->
             <div class="content ms-auto">
-                <div class="text-center">SLIDE製作影片(前後端分離版本)</div>
                 <form id="msform">
                     <div class="linker__box">
                         <p>預覽影片</p>
@@ -233,6 +232,7 @@
     <script src="static/script_util.js"></script>
     <script src="script_index.js"></script>
     <script type="text/javascript" src="static/lan.js"></script>
+    <script src="static/common.js"></script>
 </body>
 
 </html>

html/script_index.js

@@ -41,7 +41,6 @@ function login(){
             responseOBJ = JSON.parse(xhr.responseText);
             // document.cookie = 'jwt_token='+responseOBJ.jwt_token    // access_token -> jwt_token
             document.cookie = 'jwt_token='+responseOBJ.access_token;
-            alert('document.cookie = ' + document.cookie); // test
             console.log(responseOBJ);
             if (responseOBJ.access_token!=null)
                 {

html/static/common.js

@@ -0,0 +1,3 @@
+$(".btn-logout").click(function() { 
+    window.location.href = 'index.html';
+});

html/user_profile.html

@@ -28,7 +28,7 @@
     <!-- navbar -->
     <nav class="navbar navbar-expand-lg navbar-light">
         <div class="container-fluid">
-            <a class="navbar-brand" href="./index.html">AI Spokesgirl</a>
+            <a class="navbar-brand" href="index.html">AI Spokesgirl</a>
             <button class="navbar-toggler" type="button" data-bs-toggle="collapse"
                 data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false"
                 aria-label="Toggle navigation">
@@ -37,13 +37,13 @@
             <div class="collapse navbar-collapse" id="navbarSupportedContent">
                 <ul class="navbar-nav me-auto mb-2 mb-lg-0">
                     <li class="nav-item">
-                        <a class="nav-link active btn-gocreate text-white me-2" aria-current="page" href="./make_video.html" set-lan="html:make_video">製作影片</a>
+                        <a class="nav-link active btn-gocreate text-white me-2" aria-current="page" href="make_video.html" set-lan="html:make_video">製作影片</a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link active btn-gocreate text-white" aria-current="page" href="./make_video_slide.html" set-lan="html:make_slides">SLIDE製作影片</a>                        
+                        <a class="nav-link active btn-gocreate text-white" aria-current="page" href="make_video_slide.html" set-lan="html:make_slides">SLIDE製作影片</a>                        
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link active btn-gocreate text-white" aria-current="page" href="./make_video_long.html" set-lan="html:make_slides">製作長影片</a>                        
+                        <a class="nav-link active btn-gocreate text-white" aria-current="page" href="make_video_long.html" set-lan="html:make_slides">製作長影片</a>                        
                     </li>
                 </ul>
                 
@@ -58,13 +58,13 @@
                         </ul>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link active btn-login" aria-current="page" href="./login.html" set-lan="html:login">登入</a>
+                        <a class="nav-link active btn-login" aria-current="page" href="login.html" set-lan="html:login">登入</a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link btn-userProfile" aria-current="page" href="./user_profile.html" set-lan="html:user_profile">會員資料</a>
+                        <a class="nav-link btn-userProfile" aria-current="page" href="user_profile.html" set-lan="html:user_profile">會員資料</a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link btn-logout" aria-current="page" href="./logout.html" set-lan="html:logout">登出</a>
+                        <a class="nav-link btn-logout" aria-current="page" set-lan="html:logout">登出</a>
                     </li>
                 </ul>
             </div>
@@ -105,6 +105,7 @@
     <script src="static/owl.carousel.min.js"></script>
     <script src="script_profile.js"></script>
     <script type="text/javascript" src="static/lan.js"></script>
+    <script src="static/common.js"></script>
 </body>
 
 </html>