From e744c3d12e90ee10789554715b91b1f1006c1e34 Mon Sep 17 00:00:00 2001
From: Rosanny <rosanny.sihombing@hft-stuttgart.de>
Date: Fri, 15 May 2020 17:59:23 +0200
Subject: [PATCH] MLAB-129: 20200515
---
routes/methods.js | 2 +-
views/DE/account/home.pug | 6 +++---
views/DE/account/profile.pug | 13 +++++++++----
views/DE/account/security.pug | 10 +++++-----
views/DE/account/services.pug | 10 +++++-----
5 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/routes/methods.js b/routes/methods.js
index 9864273b..ce0b1dcc 100644
--- a/routes/methods.js
+++ b/routes/methods.js
@@ -57,7 +57,7 @@ var methods = {
})
},
getUserByEmail: function(email, callback) {
- dbconn.user.query('SELECT salutation, title, firstname, lastname, industry, organisation, speciality FROM user WHERE email = "' +email+'"', function (err, rows, fields) {
+ dbconn.user.query('SELECT verificationStatus, salutation, title, firstname, lastname, industry, organisation, speciality FROM user WHERE email = "' +email+'"', function (err, rows, fields) {
if (err) {
throw err;
}
diff --git a/views/DE/account/home.pug b/views/DE/account/home.pug
index 8a16fd67..7f7ace74 100644
--- a/views/DE/account/home.pug
+++ b/views/DE/account/home.pug
@@ -7,9 +7,9 @@ html(lang="de")
link(rel="stylesheet", type="text/css", href="https://transfer.hft-stuttgart.de/css/bootstrap/bootstrap.css")
link(rel="stylesheet", href="https://use.fontawesome.com/releases/v5.8.2/css/all.css", integrity="sha384-oS3vJWv+0UjzBfQzYUhtDYW+Pj2yciDJxpsK1OYPAYjqT085Qq/1cq5FLXAZQ7Ay", crossorigin="anonymous")
body
- div(class="container-fluid")
+ div(class="container")
div(class="row min-vh-100 flex-column flex-md-row")
- aside(class="col-12 col-md-2 p-0 flex-shrink-1")
+ aside(class="col-12 col-md-3 p-0 flex-shrink-1")
nav(class="navbar navbar-expand flex-md-column flex-row align-items-start py-2")
div(class="collapse navbar-collapse")
ul(class="flex-md-column flex-row navbar-nav w-100 justify-content-between")
@@ -29,7 +29,7 @@ html(lang="de")
i(class="fa fa-tasks fa-fw")
span(class="d-none d-md-inline") Projekte und Dienste
li(class="nav-item")
- a(class="nav-link pl-0" href="/logout")
+ a(class="nav-link pl-0" href="/logout" style="color:red;")
i(class="fa fa-sign-out-alt fa-fw")
span(class="d-none d-md-inline") Logout
main(class="col bg-faded py-3 flex-grow-1")
diff --git a/views/DE/account/profile.pug b/views/DE/account/profile.pug
index c74276b1..f6e800f6 100644
--- a/views/DE/account/profile.pug
+++ b/views/DE/account/profile.pug
@@ -7,14 +7,14 @@ html(lang="de")
link(rel="stylesheet", type="text/css", href="https://transfer.hft-stuttgart.de/css/bootstrap/bootstrap.css")
link(rel="stylesheet", href="https://use.fontawesome.com/releases/v5.8.2/css/all.css", integrity="sha384-oS3vJWv+0UjzBfQzYUhtDYW+Pj2yciDJxpsK1OYPAYjqT085Qq/1cq5FLXAZQ7Ay", crossorigin="anonymous")
body
- div(class="container-fluid")
+ div(class="container")
div(class="row min-vh-100 flex-column flex-md-row")
- aside(class="col-12 col-md-2 p-0 flex-shrink-1")
+ aside(class="col-12 col-md-3 p-0 flex-shrink-1")
nav(class="navbar navbar-expand flex-md-column flex-row align-items-start py-2")
div(class="collapse navbar-collapse")
ul(class="flex-md-column flex-row navbar-nav w-100 justify-content-between")
li(class="nav-item")
- a(class="nav-link pl-0 text-nowrap" href="#")
+ a(class="nav-link pl-0 text-nowrap" href="/")
span(class="font-weight-bold" style="color:black;") #{user.firstname} #{user.lastname}
li(class="nav-item")
a(class="nav-link pl-0" href="/profile")
@@ -29,10 +29,15 @@ html(lang="de")
i(class="fa fa-tasks fa-fw")
span(class="d-none d-md-inline") Projekte und Dienste
li(class="nav-item")
- a(class="nav-link pl-0" href="/logout")
+ a(class="nav-link pl-0" href="/logout" style="color:red;")
i(class="fa fa-sign-out-alt fa-fw")
span(class="d-none d-md-inline") Logout
main(class="col bg-faded py-3 flex-grow-1")
+ if user.verificationStatus == 0
+ div.alert.alert-warning.alert-dismissible
+ | Wir haben Ihnen eine E-Mail an Ihre verwendete Adresse gesendet. Diese enthält einen Link zur Bestätigung Ihres Accounts.
+ | Wenn Sie die Mail nicht in ihrem Postfach vorfinden, prüfen Sie bitte auch Ihren Spam-Ordner.
+ | <br >Falls Sie keine E-Mail von uns erhalten haben, können Sie <a href="#">diese hier</a> erneut anfordern.
if successes
for success in successes
div.alert.alert-success.alert-dismissible #{ success }
diff --git a/views/DE/account/security.pug b/views/DE/account/security.pug
index 27bcabfc..bc20963b 100644
--- a/views/DE/account/security.pug
+++ b/views/DE/account/security.pug
@@ -11,15 +11,15 @@ html(lang="de")
font-size: 11px;
}
body
- div(class="container-fluid")
+ div(class="container")
div(class="row min-vh-100 flex-column flex-md-row")
- aside(class="col-12 col-md-2 p-0 flex-shrink-1")
+ aside(class="col-12 col-md-3 p-0 flex-shrink-1")
nav(class="navbar navbar-expand flex-md-column flex-row align-items-start py-2")
div(class="collapse navbar-collapse")
ul(class="flex-md-column flex-row navbar-nav w-100 justify-content-between")
li(class="nav-item")
- a(class="nav-link pl-0 text-nowrap" href="#")
- span(class="font-weight-bold" style="color:black;") #{user.firstname} #{user.lastname}
+ a(class="nav-link pl-0 text-nowrap" href="/")
+ span(class="font-weight-bold" style="color:black;") #{user.firstName} #{user.lastName}
li(class="nav-item")
a(class="nav-link pl-0" href="/profile")
i(class="fa fa-user fa-fw")
@@ -33,7 +33,7 @@ html(lang="de")
i(class="fa fa-tasks fa-fw")
span(class="d-none d-md-inline") Projekte und Dienste
li(class="nav-item")
- a(class="nav-link pl-0" href="/logout")
+ a(class="nav-link pl-0" href="/logout" style="color:red;")
i(class="fa fa-sign-out-alt fa-fw")
span(class="d-none d-md-inline") Logout
main(class="col bg-faded py-3 flex-grow-1")
diff --git a/views/DE/account/services.pug b/views/DE/account/services.pug
index 81292350..f3aad9ce 100644
--- a/views/DE/account/services.pug
+++ b/views/DE/account/services.pug
@@ -7,15 +7,15 @@ html(lang="de")
link(rel="stylesheet", type="text/css", href="https://transfer.hft-stuttgart.de/css/bootstrap/bootstrap.css")
link(rel="stylesheet", href="https://use.fontawesome.com/releases/v5.8.2/css/all.css", integrity="sha384-oS3vJWv+0UjzBfQzYUhtDYW+Pj2yciDJxpsK1OYPAYjqT085Qq/1cq5FLXAZQ7Ay", crossorigin="anonymous")
body
- div(class="container-fluid")
+ div(class="container")
div(class="row min-vh-100 flex-column flex-md-row")
- aside(class="col-12 col-md-2 p-0 flex-shrink-1")
+ aside(class="col-12 col-md-3 p-0 flex-shrink-1")
nav(class="navbar navbar-expand flex-md-column flex-row align-items-start py-2")
div(class="collapse navbar-collapse")
ul(class="flex-md-column flex-row navbar-nav w-100 justify-content-between")
li(class="nav-item")
- a(class="nav-link pl-0 text-nowrap" href="#")
- span(class="font-weight-bold" style="color:black;") #{user.firstname} #{user.lastname}
+ a(class="nav-link pl-0 text-nowrap" href="/")
+ span(class="font-weight-bold" style="color:black;") #{user.firstName} #{user.lastName}
li(class="nav-item")
a(class="nav-link pl-0" href="/profile")
i(class="fa fa-user fa-fw")
@@ -29,7 +29,7 @@ html(lang="de")
i(class="fa fa-tasks fa-fw" style="color:black;")
span(class="d-none d-md-inline" style="color:black;") Projekte und Dienste
li(class="nav-item")
- a(class="nav-link pl-0" href="/logout")
+ a(class="nav-link pl-0" href="/logout" style="color:red;")
i(class="fa fa-sign-out-alt fa-fw")
span(class="d-none d-md-inline") Logout
main(class="col bg-faded py-3 flex-grow-1")
--
GitLab