Updated the homepage to use better async methods for performance.

img/image.js

@@ -10,7 +10,10 @@ module.exports=
         main: function(result, fileName)
         {
             result.contentType = 'image/png';
-            utils.include(result, "." + fileName);
-            result.end();
+            utils.include("." + fileName).then(function(content)
+            {
+                result.write(content);
+                result.end();
+            });
         }
     };

includes/includes.js

@@ -18,30 +18,28 @@ module.exports =
      * @param result
      * @return {*} a promise retrieved from the utils.include function
      */
-    printHeader: function(result)
+    printHeader: function()
     {
-        result.writeHead(200, {'Content-Type': 'text/html'});
-        return utils.include(result, HEADER_FILE);
+        // utils.getFileContents(HEADER_FILE);
+        return utils.include(HEADER_FILE);
     },
+
+
     /**
      * Appends the footer to the result object
      *
-     * @param result
      * @return {*|Promise}
      */
-    printFooter: function(result)
+    printFooter: function()
     {
-        return new Promise(function(resolve, reject)
-        {
-            utils.include(result, FOOTER_FILE).then(function()
-            {
-                result.end();
-                resolve();
-            })
-
-        })
+        return utils.include(FOOTER_FILE);
+        // return new Promise(function(resolve, reject)
+        // {
+        //     resolve(utils.getFileContents(FOOTER_FILE));
+        // })
     },
 
+
     /**Sends a css file to the user
      *
      * @param result
@@ -51,7 +49,14 @@ module.exports =
     sendCSS: function(result, path)
     {
         result.writeHead(200, {'Content-Type': 'text/css'});
-        utils.include(result, "./" + path);
-        result.end();
+        utils.include("./" + path).then(function(content)
+        {
+            result.write(content);
+            result.end();
+        }).catch(function(error)
+        {
+            console.log(error);
+        });
+
     }
 };

posts/homePage.js

@@ -11,21 +11,22 @@ const postRenderer = require('../posts/singlePost.js');
  * @param result
  * @returns {*|Promise}
  */
-var renderRecentPosts = function(result)
+var renderRecentPosts = function()
 {
     return new Promise(function(resolve, reject)
     {
+        console.log("recent post render page");
         sql.getRecentPostSQL().then(function(posts)
         {
             var postPromises = [];
-            result.write("<div class='col-md-8'>");
+            var content = "<div class='col-md-8'>";
             posts.forEach(function(post)
             {
                 postPromises.push(new Promise(function(res, rej)
                 {
-                    postRenderer.renderPreview(result, post).then(function()
+                    postRenderer.renderPreview(post).then(function(cont)
                     {
-                        res();
+                        res(cont);
                     }).catch(function(error)
                     {
                         rej(error);
@@ -33,17 +34,16 @@ var renderRecentPosts = function(result)
                 }));
             });
 
-            Promise.all(postPromises).then(function()
+            Promise.all(postPromises).then(function(cont)
             {
-                result.write("</div>");
-                resolve();
+                content = content + cont.join('') + "</div>";
+                resolve(content);
             }).catch(function(error)
             {
                 reject(error);
             })
         }).catch(function(error)
         {
-            console.log(error);
             reject(error);
         })
     });
@@ -57,22 +57,32 @@ module.exports=
          * @param res
          * @param fileName request url
          */
-        main: function(result, requestURL, request)
+        main: function(requestURL, request)
         {
             return new Promise(function(resolve, reject)
             {
+                // renderRecentPosts().then(function()
+                // {
+                //     return require("../sidebar/sidebar.js").main();
+                // }).then(function()
+                // {
+                //     resolve();
+                // }).catch(function(error)
+                // {
+                //     console.log(error);
+                //     reject(error);
+                // })
 
-                renderRecentPosts(result).then(function()
-                {
-                    return require("../sidebar/sidebar.js").main(result);
-                }).then(function()
+
+                console.log("home page");
+                Promise.all([renderRecentPosts(), require("../sidebar/sidebar.js").main()]).then(function(content)
                 {
-                    resolve();
+                    console.log("fin posts");
+                    resolve(content.join(''));
                 }).catch(function(error)
                 {
-                    console.log(error);
                     reject(error);
-                })
+                });
             })
         }
     };

posts/singlePost.js

@@ -36,7 +36,7 @@ module.exports=
      * @param res
      * @param post
      */
-    renderPreview: function(res, post)
+    renderPreview: function(post)
     {
        return new Promise(function(resolve, reject)
        {
@@ -88,9 +88,8 @@ module.exports=
                        "      </div>\n";
 
                    html += "</div></div></div><br><br>";
-                   res.write(html);
 
-                   resolve()
+                   resolve(html)
                }).catch(function(error)
                {
                    console.log(error);
@@ -100,7 +99,6 @@ module.exports=
            catch(ex)
            {
                reject(ex);
-               console.log(ex);
            }
        });
     },
@@ -112,7 +110,7 @@ module.exports=
      * @param post sql data about the blog post
      * @return {*|Promise}
      */
-    renderPost: function(res, post)
+    renderPost: function(post)
     {
         return new Promise(function (resolve, reject)
         {
@@ -148,14 +146,12 @@ module.exports=
                     html += "</div></div></div><br><br>";
 
 
-                    res.write(html);
-                    resolve()
+                    resolve(html);
                 });
             }
             catch(ex)
             {
-                //console.log(ex);
-                //utils.include(res, "includes/404.html");
+                reject(ex);
             }
         });
     }

