From b9e56cf59d0cce0cf71036caa04733fded8172d0 Mon Sep 17 00:00:00 2001 From: N0H3dy Date: Fri, 24 Feb 2023 15:31:02 -0500 Subject: [PATCH] Changes to home page as well as title/icon --- Frontend/Home.html | 16 +++++++++++----- Frontend/home.css | 29 ++++++++++++++++++++++------- Frontend/images/Extended-logo.png | Bin 0 -> 4150 bytes Frontend/images/Logo-16.png | Bin 0 -> 387 bytes Frontend/images/Logo-32.png | Bin 0 -> 787 bytes Frontend/test.html | 8 -------- Frontend/upload-video.js | 1 + Frontend/video-editing.html | 9 ++++++--- Frontend/video-editing.js | 2 ++ 9 files changed, 42 insertions(+), 23 deletions(-) create mode 100644 Frontend/images/Extended-logo.png create mode 100644 Frontend/images/Logo-16.png create mode 100644 Frontend/images/Logo-32.png delete mode 100644 Frontend/test.html 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..12c60c5 100644 --- a/Frontend/home.css +++ b/Frontend/home.css @@ -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 20px; + 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: 3px; + 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 0000000000000000000000000000000000000000..fdc41fcb3b56a146b4cb71ef326c0493ae915ff4 GIT binary patch literal 4150 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 R{(%4h002ovPDHLkV1j05VTk|$ literal 0 HcmV?d00001 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) {