Browse Source

add reload, fix slide_eng

huai-sian 3 years ago
parent
commit
e0ecd5bfee

+ 2 - 2
html/index_eng.html

@@ -43,9 +43,9 @@
               <li class="nav-item">
                 <a class="nav-link active text-white" aria-current="page" href="pricing.html">Pricing</a>
               </li>
-              <li class="nav-item">
+              <!-- <li class="nav-item">
                 <a class="nav-link active btn-login text-white" aria-current="page" href="login.html">Login</a>
-              </li>
+              </li> -->
               <li class="nav-item">
                 <a class="nav-link btn-userProfile text-white" aria-current="page" href="user_profile2.html">User
                   Profile</a>

+ 165 - 114
html/make_video_slide_eng.html

@@ -29,41 +29,53 @@
     <!-- ================================================================= -->
     <!-- navbar -->
    
-    <nav class="navbar navbar-expand-lg navbar-light">
-        <div class="container-fluid">
-            <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">
-                <span class="navbar-toggler-icon"></span>
-            </button>
-            <div class="collapse navbar-collapse" id="navbarSupportedContent">
-                <ul class="navbar-nav mb-2 ms-auto mb-lg-0">
-                    <li class="nav-item">
-                        <a class="nav-link active" aria-current="page" href="pricing.html">Pricing</a>
-                    </li>
-                    <li class="nav-item dropdown">
-                        <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-                            中/En
-                        </a>
-                        <ul class="dropdown-menu" aria-labelledby="navbarDropdown">
-                            <li><button class="nav-link lan-swtich" aria-current="page" set-lan="html:en" onclick="changeLan(this);window.location.reload();" value="en">English</button></li>
-                            <li><button class="nav-link lan-switch" aria-current="page" set-lan="html:zh" onclick="changeLan(this);window.location.reload();" value="zh">中文</button></li>
-                        </ul>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link active btn-login" aria-current="page" href="login.html">Log in</a>
-                    </li>
-                    <li class="nav-item">
-                        <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>
-                    </li>
-                </ul>
-            </div>
+    <div class="card2">
+        <img class="profile-bgimg img-fluid" src="./static/img/nav-bg.png" class="card-img" alt="...">
+        <img class="profile-bgimg-m img-fluid" src="./static/img/userprofile/banner-m.png" class="card-img" alt="...">
+
+        <div class="card-img-overlay pt-2 py-lg-3">
+            <nav class="navbar navbar-expand-lg navbar-light pt-0">
+                <div class="navbar-collapse d-flex" id="navbarSupportedContent">
+                    <a href="./index.html">
+                        <img width="150" src="./static/img/contactus/CMM_LOGO.png" alt="">
+                    </a>
+                    <ul style="flex-direction: row" class="navbar-des navbar-nav ms-auto mb-2 mb-lg-0 mt-2">
+                        <li class="nav-item me-3">
+                            <a class="nav-link active text-white" aria-current="page" href="pricing.html"
+                                set-lan="html:pricing">早鳥方案</a>
+                        </li>
+                        <li class="nav-item dropdown me-3 me-lg-1">
+                            <a class="nav-link dropdown-toggle text-white" href="#" id="navbarDropdown" role="button"
+                                data-bs-toggle="dropdown" aria-expanded="false">
+                                中/En
+                            </a>
+                            <ul class="dropdown-menu" aria-labelledby="navbarDropdown">
+                                <li><button class="nav-link lan-swtich" aria-current="page" set-lan="html:en"
+                                        onclick="changeLan(this);window.location.reload();" value="en">English</button>
+                                </li>
+                                <li><button class="nav-link lan-switch" aria-current="page" set-lan="html:zh"
+                                        onclick="changeLan(this);window.location.reload();" value="zh">中文</button></li>
+                            </ul>
+                        </li>
+                        <li class="nav-item me-2 me-lg-1">
+                            <a class="nav-link btn-userProfile text-white" aria-current="page" href="user_profile2.html"
+                                set-lan="html:user_profile">會員資料</a>
+                        </li>
+                        <li class="nav-item me-2 me-lg-1">
+                            <a class="nav-link active btn-login text-white" aria-current="page" href="login.html"
+                                set-lan="html:login">登入</a>
+                        </li>
+                        <li class="nav-item text-white me-2 me-lg-1">
+                            <a class="nav-link btn-logout text-white" aria-current="page" set-lan="html:logout">登出</a>
+                        </li>
+                    </ul>
+                    <span class="menu-bar ms-auto" style="font-size: 32px;"><i
+                            class="fas fa-bars text-white"></i></span>
+                </div>
+
+            </nav>
         </div>
