diff options
| author | Marvin Borner | 2020-10-01 17:33:08 +0200 |
|---|---|---|
| committer | Marvin Borner | 2020-10-01 17:33:08 +0200 |
| commit | 91f4af6e9a3a5d770f98d4a5b75c729c18861cc1 (patch) | |
| tree | b18c2d59296a0b09cc9263a41534142a3f3f3cbf | |
| parent | 417b247cf5b6e191ada3c3591cc002ebafc4dd3e (diff) | |
Some thingies
| -rw-r--r-- | auth/index.js | 5 | ||||
| -rw-r--r-- | auth/public/index.html | 4 | ||||
| -rw-r--r-- | db.js | 2 | ||||
| -rw-r--r-- | quotes/index.js | 22 | ||||
| -rw-r--r-- | quotes/public/index.html | 6 | ||||
| -rw-r--r-- | quotes/public/script.js | 17 |
6 files changed, 34 insertions, 22 deletions
diff --git a/auth/index.js b/auth/index.js index 9bc3f58..b726a25 100644 --- a/auth/index.js +++ b/auth/index.js @@ -9,6 +9,9 @@ const app = express.Router(); app.use("/", express.static(__dirname + "/public")); -app.get("/api/list", (req, res) => {}); +app.get("/api/list", async (req, res) => { + const users = await db.query("SELECT id, name, middlename, surname FROM users"); + res.json(users); +}); module.exports = app; diff --git a/auth/public/index.html b/auth/public/index.html index 8bf9ecd..e927b13 100644 --- a/auth/public/index.html +++ b/auth/public/index.html @@ -18,9 +18,9 @@ <fieldset> <legend>Login</legend> <label for="username">Username</label> - <input name="username" type="text" id="username" placeholder="Username" /> + <input name="username" type="text" id="username" placeholder="Username" required /> <label for="password">Passwort</label> - <input name="password" type="password" id="password" placeholder="Passwort" /> + <input name="password" type="password" id="password" placeholder="Passwort" required /> <label for="remember" class="pure-checkbox"> <input name="remember" type="checkbox" id="remember" /> Angemeldet bleiben @@ -50,7 +50,7 @@ class DB { const password = await bcrypt.hash(pwd, 12); await this.query( "INSERT INTO users (username, name, middlename, surname, password, class_id, type_id) VALUE (?,?,?,?,?,?,?)", - [username, names[0], middlename, surname, password, classIndex + 1, 2] + [username, names[0].replace("\r", ""), middlename, surname, password, classIndex + 1, 2] ); } }); diff --git a/quotes/index.js b/quotes/index.js index e90dd80..66aeb5e 100644 --- a/quotes/index.js +++ b/quotes/index.js @@ -4,8 +4,26 @@ const app = express.Router(); app.use("/", express.static(__dirname + "/public")); -app.get("/api/list", (req, res) => { - res.send("ok\n"); +app.post("/api/add", async (req, res) => { + if (!req.body.author || !req.body.quote) return res.send("error"); + try { + await db.query("INSERT INTO quotes (user_id, author_id, quote) VALUE (?,?,?)", [ + 72, // TODO: Add actual user identification + parseInt(req.body.author), + req.body.quote, + ]); + res.redirect("/quotes"); + } catch (e) { + console.error(e); + res.json("error"); + } +}); + +app.get("/api/list", async (req, res) => { + const quotes = await db.query( + "SELECT quotes.id, name, middlename, surname, quote FROM quotes INNER JOIN users AS a ON author_id = a.id" + ); + res.json(quotes); }); module.exports = app; diff --git a/quotes/public/index.html b/quotes/public/index.html index abe85cc..0c7b327 100644 --- a/quotes/public/index.html +++ b/quotes/public/index.html @@ -14,13 +14,13 @@ <title>Zitate</title> </head> <body> - <form class="pure-form pure-form-stacked" action="api/submit" method="post"> + <form class="pure-form pure-form-stacked" action="api/add" method="post"> <fieldset> <legend>Zitate</legend> <label for="author">Author</label> - <select name="author" id="author"></select> + <select name="author" id="author" required></select> <label for="quote">Zitat</label> - <input name="quote" type="text" id="quote" placeholder="Zitat" /> + <input name="quote" type="text" id="quote" placeholder="Zitat" required /> <button type="submit" class="pure-button pure-button-primary">Hinzufügen</button> </fieldset> </form> diff --git a/quotes/public/script.js b/quotes/public/script.js index 3fbc676..7a87486 100644 --- a/quotes/public/script.js +++ b/quotes/public/script.js @@ -6,7 +6,7 @@ function append(response) { response.forEach((elem) => { dropdown.insertAdjacentHTML( "beforeend", - `<option ${elem["id"]}>${elem["name"]} ${elem["middlename"] ? elem["middlename"] : " "}${ + `<option value="${elem["id"]}">${elem["name"]} ${elem["middlename"] ? elem["middlename"] : " "}${ elem["surname"] }</option>` ); @@ -14,15 +14,6 @@ function append(response) { } // TODO: Add api list endpoint -// fetch("/auth/api/list") -// .then((response) => response.json()) -// .then((response) => append(response)); - -const exampleJson = [ - { id: 1, name: "Lars", middlename: null, surname: "Baum" }, - { id: 2, name: "Marvin", middlename: null, surname: "Giraffe" }, - { id: 3, name: "Dominik", middlename: null, surname: "Apfel" }, - { id: 4, name: "Daniel", middlename: null, surname: "Torte" }, -]; - -append(exampleJson); +fetch("/auth/api/list") + .then((response) => response.json()) + .then((response) => append(response)); |