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

html/index_eng.html

@@ -159,6 +159,10 @@
                 <option value="11">Summer</option>
                 <option value="12">Jocelyn</option>
                 <option value="13">Angela</option>
+                <option value="15">Isabela</option>
+                <option value="16">Sofia</option>
+                <option value="17">Kristina</option>
+                <option value="18">Paula</option>
               </select>
               <div class="d-flex row row-cols-2 row-cols-lg-6">
                 <div class="card col" data-avatar="Peggy" data-img="peggy">
@@ -191,6 +195,30 @@
                     <h5 class="card-title">Angela</h5>
                   </div>
                 </div>
+                <div class="card col" data-avatar="Isabela" data-img="Isabela">
+                  <div class="imgfr"><img src="static/img/Isabela.webp" class="card-img-top" alt="..."></div>
+                  <div class="card-body">
+                    <h5 class="card-title">Isabela</h5>
+                  </div>
+                </div>
+                <div class="card col" data-avatar="Sofia" data-img="Sofia">
+                  <div class="imgfr"><img src="static/img/Sofia.webp" class="card-img-top" alt="..."></div>
+                  <div class="card-body">
+                    <h5 class="card-title">Sofia</h5>
+                  </div>
+                </div>
+                <div class="card col" data-avatar="Kristina" data-img="Kristina">
+                  <div class="imgfr"><img src="static/img/Kristina.webp" class="card-img-top" alt="..."></div>
+                  <div class="card-body">
+                    <h5 class="card-title">Kristina</h5>
+                  </div>
+                </div>
+                <div class="card col" data-avatar="Paula" data-img="Paula">
+                  <div class="imgfr"><img src="static/img/Paula.webp" class="card-img-top" alt="..."></div>
+                  <div class="card-body">
+                    <h5 class="card-title">Paula</h5>
+                  </div>
+                </div>
               </div>
             </fieldset>
             <fieldset>

html/make_video.html

@@ -284,6 +284,10 @@
                                 <option value="11">Summer韓小夏</option>
                                 <option value="12">Jocelyn</option>
                                 <option value="13">Angela</option>
+                                <option value="15">Isabela</option>
+                                <option value="16">Sofia</option>
+                                <option value="17">Kristina</option>
+                                <option value="18">Paula</option>
                             </select>
                             <div class="d-flex row row-cols-2 row-cols-lg-6">
                                 <div class="card item col" data-avatar="Peggy" data-img="peggy">
@@ -316,6 +320,30 @@
                                         <h5 class="card-title">Angela</h5>
                                     </div>
                                 </div>
+                                <div class="card col" data-avatar="Isabela" data-img="Isabela">
+                                    <div class="imgfr"><img src="static/img/Isabela.webp" class="card-img-top" alt="..."></div>
+                                    <div class="card-body">
+                                      <h5 class="card-title">Isabela</h5>
+                                    </div>
+                                </div>
+                                <div class="card col" data-avatar="Sofia" data-img="Sofia">
+                                    <div class="imgfr"><img src="static/img/Sofia.webp" class="card-img-top" alt="..."></div>
+                                    <div class="card-body">
+                                      <h5 class="card-title">Sofia</h5>
+                                    </div>
+                                </div>
+                                <div class="card col" data-avatar="Kristina" data-img="Kristina">
+                                    <div class="imgfr"><img src="static/img/Kristina.webp" class="card-img-top" alt="..."></div>
+                                    <div class="card-body">
+                                      <h5 class="card-title">Kristina</h5>
+                                    </div>
+                                </div>
+                                <div class="card col" data-avatar="Paula" data-img="Paula">
+                                    <div class="imgfr"><img src="static/img/Paula.webp" class="card-img-top" alt="..."></div>
+                                    <div class="card-body">
+                                      <h5 class="card-title">Paula</h5>
+                                    </div>
+                                </div>
                             </div>
                         </fieldset>
                         <fieldset>

html/make_video_long.html

@@ -240,6 +240,10 @@
                                 <option value="11">Summer韓小夏</option>
                                 <option value="12">Jocelyn</option>
                                 <option value="13">Angela</option>
+                                <option value="15">Isabela</option>
+                                <option value="16">Sofia</option>
+                                <option value="17">Kristina</option>
+                                <option value="18">Paula</option>
                             </select>
                             <div class="d-flex row row-cols-2 row-cols-lg-6">
                                 <div class="card item col" data-avatar="Peggy" data-img="peggy">
@@ -277,6 +281,30 @@
                                         <h5 class="card-title">Angela</h5>
                                     </div>
                                 </div>
