Merge branch 'testing' into 'master'

merge testing into master See merge request !140

Merge branch 'testing' into 'master'
merge testing into master See merge request !140
c5370b1e · Wolfgang Knopki · c1e10e86 · 5ccad0d2 · c5370b1e · c5370b1e
Commit c5370b1e authored 2 years ago by Wolfgang Knopki
Hide whitespace changes
Inline Side-by-side

Showing

with 43 additions and 37 deletions
+43 -37
--- a/routes/public.ts
+++ b/routes/public.ts
@@ -15,8 +15,8 @@ export = function (app:any, config:any, lang:string) {
  })
  app.post('/registration', function(req:any, res:any) {
    // user data
-    var curDate:Date = new Date()
-    var userData:any = {
+    let curDate:Date = new Date()
+    let userData:any = {
      salutation: req.body.inputSalutation,
      title: req.body.inputTitle,
      firstname: req.body.inputFirstname,
@@ -28,10 +28,10 @@ export = function (app:any, config:any, lang:string) {
      createdDate: curDate.toISOString().slice(0,10)
    }
    
-    var userEmail:any = userData.email
-    var pos:number = userEmail.indexOf('@')
-    var emailLength:number = userEmail.length
-    var emailDomain:any = userEmail.slice(pos, emailLength);
+    let userEmail:any = userData.email
+    let pos:number = userEmail.indexOf('@')
+    let emailLength:number = userEmail.length
+    let emailDomain:any = userEmail.slice(pos, emailLength);
    
    if ( emailDomain.toLowerCase() == "@hft-stuttgart.de") {
      res.flash('error', "Fehlgeschlagen: HFT-Account")
@@ -48,7 +48,7 @@ export = function (app:any, config:any, lang:string) {
          // encrypt password
          bcrypt.genSalt(saltRounds, function(err, salt) {
            bcrypt.hash(req.body.inputPassword, salt, function(err:any, hash:any) {
-              var newAccount:any = {
+              let newAccount:any = {
                profile: userData,
                password: hash,
                verificationToken: token
@@ -65,8 +65,8 @@ export = function (app:any, config:any, lang:string) {
            }
            else {
              // send email
-              var emailSubject = "Bitte bestätigen Sie Ihr M4_LAB Benutzerkonto"
-              var emailContent = '<div>Lieber Nutzer,<br/><br/>' +
+              let emailSubject = "Bitte bestätigen Sie Ihr M4_LAB Benutzerkonto"
+              let emailContent = '<div>Lieber Nutzer,<br/><br/>' +
                '<p>vielen Dank für Ihre Anmeldung am Transferportal der HFT Stuttgart. <br/>' +
                'Um Ihre Anmeldung zu bestätigen, klicken Sie bitte <a href='+config.app.host+'/verifyAccount?token='+newAccount.verificationToken+'>diesen Link</a> ' +
                '<br/><br/>' +
@@ -134,23 +134,23 @@ export = function (app:any, config:any, lang:string) {
            })
          } else {
            // send email
-            var emailSubject = "Herzlich willkommen"
-              var emailContent = '<div>Lieber Nutzer,<br/><br/>' +
-                '<p>herzlich willkommen beim Transferportal der HFT Stuttgart!<br/>' +
-                'Sie können nun alle Dienste des Portals nutzen.<p/><br/>' + constants.mailSignature;
-              mailer.options.to = userEmail
-              mailer.options.subject = emailSubject
-              mailer.options.html = emailContent
-              mailer.transporter.sendMail(mailer.options, function(err:any) {
-                if (err) {
-                  console.log('cannot send email')
-                  throw err
-                }
-              })
+            let emailSubject = "Herzlich willkommen";
+            let emailContent = '<div>Lieber Nutzer,<br/><br/>' +
+              '<p>herzlich willkommen beim Transferportal der HFT Stuttgart!<br/>' +
+              'Sie können nun alle Dienste des Portals nutzen.<p/><br/>' + constants.mailSignature;
+            mailer.options.to = userEmail;
+            mailer.options.subject = emailSubject;
+            mailer.options.html = emailContent;
+            mailer.transporter.sendMail(mailer.options, function(err:any) {
+              if (err) {
+                console.log('cannot send email');
+                throw err;
+              }
+            })
  
-              res.render(lang+'/account/verification', {
-                status: true
-              })
+            res.render(lang+'/account/verification', {
+              status: true
+            })
          }
        }
      })        
@@ -179,13 +179,13 @@ export = function (app:any, config:any, lang:string) {
            token += randomChars.charAt(Math.floor(Math.random() * randomChars.length));
          }

-          var emailSubject = "Ihre Passwort-Anfrage an das Transferportal der HFT Stuttgart";
-          var emailContent = '<div>Lieber Nutzer,<br/><br/>' +
+          let emailSubject = "Ihre Passwort-Anfrage an das Transferportal der HFT Stuttgart";
+          let emailContent = '<div>Lieber Nutzer,<br/><br/>' +
            '<p>wir haben Ihre Anfrage zur Erneuerung Ihres Passwortes erhalten. Falls Sie diese Anfrage nicht gesendet haben, ignorieren Sie bitte diese E-Mail.<br/><br/>' +
            'Sie können Ihr Passwort mit dem Klick auf diesen Link ändern: '+config.app.host+'/reset/' + token + '<br/>' +
            'Dieser Link ist aus Sicherheitsgründen nur für 1 Stunde gültig.<br/></p>' + constants.mailSignature + '</div>'
            
-          var credentialData = {
+          let credentialData = {
            user_id: user.id,
            resetPasswordToken: token,
            resetPasswordExpires: Date.now() + 3600000 // 1 hour
@@ -227,9 +227,9 @@ export = function (app:any, config:any, lang:string) {
      }
  })
  app.post('/reset/:token', async function(req:any, res:any) {
-      var newPwd = req.body.inputNewPwd
+      let newPwd = req.body.inputNewPwd

-      var user = await methods.getUserByToken(req.params.token)
+      let user = await methods.getUserByToken(req.params.token)
      if (!user) {
        res.flash('error', "User not found.")
        res.redirect('/login')
@@ -267,9 +267,9 @@ export = function (app:any, config:any, lang:string) {

  // ======================= CONTACT FORM ===========================
  app.get('/contact', function (req:any, res:any) {
-      res.render(lang+'/account/contact', {
-        user: req.user
-      })
+    res.render(lang+'/account/contact', {
+      user: req.user
+    })
  })
  app.post('/contact', function(req:any, res:any, next:any) {
        //methods.currentDate();
@@ -277,15 +277,15 @@ export = function (app:any, config:any, lang:string) {
        let supportAddress = "support-transfer@hft-stuttgart.de";
        let inputName = req.body.name;
        let inputContent = req.body.message;
-        let emailContent = "Es wurde eine Anfrage an das Transferportal gestellt: \n\n NAME: " + inputName + "\n NACHRICHT:\n "+ inputContent;
        let emailSubject = "Ihre Anfrage an das Transferportal";
+        let emailContent = "<div>Es wurde eine Anfrage an das Transferportal gestellt: <br/><br/>NAME: " + inputName + "<br/>NACHRICHT: "+ inputContent+"</div>";
        async.waterfall([
          function(done:any) {
            // send email
            mailer.options.to = supportAddress;
            mailer.options.cc = emailAddress;
            mailer.options.subject = emailSubject;
-            mailer.options.text = emailContent;
+            mailer.options.html = emailContent;
            mailer.transporter.sendMail(mailer.options, function(err:any) {
              done(err, 'done');
            });

--- a/views/DE/account/forgotPwd.pug
+++ b/views/DE/account/forgotPwd.pug
@@ -6,6 +6,7 @@ html(lang="de")
    meta(name="viewport", content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no")
    link(rel="stylesheet", type="text/css", href="/css/bootstrap.min.css")
    link(rel="stylesheet", type="text/css", href="/css/m4lab.css")
+    link(rel="stylesheet", type="text/css", href="/css/m4lab-mobile.css")
    link(rel="stylesheet", type="text/css", href="/css/custom/login.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
@@ -19,7 +20,7 @@ html(lang="de")
                    div.alert.alert-danger.alert-dismissible.fade.show #{flash.error}
                        a(class="close", href="#", data-dismiss="alert", aria-label="close") &times;
                form#forgotForm(class="form-signin", method="POST")
-                    img(src="https://transfer.hft-stuttgart.de/images/demo/m4lab_logo.jpg", class="img-responsive center-block", width="185", height="192")
+                    img(src="https://transfer.hft-stuttgart.de/img/M4_LAB_LOGO.png", class="img-responsive center-block", width="185", height="192")
                    div(class="form-row")
                        input#inputEmail(name="inputEmail", type="email", class="form-control", placeholder="E-Mail-Adresse" required)                  
                    br
@@ -32,3 +33,4 @@ html(lang="de")
    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/headfoot.js")
+    script(src="/js/mobile.js")
--- a/views/DE/account/newInformation.pug
+++ b/views/DE/account/newInformation.pug
@@ -6,6 +6,7 @@ html(lang="de")
    meta(name="viewport", content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no")
    link(rel="stylesheet", type="text/css", href="/css/bootstrap.min.css")
    link(rel="stylesheet", type="text/css", href="/css/m4lab.css")
+    link(rel="stylesheet", type="text/css", href="/css/m4lab-mobile.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")
@@ -99,6 +100,7 @@ html(lang="de")
    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/headfoot.js")
+    script(src="/js/mobile.js")
    script.
        // website URL
        function showWebsiteURL() {

--- a/views/DE/account/reset.pug
+++ b/views/DE/account/reset.pug
@@ -6,6 +6,7 @@ html(lang="de")
    meta(name="viewport", content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no")
    link(rel="stylesheet", type="text/css", href="/css/bootstrap.min.css")
    link(rel="stylesheet", type="text/css", href="/css/m4lab.css")
+    link(rel="stylesheet", type="text/css", href="/css/m4lab-mobile.css")
    link(rel="stylesheet", type="text/css", href="/css/custom/login.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
@@ -21,7 +22,7 @@ html(lang="de")
                        div.alert.alert-danger.alert-dismissible.fade.show #{ error }
                            a(class="close", href="#", data-dismiss="alert", aria-label="close") &times;
                form#forgotForm(method="POST", class="form-signin")
-                    img(src="https://transfer.hft-stuttgart.de/images/demo/m4lab_logo.jpg", class="img-responsive center-block", width="185", height="192")
+                    img(src="https://transfer.hft-stuttgart.de/img/M4_LAB_LOGO.png", class="img-responsive center-block", width="185", height="192")
                    div(class="form-row")
                        input#inputNewPwd(name="inputNewPwd", type="password", class="form-control", placeholder="Neues Passwort" required)
                        span#recommendation(class='warning')
@@ -38,3 +39,4 @@ html(lang="de")
    script(src="/js/security.js")
    script(src="/js/generalFunction.js")
    script(src="/js/headfoot.js")
+    script(src="/js/mobile.js")
\ No newline at end of file