Finalized changes for initial test deployment

README.md

@@ -54,4 +54,5 @@ npm install markdown
 npm install markdown-to-html -g
 npm install highlight
 npm install crypto
+npm i express-force-ssl
 ```

includes/footer.html

@@ -18,10 +18,10 @@
 
         </div>
     </div>
-    <div class="w3-center">Copyright &copy; Jrtechs.net 2018</div>
+    <div class="w3-center">Copyright &copy; <a href="https://jrtechs.net">Jrtechs.net</a> 2018</div>
 </footer>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.9.1/highlight.min.js"></script>
-<script>hljs.initHighlightingOnLoad(); console.log("yikes");</script>
+<script>hljs.initHighlightingOnLoad();</script>
 
 </body>
 

posts/category.js

@@ -16,8 +16,6 @@ var renderPosts = function(result, resultURL)
             sql.getPostsFromCategory(splitURL[2]).then(function(posts)
             {
                 var promises = [];
-                console.log(posts);
-                console.log("^^^^");
                 posts.forEach(function(p)
                 {
                     promises.push(new Promise(function(res, rej)

posts/singlePost.js

@@ -4,6 +4,8 @@ var Promise = require('promise');
 
 var markdown = require( "markdown" ).markdown;
 
+const sql = require('../utils/sql');
+
 
 module.exports=
 {
@@ -20,7 +22,10 @@ module.exports=
         {
             res.write("<div class=\"w3-card-4 w3-margin w3-white\">");
             //image
-            res.write("<img src=\"https://www.w3schools.com/w3images/woods.jpg\" alt=\"Nature\" style=\"width:100%\">");
+            if(!(post.picture_url ==="n/a"))
+            {
+                res.write("<img src=\"/img/posts/" + post.picture_url + "\" alt=\"Nature\" style=\"width:100%\">");
+            }
 
             res.write("<div class=\"w3-container\">");
             //title
@@ -31,23 +36,29 @@ module.exports=
 
             res.write("<div class=\"w3-container\">");
 
-            var pathName =  "entries/" + post.url + ".md";
             try
             {
-                var html = markdown.toHTML(utils.getFileContents(pathName).toString());
+                sql.getCategory(post.category_id).then(function(category)
+                {
+                    var pathName =  "entries/" + category.url + "/" + post.url + ".md";
 
-                html = html.split("<code>").join("<pre><code>");
-                html = html.split("</code>").join("</code></pre>");
-                res.write(html);
+                    var html = markdown.toHTML(utils.getFileContents(pathName).toString());
+
+                    html = html.split("<code>").join("<pre><code>");
+                    html = html.split("</code>").join("</code></pre>");
+                    html = html.split("\\`\\`\\`").join("```");
+                    html = html.split("![](media/").join("![](" + "entries/" + category.url + "/media/");
+                    res.write(html);
+
+                    res.write("</div></div>");
+                    resolve()
+                });
             }
             catch(ex)
             {
                 //console.log(ex);
                 //utils.include(res, "includes/404.html");
             }
-
-            res.write("</div></div>");
-            resolve()
         });
     }
 };

server.js

@@ -7,6 +7,8 @@
 
 const http = require('http');
 
+var https = require('https');
+
 const url = require('url');
 
 var express = require("express");
@@ -15,8 +17,23 @@ var session = require('express-session');
 
 const includes = require('./includes/includes.js');
 
+var forceSsl = require('express-force-ssl');
+
 var app = express();
 
+var fs = require('fs');
+
+//var key = fs.readFileSync('private.key');
+//var cert = fs.readFileSync( 'primary.crt' );
+//var ca = fs.readFileSync( 'encryption/intermediate.crt' );
+
+// var options = {
+//     key: key,
+//     cert: cert,
+//     ca: ca
+// };
+
+//the secret is different on production
 app.use(session({ secret: 'keyboard cat', cookie: { maxAge: 6000000 }}));
 
 app.use(function(request, res)
@@ -25,7 +42,7 @@ app.use(function(request, res)
     var filename = q.pathname;
 
     //handles image requests
-    if(filename.includes("/img/"))
+    if(filename.includes("/img/") || filename.includes(".jpg"))
     {
         require("./img/image.js").main(res, filename);
     }
@@ -38,7 +55,7 @@ app.use(function(request, res)
         var file = "";
 
         if(filename === '' || filename === '/')
-            filename = '/category/Java';
+            filename = '/category/projects';
 
         var urlSplit = filename.split("/");
 
@@ -62,7 +79,10 @@ app.use(function(request, res)
             //console.log("fin"); //for debugging
         })
     }
-
 });
 
-http.createServer(app).listen(8080);
+//https.createServer(options, app).listen(443);
+
+http.createServer(app).listen(80);
+
+//app.use(forceSsl);

utils/sql.js

@@ -11,7 +11,7 @@ const qs = require('querystring');
 const con = mysql.createConnection({
     host: "localhost",
     user: "blog_user",
-    password: "password",
+    password: "password", //definitely not the password on production
     database: "blog_name"
 });
 
@@ -31,7 +31,7 @@ var fetch = function(sqlStatement)
     {
         con.query(sqlStatement, function (err, result)
         {
-            if (err)
+            if(err)
             {
                 reject();
             }
@@ -130,13 +130,11 @@ module.exports=
         return new Promise(function(resolve, reject)
         {
             var q = "select * from categories where name ='" + requestURL + "' limit 1";
-            console.log(q);
             fetch(q).then(function(categories)
             {
                 if(categories.length != 0)
                 {
                     var qPosts = "select * from posts where category_id='" + categories[0].category_id + "'";
-                    console.log(qPosts);
                     resolve(fetch(qPosts));
                 }
                 else
@@ -251,5 +249,10 @@ module.exports=
                 resolve(result);
             }
         });
+    },
+
+    getCategory: function(categoryId)
+    {
+        return fetch("select * from categories where category_id='" + categoryId + "'");
     }
 };