diff --git a/public/main.js b/public/main.js index e2246f0..87ad2d4 100644 --- a/public/main.js +++ b/public/main.js @@ -34,18 +34,75 @@ function updateTable() { getRequests(count,allRequests); } +function addRequestErr(msg) { + document.getElementById('addRequestError').style.display = "inline-block"; + document.getElementById('addRequestError').innerText = msg; +} + +function addRequestErrReset() { + document.getElementById('addRequestError').style.display = "none"; + document.getElementById('addRequestError').innerText = ""; +} + +function showMessage(msg) { + document.getElementById("messageModalText").innerText = msg; + document.getElementById("modalBackground").style.display = "flex"; + document.getElementById("messageModal").style.display = "block"; +} + +function closeMessageModal() { + document.getElementById("modalBackground").style.display = "none"; + document.getElementById("messageModal").style.display = "none"; +} + function openAddRequestModal() { - document.getElementById("addRequestModalBackground").style.display = "flex"; + document.getElementById("modalBackground").style.display = "flex"; + document.getElementById("addRequestModal").style.display = "block"; } function closeAddRequestModal() { - document.getElementById("addRequestModalBackground").style.display = "none"; + document.getElementById("modalBackground").style.display = "none"; + document.getElementById("addRequestModal").style.display = "none"; +} + +const validUrlRegexes = [ + /^https:\/\/www\.youtube\.com\/watch\?v=[a-zA-Z0-9_-]{11}$/ +]; +function validateAndSubmitRequest() { + addRequestErrReset(); + var url = document.getElementById("addRequestUrl").value; + var validUrl = false; + for (var regex of validUrlRegexes) { + if (regex.test(url)) { + validUrl = true; + break; + } + } + if (!validUrl) { + addRequestErr("Invalid URL"); + return; + } + fetch("/api/addRequest", { method: 'POST', body: new URLSearchParams({ + url: url + })}) + .then(response => { + if (!response.ok) { + response.text().then(addRequestErr); + return; + } + closeAddRequestModal(); + updateTable(); + document.getElementById("addRequestUrl").value = ""; + response.text().then(showMessage); + }); } updateTable(); document.addEventListener("keydown", function onEvent(event) { if (event.key === "Escape") { + closeMessageModal(); closeAddRequestModal(); } }); +document.getElementById("modalBackground").addEventListener("click", (e) => { if (e.target === e.currentTarget) closeAddRequestModal();}); diff --git a/public/style.css b/public/style.css index cb7172b..59a1850 100644 --- a/public/style.css +++ b/public/style.css @@ -14,6 +14,13 @@ a:hover { color: #fff; } +.error { + padding: 0.25em 0.5em; + margin: 1em; + display: none; + background-color: #f00c; +} + #topbar { padding: 0.25em 0.5em; position: absolute; @@ -84,9 +91,11 @@ div#nav-userpic { text-align: right; } -#addRequestModalBackground { +#modalBackground { display: none; position: fixed; + align-items: center; + justify-content: center; z-index: 1; top: 0; left: 0; @@ -94,11 +103,10 @@ div#nav-userpic { height: 100%; background-color: #444; background-color: #444a; - align-items: center; - justify-content: center; } -#addRequestModal { +.modal { + display: none; position: relative; padding: 1em; margin: 2em; @@ -108,11 +116,12 @@ div#nav-userpic { box-shadow: 0px 5px 20px black; } -#addRequestModal h1 { - margin-top: 0; +.modal h1 { + margin: 0; } #addRequestInputContainer { + margin-top: 1em; display: flex; justify-content: center; } @@ -123,13 +132,13 @@ div#nav-userpic { margin: 0 5px; } -#addRequestModalClose { +.modalClose { position: absolute; top: 0; right: 0.5em; font-size: 150%; } -#addRequestModalClose a { +.modalClose a { text-decoration: none; } diff --git a/src/app.ts b/src/app.ts index b579022..4c24ac6 100644 --- a/src/app.ts +++ b/src/app.ts @@ -38,18 +38,18 @@ app.get("/api/getAllRequests", async (request, response) => { app.post("/api/addRequest", async (request, response) => { response.type('text/plain'); + if (!request.session || !request.session.user) { + response.status(401); + response.send("Must be logged in"); + return; + } if (!request.body.url) { response.status(400); response.send("Missing url"); return } - if (!request.body.requester) { - response.status(400); - response.send("Missing requester"); - return - } var url = request.body.url as string; - var requester = request.body.requester as string; + var requester = request.session.user.display_name; requests.addRequest(url,requester).then((val: [number,string]) => { response.status(val[0]); response.send(val[1]); diff --git a/src/requests.ts b/src/requests.ts index 00775ce..f1bf10a 100644 --- a/src/requests.ts +++ b/src/requests.ts @@ -52,11 +52,11 @@ export async function addRequest(url: string, requester: string) { var query = Object.assign(checkRequestExistsQuery, { values: [url] }); var result = await db.query(query); if (result.rowCount > 0) { - return `Song already requested by ${result.rows[0].requester}. State: ${result.rows[0].state}` + return [200,`Song already requested by ${result.rows[0].requester}. State: ${result.rows[0].state}`] } var query = Object.assign(addRequestQuery, { values: [url,requester] }); return db.query(query) - .then((result: pg.QueryResult) => [200,"Song request added."]); + .then((result: pg.QueryResult) => [201,"Song request added."]); }; // updateRequestState diff --git a/views/main.eta b/views/main.eta index c21ca40..8982c43 100644 --- a/views/main.eta +++ b/views/main.eta @@ -30,10 +30,15 @@ View requests in any state -
-
- +
+ + -