From 1b24ac7b6774fee66f7b6325374ac219011e3212 Mon Sep 17 00:00:00 2001 From: Michael Ochmann Date: Wed, 6 Oct 2021 11:59:17 +0200 Subject: [PATCH 1/6] continuing with mainREPL after user has been changed --- bin/usermanager.js | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/usermanager.js b/bin/usermanager.js index 7514bcd..2c90e46 100644 --- a/bin/usermanager.js +++ b/bin/usermanager.js @@ -190,6 +190,7 @@ const updateUser = async () => { } user.save(); console.log(answers); + mainREPL(); }); } From 428c49df8a43b8589422a205bfc4d23f36d26997 Mon Sep 17 00:00:00 2001 From: Michael Ochmann Date: Wed, 6 Oct 2021 12:02:35 +0200 Subject: [PATCH 2/6] now logging authentication attempts of unknown users --- src/routes/Auth.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/routes/Auth.js b/src/routes/Auth.js index e866c8d..64e398d 100644 --- a/src/routes/Auth.js +++ b/src/routes/Auth.js @@ -27,6 +27,7 @@ const Auth = async (request, response) => { }); if (users.length !== 1) { + Log(`Unknown user '${username}' has tried to log in`, LogLevel.ERROR); response.json(new AuthenticationError()); return; } From 843238e790d8a370c794c6fb26415a3b03e686eb Mon Sep 17 00:00:00 2001 From: Michael Ochmann Date: Wed, 6 Oct 2021 14:07:12 +0200 Subject: [PATCH 3/6] added better routing completely new system. no more #stuff shenanigans --- public/assets/icon_logout.svg | 1 + public/css/_icons.scss | 7 +++ public/css/mdos.scss | 1 + public/index.html | 51 ++++++++++++--------- public/javascript/Keypad.js | 7 ++- public/javascript/Login.js | 18 ++++++-- public/javascript/MDoS.js | 6 ++- public/javascript/Navigator.js | 66 +++------------------------ public/javascript/Password.js | 2 + public/javascript/PasswordReset.js | 14 +++--- public/javascript/Q6.js | 24 +++++----- public/javascript/Router.js | 71 ++++++++++++++++++++++++++++++ src/MDoS.js | 9 ++-- src/Response.js | 2 +- src/routes/Password.js | 2 +- 15 files changed, 170 insertions(+), 111 deletions(-) create mode 100644 public/assets/icon_logout.svg create mode 100644 public/css/_icons.scss create mode 100644 public/javascript/Router.js diff --git a/public/assets/icon_logout.svg b/public/assets/icon_logout.svg new file mode 100644 index 0000000..2723039 --- /dev/null +++ b/public/assets/icon_logout.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/css/_icons.scss b/public/css/_icons.scss new file mode 100644 index 0000000..8e649bf --- /dev/null +++ b/public/css/_icons.scss @@ -0,0 +1,7 @@ +h1 svg { + color: $blue; + margin-left: 1rem; + font-size: 1.2rem; + vertical-align: middle; + cursor: pointer; +} \ No newline at end of file diff --git a/public/css/mdos.scss b/public/css/mdos.scss index 06ec575..ee531c3 100644 --- a/public/css/mdos.scss +++ b/public/css/mdos.scss @@ -7,6 +7,7 @@ @import "footer"; @import "alert"; @import "spinner"; +@import "icons"; * { box-sizing: border-box; diff --git a/public/index.html b/public/index.html index 4e45d10..13d1353 100644 --- a/public/index.html +++ b/public/index.html @@ -2,23 +2,23 @@ MDoS - + - - - - - - + + + + + + -
+
- Logo des Maschinendeck Trier e.V. + Logo des Maschinendeck Trier e.V.

Maschinendeck Trier e.V.

@@ -27,19 +27,25 @@

Türsystem

- + - Passwort vergessen? + Passwort vergessen?
-
+
- Logo des Maschinendeck Trier e.V. + Logo des Maschinendeck Trier e.V.

Maschinendeck Trier e.V.

-

Türsystem

+

+ Türsystem + + + + +

@@ -48,7 +54,7 @@

Türsystem

-
+
@@ -74,9 +80,9 @@

Türsystem

-
+
- Logo des Maschinendeck Trier e.V. + Logo des Maschinendeck Trier e.V.

Maschinendeck Trier e.V.

@@ -96,9 +102,9 @@

Türsystem

-
+
- Logo des Maschinendeck Trier e.V. + Logo des Maschinendeck Trier e.V.

Maschinendeck Trier e.V.

@@ -112,12 +118,15 @@

Türsystem

- - + +
+
+

404 Seite nicht gefunden

+