Merge pull request #110 from jrtechs/sql-refactor

SQL Refactor

.gitignore

@@ -1,4 +1,7 @@
 *.iml
 .idea
+.vscode
 node_modules
 package-lock.json
+sitemap.txt
+blog.db

Dockerfile

@@ -5,17 +5,17 @@ FROM node:buster-slim
 WORKDIR /src/
 
 
-# installs node dependencies
-
-ADD package.json package.json
-RUN npm install
-
 # installs pandoc for markdown to html
 # need git so admin page can pull blog updates
 RUN apt-get update && \
+    apt-get install sqlite3 -y && \
     apt-get install pandoc -y && \
     apt-get install git -y
 
+# installs node dependencies
+ADD package.json package.json
+RUN npm install
+
 # exposes port application runs on
 EXPOSE 8000
 

admin/admin.js

@@ -1,80 +0,0 @@
-/**
- * Determines what template and controls that will be
- * displayed based on the url such as
- *  /
- *  /blog
- *  /downloads
- *
- *  For each controls it calls that "pages" associated javascript file
- *  which fetches the template, deals with post data and gathers context
- *  for the template engine.
- */
-
-//file IO
-const utils = require('../utils/utils.js');
-
-
-module.exports=
-{
-    /**
-     *
-     * @param request -- used to get post data
-     * @param clientAddress -- used to see if user is banned for login
-     * @param templateContext -- used by whiskers for information to plug
-     * in the template
-     * @param filename -- specific admin page requested
-     * @returns {Promise} resolves once everything has been added to the template context
-     */
-    main: function(request, clientAddress, templateContext, filename)
-    {
-        return new Promise(function(resolve, reject)
-        {
-            //if logged in
-            if(request.session && request.session.user)
-            {
-                templateContext.loggedIn = true;
-                utils.getPostData(request).then(function (postData)
-                {
-                    var page = "./adminHome.js";
-                    if(filename.includes('/downloads'))
-                    {
-                        page = "./adminDownloads.js";
-                    }
-                    else if(filename.includes("/posts"))
-                    {
-                        page = "./posts.js";
-                    }
-                    else if(filename.includes("/users"))
-                    {
-                        page = "./users.js";
-                    }
-                    else if(filename.includes("/analytics"))
-                    {
-                        page = "./analytics.js"
-                    }
-
-                    require(page).main(postData, templateContext).then(function(template)
-                    {
-                        templateContext.adminPage = template;
-                        resolve();
-                    }).catch(function(error)
-                    {
-                        console.log(error);
-                    });
-                });
-            }
-            else
-            {
-                require("./login.js").main(request, clientAddress, templateContext)
-                    .then(function()
-                {
-                    resolve();
-                }).catch(function(err)
-                {
-                    console.log(err);
-                    reject(err);
-                })
-            }
-        });
-    }
-};

admin/analytics.js

@@ -1,71 +0,0 @@
-
-/** Whiskers template file */
-const TEMPLATE_FILE = "admin/analytics.html";
-
-
-const includes = require('../includes/includes.js');
-
-//updates db
-const sql = require('../utils/sql');
-
-
-const generateData = function(templateContext)
-{
-    return new Promise(function(resolve, reject)
-    {
-        var data = [];
-
-        sql.getTraffic().then(function(traffic)
-        {
-            var start = traffic[0].date;
-            var currentMonth = new Date(start.getUTCFullYear(), start.getMonth(), 1, 0,0,0);
-            templateContext.start = JSON.stringify(currentMonth);
-            var monthCount = 0;
-            for(var i = 0; i < traffic.length; i++)
-            {
-                var currentDate = traffic[i].date;
-
-                if(currentMonth.getMonth() != currentDate.getMonth())
-                {
-                    var foo = new Object();
-                    foo.x = currentMonth;
-                    foo.y = monthCount;
-                    data.push(foo);
-                    monthCount = 0;
-                    currentMonth = new Date(currentDate.getUTCFullYear(), currentDate.getMonth(), 1, 0,0,0);
-                }
-                monthCount = monthCount + 1;
-            }
-            templateContext.finish = JSON.stringify(currentMonth);
-            templateContext.dataset = JSON.stringify(data);
-            resolve();
-        });
-    });
-};
-
-
-module.exports=
-    {
-        /**
-         * Fetches context information for the admin blog page and handles post
-         * data sent regarding editing blog.
-         *
-         * @param templateContext json object used as the template context
-         * @returns {Promise} renders the template used for this page
-         */
-        main: function(templateContext)
-        {
-            return new Promise(function(resolve, reject)
-            {
-                Promise.all([includes.fetchTemplate(TEMPLATE_FILE), generateData(templateContext)]).then(function(template)
-                {
-                    templateContext.adminPage = template[0];
-                    resolve();
-                }).catch(function(error)
-                {
-                    console.log("error in add admin blog.js");
-                    reject(error);
-                });
-            });
-        }
-    };

