fix open nav, btns, add veri email page

html/index_eng.html

@@ -37,7 +37,7 @@
                     <a class="nav-link active btn-login" aria-current="page" href="login.html">Login</a>
                 </li>
                 <li class="nav-item">
-                    <a class="nav-link btn-userProfile" aria-current="page" href="user_profile.html">User Profile</a>
+                    <a class="nav-link btn-userProfile" aria-current="page" href="user_profile2.html">User Profile</a>
                 </li>
                 <li class="nav-item">
                     <a class="nav-link btn-logout" aria-current="page">Log Out</a>
@@ -56,7 +56,7 @@
       <img class="user img-fluid rounded-circle" src="./static/img/userprofile/userimg.png" alt="">
       <p class="text-white my-3 text-center">Create something today!</p>
       <div class="navbar-nav mb-2 mb-lg-0 px-3 pe-4">
-          <a class="nav-link btn-gocreate text-white col-6" aria-current="page" href="./make_video.html">Make <br>Videos</a>
+          <a class="nav-link btn-gocreate text-white col-6" aria-current="page" href="./index_eng.html">Make English<br>Videos</a>
           <a class="nav-link btn-gocreate text-white col-6" aria-current="page" href="./make_video_slide.html">Make Videos <br>By Slides</a>
       </div>
       <hr>

html/make_video.html

@@ -85,14 +85,14 @@
                 <div class="userName"></div> 
                 <img class="user img-fluid rounded-circle" src="./static/img/userprofile/userimg.png" alt="">
                 <p class="text-white my-3 text-center" set-lan="html:Createsthtoday">今天要做甚麼影片呢?</p>
-                <div class="navbar-nav mb-2 mb-lg-0 px-3 pe-4">
-                    <a class="nav-link btn-gocreate text-white col-6 btn-makeppt" aria-current="page" href="./make_video_slide.html" set-lan="html:make_slides">投影片影片製作</a>
-                    <a class="nav-link btn-gocreate text-white col-6 btn-makeen" aria-current="page" href="./index_eng.html" set-lan="html:make_video_eng">純英文影片製作</a>
-                </div>
                 <div class="navbar-nav mb-2 mb-lg-0 px-3 pe-4">
                     <a class="nav-link btn-gocreate text-white col-6 btn-makev" aria-current="page" href="./make_video.html" set-lan="html:make_video">影片製作</a>
                     <a class="nav-link btn-gocreate text-white col-6 btn-makelong" aria-current="page" href="./make_video_long.html" set-lan="html:make_video_long">長影片製作</a>
                 </div>
+                <div class="navbar-nav mb-2 mb-lg-0 px-3 pe-4">
+                    <a class="nav-link btn-gocreate text-white col-6 btn-makeppt" aria-current="page" href="./make_video_slide.html" set-lan="html:make_slides">投影片影片製作</a>
+                    <a class="nav-link btn-gocreate text-white col-6 btn-makeen" aria-current="page" href="./index_eng.html" set-lan="html:make_video_eng">純英文影片製作</a>
+                </div>
                 <hr>
                 <ul class="nav-list ps-0">
                     <li class="nav-list-item pb-1 mb-3" data-bs-toggle="modal" data-bs-target="#howto"><i

html/make_video_long.html

@@ -85,14 +85,14 @@
                 <div class="userName"></div>            
                 <img class="user img-fluid rounded-circle" src="./static/img/userprofile/userimg.png" alt="">
                 <p class="text-white my-3 text-center" set-lan="html:Createsthtoday">今天要做甚麼影片呢?</p>
-                <div class="navbar-nav mb-2 mb-lg-0 px-3 pe-4">
-                    <a class="nav-link btn-gocreate text-white col-6 btn-makeppt" aria-current="page" href="./make_video_slide.html" set-lan="html:make_slides">投影片影片製作</a>
-                    <a class="nav-link btn-gocreate text-white col-6 btn-makeen" aria-current="page" href="./index_eng.html" set-lan="html:make_video_eng">純英文影片製作</a>
-                </div>
                 <div class="navbar-nav mb-2 mb-lg-0 px-3 pe-4">
                     <a class="nav-link btn-gocreate text-white col-6 btn-makev" aria-current="page" href="./make_video.html" set-lan="html:make_video">影片製作</a>
                     <a class="nav-link btn-gocreate text-white col-6 btn-makelong" aria-current="page" href="./make_video_long.html" set-lan="html:make_video_long">長影片製作</a>
                 </div>
