From 74680522c90ad29251be4ee5ef6804c925daae0b Mon Sep 17 00:00:00 2001 From: Dan Gowans Date: Wed, 24 Aug 2022 10:03:58 -0400 Subject: [PATCH] test databases notification --- routes/login.js | 7 +++- routes/login.ts | 9 +++- views/login.ejs | 108 +++++++++++++++++++++++++----------------------- 3 files changed, 69 insertions(+), 55 deletions(-) diff --git a/routes/login.js b/routes/login.js index 0b2953c8..062b359c 100644 --- a/routes/login.js +++ b/routes/login.js @@ -1,6 +1,7 @@ import { Router } from "express"; import * as configFunctions from "../helpers/functions.config.js"; import * as authenticationFunctions from "../helpers/functions.authentication.js"; +import { useTestDatabases } from "../data/databasePaths.js"; export const router = Router(); const getSafeRedirectURL = (possibleRedirectURL = "") => { const urlPrefix = configFunctions.getProperty("reverseProxy.urlPrefix"); @@ -31,7 +32,8 @@ router.route("/") response.render("login", { userName: "", message: "", - redirect: request.query.redirect + redirect: request.query.redirect, + useTestDatabases }); } }) @@ -76,7 +78,8 @@ router.route("/") response.render("login", { userName, message: "Login Failed", - redirect: redirectURL + redirect: redirectURL, + useTestDatabases }); } }); diff --git a/routes/login.ts b/routes/login.ts index 90252bc8..535885e7 100644 --- a/routes/login.ts +++ b/routes/login.ts @@ -6,8 +6,11 @@ import * as configFunctions from "../helpers/functions.config.js"; import * as authenticationFunctions from "../helpers/functions.authentication.js"; +import { useTestDatabases } from "../data/databasePaths.js"; + import type * as recordTypes from "../types/recordTypes"; + export const router = Router(); @@ -53,7 +56,8 @@ router.route("/") response.render("login", { userName: "", message: "", - redirect: request.query.redirect + redirect: request.query.redirect, + useTestDatabases }); } }) @@ -113,7 +117,8 @@ router.route("/") response.render("login", { userName, message: "Login Failed", - redirect: redirectURL + redirect: redirectURL, + useTestDatabases }); } }); diff --git a/views/login.ejs b/views/login.ejs index a4377558..24e0245f 100644 --- a/views/login.ejs +++ b/views/login.ejs @@ -2,16 +2,16 @@ ')"> - - Login: <%= configFunctions.getProperty("application.applicationName") %> - + + Login: <%= configFunctions.getProperty("application.applicationName") %> + - - + + - - - + + + @@ -27,51 +27,57 @@ <%= configFunctions.getProperty("application.applicationName") %>
- - + + -
-
- <%= configFunctions.getProperty("application.userDomain") %>\ +
+
+ <%= configFunctions.getProperty("application.userDomain") %>\ +
+
+ +
-
- +
+ +
+ + + + +
-
-
- -
- - - - + <% if (useTestDatabases) { %> +
+

+ Testing databases in use! +

+
+ <% } %> +
+
+ <% if (message !== "") { %> + + + + <%= message %> + <% } %> +
+
+ +
-
- -
-
- <% if (message !== "") { %> - - - - <%= message %> - <% } %> -
-
- -
-
- Build <%= buildNumber %>
- Help - GitHub + Build <%= buildNumber %>
+ Help + GitHub
@@ -79,11 +85,11 @@
- +