diff --git a/bin/config.js b/bin/config.js index d7c9081..4201779 100644 --- a/bin/config.js +++ b/bin/config.js @@ -27,6 +27,7 @@ module.exports = { }, app: { locale: 'de-DE', // default locale (de-DE & en-EN should be available) + name: 'authRXBN', passhashDelimiter: '|' }, mongoose: { diff --git a/bin/web/views/blocks/footer.pug b/bin/web/views/blocks/footer.pug index 92344bd..2aff676 100644 --- a/bin/web/views/blocks/footer.pug +++ b/bin/web/views/blocks/footer.pug @@ -1,6 +1,6 @@ footer .uk-text-center - small Copyright © Ruben Meyer 2019 + small Copyright © Ruben Meyer 2019-2020 .modals //- Logout Modal @@ -21,5 +21,5 @@ block scripts script(src="https://cdnjs.cloudflare.com/ajax/libs/uikit/3.1.5/js/uikit-icons.min.js") //- Custom scripts for this template - script(src="/public/js/locales.js") + //script(src="/public/js/locales.js") script(src="/res/js/custom.js") diff --git a/bin/web/views/blocks/head.pug b/bin/web/views/blocks/head.pug index 10f3951..e76583f 100644 --- a/bin/web/views/blocks/head.pug +++ b/bin/web/views/blocks/head.pug @@ -6,9 +6,9 @@ head meta(name="author", content="Ruben Meyer") meta(name="description" content="auth.rxbn.de") if(title) - title="authRXBN - "+title + title=cfg.app.name+" - "+title else - title authRXBN + title=cfg.app.name block css //- UIkit CSS diff --git a/bin/web/views/blocks/login.pug b/bin/web/views/blocks/login.pug index 9d3e1bc..8f6c163 100644 --- a/bin/web/views/blocks/login.pug +++ b/bin/web/views/blocks/login.pug @@ -1,5 +1,5 @@ append var - - if(!session || !session.user) var breadcrumb = {0: {"name": "authRXBN", "href": "/"}, 1: {"name": "ERROR - Please login", "active": true}}; + - if(!session || !session.user) var breadcrumb = {0: {"name": cfg.app.name, "href": "/"}, 1: {"name": "ERROR - Please login", "active": true}}; - if(!session || !session.user) var title = "Please login"; .uk-flex.uk-margin-medium-top.uk-margin-medium-bottom div(class="uk-width-auto uk-width-1-4@s") diff --git a/bin/web/views/blocks/nav.pug b/bin/web/views/blocks/nav.pug index 65bec95..61eb5d9 100644 --- a/bin/web/views/blocks/nav.pug +++ b/bin/web/views/blocks/nav.pug @@ -8,14 +8,14 @@ mixin navItem(name, id, symbol, href) nav(uk-navbar).uk-navbar-container .uk-navbar-left.uk-margin-left ul.uk-navbar-nav - li(title="authRXBN") + li(title=cfg.app.name) a(href="/", style="text-transform: unset") span authRXBN .uk-navbar-right.uk-margin-right ul.uk-navbar-nav if(session && session.user) +navItem("Apps", "apps", "fas fa-tachometer-alt", "/") - +navItem("Configs", "configs", "fas fa-wrench", "/configs") + +navItem("Settings", "settings", "fas fa-wrench", "/settings") +navItem("Logout", "logout", "fas fa-sign-out-alt", "/logout") else +navItem("Register", "register", "fas fa-user-plus", "/register") diff --git a/bin/web/views/index.pug b/bin/web/views/index.pug index 6b78908..7049981 100644 --- a/bin/web/views/index.pug +++ b/bin/web/views/index.pug @@ -1,8 +1,8 @@ extends blocks/layout.pug append var if(session && session.user) - - var breadcrumb = {0: {"name": "authRXBN", "href": "/"}, 1: {"name": "Dashboard", "active": true}}; - - var title = "Dashboard"; + - var breadcrumb = {0: {"name": cfg.app.name, "href": "/"}, 1: {"name": "Apps", "active": true}}; + - var title = "Apps"; mixin item(name, id, description) div diff --git a/bin/web/views/login.pug b/bin/web/views/login.pug index 37fef79..317c0ff 100644 --- a/bin/web/views/login.pug +++ b/bin/web/views/login.pug @@ -1,7 +1,7 @@ extends blocks/layout.pug append var if(session && !session.user) - - 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"; append content diff --git a/bin/web/views/logout.pug b/bin/web/views/logout.pug index 146f6b3..766a7f4 100644 --- a/bin/web/views/logout.pug +++ b/bin/web/views/logout.pug @@ -1,7 +1,7 @@ extends blocks/layout.pug append var if(session && session.user) - - var breadcrumb = {0: {"name": "authRXBN", "href": "/"}, 1: {"name": "Logout", "active": true}}; + - var breadcrumb = {0: {"name": cfg.app.name, "href": "/"}, 1: {"name": "Logout", "active": true}}; - var title = "Logout"; append content diff --git a/bin/web/views/register.pug b/bin/web/views/register.pug index 118abf2..56a8d1a 100644 --- a/bin/web/views/register.pug +++ b/bin/web/views/register.pug @@ -1,7 +1,7 @@ extends blocks/layout.pug append var if(cfg && cfg.web.registration && session && !session.user) - - var breadcrumb = {0: {"name": "authRXBN", "href": "/"}, 1: {"name": "Register", "active": true}}; + - var breadcrumb = {0: {"name": cfg.app.name, "href": "/"}, 1: {"name": "Register", "active": true}}; - var title = "Register"; append content diff --git a/bin/web/views/request.pug b/bin/web/views/request.pug index 7dfc775..ed33e76 100644 --- a/bin/web/views/request.pug +++ b/bin/web/views/request.pug @@ -1,7 +1,7 @@ extends blocks/layout.pug append var if(session && session.user) - - var breadcrumb = {0: {"name": "authRXBN", "href": "/"}, 1: {"name": "Authorization", "active": true}}; + - var breadcrumb = {0: {"name": cfg.app.name, "href": "/"}, 1: {"name": "Authorization", "active": true}}; - var title = "authorize App"; append content diff --git a/bin/web/views/reset.pug b/bin/web/views/reset.pug index 8178c80..0fcc4c9 100644 --- a/bin/web/views/reset.pug +++ b/bin/web/views/reset.pug @@ -1,7 +1,7 @@ extends blocks/layout.pug append var if(session && !session.user) - - var breadcrumb = {0: {"name": "authRXBN", "href": "/"}, 1: {"name": "Forgot your password?", "active": true}}; + - var breadcrumb = {0: {"name": cfg.app.name, "href": "/"}, 1: {"name": "Forgot your password?", "active": true}}; - var title = "Reset password"; append content