+                <div class="navbar-nav mb-2 mb-lg-0 px-3 pe-4">
+                    <a class="nav-link btn-gocreate text-white col-6 btn-makeppt" aria-current="page" href="./make_video_slide.html" set-lan="html:make_slides">投影片影片製作</a>
+                    <a class="nav-link btn-gocreate text-white col-6 btn-makeen" aria-current="page" href="./index_eng.html" set-lan="html:make_video_eng">純英文影片製作</a>
+                </div>
                 <hr>
                 <ul class="nav-list ps-0">
                     <li class="nav-list-item pb-1 mb-3" data-bs-toggle="modal" data-bs-target="#howto"><i

html/make_video_slide.html

@@ -85,14 +85,14 @@
                 <div class="userName"></div> 
                 <img class="user img-fluid rounded-circle" src="./static/img/userprofile/userimg.png" alt="">
                 <p class="text-white my-3 text-center" set-lan="html:Createsthtoday">今天要做甚麼影片呢?</p>
-                <div class="navbar-nav mb-2 mb-lg-0 px-3 pe-4">
-                    <a class="nav-link btn-gocreate text-white col-6 btn-makeppt" aria-current="page" href="./make_video_slide.html" set-lan="html:make_slides">投影片影片製作</a>
-                    <a class="nav-link btn-gocreate text-white col-6 btn-makeen" aria-current="page" href="./index_eng.html" set-lan="html:make_video_eng">純英文影片製作</a>
-                </div>
                 <div class="navbar-nav mb-2 mb-lg-0 px-3 pe-4">
                     <a class="nav-link btn-gocreate text-white col-6 btn-makev" aria-current="page" href="./make_video.html" set-lan="html:make_video">影片製作</a>
                     <a class="nav-link btn-gocreate text-white col-6 btn-makelong" aria-current="page" href="./make_video_long.html" set-lan="html:make_video_long">長影片製作</a>
                 </div>
+                <div class="navbar-nav mb-2 mb-lg-0 px-3 pe-4">
+                    <a class="nav-link btn-gocreate text-white col-6 btn-makeppt" aria-current="page" href="./make_video_slide.html" set-lan="html:make_slides">投影片影片製作</a>
+                    <a class="nav-link btn-gocreate text-white col-6 btn-makeen" aria-current="page" href="./index_eng.html" set-lan="html:make_video_eng">純英文影片製作</a>
+                </div>
                 <hr>
                 <ul class="nav-list ps-0">
                     <li class="nav-list-item pb-1 mb-3" data-bs-toggle="modal" data-bs-target="#howto"><i

html/reset_pwd.html

@@ -65,12 +65,12 @@
       <img class="user img-fluid rounded-circle" src="./static/img/userprofile/userimg.png" alt="">
       <p class="text-white my-3 text-center" set-lan="html:Createsthtoday">今天要做甚麼影片呢?</p>
       <div class="navbar-nav mb-2 mb-lg-0 px-3 pe-4">
-        <a class="nav-link btn-gocreate text-white col-6 btn-makeppt" aria-current="page" href="./make_video_slide.html" set-lan="html:make_slides">投影片影片製作</a>
-        <a class="nav-link btn-gocreate text-white col-6 btn-makeen" aria-current="page" href="./index_eng.html" set-lan="html:make_video_eng">純英文影片製作</a>
-    </div>
-    <div class="navbar-nav mb-2 mb-lg-0 px-3 pe-4">
         <a class="nav-link btn-gocreate text-white col-6 btn-makev" aria-current="page" href="./make_video.html" set-lan="html:make_video">影片製作</a>
         <a class="nav-link btn-gocreate text-white col-6 btn-makelong" aria-current="page" href="./make_video_long.html" set-lan="html:make_video_long">長影片製作</a>
+    </div>
+      <div class="navbar-nav mb-2 mb-lg-0 px-3 pe-4">
+        <a class="nav-link btn-gocreate text-white col-6 btn-makeppt" aria-current="page" href="./make_video_slide.html" set-lan="html:make_slides">投影片影片製作</a>
+        <a class="nav-link btn-gocreate text-white col-6 btn-makeen" aria-current="page" href="./index_eng.html" set-lan="html:make_video_eng">純英文影片製作</a>
     </div>
       <hr>
       <ul class="nav-list ps-0">

html/reset_pwd.js