-    </nav>
+    </div>
     <!-- ================================================================= -->
 
 
@@ -75,34 +87,58 @@
                 <div id="mySidenav" class="sidenav">
                     <!-- <a href="javascript:void(0)" class="closebtn" onclick="closeNav()">&times;</a> -->
                     <div class="sidenav-content">
-    
-                    <div class="text-start mt-3">
-                        <h2 class="fw-bold ps-0" href="index.html"><a class="nav-link active ps-1" aria-current="page" href="index.html">AI Spokesgirl</a></h2>
-                    </div>
-                    <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">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 btn-makeen" aria-current="page" href="./index_eng.html">Make English Videos</a>
-                        <a class="nav-link btn-gocreate text-white col-6 btn-makeppt" aria-current="page" href="./make_video_slide.html">Make Videos By Slides</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
+                        <div style="font-size: 20px;" class="close-btn text-end">
+                            <i class="fas fa-times text-white me-3 mt-3"></i>
+                        </div>
+                        <div class="text-start">
+                            <h2 class="fw-bold ps-0" href="index.html"><a class="nav-link active ps-3 pt-0"
+                                    aria-current="page" href="index.html">AI Spokesgirl</a></h2>
+                        </div>
+                        <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">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="./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_eng.html">Make Videos <br>By Slides</a>
+                        </div>
+                        <hr>
+                        <ul class="nav-list ps-0">
+                            <li class="nav-list-item pb-1 mb-3 text-start ps-3" data-bs-toggle="modal" data-bs-target="#howto"><i
                                 class="fas fa-book-open me-2"></i>
-                            <lan>Usage Introduction</lan>
-                        </li>
-                        <a style="text-decoration: none;color:white;" href="./user_profile2.html">
-                            <li class="nav-list-item pb-1 mb-3" data-bs-toggle="modal">
+                              <lan>Usage Introduction</lan>
+                            </li>
+                            <a style="text-decoration: none;color:white;" href="./user_profile2.html">
+                              <li class="nav-list-item pb-1 mb-3 text-start ps-3" data-bs-toggle="modal">
                                 <i class="fas fa-user me-2"></i>
-                               <lan>User Profile</lan>
+                                <lan>User Profile</lan>
+                              </li>
+                            </a>
+                            <li class="nav-list-item pb-1 text-start ps-3" data-bs-toggle="modal" data-bs-target="#history"
+                              onclick="openNav()">
+                              <i class="fas fa-history me-2"></i>
+                              <lan>History</lan>
                             </li>
-                        </a>
-                        <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>History</lan>
-                        </li>
-                    </ul>
+                            <div class="Mobile-nav">
+                              <hr>
+                              <li class="nav-item text-start">
+                                <a style="font-size: 18px;" class="nav-link active text-white" aria-current="page" href="pricing.html"><i class='fas fa-tags me-2'></i>Pricing</a>
+                              </li>
+                              <!-- <li class="nav-item text-start">
+                                <a style="font-size: 18px;" class="nav-link active btn-login text-white" aria-current="page" href="login.html"><i class="fas fa-sign-in-alt text-white me-3"></i>Login</a>
+                              </li> -->
+                              <!-- <li class="nav-item text-start">
+                                <a style="font-size: 18px;" class="nav-link btn-userProfile text-white" aria-current="page" href="user_profile2.html">User
+                                  Profile</a>
+                              </li> -->
+                              <li class="nav-item text-start">
+                                <a style="font-size: 18px;" class="nav-link btn-logout text-white" aria-current="page"><i class='fas fa-sign-out-alt text-white me-3'></i>Log Out</a>
+                              </li>
+                              
+                          </div>
+                          </ul>
+
                     </div>
                     <div class="right-text">
                         <a target="_blank" href="http://www.choozmo.com/">| 官網 |</a>
@@ -118,7 +154,7 @@
                                 style="width: 20px;" src="./static/img/contactus/youtube.png" alt=""></a>
                         <a target="_blank" href="https://twitter.com/ai_cmm"><img style="width: 20px;"
                                 src="./static/img/contactus/twitter.png" alt=""></a>
-                        <p class="Reserved text-white text-start mt-3 ps-2">Choozmo All Rights Reserved</p>
+                        <p class="Reserved text-white text-start mt-3 ps-3 ps-lg-3">Choozmo All Rights Reserved</p>
                     </div>
                 </div>
             </div>
@@ -137,47 +173,49 @@
                             <input type="checkbox" id="multiLang" > <br/>
                         </fieldset>
                         <fieldset>
