Browse Source

fix draft, db click and side bar

huaisianhuang 3 years ago
parent
commit
7a7cb44e1b

+ 0 - 1
html/index_eng.html

@@ -50,7 +50,6 @@
     <div id="mySidenav" class="sidenav">
       <!-- <a href="javascript:void(0)" class="closebtn" onclick="closeNav()">&times;</a> -->
       <div class="text-start mt-3">
-          <a href="index.html"><img class="img-fluid w-50 ps-1" src="./static/img/contactus/CMM_LOGO.png" alt=""></a>
           <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> 

+ 0 - 1
html/make_video.html

@@ -80,7 +80,6 @@
             <div id="mySidenav" class="sidenav">
                 <!-- <a href="javascript:void(0)" class="closebtn" onclick="closeNav()">&times;</a> -->
                 <div class="text-start mt-3">
-                    <a href="index.html"><img class="img-fluid w-50 ps-1" src="./static/img/contactus/CMM_LOGO.png" alt=""></a>
                     <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> 

+ 0 - 1
html/make_video_long.html

@@ -80,7 +80,6 @@
             <div id="mySidenav" class="sidenav">
                 <!-- <a href="javascript:void(0)" class="closebtn" onclick="closeNav()">&times;</a> -->
                 <div class="text-start mt-3">
-                    <a href="index.html"><img class="img-fluid w-50 ps-1" src="./static/img/contactus/CMM_LOGO.png" alt=""></a>
                     <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>            

+ 0 - 1
html/make_video_slide.html

@@ -80,7 +80,6 @@
             <div id="mySidenav" class="sidenav">
                 <!-- <a href="javascript:void(0)" class="closebtn" onclick="closeNav()">&times;</a> -->
                 <div class="text-start mt-3">
-                    <a href="index.html"><img class="img-fluid w-50 ps-1" src="./static/img/contactus/CMM_LOGO.png" alt=""></a>
                     <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> 

+ 19 - 2
html/script_profiles.js

@@ -131,7 +131,7 @@ renderView();
 function getDraft() {
   JsLoadingOverlay.show({
     "overlayBackgroundColor": "#FFFFFF",
-    "overlayOpacity": "0.1",
+    "overlayOpacity": "1",
     "spinnerIcon": "ball-circus",
     "spinnerColor": "#B9DDF3",
     "spinnerSize": "1x",
@@ -165,7 +165,7 @@ function getDraft() {
                   <span class="me-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" id="${result[i].id}" onclick="deleteDraft(${result[i].id})">
+                    <span class="ms-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>
@@ -299,6 +299,21 @@ function gotoDraft (id) {
 }
 function deleteDraft(id) {
   let token = getCookie('jwt_token');
+  JsLoadingOverlay.show({
+    "overlayBackgroundColor": "#FFFFFF",
+    "overlayOpacity": "1",
+    "spinnerIcon": "ball-circus",
+    "spinnerColor": "#B9DDF3",
+    "spinnerSize": "1x",
+    "overlayIDName": "overlay",
+    "spinnerIDName": "spinner",
+    "offsetX": 0,
+    "offsetY": 0,
+    "containerID": "draft-table",
+    "lockScroll": false,
+    "overlayZIndex": 9998,
+    "spinnerZIndex": 9999
+  });
   axios({
     method: 'post',
     url: 'https://www.choozmo.com:8887/del_draft',
@@ -310,6 +325,8 @@ function deleteDraft(id) {
     data: { "id": id }
   }).then(res => {
     console.log(res.data);
+    //$('.draft-content-delete').html('<i class="fas fa-trash-alt"></i>');
+    JsLoadingOverlay.hide();
     getDraft();
   }).catch(err => {
     console.log(err);

+ 5 - 0
html/static/script_slides.js

@@ -1,5 +1,10 @@
 checkRoute();
 
+let userBasics = JSON.parse(localStorage.getItem('user_profile')) || [];
+if(userBasics !== []){
+  $('.userName').html(`<h2 class="user-name text-white mt-4 fw-bold">Hello,${userBasics.user_info.userName}</h2>`);
+}
+
 function checkRoute() {
   let jwt_token = get_jwt_token();
   if(jwt_token == undefined) {

+ 1 - 1
html/static/script_util.js

@@ -412,7 +412,7 @@ function load_data(tid, loaded_data, draft = false) {
     $("#avatar").val(historyItem.avatar);
   } else {
     $(".title_new").val(loaded_data.find(item => item.id == tid).name);
-    //$("#avatar").val(historyItem.avatar);
+    $("#avatar").val(historyItem.avatar);
   }
 
   let txtlength = historyItem.text_content.length;

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

@@ -140,7 +140,7 @@ body {
 
 .nav-list {
   color: white;
-  margin-top: 3rem;
+  margin-top: 1.5rem;
 }
 
 .nav-list-item {

File diff suppressed because it is too large
+ 0 - 0
html/static/scss/style.css.map


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

@@ -133,7 +133,7 @@ body {
 
 .nav-list {
 	color: white;
-	margin-top: 3rem;
+	margin-top: 1.5rem;
 }
 
 .nav-list-item {

+ 2 - 2
html/user_profile2.html

@@ -230,9 +230,9 @@
                                         <h3>Want to get more minutes?</h3>
                                        <p class="mb-0">Invite your friends to AI Spokesgirl and for each eligible one that </p>
                                        <p>signs up from your referral, we'll give you 3 more minutes free!</p>
-                                       <div>
+                                       <div class="d-flex">
                                            <p style="color:#183790; font-size: 20px;" class="d-inline fw-bold">Share:</p>
-                                           <div class="fb-share-button" data-href="https://video.choozmo.com/" data-layout="button" data-size="large"><a target="_blank" href="https://www.facebook.com/sharer/sharer.php?u=http%3A%2F%2Flocalhost%3A8080%2Fhtml%2Findex.html&amp;src=sdkpreparse" class="fb-xfbml-parse-ignore">分享</a></div>
+                                           <div class="fb-share-button mx-4" data-href="https://video.choozmo.com/" data-layout="button" data-size="large"><a target="_blank" href="https://www.facebook.com/sharer/sharer.php?u=http%3A%2F%2Flocalhost%3A8080%2Fhtml%2Findex.html&amp;src=sdkpreparse" class="fb-xfbml-parse-ignore">Facebook</a></div>
                                             <a class="mx-4" href="https://twitter.com/intent/tweet?text=I%20just%20created%20a%20video%20in%205%20minutes.%20Check%20it%20out%20%F0%9F%91%89%20https%3A%2F%2Fvideo.choozmo.com/&related=ai_cmm" target="_blank"><img width="28" class="me-2" src="./static/img/userprofile/Icon awesome-twitter-square.png" alt="">Twitter</a>
                                             <a class="mx-4 share-email"><img width="28" class="me-2" src="./static/img/userprofile/Icon material-email.png" alt="">Email</a>                                         
                                        </div>

Some files were not shown because too many files changed in this diff