Merge pull request #45 from MAlshaik/main

small errors fixed
MSU-AI · Apr 13, 2023 · 39fca45 · 39fca45
2 parents 486f39e + d69c20a
commit 39fca45
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 18 deletions.
diff --git a/998d45b0-b0a0-4111-9655-e6e58920bc36TEMP_MPY_wvf_snd.mp3 b/998d45b0-b0a0-4111-9655-e6e58920bc36TEMP_MPY_wvf_snd.mp3
diff --git a/Frontend/templates/Frontend/video-editing.html b/Frontend/templates/Frontend/video-editing.html
@@ -73,20 +73,19 @@
 
           <video id="video" controls>
               <source id="source" type="video/mp4">
-          </video>
-
-          <div id="timeline">
-              <div id="timeline-controls">
-                <button id="cut" onclick="cuttingMode()">cut</button>
-                <button id="start" onclick="startCut()">start</button>
-                <button id="end" onclick="endCut()">end</button>
-              </div> 
-              <div id="screenshotContainer">
-                  <div id="bar"></div>
-              </div>
+          </video> 
+      </div> 
+      <div id="timeline">
+          <div id="timeline-controls">
+              <button id="cut" onclick="cuttingMode()">cut</button>
+              <button id="start" onclick="startCut()">start</button>
+              <button id="end" onclick="endCut()">end</button>
+          </div> 
+          <div id="screenshotContainer">
+              <div id="bar"></div>
           </div>
+      </div>
 
-      </div> 
       <script src="{% static 'js/upload-video.js' %}"></script>
       <script src="{% static 'js/transcript-generation.js' %}"></script>
       <script src="{% static 'js/transcript-editing.js' %}"></script>
@@ -96,8 +95,8 @@
           document.addEventListener("DOMContentLoaded", function() {
               console.log("----------------DOMContentLoaded------------------------")
           });
-    </script>
+      </script>
+
 
-
 
-      </body>
+  </body>
diff --git a/d23f6b79-19b6-4037-bcb2-eb1188f753b6TEMP_MPY_wvf_snd.mp3 b/d23f6b79-19b6-4037-bcb2-eb1188f753b6TEMP_MPY_wvf_snd.mp3
diff --git a/static/css/video-editing.css b/static/css/video-editing.css
@@ -380,13 +380,16 @@ nav ul li a{
 #timeline {
   width: 100%;
   height: 20%;
-  margin-top: 20px;
+  padding: 20px 20px 20px 20px;
+  margin-top: 10px;
   background-color: #454c5a;
   border-radius: 5px;
   display: flex;
   align-items: center;
   justify-content: center;
-
+  clear: both;
+  position: absolute;
+  bottom: 0;
 }
 
 #screenshotContainer {

diff --git a/static/js/transcript-editing.js b/static/js/transcript-editing.js
@@ -93,6 +93,7 @@ function deleteTranscript() {
         selectedWordsArr.forEach(element => {
             console.log(element);
             timestamps["timestamps"].push([parseFloat(element.getAttribute("data-start")), parseFloat(element.getAttribute("data-stop"))]);
+            console.log(timestamps);
             element.remove();
         });
 

diff --git a/static/js/upload-video.js b/static/js/upload-video.js
@@ -156,13 +156,14 @@ function transcribeFile(id) {
     // If the upload feild is gone show the loading bar
 
     if (document.getElementById("wrapper").style.display == "none") {
+        console.log("hidding upload area and starting loading bar")
 
         let container = document.getElementById("loading-container");
         let fill = document.querySelector(".fill");
         let transcript = document.querySelector(".transcript-container").innerHTML;
         console.log(transcript);
 
- if (document.querySelector(".transcript-container").innerHTML != transcript) {
+        console.log("loading bar should be showing");
         container.style.display = "flex";
         console.log(container.style.display);
 
@@ -191,5 +192,6 @@ function transcribeFile(id) {
                 fill.style.width = bar / interval + "%";
             }
         }
+
     }
 }