From 34326c00ebbfeb98243668e137fa8aabee7cabdb Mon Sep 17 00:00:00 2001 From: Luna Date: Mon, 26 Jul 2021 15:49:52 -0700 Subject: [PATCH] Frontend: orgasnized the files. fixed redirects. --- frontend/{ => assets}/LinotteRegular.otf | Bin frontend/{ => assets}/favicon.ico | Bin frontend/{ => assets}/favicon.svg | 3 -- frontend/{ => css}/chat.css | 2 +- frontend/{ => css}/index.css | 2 +- frontend/{ => css}/style.css | 0 frontend/{ => html}/chat.html | 6 ++-- frontend/{ => html}/login.html | 6 ++-- frontend/{ => html}/register.html | 6 ++-- frontend/{ => html}/updateinfo.html | 6 ++-- frontend/index.html | 14 +++++----- frontend/{ => js}/chat.js | 4 +-- frontend/{ => js}/login.js | 0 frontend/{ => js}/logout.js | 0 frontend/{ => js}/register.js | 2 +- frontend/{ => js}/updateinfo.js | 2 +- frontend/stream.css | 34 ----------------------- 17 files changed, 25 insertions(+), 62 deletions(-) rename frontend/{ => assets}/LinotteRegular.otf (100%) rename frontend/{ => assets}/favicon.ico (100%) rename frontend/{ => assets}/favicon.svg (93%) rename frontend/{ => css}/chat.css (96%) rename frontend/{ => css}/index.css (96%) rename frontend/{ => css}/style.css (100%) rename frontend/{ => html}/chat.html (84%) rename frontend/{ => html}/login.html (83%) rename frontend/{ => html}/register.html (90%) rename frontend/{ => html}/updateinfo.html (92%) rename frontend/{ => js}/chat.js (97%) rename frontend/{ => js}/login.js (100%) rename frontend/{ => js}/logout.js (100%) rename frontend/{ => js}/register.js (97%) rename frontend/{ => js}/updateinfo.js (98%) delete mode 100644 frontend/stream.css diff --git a/frontend/LinotteRegular.otf b/frontend/assets/LinotteRegular.otf similarity index 100% rename from frontend/LinotteRegular.otf rename to frontend/assets/LinotteRegular.otf diff --git a/frontend/favicon.ico b/frontend/assets/favicon.ico similarity index 100% rename from frontend/favicon.ico rename to frontend/assets/favicon.ico diff --git a/frontend/favicon.svg b/frontend/assets/favicon.svg similarity index 93% rename from frontend/favicon.svg rename to frontend/assets/favicon.svg index ef622d0..913a880 100644 --- a/frontend/favicon.svg +++ b/frontend/assets/favicon.svg @@ -9,9 +9,6 @@ id="svg5" inkscape:version="1.1 (c4e8f9ed74, 2021-05-24)" sodipodi:docname="favicon.svg" - inkscape:export-filename="/home/erin/bitmap.png" - inkscape:export-xdpi="200" - inkscape:export-ydpi="200" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" diff --git a/frontend/chat.css b/frontend/css/chat.css similarity index 96% rename from frontend/chat.css rename to frontend/css/chat.css index 8f5f87d..2a84b4c 100644 --- a/frontend/chat.css +++ b/frontend/css/chat.css @@ -6,7 +6,7 @@ html { @font-face { font-family: Linotte; - src: url(LinotteRegular.otf); + src: url(../assets/LinotteRegular.otf); } form { diff --git a/frontend/index.css b/frontend/css/index.css similarity index 96% rename from frontend/index.css rename to frontend/css/index.css index bb184d1..0016675 100644 --- a/frontend/index.css +++ b/frontend/css/index.css @@ -5,7 +5,7 @@ html { @font-face { font-family: Linotte; - src: url(LinotteRegular.otf); + src: url(../assets/LinotteRegular.otf); } a { diff --git a/frontend/style.css b/frontend/css/style.css similarity index 100% rename from frontend/style.css rename to frontend/css/style.css diff --git a/frontend/chat.html b/frontend/html/chat.html similarity index 84% rename from frontend/chat.html rename to frontend/html/chat.html index 364eb57..31e2f92 100644 --- a/frontend/chat.html +++ b/frontend/html/chat.html @@ -7,7 +7,7 @@ - + @@ -34,8 +34,8 @@
- - + + diff --git a/frontend/login.html b/frontend/html/login.html similarity index 83% rename from frontend/login.html rename to frontend/html/login.html index 48ad76a..b5bcf56 100644 --- a/frontend/login.html +++ b/frontend/html/login.html @@ -7,8 +7,8 @@ - - + + @@ -27,7 +27,7 @@ - +
diff --git a/frontend/register.html b/frontend/html/register.html similarity index 90% rename from frontend/register.html rename to frontend/html/register.html index 2d000d1..1554419 100644 --- a/frontend/register.html +++ b/frontend/html/register.html @@ -7,8 +7,8 @@ - - + +

