Refactored file structure of the website to create more uniformity.

README.md

@@ -162,9 +162,10 @@ server {
         proxy_cache_bypass $http_upgrade;
     }
 }
+```
 
-
-#admin.jrtechs.net.con
+```
+#admin.jrtechs.net.conf
 server {
     listen 80;
     server_name www.admin.jrtechs.net admin.jrtechs.net;

admin/admin.js

@@ -1,16 +1,20 @@
+/**
+ * Renders the admin page contents
+ */
+
+//file IO
 const utils = require('../utils/utils.js');
-const Promise = require('promise');
+
 
 module.exports=
 {
     /**
      * Method calls the admin widgets it correct order
      *
-     * @param fileName
      * @param request
      * @return {*|Promise}
      */
-    main: function(fileName, request)
+    main: function(request)
     {
         return new Promise(function(resolve, reject)
         {
@@ -18,10 +22,10 @@ module.exports=
             {
                 utils.getPostData(request).then(function (postData)
                 {
-                    Promise.all([require("../admin/newPost.js").main(postData),
-                        require("../admin/addCategory.js").main(postData),
-                        require("../admin/editPost.js").main(postData),
-                        require("./manageDownloads.js").main(postData)])
+                    Promise.all([require("./posts/newPost.js").main(postData),
+                        require("./category/addCategory.js").main(postData),
+                        require("./posts/editPost.js").main(postData),
+                        require("./downloads/manageDownloads.js").main(postData)])
                             .then(function(content)
                     {
                         resolve(content.join(''));
@@ -33,14 +37,13 @@ module.exports=
             }
             else
             {
-                //login page
-                console.log("login page");
-                require("../admin/login.js").main(request).then(function(html)
+                require("./login/login.js").main(request).then(function(html)
                 {
                     resolve(html);
                 }).catch(function(err)
                 {
                     console.log(err);
+                    reject(err);
                 })
             }
         });

admin/analytics/analytics.js

@@ -0,0 +1,24 @@
+
+
+
+module.exports=
+    {
+        main: function(postData)
+        {
+            return new Promise(function(resolve, reject)
+            {
+                Promise.all([utils.include("./admin/addCategory.html"),
+                    printCategories(),
+                    processPost(postData)]).then(function(html)
+                {
+                    resolve("<div class=\"col-md-6\">" +
+                        html.join('') +
+                        "</div></div>");
+                }).catch(function(error)
+                {
+                    console.log("error in addCategory.js");
+                    reject(error);
+                })
+            });
+        }
+    };

admin/addCategory.html → admin/category/addCategory.html

@@ -1,8 +1,7 @@
-
 <div class="blogPost">
     <h1 class="text-center">Add Category</h1>
 
-    <form action="/admin/" method ="post" class="p-2">
+    <form action="/admin" method ="post" class="p-2">
         <div class="form-group">
             <input class="form-control" type="text" name="add_category" required>
             <label>Category</label>

admin/addCategory.js → admin/category/addCategory.js

@@ -1,8 +1,11 @@
-const utils = require('../utils/utils.js');
-const sql = require('../utils/sql');
+//file io
+const utils = require('../../utils/utils.js');
 
+//update db
+const sql = require('../../utils/sql');
+
+//parse post data
 const qs = require('querystring');
-const Promise = require('promise');
 
 
 /**
@@ -52,11 +55,11 @@ const processPost = function(postData)
 {
     return new Promise(function(resolve, reject)
     {
-        var post = qs.parse(postData);
+        const post = qs.parse(postData);
         if(post.add_category)
         {
-            var url = post.add_category.split(" ").join("-").toLowerCase();
-            var q = "insert into categories (name, url) values " +
+            const url = post.add_category.split(" ").join("-").toLowerCase();
+            const q = "insert into categories (name, url) values " +
                 "('" + post.add_category + "','" + url + "')";
             if(sql.insert(q) != 0)
             {
@@ -78,12 +81,16 @@ module.exports=
     {
         return new Promise(function(resolve, reject)
         {
-            Promise.all([utils.include("./admin/addCategory.html"), printCategories(), processPost(postData)]).then(function(html)
+            Promise.all([utils.include("./admin/addCategory.html"),
+                printCategories(),
+                processPost(postData)]).then(function(html)
             {
-                resolve("<div class=\"col-md-6\">" + html.join('') + "</div></div>");
+                resolve("<div class=\"col-md-6\">" +
+                    html.join('') +
+                    "</div></div>");
             }).catch(function(error)
             {
-                console.log("error in cat.js");
+                console.log("error in addCategory.js");
                 reject(error);
             })
         });

admin/addDownload.html → admin/downloads/addDownload.html

@@ -1,7 +1,7 @@
 <div class="blogPost">
     <h1 class="text-center">Add Download</h1>
 
-    <form action="/admin/" method ="post" class="p-2">
+    <form action="/admin" method ="post" class="p-2">
         <div class="form-group">
             <input class="form-control" type="text" name="add_download_name" required>
             <label>Download Name</label>

admin/manageDownloads.js → admin/downloads/manageDownloads.js

@@ -7,10 +7,10 @@
 
 
 //file IO
-const utils = require('../utils/utils.js');
+const utils = require('../../utils/utils.js');
 
 //updates db
-const sql = require('../utils/sql');
+const sql = require('../../utils/sql');
 
 //parses post data
 const qs = require('querystring');
@@ -109,7 +109,7 @@ const renderDownloadRow = function(download)
         "<td>" + download.name + "</td>" +
         "<td>" + download.file + "</td>" +
         "<td>" + download.download_count + "</td>" +
-        "<td><form action=\"/admin/\" method =\"post\" >\n" +
+        "<td><form action=\"/admin\" method =\"post\" >\n" +
             "    <input type=\"submit\" name=\"submit\" value=\"Delete\"\n" +
             "              class=\"btn btn-secondary\"/>\n" +
             "<input type='hidden' name='delete_download' value='" +

admin/login.html → admin/login/login.html

@@ -4,7 +4,7 @@
             <h2>Login</h2>
         </div>
 
-        <form action="/admin/" method ="post" class="p-2">
+        <form action="/admin" method ="post" class="p-2">
             <div class="form-group">
                 <label for="username1">User Name</label>
                 <input class="form-control" type="test" id="username1" name="username" placeholder="Enter username" required>

admin/login.js → admin/login/login.js

@@ -1,7 +1,18 @@
-const utils = require('../utils/utils.js');
-const Promise = require('promise');
-const sql = require('../utils/sql');
+//file io
+const utils = require('../../utils/utils.js');
 
+//update db
+const sql = require('../../utils/sql');
+
+
+/**
+ * Processes post data to see if the user has successfully
+ * logged in. If the user has logged in successfully, a session
+ * variable is set and the page is refreshed.
+ *
+ * @param request
+ * @returns {Promise}
+ */
 const processLogin = function(request)
 {
     return new Promise(function(resolve, reject)
@@ -31,12 +42,18 @@ const processLogin = function(request)
 
 module.exports=
     {
+        /**
+         * Renders the contents of the login page of the website
+         *
+         * @param request express request containing post data
+         * @returns {Promise} resolves html of login page
+         */
         main: function(request)
         {
             return new Promise(function(resolve, reject)
             {
                 Promise.all([utils.include('./admin/login.html'),
-                    require("../sidebar/sidebar.js").main(),
+                    require("../../sidebar/sidebar.js").main(),
                     processLogin(request)]).then(function(html)
                 {
                     resolve(html.join('') + "</div>");

admin/editPost.js → admin/posts/editPost.js

@@ -1,12 +1,15 @@
-/** File which renders the edit form for the posts and processes
+/**
+ * File which renders the edit form for the posts and processes
  * the post data generated by edit forms.
  *
  * @type {Promise|*}
  */
 
-const Promise = require('promise');
+//parses the post data
 const qs = require('querystring');
-const sql = require('../utils/sql');
+
+//updates db
+const sql = require('../../utils/sql');
 
 
 /**
@@ -21,7 +24,7 @@ const renderPostRow = function(post)
         "<td>" + post.name + "</td>" +
         "<td>" + post.picture_url + "</td>" +
         "<td>" + post.published + "</td>" +
-        "<td><form action=\"/admin/\" method =\"post\" >\n" +
+        "<td><form action=\"/admin\" method =\"post\" >\n" +
             "<input type=\"submit\" name=\"submit\" value=\"Edit\"\n" +
             "              class=\"btn btn-secondary\"/>\n" +
             "<input type='hidden' name='edit_post' value='" + post.post_id + "'/>"+
@@ -35,7 +38,7 @@ const renderPostRow = function(post)
  */
 const postsTable = function()
 {
-    var html = "<div class='blogPost p-2'>" +
+    const html = "<div class='blogPost p-2'>" +
         "<h1 class=\"text-center\">Posts</h1>" +
         "<div class=\"\"><table class=\"table table-striped\">" +
         "<thead class=\"thead-dark\"><tr>" +
@@ -68,6 +71,7 @@ const postsTable = function()
 
 /**
  * Displays the edit form for edit posts
+ *
  * @param post_id
  */
 const displayRenderForm = function(post_id)
@@ -76,9 +80,9 @@ const displayRenderForm = function(post_id)
     {
         sql.getPostById(post_id).then(function(post)
         {
-            var html = "<div class='blogPost'>"+
+            const html = "<div class='blogPost'>"+
                 "<h1 class=\"text-center\">Edit Post</h1>"+
-                "<form action=\"/admin/\" method =\"post\" >"+
+                "<form action=\"/admin\" method =\"post\" >"+
                 "    <div class=\"form-group\">\n" +
                 "        <input class=\"form-control\" type=\"text\" name=\"edit_cat_num\" value='" + post.category_id + "' required>\n" +
                 "        <label class=\"w3-label w3-validate\">Category Number</label>\n" +
@@ -114,6 +118,7 @@ const displayRenderForm = function(post_id)
 /**
  * Detects if the post data came from the edit form in posts table or edit post
  * in the edit post form. Based on this, this function will call one of two functions
+ *
  * @param postData
  */
 const processPost = function(postData)
@@ -156,6 +161,7 @@ module.exports=
     /**
      * Method which calls helper functions which processes post data for editing posts
      * and calls a function which displays all the posts in a table
+     *
      * @param postData
      */
     main: function(postData)

admin/newPost.html → admin/posts/newPost.html

@@ -1,7 +1,7 @@
 <div class="col-md-6 blogPost">
     <h1 class="text-center">New Post</h1>
 
-    <form action="/admin/" method ="post" class="p-2">
+    <form action="/admin" method ="post" class="p-2">
         <!-- Post category -->
         <div class="form-group">
             <input class="form-control" type="text" name="add_post_category" required>

admin/newPost.js → admin/posts/newPost.js

@@ -1,5 +1,5 @@
-const utils = require('../utils/utils.js');
-const sql = require('../utils/sql');
+const utils = require('../../utils/utils.js');
+const sql = require('../../utils/sql');
 
 const qs = require('querystring');
 const Promise = require('promise');
@@ -28,7 +28,7 @@ const processPost = function(postData)
                 "', '" + post.add_post_date + "', '" + post.add_post_name + "', '" + urls + "')";
             sql.insert(q).then(function()
             {
-                var map = require('../utils/generateSiteMap');
+                var map = require('../../utils/generateSiteMap');
                 map.main();
                 resolve("");
             }).catch(function(error)

generateSitemap

@@ -1,5 +0,0 @@
-#!/bin/bash
-#
-# 2/21/18 Jeffery Russell
-
-nodejs ./utils/generateSiteMap.js

includes/contact.js

@@ -117,7 +117,6 @@ const sendEmail = function(name, email, message)
             console.log("Message sent: " + response);
         }
 
-        // if you don't want to use this transport object anymore, uncomment following line
         transporter.close(); // shut down the connection pool, no more messages
     });
 };
@@ -139,10 +138,14 @@ const processContactPage = function(request)
         {
             const data = qs.parse(postData);
 
-            if(data.name && data.email && data["g-recaptcha-response"] && data.message)
+            if(data.name &&
+                data.email &&
+                data["g-recaptcha-response"] &&
+                data.message)
             {
 
-                verifyCapcha(sanitizer.sanitize(data["g-recaptcha-response"])).then(function(valid)
+                verifyCapcha(sanitizer.sanitize(data["g-recaptcha-response"]))
+                    .then(function(valid)
                 {
                     if(valid)
                     {

downloads/downloads.js → includes/downloads.js

@@ -3,19 +3,22 @@
  including html files easier for me programming.
  */
 
-const Promise = require('promise');
 
+//file IO
 const utils = require('../utils/utils.js');
 
+//DB query
 const sql = require('../utils/sql');
 
+
 module.exports=
     {
         /**
+         * Processes download url and sends download to user if it
+         * exists in the database.
          *
          * @param res
          * @param requestURL
-         * @param request
          * @returns {*|Promise}
          */
         main: function(res, requestURL)
@@ -32,7 +35,8 @@ module.exports=
                         console.log(result);
                         if(result.length == 1)
                         {
-                            const file = './downloads/content/' + result[0].file;
+                            const file = './blogContent/downloads/' +
+                                result[0].file;
                             res.download(file);
                         }
                         else