Merge branch 'MLAB-383' into 'testing'

Mlab 383

See merge request !72

README.md

 User Account Management
 
-Re-implementation of https://transfer.hft-stuttgart.de/gitlab/sihombing/portal/tree/master/app-useracc using NodeJS and ExpressJS
+MLAB-481 branch should be created from this branch
\ No newline at end of file

routes/routes-account.js

@@ -594,7 +594,7 @@ module.exports = function (app, config, passport, i18n) {
             } else {
               updatedInformation.setLogo(pagesData.avatar_url)
               updatedInformation.setPath(pagesData.path)
-              res.flash("success", "Your website has been updated")
+              res.flash("success", "Ihre Website wurde aktualisiert")
             }
             res.redirect('/account/updateInformation?id='+updatedInformation.getId())
           }

views/DE/account/newInformation.pug

@@ -16,7 +16,7 @@ html(lang="de")
                         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="/account/")
-                                    span(class="font-weight-bold" style="color:black;") #{user.firstName} #{user.lastName}
+                                    span(class="font-weight-bold" style="color:black;") #{user.firstName} #{user.lastName} - #{user.gitlabUserId}
                             li(class="nav-item")
                                 a(class="nav-link pl-0" href="/account/profile")
                                     i(class="fa fa-user fa-fw")
@@ -72,10 +72,14 @@ html(lang="de")
                             label(for="description", class="col-sm-2") Beschreibung
                             div(class="col-sm-8")
                                 textarea#description(name="description", type="text", class="form-control", placeholder="Beschreibung", maxlength="500" required)
-                        div(class="form-group row")    
+                        div(class="form-group row")
                             label(for="logo", class="col-sm-2") Projektlogo
                             div(class="col-sm-8")
-                                input#logo(name="logo", class="form-control-file", type="file" required)
+                                div(class="form-group row px-4")
+                                    - let defaultLogo = "https://m4lab.hft-stuttgart.de/img/footer/M4_LAB_LOGO_Graustufen.png"
+                                    img(src=defaultLogo, width="100" height="100")
+                                div(class="form-group row px-3")
+                                    input#logo(name="logo", class="form-control-file", type="file")
                         input(type="submit", class="btn btn-primary", value="Senden")
                 hr
                 div(class="mx-4", style="color: gray;")