+                                <div class="card col" data-avatar="Isabela" data-img="Isabela">
+                                    <div class="imgfr"><img src="static/img/Isabela.webp" class="card-img-top" alt="..."></div>
+                                    <div class="card-body">
+                                      <h5 class="card-title">Isabela</h5>
+                                    </div>
+                                </div>
+                                <div class="card col" data-avatar="Sofia" data-img="Sofia">
+                                    <div class="imgfr"><img src="static/img/Sofia.webp" class="card-img-top" alt="..."></div>
+                                    <div class="card-body">
+                                      <h5 class="card-title">Sofia</h5>
+                                    </div>
+                                </div>
+                                <div class="card col" data-avatar="Kristina" data-img="Kristina">
+                                    <div class="imgfr"><img src="static/img/Kristina.webp" class="card-img-top" alt="..."></div>
+                                    <div class="card-body">
+                                      <h5 class="card-title">Kristina</h5>
+                                    </div>
+                                </div>
+                                <div class="card col" data-avatar="Paula" data-img="Paula">
+                                    <div class="imgfr"><img src="static/img/Paula.webp" class="card-img-top" alt="..."></div>
+                                    <div class="card-body">
+                                      <h5 class="card-title">Paula</h5>
+                                    </div>
+                                </div>
                             </div>
                         </fieldset>
                         <fieldset>

html/make_video_slide.html

@@ -242,6 +242,10 @@
                                 <option value="11">Summer韓小夏</option>
                                 <option value="12">Jocelyn</option>
                                 <option value="13">Angela</option>
+                                <option value="15">Isabela</option>
+                                <option value="16">Sofia</option>
+                                <option value="17">Kristina</option>
+                                <option value="18">Paula</option>
                             </select>
                             <div class="d-flex row row-cols-2 row-cols-lg-6">
                                 <div class="card item col" data-avatar="Peggy" data-img="peggy">
@@ -279,6 +283,30 @@
                                         <h5 class="card-title">Angela</h5>
                                     </div>
                                 </div>
+                                <div class="card col" data-avatar="Isabela" data-img="Isabela">
+                                    <div class="imgfr"><img src="static/img/Isabela.webp" class="card-img-top" alt="..."></div>
+                                    <div class="card-body">
+                                      <h5 class="card-title">Isabela</h5>
+                                    </div>
+                                </div>
+                                <div class="card col" data-avatar="Sofia" data-img="Sofia">
+                                    <div class="imgfr"><img src="static/img/Sofia.webp" class="card-img-top" alt="..."></div>
+                                    <div class="card-body">
+                                      <h5 class="card-title">Sofia</h5>
+                                    </div>
+                                </div>
+                                <div class="card col" data-avatar="Kristina" data-img="Kristina">
+                                    <div class="imgfr"><img src="static/img/Kristina.webp" class="card-img-top" alt="..."></div>
+                                    <div class="card-body">
+                                      <h5 class="card-title">Kristina</h5>
+                                    </div>
+                                </div>
+                                <div class="card col" data-avatar="Paula" data-img="Paula">
+                                    <div class="imgfr"><img src="static/img/Paula.webp" class="card-img-top" alt="..."></div>
+                                    <div class="card-body">
+                                      <h5 class="card-title">Paula</h5>
+                                    </div>
+                                </div>
                             </div>
                         </fieldset>
                         <input id="send_slide" type="button" name="next" class="action-button" set-lan="value:submit"

html/make_video_slide_eng.html

@@ -182,6 +182,10 @@
                               <option value="11">Summer</option>
                               <option value="12">Jocelyn</option>
                               <option value="13">Angela</option>
+                              <option value="15">Isabela</option>
+                              <option value="16">Sofia</option>
+                              <option value="17">Kristina</option>
+                              <option value="18">Paula</option>
                             </select>
                             <div class="d-flex row row-cols-2 row-cols-lg-6">
                               <div class="card col" data-avatar="Peggy" data-img="peggy">
@@ -214,6 +218,30 @@
                                   <h5 class="card-title">Angela</h5>
                                 </div>
                               </div>
+                              <div class="card col" data-avatar="Isabela" data-img="Isabela">
+                                <div class="imgfr"><img src="static/img/Isabela.webp" class="card-img-top" alt="..."></div>
+                                <div class="card-body">
+                                  <h5 class="card-title">Isabela</h5>
+                                </div>
+                              </div>
+                              <div class="card col" data-avatar="Sofia" data-img="Sofia">
+                                <div class="imgfr"><img src="static/img/Sofia.webp" class="card-img-top" alt="..."></div>
+                                <div class="card-body">
+                                  <h5 class="card-title">Sofia</h5>
+                                </div>
+                              </div>
+                              <div class="card col" data-avatar="Kristina" data-img="Kristina">
+                                <div class="imgfr"><img src="static/img/Kristina.webp" class="card-img-top" alt="..."></div>
+                                <div class="card-body">
+                                  <h5 class="card-title">Kristina</h5>
+                                </div>
+                              </div>
+                              <div class="card col" data-avatar="Paula" data-img="Paula">
+                                <div class="imgfr"><img src="static/img/Paula.webp" class="card-img-top" alt="..."></div>
+                                <div class="card-body">
+                                  <h5 class="card-title">Paula</h5>
+                                </div>
+                              </div>
                             </div>
                           </fieldset>
                         <input id="send_slide" type="button" name="next" class="action-button" value="Submit" />