@@ -81,8 +81,9 @@ function openNav() {
   }).then(res => {
     console.log(res.data);
     loaded_data = res.data;
+    var historyList = document.querySelector('.historyList');
+    historyList.innerHTML = '';
     for (var obj of loaded_data) {
-      var historyList = document.querySelector('.historyList');
       var list = document.createElement('li');
       list.id = obj.id;
       // div-imgfr

html/reset_pwd_email.html

@@ -65,12 +65,12 @@
       <img class="user img-fluid rounded-circle" src="./static/img/userprofile/userimg.png" alt="">
       <p class="text-white my-3 text-center" set-lan="html:Createsthtoday">今天要做甚麼影片呢?</p>
       <div class="navbar-nav mb-2 mb-lg-0 px-3 pe-4">
-        <a class="nav-link btn-gocreate text-white col-6 btn-makeppt" aria-current="page" href="./make_video_slide.html" set-lan="html:make_slides">投影片影片製作</a>
-        <a class="nav-link btn-gocreate text-white col-6 btn-makeen" aria-current="page" href="./index_eng.html" set-lan="html:make_video_eng">純英文影片製作</a>
-    </div>
-    <div class="navbar-nav mb-2 mb-lg-0 px-3 pe-4">
         <a class="nav-link btn-gocreate text-white col-6 btn-makev" aria-current="page" href="./make_video.html" set-lan="html:make_video">影片製作</a>
         <a class="nav-link btn-gocreate text-white col-6 btn-makelong" aria-current="page" href="./make_video_long.html" set-lan="html:make_video_long">長影片製作</a>
+    </div>
+      <div class="navbar-nav mb-2 mb-lg-0 px-3 pe-4">
+        <a class="nav-link btn-gocreate text-white col-6 btn-makeppt" aria-current="page" href="./make_video_slide.html" set-lan="html:make_slides">投影片影片製作</a>
+        <a class="nav-link btn-gocreate text-white col-6 btn-makeen" aria-current="page" href="./index_eng.html" set-lan="html:make_video_eng">純英文影片製作</a>
     </div>
       <hr>
       <ul class="nav-list ps-0">

html/reset_pwd_email.js

@@ -78,8 +78,9 @@ function openNav() {
   }).then(res => {
     console.log(res.data);
     loaded_data = res.data;
+    var historyList = document.querySelector('.historyList');
+    historyList.innerHTML = '';
     for (var obj of loaded_data) {
-      var historyList = document.querySelector('.historyList');
       var list = document.createElement('li');
       list.id = obj.id;
       // div-imgfr
@@ -129,4 +130,4 @@ function view() {
     } else {
       window.open(`http://${event.target.dataset.url}`, '_blank');
     }
-  }
+}

html/script_eng.js

@@ -205,8 +205,9 @@ function openNav() {
   }).then(res => {
     console.log(res.data);
     loaded_data = res.data;
+    var historyList = document.querySelector('.historyList');
+    historyList.innerHTML = '';
     for (var obj of loaded_data) {
-      var historyList = document.querySelector('.historyList');
       var list = document.createElement('li');
       list.id = obj.id;
       // div-imgfr

html/script_long.js

@@ -228,8 +228,9 @@ function openNav() {
   }).then(res => {
     console.log(res.data);
     loaded_data = res.data;
+    var historyList = document.querySelector('.historyList');
+    historyList.innerHTML = '';
     for (var obj of loaded_data) {
-      var historyList = document.querySelector('.historyList');
       var list = document.createElement('li');
       list.id = obj.id;
       // div-imgfr

html/script_profiles.js

@@ -201,11 +201,19 @@ function getDraft() {
                     </td>
                 </tr>`
       }
+      let titleTxt = '標題';
+      let editTxt = '編輯';
+      let nodraftTxt = '目前沒有草稿喔';
+      if(lan == 'en') {
+        titleTxt = 'Video Title';
+        editTxt = 'Edit';
+        nodraftTxt = 'no_draft';
+      }
       str = `<table class="table text-center">
       <thead>
         <tr>
-          <th scope="col" set-lan="html:video_title">標題</th>
-          <th class="px-0" scope="col" set-lan="html:draft_edit">編輯</th>
+          <th scope="col" set-lan="html:video_title">${titleTxt}</th>
+          <th class="px-0" scope="col" set-lan="html:draft_edit">${editTxt}</th>
         </tr>
       </thead>
       <tbody class="draft-content">${draftStr}</tbody>
@@ -214,7 +222,7 @@ function getDraft() {
       JsLoadingOverlay.hide();
     } else {
       str = `<div>
-              <h5 set-lan="html:no_draft">目前沒有草稿喔</h5>
+              <h5 set-lan="html:no_draft">${nodraftTxt}</h5>
               <img src="static/img/undraw_void_3ggu.svg" width="80">
             </div>`;
       $('.draft-table .card').html(str); 
@@ -271,8 +279,9 @@ function openNav() {
   }).then(res => {
     console.log(res.data);
     loaded_data = res.data;
+    var historyList = document.querySelector('.historyList');
+    historyList.innerHTML = '';
     for (var obj of loaded_data) {
-      var historyList = document.querySelector('.historyList');
       var list = document.createElement('li');
       list.id = obj.id;
       // div-imgfr

html/static/script_slides.js

@@ -227,8 +227,9 @@ function openNav() {
   }).then(res => {
     console.log(res.data);
     loaded_data = res.data;
+    var historyList = document.querySelector('.historyList');
+    historyList.innerHTML = '';
     for (var obj of loaded_data) {
-      var historyList = document.querySelector('.historyList');
       var list = document.createElement('li');
       list.id = obj.id;
       // div-imgfr
@@ -244,6 +245,7 @@ function openNav() {
       boxTitle.classList.add('box-title');
       boxTitle.textContent = obj.name;
       boxTitle.id = obj.id;
+      boxTitle.setAttribute('onclick', `direct(${obj.id})`);
 
       var boxLink = document.createElement('span');
       boxLink.classList.add('box-link');
@@ -263,6 +265,11 @@ function openNav() {
     console.log(err);
   });
 }
+
+function direct(id) {
+  location.href = `make_video.html?id=${id}`;
+}
+
 function closeNav() {
   document.getElementById("mySidenav").style.width = "250px";
 }

html/static/script_util.js

@@ -388,8 +388,9 @@ function openNav() {
   }).then(res => {
     console.log(res.data);
     loaded_data = res.data;
+    var historyList = document.querySelector('.historyList');
+    historyList.innerHTML = '';
     for (var obj of loaded_data) {
-      var historyList = document.querySelector('.historyList');
       var list = document.createElement('li');
       list.id = obj.id;
       // div-imgfr

html/user_profile2.html

@@ -80,14 +80,15 @@
             <div class="userName"></div> 
             <img class="user img-fluid rounded-circle" src="./static/img/userprofile/userimg.png" alt="">
             <p class="text-white my-3 text-center" set-lan="html:Createsthtoday">今天要做甚麼影片呢?</p>
-            <div class="navbar-nav mb-2 mb-lg-0 px-3 pe-4">
-                <a class="nav-link btn-gocreate text-white col-6 btn-makeppt" aria-current="page" href="./make_video_slide.html" set-lan="html:make_slides">投影片影片製作</a>
-                <a class="nav-link btn-gocreate text-white col-6 btn-makeen" aria-current="page" href="./index_eng.html" set-lan="html:make_video_eng">純英文影片製作</a>
-            </div>
             <div class="navbar-nav mb-2 mb-lg-0 px-3 pe-4">
                 <a class="nav-link btn-gocreate text-white col-6 btn-makev" aria-current="page" href="./make_video.html" set-lan="html:make_video">影片製作</a>
                 <a class="nav-link btn-gocreate text-white col-6 btn-makelong" aria-current="page" href="./make_video_long.html" set-lan="html:make_video_long">長影片製作</a>
             </div>
+            <div class="navbar-nav mb-2 mb-lg-0 px-3 pe-4">
+                <a class="nav-link btn-gocreate text-white col-6 btn-makeppt" aria-current="page" href="./make_video_slide.html" set-lan="html:make_slides">投影片影片製作</a>
+                <a class="nav-link btn-gocreate text-white col-6 btn-makeen" aria-current="page" href="./index_eng.html" set-lan="html:make_video_eng">純英文影片製作</a>
+            </div>
+            
             <hr>
             <ul class="nav-list ps-0">
                 <li class="nav-list-item pb-1 mb-3" data-bs-toggle="modal" data-bs-target="#howto"><i

html/verify_email.html

@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html lang="en" >
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>驗證信箱</title>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/meyer-reset/2.0/reset.min.css">
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp"
+        crossorigin="anonymous">
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-+0n0xVW2eSR5OomGNYDnhzAbDsOXxcvSN1TPprVMTNDbiYZCxYbOOl7+AMvyTG2x" crossorigin="anonymous">
+    <script src="https://unpkg.com/axios/dist/axios.min.js"></script>
+    <style>
+    .h2 {
+        text-align: center;
+        font-size: 2rem;
+        font-weight: 500;
+        margin-top: 2rem;
+    }
+    .imgfr {
+      width: 70%;
+      max-width: 800px;
+      min-width: 300px;
+    }
+    .imgfr img {
+      width: 100%;
+    }
+    .pl-0 {
+        padding-left: 0;
+    }
+    .link {
+      text-decoration: none;
+    }
+    </style>
+</head>
+<body>
+    <div class="container">
+      <main>
+        <div class="m-auto text-center">
+          <h2 class="h2"><img src="../html/static/img/checked (2).png" width="36" class="me-2">驗證成功</h2>
+          <p>立即導頁至<a href="./login.html" class="link">登入頁</a>，以繼續使用服務</p>
+          <div><img src="../html/static/img/Spinner-1s-181px.gif" width="36" alt=""></div>
+          <div class="imgfr mx-auto">
+            <img src="../html/static/img/undraw_well_done_i2wr.png" alt="">
+          </div>
+          
+        </div>
+      </main>
+        
+    </div>
+    <script src='https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js'></script>
+    <script src='https://cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.3/jquery.easing.min.js'></script>
+    <script>
+      
+    </script>
+</body>
+</html>