async/await

routes/project.ts

 //const SamlStrategy = require('passport-saml').Strategy
-import async from 'async'
 import methods from '../functions/methods'
 import gitlab from '../functions/gitlab'
 import helpers from '../functions/helpers'
@@ -12,27 +11,19 @@ module.exports = function (app:any, lang:string) {
     res.render(lang+'/project/project-simplified')
   })
 
-  app.get('/mailinglists', function (req:any, res:any) {
-    async.waterfall([
-      function(done:any) {
-        methods.getAllMailinglists(function(mailinglistOverview:any, err:any) {
-          if (!err) {
-            done(err, mailinglistOverview)
-          }
-        })
-      },
-      // create JSON object of mailinglists for front-end
-      function(mailinglistOverview:any) {
-        var allMailingLists = []  // JSON object
-        for (let i = 0; i < mailinglistOverview.length; i++) {
+  app.get('/mailinglists', async function (req:any, res:any) {
+    let mailList = await methods.getAllMailinglists()
+    if (mailList) {
+      let allMailingLists = []  // JSON object
+      for (let i = 0; i < mailList.length; i++) {
         // add data to JSON object
         allMailingLists.push({
-            id: mailinglistOverview[i].id,
-            name: mailinglistOverview[i].name,
-            src: mailinglistOverview[i].src,
-            projectstatus: mailinglistOverview[i].projectstatus,
-            project_title: mailinglistOverview[i].project_title,
-            keywords: mailinglistOverview[i].keywords
+          id: mailList[i].id,
+          name: mailList[i].name,
+          src: mailList[i].src,
+          projectstatus: mailList[i].projectstatus,
+          project_title: mailList[i].project_title,
+          keywords: mailList[i].keywords
         });
       }
 
@@ -41,29 +32,18 @@ module.exports = function (app:any, lang:string) {
         //user: req.user,
         mailinglists: allMailingLists
       });
-      }
-    ])
-  })
-
-  app.get('/projectoverview', function(req:any, res:any){
-    async.waterfall([
-      function(done:any) {
-        methods.getProjectOverviewById(req.query.projectID, function(projectOverview:any, err:any) {
-          if (!err) {
-            done(err, projectOverview)
-          }
+    } else {
+      res.render(lang+'/project/mailinglists', {
+        //isUserAuthenticated: req.isAuthenticated(),
+        //user: req.user,
+        mailinglists: null
       })
-      },
-      function(projectOverview:any, done:any){
-        methods.getProjectImagesById(req.query.projectID, function(projectImages:any, err:any) {
-          if (!err) {
-            done(err, projectImages, projectOverview)
     }
   })
-      },
-      // render projectOverview page
-      function(projectImages:any, projectOverview:any) {
-        //console.log(projectImages)
+
+  app.get('/projectoverview', async function(req:any, res:any){
+    let projectOverview = await methods.getProjectOverviewById(req.query.projectID)
+    if (projectOverview.length > 0) {
       let partnerWebsites = helpers.stringToArray(projectOverview[0].partner_website)
       let partnerNames = helpers.stringToArray(projectOverview[0].partner_name)
       let awardSites = helpers.stringToArray(projectOverview[0].award_website)
@@ -72,6 +52,7 @@ module.exports = function (app:any, lang:string) {
       let sponsorImgs = helpers.stringToArray(projectOverview[0].sponsor_img)
       let sponsorNames = helpers.stringToArray(projectOverview[0].sponsor_name)
 
+      let projectImages = await methods.getProjectImagesById(req.query.projectID)
       res.render(lang+'/project/projectOverview', {
         //isUserAuthenticated: req.isAuthenticated(),
         //user: req.user,
@@ -85,8 +66,9 @@ module.exports = function (app:any, lang:string) {
         sponsorIMG: sponsorImgs,
         sponsorN: sponsorNames
       });
+    } else {
+      res.redirect('/')
     }
-    ])
   })
 
   // Projektdaten