Got blog posts working with the routes system.

blog/category.js

@@ -26,7 +26,7 @@ module.exports=
                 sql.getPostsFromCategory(category).then(function(posts)
                 {
                     Promise.all([blogBodyRenderer.renderBatchOfPosts(requestURL, posts, page, 5, templateContext),
-                        require('./renderNextBar').main(requestURL, page, 5, posts.length, templateContext)]).then(function()
+                        require('./renderNextBar').main("/category" + request.url, page, 5, posts.length, templateContext)]).then(function()
                     {
                         resolve();
                     });

blog/renderBlogPost.js

@@ -255,4 +255,4 @@ module.exports=
                 });
             });
         }
-    }
+    };

routes/index.js

@@ -25,23 +25,22 @@ routes.use('/includes', includes);
 const category = require('./category');
 routes.use('/category', category);
 
-
+const pageBuilder = require('../utils/pageBuilder');
 
 const projects = ["/steam/"];
 
 
-
-
+//blog home page
 routes.get('/', (request, result) =>
 {
-    //blog home page
+    pageBuilder.buildBlogPage(request, result, require("../blog/homePage").main)
 });
 
-
+//regular blog posts
 routes.get('*', (request, result) =>
 {
-    console.log("Un registered event.")
+    pageBuilder.buildBlogPage(request, result,
+        require("../blog/posts").main, request.url);
 });
 
-
 module.exports = routes;

sites/blog.js

@@ -1,108 +0,0 @@
-//used to append static content to result
-const includes = require('../includes/includes.js');
-
-//used to append static content to result
-const contentLoader = require('../includes/staticContentServer.js');
-
-const whiskers = require('whiskers');
-
-const TEMPLATE_FILE="blog/blogMain.html";
-
-
-const PAGINATION_TEMPLATE_KEY = "paginationTemplate";
-const PAGINATION_TEMPLATE_FILE = "blog/paginationBar.html";
-
-
-//caching program to make the application run faster
-const cache = require('memory-cache');
-
-//file io
-const utils = require('../utils/utils.js');
-
-/**
- * @author Jeffery Russell 11-3-18
- *
- * @type {{main: (function(*=, *): Promise)}}
- */
-module.exports=
-    {
-        /**
-         * Calls posts and sidebar modules to render blog contents in order
-         *
-         * @param requestURL
-         * @returns {Promise|*}
-         */
-        main: function(request, result, filename)
-        {
-
-            var page = request.query.page;
-            if(typeof page == "undefined")
-                page = 1;
-            page = Number(page);
-
-            const html = cache.get(filename + "?page=" + page);
-
-            result.writeHead(200, {'Content-Type': 'text/html'});
-            if (html == null)
-            {
-                var file = "";
-
-                if (filename === '' || filename === '/')
-                {
-                    file = "../blog/homePage.js";
-                }
-                else
-                {
-                    var urlSplit = filename.split("/");
-
-                    if (urlSplit.length >= 2 && urlSplit[1] === 'category') //single category page
-                        file = "../blog/category.js";
-                    else
-                    {
-                        file = "../blog/posts.js";
-                        page = 1; // all blog are single page, everyone must be one to ensure
-                        // cache is not tricked into storing same blog post a ton of times
-                    }
-                }
-
-                var templateContext = Object();
-                Promise.all([includes.fetchTemplate(TEMPLATE_FILE),
-                    utils.includeInObject(PAGINATION_TEMPLATE_KEY, templateContext, "templates/" + PAGINATION_TEMPLATE_FILE),
-                    includes.printHeader(templateContext),
-                    includes.printFooter(templateContext),
-                    require(file).main(filename, request, templateContext),
-                    require("../blog/sidebar.js").main(templateContext)])
-                        .then(function (content)
-                {
-                    const html = whiskers.render(content[0], templateContext);
-                    result.write(html);
-                    result.end();
-                    cache.put(filename + "?page=" + page, html);
-                }).catch(function (err)
-                {
-                    console.log(err);
-                    cache.del(filename + "?page=" + page);
-                    utils.print404().then(function(content)
-                    {
-                        result.write(content);
-                        result.end();
-                    })
-                });
-            }
-            else
-            {
-                result.write(html);
-                result.end();
-            }
-
-        },
-
-        /**
-         * Clears the memory cache.
-         */
-        clearCache: function()
-        {
-            console.log("Blog cache cleared");
-            cache.clear();
-        }
-    };

utils/pageBuilder.js

@@ -128,40 +128,18 @@ module.exports =
         },
 
 
-        buildBlogPage: function(request, result, templateFiller)
+        buildBlogPageWithURL: function(request, result, templateFiller, filename)
         {
             var page = request.query.page;
             if(typeof page == "undefined")
                 page = 1;
             page = Number(page);
 
-            var filename = url.parse(request.url, true).pathname;
-
             const html = cache.get(filename + "?page=" + page);
 
             result.writeHead(200, {'Content-Type': 'text/html'});
             if (html == null)
             {
-                // var file = "";
-                //
-                // if (filename === '' || filename === '/')
-                // {
-                //     file = "../blog/homePage.js";
-                // }
-                // else
-                // {
-                //     var urlSplit = filename.split("/");
-                //
-                //     if (urlSplit.length >= 2 && urlSplit[1] === 'category') //single category page
-                //         file = "../blog/category.js";
-                //     else
-                //     {
-                //         file = "../blog/posts.js";
-                //         page = 1; // all blog are single page, everyone must be one to ensure
-                //         // cache is not tricked into storing same blog post a ton of times
-                //     }
-                // }
-
                 var templateContext = Object();
                 Promise.all([includes.fetchTemplate(TEMPLATE_FILE),
                     includes.includeInObject(PAGINATION_TEMPLATE_KEY, templateContext, "templates/" + PAGINATION_TEMPLATE_FILE),
@@ -177,13 +155,13 @@ module.exports =
                         result.end();
                         cache.put(filename + "?page=" + page, html);
                     }).catch(function (err)
-                    {
-                        console.log("dewie");
-                        console.log(err);
-                        cache.del(filename + "?page=" + page);
+                {
+                    console.log("dewie");
+                    console.log(err);
+                    cache.del(filename + "?page=" + page);
 
-                        module.exports.print404(result)
-                    });
+                    module.exports.print404(result)
+                });
             }
             else
             {
@@ -192,6 +170,12 @@ module.exports =
             }
         },
 
+        buildBlogPage: function(request, result, templateFiller)
+        {
+            var filename = url.parse(request.url, true).pathname;
+            module.exports.buildBlogPageWithURL(request, result,templateFiller, filename);
+        },
+
         /**
          * Clears the memory cache.
          */