From 564768d32c1867f3410b527788ae0df0369f484d Mon Sep 17 00:00:00 2001 From: SileNce5k Date: Sun, 26 Jan 2025 08:56:25 +0100 Subject: [PATCH] Improve login Remove duplicate ejs file for easier development --- backend/server.js | 5 +++-- frontend/views/invalid_login.ejs | 14 -------------- frontend/views/login.ejs | 1 + 3 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 frontend/views/invalid_login.ejs diff --git a/backend/server.js b/backend/server.js index 8920b99..5586778 100644 --- a/backend/server.js +++ b/backend/server.js @@ -133,9 +133,10 @@ app.get('/logout', (req, res) => { app.get('/login', (req, res) => { if(req.query.invalid === "yes"){ - res.render("login_incorrect") + let invalidMessage = "Username or password incorrect" + res.render("login", {invalid_login: true, invalid_message: invalidMessage}) }else{ - res.render("login") + res.render("login", {invalid_login: false, invalid_message: ""}) } }) diff --git a/frontend/views/invalid_login.ejs b/frontend/views/invalid_login.ejs deleted file mode 100644 index 8a990a4..0000000 --- a/frontend/views/invalid_login.ejs +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - Discord Bot Control Panel - - - -

Not logged in

-

Please login before you can access the control panel.

-

Register here

- - \ No newline at end of file diff --git a/frontend/views/login.ejs b/frontend/views/login.ejs index acb60cb..2ff7840 100644 --- a/frontend/views/login.ejs +++ b/frontend/views/login.ejs @@ -13,6 +13,7 @@
+

<%= invalid_message %>