+
diff --git a/includes/html/header.html b/includes/html/header.html index 873c01d..db302d4 100644 --- a/includes/html/header.html +++ b/includes/html/header.html @@ -25,6 +25,11 @@ } p{font-size:18px;} + + + + + diff --git a/package.json b/package.json index 03375c9..802a1d6 100644 --- a/package.json +++ b/package.json @@ -11,9 +11,9 @@ "highlight": "^0.2.4", "highlight.js": "^9.12.0", "markdown": "^0.5.0", - "markdown-to-html": "^0.0.13", "memory-cache": "^0.2.0", "mysql": "^2.16.0", + "node-pandoc": "^0.3.0", "nodemailer": "^4.6.8", "nodemailer-smtp-transport": "^2.7.4", "promise": "^8.0.1", diff --git a/posts/singlePost.js b/posts/singlePost.js index d31b557..97ef5c7 100644 --- a/posts/singlePost.js +++ b/posts/singlePost.js @@ -1,34 +1,4 @@ -const utils = require('../utils/utils.js'); - -const sql = require('../utils/sql'); - -const Remarkable = require('remarkable'); -const hljs = require('highlight.js'); - - -const md = new Remarkable( -{ - html: true, - highlight: function (str, lang) - { - if (lang && hljs.getLanguage(lang)) - { - try - { - return hljs.highlight(lang, str).value; - } - catch (err) {} - } - - try - { - return hljs.highlightAuto(str).value; - } - catch (err) {} - - return ''; // use external default escaping - } -}); +const postGenerator = require('../utils/renderBlogPost.js'); module.exports= @@ -41,69 +11,7 @@ module.exports= */ renderPreview: function(post) { - return new Promise(function(resolve, reject) - { - //var html = "
";
-
- var html = "
"; - - resolve(html) - }).catch(function(error) - { - reject(error); - }); - } - catch(ex) - { - reject(ex); - } - }); + return postGenerator.generateBlogPost(post, 3); }, /** @@ -115,47 +23,6 @@ module.exports= */ renderPost: function(post) { - return new Promise(function (resolve, reject) - { - var htmlHead = "
"; - - resolve(htmlHead + html); - }); - } - catch(ex) - { - reject(ex); - } - }); + return postGenerator.generateBlogPost(post, -1); } }; \ No newline at end of file diff --git a/utils/sql.js b/utils/sql.js index 336fe97..fb86cf5 100644 --- a/utils/sql.js +++ b/utils/sql.js @@ -268,16 +268,16 @@ module.exports= if(post.username && post.password) { - var cleanName = sanitizer.sanitize(post.username); - var cleanPassword = sanitizer.sanitize(post.password); + const cleanName = sanitizer.sanitize(post.username); + const cleanPassword = sanitizer.sanitize(post.password); - var getSalt = "select * from users where user_name='" + + const getSalt = "select * from users where user_name='" + cleanName + "'"; fetch(getSalt).then(function(saltResult) { if(saltResult.length == 1) { - var hashedPassword = crypto.createHash('sha256') + const hashedPassword = crypto.createHash('sha256') .update(cleanPassword + saltResult[0].salt) .digest('hex'); if(saltResult[0].password === hashedPassword)
";
-
- //image
- if(!(post.picture_url === "n/a"))
- {
- html +="![\"\"](\"/blogContent/headerImages/")
";
- }
-
- html += "
";
- //title
- html += "
";
-
- html += "" + post.name + "
"; - //date - html += "" + - post.published.toDateString() + "
"; - html +="";
-
- try
- {
- sql.getCategory(post.category_id).then(function(category)
- {
- var pathName = "blogContent/posts/" + category[0].url + "/"
- + post.url + ".md";
- var markDown = utils.getFileContents(pathName).toString();
-
- markDown = markDown.split("(media/").join("(" + "../blogContent/posts/"
- + category[0].url + "/media/");
- var htmlPost = md.render(markDown).split("
"); - - for(var i = 0; i < 3; i++) - { - html+= "
" + htmlPost[i];
- }
-
- html = html.split("");
-
- html += " \n" +
- " \n" +
- " \n";
-
- html += "
"; - - resolve(html) - }).catch(function(error) - { - reject(error); - }); - } - catch(ex) - { - reject(ex); - } - }); + return postGenerator.generateBlogPost(post, 3); }, /** @@ -115,47 +23,6 @@ module.exports= */ renderPost: function(post) { - return new Promise(function (resolve, reject) - { - var htmlHead = "
";
- //image
- if(!(post.picture_url === "n/a"))
- {
- htmlHead +="";
- }
-
- htmlHead += "
";
- //title
- htmlHead += "
";
-
- var html = "" + post.name + "
"; - //date - htmlHead += "" + - post.published.toDateString() + "
"; - htmlHead +="";
- try
- {
- sql.getCategory(post.category_id).then(function(category)
- {
- const pathName = "blogContent/posts/" + category[0].url + "/"
- + post.url + ".md";
- var markDown = utils.getFileContents(pathName).toString();
- markDown = markDown.split("(media/").join("(" + "../blogContent/posts/"
- + category[0].url + "/media/");
- html += md.render(markDown);
-
- html = html.split("").join("
");
- html += ""; - - resolve(htmlHead + html); - }); - } - catch(ex) - { - reject(ex); - } - }); + return postGenerator.generateBlogPost(post, -1); } }; \ No newline at end of file diff --git a/utils/sql.js b/utils/sql.js index 336fe97..fb86cf5 100644 --- a/utils/sql.js +++ b/utils/sql.js @@ -268,16 +268,16 @@ module.exports= if(post.username && post.password) { - var cleanName = sanitizer.sanitize(post.username); - var cleanPassword = sanitizer.sanitize(post.password); + const cleanName = sanitizer.sanitize(post.username); + const cleanPassword = sanitizer.sanitize(post.password); - var getSalt = "select * from users where user_name='" + + const getSalt = "select * from users where user_name='" + cleanName + "'"; fetch(getSalt).then(function(saltResult) { if(saltResult.length == 1) { - var hashedPassword = crypto.createHash('sha256') + const hashedPassword = crypto.createHash('sha256') .update(cleanPassword + saltResult[0].salt) .digest('hex'); if(saltResult[0].password === hashedPassword)