From be6f4dc2ac24456e89d062e33f8c4178034d5752 Mon Sep 17 00:00:00 2001 From: rxbn_ Date: Sun, 20 Sep 2020 19:00:06 +0200 Subject: [PATCH] web - minor ui fixes --- bin/web/routes/static.js | 4 ++-- bin/web/views/blocks/error/404.pug | 2 +- bin/web/views/blocks/error/login.pug | 2 +- bin/web/views/blocks/error/permission.pug | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/web/routes/static.js b/bin/web/routes/static.js index 0b1e3fc..80d351c 100644 --- a/bin/web/routes/static.js +++ b/bin/web/routes/static.js @@ -55,7 +55,7 @@ let getRoutes = async () => { apps = await db.getApps(); // set appId in appRequest - if(req.query.appId) { + if(req.query.appId || req.session.appRequest) { if(req.query.appId && typeof req.query.appId == "string") { // req.query.appId // verify appId (if in rep) @@ -126,7 +126,7 @@ let getRoutes = async () => { * @url /* * @method all */ - route.get('/*', asyncer(async (req, res, next) => { + route.get(['/request', '/login', '/logout', '/reset', '/admin'], asyncer(async (req, res, next) => { // passthrough to next route if(req.path.startsWith('/api')) return next(); diff --git a/bin/web/views/blocks/error/404.pug b/bin/web/views/blocks/error/404.pug index 94969d4..c08b8f3 100644 --- a/bin/web/views/blocks/error/404.pug +++ b/bin/web/views/blocks/error/404.pug @@ -1,6 +1,6 @@ append var if((!breadcrumb && !title) || overwrite_vars) - - var breadcrumb = {0: {"name": "authRXBN", "href": "/"}, 1: {"name": "404 - not found", "active": true}}; + - var breadcrumb = {0: {"name": cfg.app.name, "href": "/"}, 1: {"name": "404 - not found", "active": true}}; - var title = "I'm so sooryy"; .uk-flex.uk-margin-medium-top.uk-margin-medium-bottom diff --git a/bin/web/views/blocks/error/login.pug b/bin/web/views/blocks/error/login.pug index 5bf05db..68e1a83 100644 --- a/bin/web/views/blocks/error/login.pug +++ b/bin/web/views/blocks/error/login.pug @@ -1,6 +1,6 @@ append var if((!breadcrumb && !title) || overwrite_vars) - - var breadcrumb = {0: {"name": "authRXBN", "href": "/"}, 1: {"name": "Login", "active": true}}; + - var breadcrumb = {0: {"name": cfg.app.name, "href": "/"}, 1: {"name": "Login", "active": true}}; - var title = "Login"; .uk-flex.uk-margin-medium-top.uk-margin-medium-bottom diff --git a/bin/web/views/blocks/error/permission.pug b/bin/web/views/blocks/error/permission.pug index ff2d7fa..45c096b 100644 --- a/bin/web/views/blocks/error/permission.pug +++ b/bin/web/views/blocks/error/permission.pug @@ -1,6 +1,6 @@ append var if((!breadcrumb && !title) || overwrite_vars) - - var breadcrumb = {0: {"name": "authRXBN", "href": "/"}, 1: {"name": "401 - Permission needed", "active": true}}; + - var breadcrumb = {0: {"name": cfg.app.name, "href": "/"}, 1: {"name": "401 - Permission needed", "active": true}}; - var title = "Me so sooryy"; .uk-flex.uk-margin-medium-top.uk-margin-medium-bottom