Merge pull request #13 from MAlshaik/main

Changes to home page + Editing page
MSU-AI · Feb 24, 2023 · 9f7471d · 9f7471d
2 parents d11e789 + 1ef3dcb
commit 9f7471d
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 24 deletions.
diff --git a/Frontend/Home.html b/Frontend/Home.html
@@ -1,19 +1,25 @@
-{% load static%}
-
 <!DOCTYPE html>
 <html>
 <head>
+  <link rel="icon" type="image/png" href="images/Logo-32.png" sizes="32x32" />
+  <link rel="icon" type="image/png" href="images/Logo-16.png" sizes="16x16" />
+
   <link href="https://cdn.quilljs.com/1.3.6/quill.snow.css" rel="stylesheet">
   <link rel="stylesheet" href="home.css">
+  <title>Transcript-Home</title>
 </head>
 <body>
   <div id="navbar">
     <nav>
-        <img src="images/Logo.png" class="logo">
+        <img src="images/Extended-logo.png" class="logo">
         <ul>
             <li><a href="">About</a></li> 
-            <li><a href="">Login</a></li> 
-            <li><a href="">Sign-up</a></li> 
+            <!-- <div class="login">
+              <li><a href="" id="login">Login</a></li> 
+              <li><a href="" id="login">Sign-up</a></li> 
+            </div> -->
+            <button>Login</button>
+            <button>Sign-up</button>
         </ul>
     </nav>
   </div>

diff --git a/Frontend/home.css b/Frontend/home.css
@@ -90,14 +90,15 @@
   }
 
   nav .logo {
-      transform: translateY(-20%);
+      transform: translateY(-18%);
       cursor: pointer;
 
   }
 
   nav ul{
       flex: 1;
       text-align: right;
+      display: inline-block;
 
   }
 
@@ -108,22 +109,36 @@
 
   }
 
+  nav ul li a#login {
+    text-decoration: none;
+    background: #00986f;
+    padding: 10px 40px;
+    display: inline-block;
+    color: #fff;
+    border-radius: 3px;
+
+  }
+
   nav ul li a{
       text-decoration: none;
       color: white;
   }
 
 
-  /* button{
-    background: #efefef;
-    height: 30px;
-    width: 60px;
-    border-radius: 20px;
-    border: 0;
-    outline: 0;
+
+button{
+    background: #00986f;
+    background: #00986f;
+    padding: 10px 20px;
+    display: inline-block;
+    color: #fff;
+    border-radius: 6px;
+    font-size: 16px;
     cursor: pointer;
 }
 
+/*
+
 button span {
     display: block;
     background: #999;

diff --git a/Frontend/images/Extended-logo.png b/Frontend/images/Extended-logo.png
diff --git a/Frontend/images/Logo-16.png b/Frontend/images/Logo-16.png
diff --git a/Frontend/images/Logo-32.png b/Frontend/images/Logo-32.png
diff --git a/Frontend/test.html b/Frontend/test.html
diff --git a/Frontend/upload-video.js b/Frontend/upload-video.js
@@ -82,6 +82,7 @@ function uploadFile(name){
   });
   let data = new FormData(form); //FormData is an object to easily send form data
   xhr.send(data); //sending form data
+  load();
 }
 
 
diff --git a/Frontend/video-editing.html b/Frontend/video-editing.html
@@ -1,7 +1,12 @@
 <html>
   <head>
+    <link rel="icon" type="image/png" href="images/Logo-32.png" sizes="32x32" />
+    <link rel="icon" type="image/png" href="images/Logo-16.png" sizes="16x16" />
+
     <link rel="stylesheet" href="video-editing.css">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css"/>
+
+    <title>Transcript-Editing</title>
   </head>
   <body>
 
@@ -45,9 +50,7 @@
 
         <!-- Transcript -->
         <div id = "transcript">
-          <p data-time="0">Testing for the length of the transcript container. </p>
-          <p data-time="5">This is the second line of the transcript.</p>
-          <p data-time="10">This is the third line of the transcript.</p>
+
         </div>
         <div class="transcript-controls">
           <button id="save-transcript-button">Save</button>

diff --git a/Frontend/video-editing.js b/Frontend/video-editing.js
@@ -1,12 +1,14 @@
 let transcriptArea = document.getElementById("transcript");
 let transcriptHTML = ` `;
 
+function load(){
 fetch('assets/output.json')
   .then(response => response.json())
   .then(data => {
     // Use the data object here
     processData(data);
   });
+}
 
 function processData(data) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -82,6 +82,7 @@ function uploadFile(name){ @@
       });
       let data = new FormData(form); //FormData is an object to easily send form data
       xhr.send(data); //sending form data
+      load();
     }