html/static/script_slides.js

@@ -101,9 +101,9 @@ function getAvatar() {
   });
 }
 
-getAvatar();
+// getAvatar();
 
-var client_id = Date.now()
+var client_id = Date.now();
 var tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'))
 var tooltipList = tooltipTriggerList.map(function (tooltipTriggerEl) {
   return new bootstrap.Tooltip(tooltipTriggerEl)
@@ -117,18 +117,18 @@ var avatarModal = new bootstrap.Modal(document.getElementById('avatarmega'), {
 var modalImg = document.querySelector("#avatarmega .modal-img");
 var modalTitle = document.querySelector("#avatarmega .modal-title");
 var avatarSelector = document.getElementById("avatar");
-var card = '';
-
+var card = document.getElementsByClassName('card');
+card = [...card];
 avatarSelector.addEventListener('change', avatarChange);
 avatarChange();
 
-function addCardListener(arr) {
-  for (let i = 0; i < arr.length; i++) {
-    arr[i].addEventListener('click', openavatarModel);
+function addCardListener() {
+  for (let i = 0; i < card.length; i++) {
+    card[i].addEventListener('click', openavatarModel);
   }
 }
 
-
+addCardListener();
 
 function avatarChange() {
   var value = avatarSelector.options[avatarSelector.selectedIndex].text;

html/static/script_slides_eng.js

@@ -105,7 +105,8 @@ function getAvatar() {
 
 //getAvatar();
 
-var client_id = Date.now()
+
+var client_id = Date.now();
 var tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'))
 var tooltipList = tooltipTriggerList.map(function (tooltipTriggerEl) {
   return new bootstrap.Tooltip(tooltipTriggerEl)
@@ -119,18 +120,18 @@ var avatarModal = new bootstrap.Modal(document.getElementById('avatarmega'), {
 var modalImg = document.querySelector("#avatarmega .modal-img");
 var modalTitle = document.querySelector("#avatarmega .modal-title");
 var avatarSelector = document.getElementById("avatar");
-var card = '';
-
+var card = document.getElementsByClassName('card');
+card = [...card];
 avatarSelector.addEventListener('change', avatarChange);
 avatarChange();
 
-function addCardListener(arr) {
-  for (let i = 0; i < arr.length; i++) {
-    arr[i].addEventListener('click', openavatarModel);
+function addCardListener() {
+  for (let i = 0; i < card.length; i++) {
+    card[i].addEventListener('click', openavatarModel);
   }
 }
 
-
+addCardListener();
 
 function avatarChange() {
   var value = avatarSelector.options[avatarSelector.selectedIndex].text;

html/verify_email.html

@@ -38,10 +38,18 @@
     <div class="container">
       <main>
         <div class="m-auto text-center">
-          <h2 class="h2">
-            <img src="https://i.imgur.com/eFBgdgI.png" width="36" class="me-2">
-            驗證成功!</h2>
-          <p>立即至<a href="./login.html" class="link">登入頁</a>，以繼續使用服務</p>
+          <div class="block-validating">
+            <h2 class="h2">
+              <img src="https://i.imgur.com/crQ3rg6.png" alt="" width="36" class="me-2">
+              驗證中...</h2>
+          </div>
+          <div class="block-success">
+            <h2 class="h2">
+              <img src="https://i.imgur.com/crQ3rg6.png" alt="">
+              <img src="https://i.imgur.com/eFBgdgI.png" width="36" class="me-2">
+              驗證成功!</h2>
+            <p>立即至<a href="./login.html" class="link">登入頁</a>，以繼續使用服務</p>
+          </div>
           <!-- <div><img src="../html/static/img/Spinner-1s-181px.gif" width="36" alt=""></div> -->
           <div class="imgfr mx-auto">
             <img src="https://i.imgur.com/EqED9CY.png" alt="">
@@ -54,7 +62,29 @@
     <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>
-      
+      $('.block-success').css('display', 'none');
+      function getCode(){
+        let id = window.location.search.split('?').pop();
+        return id.split('=')[1];
+      }
+      axios({
+        method: 'get',
+        url: `https://www.choozmo.com:8887/verify_email?code=${getCode()}`,
+        headers: { 
+            'accept': 'application/json',
+        }
+      }).then(res => {
+        console.log(res.data);
+        if(res.data.msg == 'ok') {
+          $('.block-success').css('display', 'block');
+          $('.block-validating').css('display', 'none');
+          window.setTimeout(() => {
+            window.location.href = './login.html';
+          }, 3500);
+        }
+      }).catch(err => {
+        console.log(err);
+      });
     </script>
 </body>
 </html>