server.js

@@ -9,22 +9,22 @@ const http = require('http');
 
 const url = require('url');
 
-var express = require("express");
+const express = require("express");
 
-var session = require('express-session');
+const session = require('express-session');
 
 const includes = require('./includes/includes.js');
 
 const utils = require('./utils/utils.js');
 
-var map = require('./utils/generateSiteMap.js');
+const map = require('./utils/generateSiteMap.js');
 map.main();
 
-var app = express();
+const app = express();
 
 app.use(session({ secret: utils.getFileLine('../session_secret'), cookie: { maxAge: 6000000 }}));
 
-var port = 8000;
+const port = 8000;
 
 
 /**
@@ -76,16 +76,31 @@ app.use(function(request, res)
                     file = "./posts/posts.js";
             }
 
-            includes.printHeader(res).then(function()
+            // includes.printHeader(res).then(function()
+            // {
+            //     return require(file).main(res, filename, request);
+            // }).then(function()
+            // {
+            //     return includes.printFooter(res);
+            // }).catch(function(err)
+            // {
+            //     console.log(err);
+            // })
+
+            res.writeHead(200, {'Content-Type': 'text/html'});
+
+            Promise.all([includes.printHeader(),
+                require(file).main(filename, request),
+                includes.printFooter()]).then(function(content)
             {
-                return require(file).main(res, filename, request);
-            }).then(function()
-            {
-                return includes.printFooter(res);
+                console.log("main fin");
+                res.write(content.join(''));
+                res.end();
             }).catch(function(err)
             {
                 console.log(err);
-            })
+            });
+
         }
     }
     else

sidebar/categoriesSideBar.js

@@ -10,33 +10,30 @@ module.exports=
          * @param res
          * @return {*|Promise}
          */
-        main: function(res)
+        main: function()
         {
             return new Promise(function(resolve, reject)
             {
-                res.write("<br><br><div class=\"container\">");
+                var content = "<br><br><div class=\"container\">";
 
-                //res.write("<div class=\"w3-container w3-padding w3-gray\"><h4>Categories</h4></div>");
+                content += "<div class=\"list-group\">";
 
-                //res.write("<div class=\"container\"><h4 class=\"align-content-center\">Categories</h4></div>");
-
-                //res.write("<div class=\"w3-bar-block w3-white\">");
-                res.write("<div class=\"list-group\">");
-
-                res.write("  <a href=\"#\" class=\"list-group-item list-group-item-action flex-column align-items-start active\">\n" +
+                content += "  <a href=\"#\" class=\"list-group-item list-group-item-action flex-column align-items-start active\">\n" +
                     "      <h5 class=\"mb-1\">Categories</h5>\n" +
-                    "  </a>");
+                    "  </a>";
 
                 sql.getCategories().then(function(categories)
                 {
                     categories.forEach(function(cat)
                     {
-                        //res.write(cat.name);
-                        res.write("<a class=\"list-group-item\" href='/category/" + cat.url + "'>" + cat.name + "<br></a>");
+                        content += "<a class=\"list-group-item\" href='/category/" + cat.url + "'>" + cat.name + "<br></a>";
                     });
-                    res.write("</div></div><br>");
-                    resolve();
-                })
+                    content += "</div></div><br>";
+                    resolve(content);
+                }).catch(function(error)
+                {
+                    reject(error);
+                });
             });
         }
     };

