diff options
| author | LarsVomMars | 2020-10-01 16:48:23 +0200 |
|---|---|---|
| committer | LarsVomMars | 2020-10-01 16:48:23 +0200 |
| commit | c0469923b81368d087746a0789fec416ecdec43c (patch) | |
| tree | 85485162adf07781b8eb0c19b37a9f34ec4e7320 | |
| parent | 11ec7d944ad240ddf696ee808a0121eeda13d493 (diff) | |
| parent | ce6a00fa25bd12774fa86ee384e840565ecf965b (diff) | |
Merge
| -rw-r--r-- | app.js | 2 | ||||
| -rw-r--r-- | auth/public/index.html | 27 | ||||
| -rw-r--r-- | auth/public/style.css | 32 | ||||
| -rw-r--r-- | quotes/public/index.html | 30 | ||||
| -rw-r--r-- | quotes/public/script.js | 28 | ||||
| -rw-r--r-- | quotes/public/style.css | 33 | ||||
| -rw-r--r-- | tables.sql | 18 |
7 files changed, 165 insertions, 5 deletions
@@ -3,6 +3,7 @@ const express = require("express"); const motto = require("./motto"); const auth = require("./auth"); +const quotes = require("./quotes"); const app = express(); @@ -12,5 +13,6 @@ app.use(express.json()); app.get("/", (req, res) => res.redirect("/motto")); app.use("/motto", motto); app.use("/auth", auth); +app.use("/quotes", quotes); app.listen(5005, () => console.log("Server started on http://localhost:5005")); diff --git a/auth/public/index.html b/auth/public/index.html index c290ab0..8bf9ecd 100644 --- a/auth/public/index.html +++ b/auth/public/index.html @@ -2,8 +2,31 @@ <html> <head> <meta charset="UTF-8" /> - <meta name="viewport" content="width=device-width" /> + <meta name="viewport" content="width=device-width, initial-scale=1" /> + <link + rel="stylesheet" + href="https://unpkg.com/purecss@2.0.3/build/pure-min.css" + integrity="sha384-cg6SkqEOCV1NbJoCu11+bm0NvBRc8IYLRGXkmNrqUBfTjmMYwNKPWBTIKyw9mHNJ" + crossorigin="anonymous" + /> + <link rel="stylesheet" href="style.css" type="text/css" media="all" /> + <title>Auth</title> </head> - <body></body> + <body> + <form class="pure-form pure-form-stacked" action="api/login" method="post"> + <fieldset> + <legend>Login</legend> + <label for="username">Username</label> + <input name="username" type="text" id="username" placeholder="Username" /> + <label for="password">Passwort</label> + <input name="password" type="password" id="password" placeholder="Passwort" /> + <label for="remember" class="pure-checkbox"> + <input name="remember" type="checkbox" id="remember" /> + Angemeldet bleiben + </label> + <button type="submit" class="pure-button pure-button-primary">Anmelden</button> + </fieldset> + </form> + </body> </html> diff --git a/auth/public/style.css b/auth/public/style.css new file mode 100644 index 0000000..7cb346f --- /dev/null +++ b/auth/public/style.css @@ -0,0 +1,32 @@ +html, +body { + padding: 0; + margin: 0; + height: 100%; + width: 100%; + background: url(https://images.unsplash.com/photo-1544829728-e5cb9eedc20e?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=1500&q=80); + background-size: cover; +} + +form { + position: absolute; + width: 30%; + left: 50%; + top: 50%; + -webkit-transform: translate(-50%, -50%); + transform: translate(-50%, -50%); + padding: 20px; + border-radius: 10px; + background: white; +} + +input:not([type="checkbox"]), +button { + width: 100%; +} + +@media only screen and (max-width: 600px) { + form { + width: calc(100% - 50px); + } +} diff --git a/quotes/public/index.html b/quotes/public/index.html new file mode 100644 index 0000000..abe85cc --- /dev/null +++ b/quotes/public/index.html @@ -0,0 +1,30 @@ +<!DOCTYPE html> +<html> + <head> + <meta charset="UTF-8" /> + <meta name="viewport" content="width=device-width, initial-scale=1" /> + <link + rel="stylesheet" + href="https://unpkg.com/purecss@2.0.3/build/pure-min.css" + integrity="sha384-cg6SkqEOCV1NbJoCu11+bm0NvBRc8IYLRGXkmNrqUBfTjmMYwNKPWBTIKyw9mHNJ" + crossorigin="anonymous" + /> + <link rel="stylesheet" href="style.css" type="text/css" media="all" /> + + <title>Zitate</title> + </head> + <body> + <form class="pure-form pure-form-stacked" action="api/submit" method="post"> + <fieldset> + <legend>Zitate</legend> + <label for="author">Author</label> + <select name="author" id="author"></select> + <label for="quote">Zitat</label> + <input name="quote" type="text" id="quote" placeholder="Zitat" /> + <button type="submit" class="pure-button pure-button-primary">Hinzufügen</button> + </fieldset> + </form> + + <script src="script.js" charset="utf-8"></script> + </body> +</html> diff --git a/quotes/public/script.js b/quotes/public/script.js new file mode 100644 index 0000000..3fbc676 --- /dev/null +++ b/quotes/public/script.js @@ -0,0 +1,28 @@ +const dropdown = document.getElementById("author"); + +dropdown.insertAdjacentHTML("beforeend", '<option selected="true" disabled>Author auswählen...</option>'); + +function append(response) { + response.forEach((elem) => { + dropdown.insertAdjacentHTML( + "beforeend", + `<option ${elem["id"]}>${elem["name"]} ${elem["middlename"] ? elem["middlename"] : " "}${ + elem["surname"] + }</option>` + ); + }); +} + +// 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); diff --git a/quotes/public/style.css b/quotes/public/style.css new file mode 100644 index 0000000..6ab5ef0 --- /dev/null +++ b/quotes/public/style.css @@ -0,0 +1,33 @@ +html, +body { + padding: 0; + margin: 0; + height: 100%; + width: 100%; + background: url(https://images.unsplash.com/photo-1544829728-e5cb9eedc20e?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=1500&q=80); + background-size: cover; +} + +form { + position: absolute; + width: 30%; + left: 50%; + top: 50%; + -webkit-transform: translate(-50%, -50%); + transform: translate(-50%, -50%); + padding: 20px; + border-radius: 10px; + background: white; +} + +input, +button, +select { + width: 100%; +} + +@media only screen and (max-width: 600px) { + form { + width: calc(100% - 50px); + } +} @@ -9,25 +9,26 @@ CREATE TABLE IF NOT EXISTS theme( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -- TODO: Remove dropping +DROP TABLE IF EXISTS quotes; DROP TABLE IF EXISTS users; DROP TABLE IF EXISTS types; DROP TABLE IF EXISTS class; CREATE TABLE IF NOT EXISTS types( id INTEGER PRIMARY KEY AUTO_INCREMENT, - name VARCHAR(255) NOT NULL + name VARCHAR(255) NOT NULL UNIQUE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS class( id INTEGER PRIMARY KEY AUTO_INCREMENT, - name VARCHAR(255) NOT NULL + name VARCHAR(255) NOT NULL UNIQUE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS users( id INTEGER PRIMARY KEY AUTO_INCREMENT, username VARCHAR(255) NOT NULL, name VARCHAR(255) NOT NULL, - middlename VARCHAR(255) NULL, + middlename VARCHAR(255) DEFAULT NULL, surname VARCHAR(255) NOT NULL, password VARCHAR(255) NOT NULL, class_id INTEGER NOT NULL, @@ -38,6 +39,17 @@ CREATE TABLE IF NOT EXISTS users( CONSTRAINT `fk_type_user` FOREIGN KEY (type_id) REFERENCES types (id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +CREATE TABLE IF NOT EXISTS quotes( + id INTEGER PRIMARY KEY AUTO_INCREMENT, + user_id INTEGER NOT NULL, -- Person who heard it + author_id INTEGER NOT NULL, -- Person who said it + quote VARCHAR(255) NOT NULL, + + UNIQUE KEY uk_quote (author_id, quote), + CONSTRAINT `fk_user_quote1` FOREIGN KEY (user_id) REFERENCES users (id), + CONSTRAINT `fk_user_quote2` FOREIGN KEY (author_id) REFERENCES users (id) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + INSERT INTO types VALUES (1, "teacher"), (2, "pupil"); INSERT INTO class VALUES (1, "TGM13.1"), |