From ba16ce3b92379c31afd060fa5b7c1e3a37aac995 Mon Sep 17 00:00:00 2001 From: LarsVomMars Date: Sat, 10 Oct 2020 01:07:44 +0200 Subject: env Port --- .env.example | 1 + app.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.env.example b/.env.example index ef55330..febc0cd 100644 --- a/.env.example +++ b/.env.example @@ -1,3 +1,4 @@ +PORT= DBHost= DBName= DBUser= diff --git a/app.js b/app.js index fcb7a8a..442ac13 100644 --- a/app.js +++ b/app.js @@ -34,4 +34,4 @@ app.use("/quotes", checkUser, quotes); app.use("/poll", checkUser, poll); app.use("/auth", auth); -app.listen(5005, () => console.log("Server started on http://localhost:5005")); +app.listen(process.env.PORT || 5005, () => console.log("Server started on http://localhost:5005")); -- cgit v1.2.3 From f91f414f3ecac85c2b3a44193fadda3d79cd600c Mon Sep 17 00:00:00 2001 From: Marvin Borner Date: Sat, 10 Oct 2020 11:14:10 +0200 Subject: Frontend improvements --- motto/public/style.css | 2 +- mottovote/public/style.css | 2 +- overview/public/style.css | 2 ++ quotes/public/style.css | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/motto/public/style.css b/motto/public/style.css index 22532da..92fd0e3 100644 --- a/motto/public/style.css +++ b/motto/public/style.css @@ -67,7 +67,7 @@ body { z-index: 100000; width: 100vw; height: 100vh; - overflow-y: scroll; + overflow-y: auto; overflow-x: hidden; padding-top: 20px; text-align: center; diff --git a/mottovote/public/style.css b/mottovote/public/style.css index 7f92570..1982e0a 100644 --- a/mottovote/public/style.css +++ b/mottovote/public/style.css @@ -33,7 +33,7 @@ main { #vote { max-height: 80%; margin-bottom: 20px; - overflow-y: scroll; + overflow-y: auto; width: 100%; } diff --git a/overview/public/style.css b/overview/public/style.css index ab38722..77853bf 100644 --- a/overview/public/style.css +++ b/overview/public/style.css @@ -10,6 +10,8 @@ body { .card { position: absolute; + max-height: 80%; + overflow: auto; width: 30%; left: 50%; top: 50%; diff --git a/quotes/public/style.css b/quotes/public/style.css index 0336774..a4e85ea 100644 --- a/quotes/public/style.css +++ b/quotes/public/style.css @@ -15,7 +15,7 @@ div { main { position: absolute; max-height: 80%; - overflow-y: scroll; + overflow-y: auto; width: 30%; left: 50%; top: 50%; -- cgit v1.2.3 From 54837fbd3614f97c06675ca416859dcbe96e1190 Mon Sep 17 00:00:00 2001 From: Marvin Borner Date: Sat, 10 Oct 2020 11:27:18 +0200 Subject: Fixed teacher quotes --- overview/public/index.html | 3 +++ quotes/public/script.js | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/overview/public/index.html b/overview/public/index.html index ba3596f..27d5292 100644 --- a/overview/public/index.html +++ b/overview/public/index.html @@ -34,6 +34,9 @@
  • Zitate
  • Schüler-Ranking
    • +

    + Bitte benutzt diese Tools nur ernsthaft - es ist nun mal unsere gemeinsame Zeitung :) +

    Falls ihr uns bei der Entwicklung helfen wollt, Fehler gefunden habt oder Fragen an uns habt, könnt ihr gerne mit dem Entwicklungs-Team Kontakt aufnehmen: diff --git a/quotes/public/script.js b/quotes/public/script.js index 55eeb5f..f8486f9 100644 --- a/quotes/public/script.js +++ b/quotes/public/script.js @@ -1,5 +1,5 @@ const dropdown = document.getElementById("author"); -const classes = ["TGM13.1", "TGM13.2", "TGTM13.1", "TGI13.1", "TGI13.2", "Lehrer"]; +const classes = ["TGM13.1", "TGM13.2", "TGTM13.1", "TGI13.1", "TGI13.2", "teacher"]; dropdown.insertAdjacentHTML("beforeend", ''); dropdown.insertAdjacentHTML("beforeend", ``); -- cgit v1.2.3 From ad2d5dd284dc733a5fbd2a9f60c30fa1b7a0da73 Mon Sep 17 00:00:00 2001 From: Marvin Borner Date: Sat, 10 Oct 2020 11:37:35 +0200 Subject: Fixed HTML injection and middlename spaces --- poll/public/script.js | 15 +-------------- quotes/index.js | 2 +- quotes/public/script.js | 4 ++-- 3 files changed, 4 insertions(+), 17 deletions(-) diff --git a/poll/public/script.js b/poll/public/script.js index bfb686d..a1911fa 100644 --- a/poll/public/script.js +++ b/poll/public/script.js @@ -8,26 +8,13 @@ function appendOption(response) { response.forEach((elem) => { dropdown.insertAdjacentHTML( "beforeend", - ``, ); }); } -function appendQuote(response) { - response.forEach((elem) => { - document - .getElementById(elem["class"]) - .insertAdjacentHTML( - "beforeend", - `

  • ${elem["name"]} ${elem["middlename"] ? elem["middlename"] : " "}${elem["surname"]}: ${ - elem["quote"] - }
    • `, - ); - }); -} - fetch("/auth/api/list") .then((response) => response.json()) .then((response) => appendOption(response)); diff --git a/quotes/index.js b/quotes/index.js index 5aa0646..0e0717b 100644 --- a/quotes/index.js +++ b/quotes/index.js @@ -11,7 +11,7 @@ app.post("/api/add", checkUser, async (req, res) => { await db.query("INSERT INTO quotes (user_id, author_id, quote) VALUE (?,?,?)", [ req.session.uid, parseInt(req.body.author), - req.body.quote, + req.body.quote.replace(//g, ">"), ]); res.redirect("/quotes"); } catch (e) { diff --git a/quotes/public/script.js b/quotes/public/script.js index f8486f9..d848814 100644 --- a/quotes/public/script.js +++ b/quotes/public/script.js @@ -11,7 +11,7 @@ function appendOption(response) { (response[i - 1 < 0 ? 0 : i - 1]["class_id"] !== elem["class_id"] ? `` : "") + - ``, ); @@ -24,7 +24,7 @@ function appendQuote(response) { .getElementById(elem["class"]) .insertAdjacentHTML( "beforeend", - `
  • ${elem["name"]} ${elem["middlename"] ? elem["middlename"] : ""}${elem["surname"]}: ${ + `
  • ${elem["name"]} ${elem["middlename"] ? elem["middlename"] + " " : ""}${elem["surname"]}: ${ elem["quote"] }${elem["owner"] ? ' [x]
    • ' : ""}`, ); -- cgit v1.2.3