-                            <h3  class="fs-subtitle"><lan>Choose Character</lan><img class="ms-1" src="static/img/question.png" alt="" data-bs-toggle="tooltip" data-bs-placement="right" title="將作為影片的講者 The spokesgirl of your video"></h3>
+                            <h3 class="fs-subtitle">Choose Character<img class="ms-1" src="static/img/question.png" alt=""
+                                data-bs-toggle="tooltip" data-bs-placement="right" title="The spokesgirl of your video"></h3>
                             <select id="avatar" class='avatar'>
-                                <option value="7">Peggy</option>
-                                <option value="8">Stacy</option>
-                                <option value="11">Summer韓小夏</option>
-                                <option value="12">Jocelyn</option>
-                                <option value="13">Angela</option>
+                              <option value="Choose Character" selected="selected" disabled>Choose Character</option>
+                              <option value="7">Peggy</option>
+                              <option value="8">Stacy</option>
+                              <option value="11">Summer</option>
+                              <option value="12">Jocelyn</option>
+                              <option value="13">Angela</option>
                             </select>
-                            <div class="owl-carousel owl-theme d-flex row">
-                                <div class="card item" data-avatar="Peggy" data-img="peggy">
-                                    <div class="imgfr"><img src="static/img/peggy.webp" class="card-img-top" alt="..."></div>
-                                    <div class="card-body">
-                                        <h5 class="card-title">Peggy</h5>
-                                    </div>
+                            <div class="d-flex row row-cols-2 row-cols-lg-6">
+                              <div class="card col" data-avatar="Peggy" data-img="peggy">
+                                <div class="imgfr"><img src="static/img/peggy.webp" class="card-img-top" alt="..."></div>
+                                <div class="card-body">
+                                  <h5 class="card-title">Peggy</h5>
                                 </div>
-                                <div class="card item" data-avatar="Stacy" data-img="stacy">
-                                    <div class="imgfr"><img src="static/img/stacy.webp" class="card-img-top" alt="..."></div>
-                                    <div class="card-body">
-                                        <h5 class="card-title">Stacy</h5>
-                                    </div>
+                              </div>
+                              <div class="card col" data-avatar="Stacy" data-img="stacy">
+                                <div class="imgfr"><img src="static/img/stacy.webp" class="card-img-top" alt="..."></div>
+                                <div class="card-body">
+                                  <h5 class="card-title">Stacy</h5>
                                 </div>
-                                <div class="card item" data-avatar="Summer韓小夏" data-img="summer">
-                                    <div class="imgfr"><img src="static/img/summer.webp" class="card-img-top" alt="..."></div>
-                                    <div class="card-body">
-                                        <h5 class="card-title">Summer韓小夏</h5>
-                                    </div>
+                              </div>
+                              <div class="card col" data-avatar="Summer" data-img="summer">
+                                <div class="imgfr"><img src="static/img/summer.webp" class="card-img-top" alt="..."></div>
+                                <div class="card-body">
+                                  <h5 class="card-title">Summer</h5>
                                 </div>
-                                <div class="card item" data-avatar="Jocelyn" data-img="Jocelyn">
-                                    <div class="imgfr"><img src="static/img/Jocelyn.webp" class="card-img-top" alt="..."></div>
-                                    <div class="card-body">
-                                        <h5 class="card-title">Jocelyn</h5>
-                                    </div>
+                              </div>
+                              <div class="card col" data-avatar="Jocelyn" data-img="Jocelyn">
+                                <div class="imgfr"><img src="static/img/Jocelyn.webp" class="card-img-top" alt="..."></div>
+                                <div class="card-body">
+                                  <h5 class="card-title">Jocelyn</h5>
                                 </div>
-                                <div class="card item" data-avatar="Angela" data-img="Angela">
-                                    <div class="imgfr"><img src="static/img/Angela.webp" class="card-img-top" alt="..."></div>
-                                    <div class="card-body">
-                                        <h5 class="card-title">Angela</h5>
-                                    </div>
+                              </div>
+                              <div class="card col" data-avatar="Angela" data-img="Angela">
+                                <div class="imgfr"><img src="static/img/Angela.webp" class="card-img-top" alt="..."></div>
+                                <div class="card-body">
+                                  <h5 class="card-title">Angela</h5>
                                 </div>
+                              </div>
                             </div>
-                        </fieldset>
+                          </fieldset>
                         <input id="send_slide" type="button" name="next" class="action-button" value="Submit" />
                     </form>
                     <!-- <div style="width: 80%;margin: 0 auto;"><iframe src="http://www.choozmo.com:8168/ai_anchor_video/16250306886652043.mp4" frameborder="0" style="width: 100%;height: 400px;"></iframe></div> -->