Register:

@@ -45,7 +45,7 @@
- + diff --git a/frontend/updateinfo.html b/frontend/html/updateinfo.html similarity index 92% rename from frontend/updateinfo.html rename to frontend/html/updateinfo.html index 5cc9e75..477dd4a 100644 --- a/frontend/updateinfo.html +++ b/frontend/html/updateinfo.html @@ -7,8 +7,8 @@ - - + + @@ -53,7 +53,7 @@ - +
diff --git a/frontend/index.html b/frontend/index.html index 02da865..2b8f818 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -7,8 +7,8 @@ - - + + @@ -18,16 +18,16 @@
  • Stream
    • -
  • +
  • Just Chat
    • -
  • +
  • Register
    • -
  • +
  • Login
    • -
  • +
  • Update Info
    • @@ -61,7 +61,7 @@ scrolling="no"> - + diff --git a/frontend/chat.js b/frontend/js/chat.js similarity index 97% rename from frontend/chat.js rename to frontend/js/chat.js index 325a863..9755631 100644 --- a/frontend/chat.js +++ b/frontend/js/chat.js @@ -14,7 +14,7 @@ form.addEventListener("submit", async function (event) { //KINDA UNNECESSARY //CHECKS TO SEE IF THE PERSON IS LOGGED IN IN ORDER TO SEND A MESSAGE. - const response = await fetch(`api/token/${username}/`); + const response = await fetch(`../api/token/${username}/`); const matches = await response.json(); //YES THIS IS CONFUSING I KNOW. @@ -34,7 +34,7 @@ form.addEventListener("submit", async function (event) { async function sendMessage() { sendMessageInfo = { "name": username, "body": formMessage } - fetch('/api/message/send', { + fetch('../api/message/send', { method: 'POST', headers: { 'Content-Type': 'application/json', diff --git a/frontend/login.js b/frontend/js/login.js similarity index 100% rename from frontend/login.js rename to frontend/js/login.js diff --git a/frontend/logout.js b/frontend/js/logout.js similarity index 100% rename from frontend/logout.js rename to frontend/js/logout.js diff --git a/frontend/register.js b/frontend/js/register.js similarity index 97% rename from frontend/register.js rename to frontend/js/register.js index c185443..ab3c101 100644 --- a/frontend/register.js +++ b/frontend/js/register.js @@ -38,7 +38,7 @@ form.addEventListener("submit", async function (event) { if (regRes.status === 'ok') { document.querySelector("#errormessage").innerHTML = 'Registered!' - window.location.replace("/login.html") + window.location.replace("../html/login.html") } else { document.querySelector("#errormessage").innerHTML = 'Failed to register. Try again later.' } diff --git a/frontend/updateinfo.js b/frontend/js/updateinfo.js similarity index 98% rename from frontend/updateinfo.js rename to frontend/js/updateinfo.js index de6f42a..a8cd4e9 100644 --- a/frontend/updateinfo.js +++ b/frontend/js/updateinfo.js @@ -82,7 +82,7 @@ form.addEventListener("submit", async function (event) { if (updateResponse.status === 'ok') { document.querySelector("#errormessage").innerHTML = 'Login Changed!' - window.location.replace("/login.html") + window.location.replace("../html/login.html") } else { document.querySelector("#errormessage").innerHTML = 'Failed to update info. Try again later.' } diff --git a/frontend/stream.css b/frontend/stream.css deleted file mode 100644 index 9a3cbe1..0000000 --- a/frontend/stream.css +++ /dev/null @@ -1,34 +0,0 @@ -html { - background: #F7A8B8; - text-align: center; - font-family: "Lucida Console", "Courier New", monospace; -} - -body { - margin-top: 3%; -} - -#streamchat { - display: flex; - height: 100%; - max-width: 960px; - margin: 0 auto; - -} - -#stream { - background-color: white; - padding: 5%; - box-shadow: 10px 10px 10px black; - border-radius: 5px; - width: 100%; - height: 100%; - margin-right: 4em; -} - -#chatbox { - width: 100%; - height: 100%; - margin-left: 4em; -} -