admin/posts.js

@@ -32,7 +32,7 @@ const processPostData = function(postData, renderContext)
             renderContext.editPost = true;
             sql.getPostById(postParsed.edit_post).then(function(post)
             {
-                post.published = post.published.toISOString().split('T')[0];
+                post.published = new Date(post.published).toDateString();
                 renderContext.post = post;
                 resolve();
             });

blog/renderBlogPost.js

@@ -47,8 +47,7 @@ module.exports=
         {
             if(post.picture_url !== "n/a")
                 post.hasPicture = true;
-
-            post.published = post.published.toDateString();
+            post.published = new Date(post.published).toDateString();
             return;
         },
 
@@ -91,11 +90,11 @@ module.exports=
         {
             return new Promise(function(resolve, reject)
             {
-                const pathName =  "blogContent/posts/" + categoryURL + "/"
+                const pathName =  "content/posts/" + categoryURL + "/"
                     + postURL + ".md";
                 var markDown = utils.getFileContents(pathName).toString();
 
-                markDown = markDown.split("(media/").join("(" + "../blogContent/posts/"
+                markDown = markDown.split("(media/").join("(" + "../content/posts/"
                     + categoryURL + "/media/");
 
                 module.exports.convertToHTML(markDown, blocks).then(function(result)
@@ -142,7 +141,7 @@ module.exports=
                     var regExp = /\<customHTML .*?>/;
                     while (result.search(regExp) != -1)
                     {
-                        const pathName =  "blogContent/posts/" + categoryURL + "/html/"
+                        const pathName =  "content/posts/" + categoryURL + "/html/"
                             + postURL + ".html";
 
                         var htmlContent = utils.getFileContents(pathName).toString();

blogContent/posts/data-science/html/gans-in-pytorch.html

@@ -1 +0,0 @@
-<embed src="https://jrtechs.net/blogContent/posts/data-science/html/CV_Final_Project_Final.pdf" type="application/pdf" width="100%" height="500px">

blogContent/posts/open-source/html/teaching-ssh-through-a-ctf.html

@@ -1 +0,0 @@
-<embed src="https://jrtechs.net/blogContent/posts/open-source/html/everything-ssh.pdf" type="application/pdf" width="100%" height="500px">

config.json

@@ -1,16 +1,6 @@
 {
   "PORT": 8000,
-
-  "SESSION_SECRET": "random-data-to-seed-session-data",
-
-  "SQL_HOST": "localhost",
-  "SQL_DATABASE": "jrtechs_blog",
-  "SQL_USER": "root",
-  "SQL_PASSWORD": "password",
-
-
-  "CAPTCHA_SECRET": "captcha-secret",
-  "GMAIL_ACCOUNT": "email@gmail.com",
-  "EMAIL_PASSWORD": "email-password",
-  "DESTINATION_EMAIL": "destination email address"
+  "CACHE": false,
+  "ADMIN_CHECK": true,
+  "SESSION_SECRET": "random-data-to-seed-session-data"
 }