diff --git a/Frontend/Home.html b/Frontend/Home.html index 6df8650..5fefbbb 100644 --- a/Frontend/Home.html +++ b/Frontend/Home.html @@ -1,19 +1,25 @@ -{% load static%} - + + + + Transcript-Home diff --git a/Frontend/home.css b/Frontend/home.css index 95ec263..8276d8f 100644 --- a/Frontend/home.css +++ b/Frontend/home.css @@ -90,7 +90,7 @@ } nav .logo { - transform: translateY(-20%); + transform: translateY(-18%); cursor: pointer; } @@ -98,6 +98,7 @@ 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 new file mode 100644 index 0000000..fdc41fc Binary files /dev/null and b/Frontend/images/Extended-logo.png differ diff --git a/Frontend/images/Logo-16.png b/Frontend/images/Logo-16.png new file mode 100644 index 0000000..7552634 Binary files /dev/null and b/Frontend/images/Logo-16.png differ diff --git a/Frontend/images/Logo-32.png b/Frontend/images/Logo-32.png new file mode 100644 index 0000000..81a56ff Binary files /dev/null and b/Frontend/images/Logo-32.png differ diff --git a/Frontend/test.html b/Frontend/test.html deleted file mode 100644 index 789912a..0000000 --- a/Frontend/test.html +++ /dev/null @@ -1,8 +0,0 @@ - - -

- hi - hello -

- - \ No newline at end of file diff --git a/Frontend/upload-video.js b/Frontend/upload-video.js index b63a280..0061925 100644 --- 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 index 7b6f136..2c4c1cd 100644 --- a/Frontend/video-editing.html +++ b/Frontend/video-editing.html @@ -1,7 +1,12 @@ + + + + + Transcript-Editing @@ -45,9 +50,7 @@
-

Testing for the length of the transcript container.

-

This is the second line of the transcript.

-

This is the third line of the transcript.

+
diff --git a/Frontend/video-editing.js b/Frontend/video-editing.js index 96fa733..613bd58 100644 --- 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) {