@@ -264,28 +302,41 @@
     <script type="text/javascript" src="static/lan.js"></script>
     <script src="static/common.js"></script>
 <script>
-$('.owl-carousel').owlCarousel({
-    loop: true,
-    margin: 10,
-    nav: false,
-    mouseDrag: true,
-    touchDrag: true,
-    smartSpeed: 1000,
-    autoplay: true,
-    autoplayTimeout: 8000,
-    autoplayHoverPause: false,
-    responsive: {
-        0: {
-            items: 1
-        },
-        600: {
-            items: 2
-        },
-        1000: {
-            items: 4
+    $('.owl-carousel').owlCarousel({
+        loop: true,
+        margin: 10,
+        nav: false,
+        mouseDrag: true,
+        touchDrag: true,
+        smartSpeed: 1000,
+        autoplay: true,
+        autoplayTimeout: 8000,
+        autoplayHoverPause: false,
+        responsive: {
+            0: {
+                items: 1
+            },
+            600: {
+                items: 2
+            },
+            1000: {
+                items: 4
+            }
         }
-    }
-});
+    });
+    $(".menu-bar").click(function () {
+        $(".sidenav").show();
+    });
+
+    $(".close-btn").click(function () {
+        $(".sidenav").hide();
+    });
+    $("#lang-manu").hide();
+
+    $("#changeLanguage").click(function () {
+        $("#lang-manu").slideToggle();
+        $("#lang-arrow").toggleClass("arrowdoup");
+    });
 </script>
 </body>
 

+ 4 - 3
html/script_profile.js

@@ -129,7 +129,8 @@ function renderView() {
         // 歷史紀錄
         // const historicalrecord 
         var  historicalrecord='';
-        for (var i = 0; i < userInfo.video_info.length; i++) {
+        var length = userInfo.video_info.length > 5 ? 5 : userInfo.video_info.length;
+        for (var i = 0; i < length; i++) {
           let formatted = userInfo.video_info[i].time_stamp;
           if (lan == 'zh') {
             const timeStamp = userInfo.video_info[i].time_stamp;
@@ -200,10 +201,10 @@ function getDraft() {
         draftStr += `<tr>
                   <td>${result[i].title}</td>
                   <td>
-                  <span class="me-3 draft-content-icon" id="${result[i].id}" onclick="gotoDraft(${result[i].id})">
+                  <span class="me-md-3 draft-content-icon" id="${result[i].id}" onclick="gotoDraft(${result[i].id})">
                     <i class="fas fa-edit"></i>
                     </span>
-                    <span class="ms-3 draft-content-icon draft-content-delete" id="${result[i].id}" onclick="deleteDraft(${result[i].id})">
+                    <span class="ms-md-3 draft-content-icon draft-content-delete" id="${result[i].id}" onclick="deleteDraft(${result[i].id})">
                     <i class="fas fa-trash-alt"></i>
                     </span>
                     </td>

+ 1 - 1
html/static/script_slides_eng.js

@@ -103,7 +103,7 @@ function getAvatar() {
   });
 }
 
-getAvatar();
+//getAvatar();
 
 var client_id = Date.now()
 var tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'))

+ 1 - 1
html/static/scss/style.css

@@ -1561,7 +1561,7 @@ body {
 
 @media screen and (max-width: 767px) {
   .sidenav .user {
-    width: 30vw;
+    width: 20vw;
   }
 }
 

+ 1 - 1
html/static/scss/style.scss

@@ -1417,7 +1417,7 @@ body {
 		object-fit: cover;
 		width: 8vw;
 		@media screen and(max-width:767px) {
-			width: 30vw;
+			width: 20vw;
 		}
 	}
 	.user-name {

+ 2 - 2
html/user_profile2.html

@@ -146,10 +146,10 @@
                                     </li>
                                     <div id="lang-manu">
                                             <li><button class="nav-link lan-swtich bg-transparent text-white border-0 mx-auto" aria-current="page"
-                                                    set-lan="html:en" onclick="changeLan(this)"
+                                                    set-lan="html:en" onclick="changeLan(this);window.location.reload();"
                                                     value="en">English</button></li>
                                             <li><button class="nav-link lan-switch bg-transparent text-white border-0 mx-auto" aria-current="page"
-                                                    set-lan="html:zh" onclick="changeLan(this)" value="zh">中文</button>
+                                                    set-lan="html:zh" onclick="changeLan(this);window.location.reload();" value="zh">中文</button>
                                             </li>
                                     </div>
                                     <li class="nav-item text-white  me-lg-1">