Merge branch 'testing' into 'prepare_prod'

Hide mobile menu in account pages

See merge request !128

functions/methods.ts

@@ -3,62 +3,64 @@ import dbconn = require('../config/dbconn')
 var methods = {
     // ===================== user db =====================
     registerNewUser: function(data:any, callback:any) {
-        dbconn.user.beginTransaction(function(err:any) { // START TRANSACTION
-            if (err) { throw err }
-            // insert profile
-            dbconn.user.query('INSERT INTO user SET ?', data.profile, function (err:any, results:any, fields:any) {
-                if (err) {
-                  return dbconn.user.rollback(function() {
-                    throw err
-                  });
-                }
-                let newUserId:number = results.insertId
-                // set password
-                var credentialData:any = {
-                    user_id: newUserId,
-                    password: data.password
-                }
-                dbconn.user.query('INSERT INTO credential SET ?', credentialData, function (err:any, results:any, fields:any) {
+	dbconn.user.getConnection(function(err:any, thisconn){
+            thisconn.beginTransaction(function(err:any) { // START TRANSACTION
+                if (err) { throw err }
+                 // insert profile
+                thisconn.query('INSERT INTO user SET ?', data.profile, function (err:any, results:any, fields:any) {
                     if (err) {
-                        return dbconn.user.rollback(function() {
-                            throw err
-                        });
+                      return thisconn.rollback(function() {
+                        throw err
+                      });
                     }
-                    // set default user-project-role
-                    var projectRoleData:any = {
-                        project_id: 1,  //M4_LAB
-                        role_id: 2,     // USER
-                        user_id: newUserId
+                    let newUserId:number = results.insertId
+                    // set password
+                    var credentialData:any = {
+                        user_id: newUserId,
+                        password: data.password
                     }
-                    dbconn.user.query('INSERT INTO user_project_role SET ?', projectRoleData, function (err:any, results:any, fields:any) {
+                    thisconn.query('INSERT INTO credential SET ?', credentialData, function (err:any, results:any, fields:any) {
                         if (err) {
-                            return dbconn.user.rollback(function() {
+                            return thisconn.rollback(function() {
                                 throw err
                             });
                         }
-                        // MLAB-129: INSERT verification token
-                        let verificationData:any = {
-                            user_id: newUserId,
-                            token: data.verificationToken
+                        // set default user-project-role
+                        var projectRoleData:any = {
+                            project_id: 1,  //M4_LAB
+                            role_id: 2,     // USER
+                            user_id: newUserId
                         }
-                        dbconn.user.query('INSERT INTO verification SET ?', verificationData, function (err:any, results:any, fields:any) {
+                        thisconn.query('INSERT INTO user_project_role SET ?', projectRoleData, function (err:any, results:any, fields:any) {
                             if (err) {
-                                return dbconn.user.rollback(function() {
+                                return thisconn.rollback(function() {
                                     throw err
                                 });
                             }
-                            // COMMIT
-                            dbconn.user.commit(function(err:any) {
+                            // MLAB-129: INSERT verification token
+                            let verificationData:any = {
+                                user_id: newUserId,
+                                token: data.verificationToken
+                            }
+                            thisconn.query('INSERT INTO verification SET ?', verificationData, function (err:any, results:any, fields:any) {
                                 if (err) {
-                                    return dbconn.user.rollback(function() {
+                                    return thisconn.rollback(function() {
                                         throw err
-                                    })
+                                    });
                                 }
+                                // COMMIT
+                                thisconn.commit(function(err:any) {
+                                    if (err) {
+                                        return thisconn.rollback(function() {
+                                            throw err
+                                        })
+                                    }
+                                })
                             })
                         })
-                    })
+                    });
                 });
-            });
+	    });
             callback(err)
         })
     },
@@ -162,27 +164,29 @@ var methods = {
         return null
     },
     verifyUserAccount: function(userData:any, callback:any) {
-        dbconn.user.beginTransaction(function(err:any) { // START TRANSACTION
-            if (err) { throw err }
-            // update user status
-            dbconn.user.query('UPDATE user SET ? WHERE id =' +userData.id, userData, function (err:any, rows:any, fields:any) {
-                if (err) {
-                    return dbconn.user.rollback(function() { throw err })
-                }
-                // delete verification token
-                dbconn.user.query('DELETE FROM verification WHERE user_id = '+userData.id, function (err:any, rows:any, fields:any) {
+	dbconn.user.getConnection(function(err:any, thisconn){
+            thisconn.beginTransaction(function(err:any) { // START TRANSACTION
+                if (err) { throw err }
+                // update user status
+                thisconn.query('UPDATE user SET ? WHERE id =' +userData.id, userData, function (err:any, rows:any, fields:any) {
                     if (err) {
-                        return dbconn.user.rollback(function() { throw err })
+                        return thisconn.rollback(function() { throw err })
                     }
-                    // COMMIT
-                    dbconn.user.commit(function(err:any) {
+                    // delete verification token
+                    thisconn.query('DELETE FROM verification WHERE user_id = '+userData.id, function (err:any, rows:any, fields:any) {
                         if (err) {
-                            return dbconn.user.rollback(function() { throw err })
+                            return thisconn.rollback(function() { throw err })
                         }
+                        // COMMIT
+                        thisconn.commit(function(err:any) {
+                            if (err) {
+                                return thisconn.rollback(function() { throw err })
+                            }
+                        })
                     })
                 })
             })
-            callback(err)
+        callback(err)
         })
     },
     /* ===== GitLab ===== */
@@ -208,4 +212,4 @@ var methods = {
     }
 };
 
-export = methods
+export = methods
\ No newline at end of file

routes/account.ts

@@ -106,10 +106,14 @@ export = function (app:any, config:any, passport:any, lang:string) {
       res.redirect('/login')
     } else {
       let loggedInUser = await getLoggedInUserData(req.user.email)
-      
-      res.render(lang+'/account/home', {
-        user: loggedInUser
-      });
+      if (!loggedInUser) {
+        console.error("user data is not found")
+        res.status(500).render(lang+'/500', { error: "Your data is not found. Please try again." })
+      } else {
+        res.render(lang+'/account/home', {
+          user: loggedInUser
+        });
+      }
     }
   });
 

views/DE/account/contact.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/Contact-Form-Clean.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
@@ -52,3 +53,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")

views/DE/account/home.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")
@@ -55,6 +56,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.
         // call verifyAccount
         function verify() {

views/DE/account/profile.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")
@@ -49,7 +50,7 @@ html(lang="de")
                         a(class="close", href="#", data-dismiss="alert", aria-label="close") ×
 
                 h3(class="pb-2") Mein Profil
-                form#profileForm(method="POST", action="/updateProfile")
+                form#profileForm(method="POST", action="/account/updateProfile")
                     div(class="form-row")
                         div(class='form-group col-md-2')
                             label(for="title") Anrede
@@ -108,3 +109,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")

views/DE/account/security.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")
     style.
         .warning {
@@ -73,6 +74,7 @@ html(lang="de")
     script(src="/js/security.js")
     script(src="/js/generalFunction.js")
     script(src="/js/headfoot.js")
+    script(src="/js/mobile.js")
     script.
         // check input fields
         'use strict';

views/DE/account/services.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")
@@ -93,4 +94,5 @@ html(lang="de")
     // 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/headfoot.js")
+    script(src="/js/headfoot.js")
\ No newline at end of file
+    script(src="/js/mobile.js")
\ No newline at end of file

views/DE/account/updateInformation.pug

@@ -130,7 +130,7 @@ html(lang="de")
                     | <p>Sie sind dabei, diese Webseite, ihr Repositorium und alle zugehörigen Ressourcen, inklusive aller Inhalte, Bilder etc. endgültig zu löschen.</p>
                     | <p>Sobald eine Webseite endgültig gelöscht ist, kann sie nicht wiederhergestellt werden. <strong>Diese Aktion kann nicht rückgängig gemacht werden.</strong></p>
                 div(class="modal-footer")
-                    form(method="POST", action="/deleteProject?_method=DELETE", encType="multipart/form-data")
+                    form(method="POST", action="/account/deleteProject?_method=DELETE", encType="multipart/form-data")
                         input(name="id", value=information.id, type="hidden")
                         button(type="button" class="btn btn-primary mx-2" data-dismiss="modal") Abbrechen, Webseite behalten
                         button(type="submit" class="btn btn-danger") Ja, Webseite löschen