sidebar/recentPosts.js

@@ -5,35 +5,38 @@ module.exports=
     {
         /** Renders the the recent post sidebar.
          *
-         * @param res
          * @returns {*|Promise}
          */
-        main: function(res)
+        main: function()
         {
             return new Promise(function(resolve, reject)
             {
 
-                res.write("<div class=\"container\">");
+                console.log("recent page");
 
-                // res.write("<div class=\"\">" +
-                //     "<h4 class=\"text-center\">Recent Posts</h4></div>");
 
-                res.write("<div class=\"list-group\">");
+                var content = "<div class=\"container\">";
 
-                res.write("  <a href=\"#\" class=\"list-group-item list-group-item-action flex-column align-items-start active\">\n" +
+
+                content +="<div class=\"list-group\">";
+
+                content +="  <a href=\"#\" class=\"list-group-item list-group-item-action flex-column align-items-start active\">\n" +
                     "      <h5 class=\"mb-1\">Recent Posts</h5>\n" +
-                    "  </a>");
+                    "  </a>";
 
                 sql.getRecentPosts().then(function(posts)
                 {
                     posts.forEach(function(p)
                     {
                         var url = '/' +  p.category + '/' + p.url;
-                        res.write("<a class=\"list-group-item\" href='"
-                            + url + "'>" + p.name + "<br></a>");
+                        content += "<a class=\"list-group-item\" href='"
+                            + url + "'>" + p.name + "<br></a>";
                     });
-                    res.write("</div></div>");
-                    resolve();
+                    content +="</div></div>";
+                    resolve(content);
+                }).catch(function(error)
+                {
+                    reject(error);
                 })
             });
         }

sidebar/sidebar.js

@@ -1,5 +1,5 @@
 const utils = require('../utils/utils.js');
-var Promise = require('promise');
+const Promise = require('promise');
 
 module.exports=
     {
@@ -9,28 +9,40 @@ module.exports=
          * @param res
          * @returns {*|Promise}
          */
-        main: function(res)
+        main: function()
         {
             return new Promise(function(resolve, reject)
             {
-                res.write("<div class=\"col-md-4\">");
+                console.log("sidebar  page");
 
-                utils.include(res,"sidebar/sidebar.html").then(function()
-                {
-                    return require("../sidebar/recentPosts.js").main(res);
-                }).then(function()
-                {
-                    return require("../sidebar/categoriesSideBar.js")
-                        .main(res);
-                }).then(function()
+                // res.write("<div class=\"col-md-4\">");
+                //
+                // utils.include(res,"sidebar/sidebar.html").then(function()
+                // {
+                //     return require("../sidebar/recentPosts.js").main(res);
+                // }).then(function()
+                // {
+                //     return require("../sidebar/categoriesSideBar.js")
+                //         .main(res);
+                // }).then(function()
+                // {
+                //     res.write("</div>");
+                //     resolve();
+                // }).catch(function(err)
+                // {
+                //     console.log("hit error");
+                //     console.log(err);
+                // })
+
+                Promise.all([utils.include("sidebar/sidebar.html"),
+                    require("../sidebar/recentPosts.js").main(),
+                    require("../sidebar/categoriesSideBar.js").main()]).then(function(content)
                 {
-                    res.write("</div>");
-                    resolve();
-                }).catch(function(err)
+                    resolve("<div class=\"col-md-4\">" + content.join('') + "</div>");
+                }).catch(function(error)
                 {
-                    console.log("hit error");
-                    console.log(err);
-                })
+                    reject(error);
+                });
             })
         }
     };

utils/utils.js

@@ -13,22 +13,22 @@ module.exports=
      * A function similar to the include statement in PHP
      * This function writes a file to the output
      *
-     * @param result the result that is sent to the user from node
      * @param fileName the file to append to the result
      */
-    include: function(result, fileName)
+    include: function(fileName)
     {
         return new Promise(function(resolve, reject)
         {
             try
             {
-                result.write(fs.readFileSync(fileName));
+                resolve(fs.readFileSync(fileName));
+
             }
             catch (e)
             {
                 console.log("Could not find " + fileName);
+                resolve("");
             }
-            resolve();
         });
     },