Skip to content

GitLab

Commit b3c18b99 authored by Wolfgang Knopki's avatar Wolfgang Knopki
Browse files

changed redirect paths relative to account in virews

parent 45bbab2b
Hide whitespace changes
Inline Side-by-side
views/forgotPwd.pug
View file @ b3c18b99
......@@ -40,7 +40,7 @@ html(lang="en")
for error, i in errors
div.alert.alert-danger.alert-dismissible.fade.show #{ error }
a(class="close", href="#", data-dismiss="alert", aria-label="close") ×
form#forgotForm(class="form-signin", method="POST", action="/forgotPwd")
form#forgotForm(class="form-signin", method="POST", action="/account/forgotPwd")
img(src="https://transfer.hft-stuttgart.de/images/demo/m4lab_logo.jpg", class="img-responsive center-block", width="185", height="192")
div(class="form-row")
input#inputEmail(name="inputEmail", type="email", class="form-control", placeholder="Email" required)
......@@ -53,4 +53,8 @@ html(lang="en")
// Bootstrap
script(src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous")
// M4_LAB
script(src="https://transfer.hft-stuttgart.de/js/headfoot.js")
\ No newline at end of file
<<<<<<< 45bbab2b386c98e5d2ea481b59357ab41b28bd9b
=======
script(src="/account/js/account.js")
>>>>>>> changed redirect paths relative to account in virews
script(src="https://transfer.hft-stuttgart.de/js/headfoot.js")
views/home.pug
View file @ b3c18b99
......@@ -3,10 +3,10 @@ extends layout
block content
if user !== null
h1 Hello, #{user.firstName}
a(href="/profile") Profile
a(href="/account/profile") Profile
br
a(href="/logout") Logout
a(href="/account/logout") Logout
else
h1 Welcome
br
a(href="/login") Login
a(href="/account/login") Login
views/profile.pug
View file @ b3c18b99
......@@ -35,9 +35,9 @@ html(lang="en")
span #{user.firstname} #{user.lastname}
div(class="nav flex-column nav-pills", id="v-pills-tab", role="tablist", aria-orientation="vertical")
a(class="nav-link" href="#" aria-selected="true") Profile
a(class="nav-link" href="/security" aria-selected="false") Security
a(class="nav-link" href="/services" aria-selected="false") Services
div(class="col-sm-8")
a(class="nav-link" href="/account/security" aria-selected="false") Security
a(class="nav-link" href="/account/services" aria-selected="false") Services
div(class="col-sm-9")
if successes
for success in successes
div.alert.alert-success.alert-dismissible #{ success }
......@@ -87,5 +87,5 @@ html(lang="en")
// Bootstrap
script(src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous")
// M4_LAB
//script(src="/js/account.js")
script(src="https://transfer.hft-stuttgart.de/js/headfoot.js")
\ No newline at end of file
script(src="/account//js/account.js")
script(src="https://transfer.hft-stuttgart.de/js/headfoot.js")
views/reset.pug
View file @ b3c18b99
......@@ -56,6 +56,6 @@ html(lang="en")
// Bootstrap
script(src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous")
// M4_LAB
script(src="/js/account.js")
script(src="/js/generalFunction.js")
script(src="/account/js/account.js")
script(src="/account/js/generalFunction.js")
script(src="https://transfer.hft-stuttgart.de/js/headfoot.js")
\ No newline at end of file
views/security.pug
View file @ b3c18b99
......@@ -37,9 +37,9 @@ html(lang="en")
h5
span #{user.firstName} #{user.lastName}
div(class="nav flex-column nav-pills", id="v-pills-tab", role="tablist", aria-orientation="vertical")
a(class="nav-link" href="/profile" aria-selected="true") Profile
a(class="nav-link" href="/account/profile" aria-selected="true") Profile
a(class="nav-link" href="#" aria-selected="false") Security
a(class="nav-link" href="/services" aria-selected="false") Services
a(class="nav-link" href="/account/services" aria-selected="false") Services
div(class="col-sm-9")
if successes
for success in successes
......@@ -49,24 +49,21 @@ html(lang="en")
for error, i in errors
div.alert.alert-danger.alert-dismissible.fade.show #{ error }
a(class="close", href="#", data-dismiss="alert", aria-label="close") &times;
form(class="needs-validation", method="post", action="/changePwd" novalidate)
div(class="form-row")
div(class='form-group col-md-6')
label(for="currPwd") Current Password
input(id="inputCurrPwd", name="inputCurrPwd", type="password", class="form-control" required)
div(class="invalid-feedback") Please fill in this field.
div(class="form-row")
div(class='form-group col-md-6')
label(for="newPwd") New Password
input#inputNewPwd(name="inputNewPwd", type="password", class="form-control" required)
span#recommendation(class='warning')
div(class="invalid-feedback") Please fill in this field.
div(class="form-row")
div(class='form-group col-md-6')
label(for="confirm") Confirm New Password
input#inputConfirm(name="inputConfirm", type="password", class="form-control" required)
span#message(class='warning')
div(class="invalid-feedback") Please fill in this field.
form(class="needs-validation", method="post", action="/account/changePwd" novalidate)
div(class="form-group row")
label(for="currPwd") Current Password
input(id="inputCurrPwd", name="inputCurrPwd", type="password", class="form-control" required)
div(class="invalid-feedback") Please fill in this field.
div(class="form-group row")
label(for="newPwd") New Password
input#inputNewPwd(name="inputNewPwd", type="password", class="form-control" required)
span#recommendation
div(class="invalid-feedback") Please fill in this field.
div(class="form-group row")
label(for="confirm") Confirm New Password
input#inputConfirm(name="inputConfirm", type="password", class="form-control" required)
span#message
div(class="invalid-feedback") Please fill in this field.
input#updateBtn(type="submit", class="btn btn-primary", value="Update Password" disabled)
// jQuery
......@@ -75,8 +72,8 @@ html(lang="en")
// Bootstrap
script(src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous")
// M4_LAB
script(src="/js/generalFunction.js")
script(src="/js/security.js")
script(src="/account/js/account.js")
script(src="/account/js/generalFunction.js")
script(src="https://transfer.hft-stuttgart.de/js/headfoot.js")
script.
// check input fields
......@@ -94,4 +91,4 @@ html(lang="en")
form.classList.add('was-validated');
}, false);
});
}, false);
\ No newline at end of file
}, false);
views/services.pug
View file @ b3c18b99
......@@ -34,8 +34,8 @@ html(lang="en")
h5
span #{user.firstName} #{user.lastName}
div(class="nav flex-column nav-pills", id="v-pills-tab", role="tablist", aria-orientation="vertical")
a(class="nav-link" href="/profile" aria-selected="true") Profile
a(class="nav-link" href="/security" aria-selected="false") Security
a(class="nav-link" href="/account/profile" aria-selected="true") Profile
a(class="nav-link" href="/account/security" aria-selected="false") Security
a(class="nav-link" href="#" aria-selected="false") Services
div(class="col-sm-9")
if successes
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Dies ist die Gitlab-Instanz des Transferportals der Hochschule für Technik Stuttgart. Hier geht es zurück zum Portal