From 30236674def1ce21a055836dfca27b96520ad428 Mon Sep 17 00:00:00 2001
From: jrtechs <jeffery@jrtechs.net>
Date: Thu, 18 Jun 2020 19:56:31 -0400
Subject: [PATCH] Finished more posts load system

---
 blog/category.js             |  1 +
 blog/homePage.js             |  2 +-
 templates/blog/blogMain.html | 36 +++++++++++++++++++++++++-----------
 templates/blog/header.html   |  1 -
 utils/sql.js                 | 29 +++++++++++++++++++++++++++++
 5 files changed, 56 insertions(+), 13 deletions(-)

diff --git a/blog/category.js b/blog/category.js
index 8a2e5ab..67c4b2d 100644
--- a/blog/category.js
+++ b/blog/category.js
@@ -25,6 +25,7 @@ module.exports=
                 templateContext["title"] = category;
                 sql.getPostsFromCategory(category).then(function(posts)
                 {
+                    templateContext["categoryID"] = posts[0].category_id;
                     Promise.all([blogBodyRenderer.renderBatchOfPosts(requestURL, posts, page, 5, templateContext),
                         require('./renderNextBar').main("/category" + request.url, page, 5, posts.length, templateContext)]).then(function()
                     {
diff --git a/blog/homePage.js b/blog/homePage.js
index 912b794..2736181 100644
--- a/blog/homePage.js
+++ b/blog/homePage.js
@@ -13,7 +13,7 @@ module.exports=
         main: function(requestURL, request, templateContext)
         {
             var page = request.query.page;
-
+            templateContext["categoryID"] = 0;
             return new Promise(function(resolve, reject)
             {
                 sql.getAllPosts().then(function(posts)
diff --git a/templates/blog/blogMain.html b/templates/blog/blogMain.html
index de4c18c..3367e4f 100644
--- a/templates/blog/blogMain.html
+++ b/templates/blog/blogMain.html
@@ -7,7 +7,7 @@
 
 <script>
 
-    var postsToLoad= [1,3,4,5,6,7,8,12];
+    var postsToLoad= [];
 
     /**
      * Runs a get request using ajax
@@ -63,14 +63,14 @@
         {
             pic = '<img src="/blogContent/headerImages/' + post.picture_url + '" style="width:100%;">';
         }
-        return '<div class="blogPost">' + pic + '<div class="p-4"><b><h3>' + post.name + '</h3></b><h5>' + post.published + '</span></h5><div>' + post.blogBody + '<p class="text-center"><a class="btn btn-secondary btn-lg text-white" href="https://jrtechs.net/' + post.categoryURL + '"/"' + post.url + '"><b>Read More &raquo;</b></a></p></div></div></div><br><br><br>';
+        return '<div class="blogPost">' + pic + '<div class="p-4"><b><h3>' + post.name + '</h3></b><h5>' + post.published + '</span></h5><div>' + post.blogBody + '<p class="text-center"><a class="btn btn-secondary btn-lg text-white" href="https://jrtechs.net/' + post.categoryURL + '/' + post.url + '"><b>Read More &raquo;</b></a></p></div></div></div><br><br>';
     }
 
     function addPosts(id)
     {
         return new Promise(function(resolve, reject)
         {
-            runAjax("api/preview/" + id,
+            runAjax("/api/preview/" + id,
                 (html)=>
             {
                 var content = buildPostHTML(html)
@@ -105,10 +105,26 @@
                 break;
             }
                 
-            await addPosts(postsToLoad.pop());
+            await addPosts(postsToLoad.shift());
         }
         console.log("Wham");
     }
+
+    $(document).ready(function()
+    {
+        runAjax("/api/getPostsIds/{categoryID}",
+            (idsList)=>
+        {
+            postsToLoad=idsList;
+        },
+        (err)=>
+        {
+            console.log(err);
+            reject();
+        });
+    });
+
+
 </script>
 
 <br><br><br><br><br>
@@ -155,13 +171,11 @@
             <div id="newPosts"></div>
 
             {if preview}
-            <div class="row justify-content-center w-100" id="morePostsBtn">
-                <div class="col-md-6 col-12">
-                    <p class="text-center">
-                        <a class="btn btn-secondary btn-lg text-white" id="readMore"
-                            onclick="loadMore()"><b>More Posts &raquo;</b></a>
-                    </p>
-                </div>
+            <div class="justify-content-center w-100 blogPost" id="morePostsBtn">
+                <a class="btn btn-secondary btn-lg btn-block text-white w-100 text-center" id="readMore"
+                    onclick="loadMore()"><b>More Posts &raquo;</b></a>
+
+
             </div>
             {/if}
             <br>
diff --git a/templates/blog/header.html b/templates/blog/header.html
index 04caf1e..4cc77e6 100644
--- a/templates/blog/header.html
+++ b/templates/blog/header.html
@@ -2,7 +2,6 @@
 
 <html lang="en">
 <head>
-    <!--fuck-->
     {if title}
     <title>Jrtechs: {title}</title>
     {else}
diff --git a/utils/sql.js b/utils/sql.js
index 05d17be..e4f80cf 100644
--- a/utils/sql.js
+++ b/utils/sql.js
@@ -178,6 +178,35 @@ module.exports=
         });
     },
 
+    getPostIds: function(categoryID)
+    {
+        return new Promise((resolve, reject)=>
+        {
+            if(categoryID == 0)
+            {
+                fetch("select post_id from posts order by published desc")
+                    .then(function(ids)
+                {
+                    resolve(ids);
+                }).catch((error)=>
+                {
+                    reject(error);
+                });
+            }
+            else
+            {
+                fetch("select post_id from posts where category_id='" + categoryID + "' order by published desc")
+                    .then(function(ids)
+                {
+                    resolve(ids);
+                }).catch((error)=>
+                {
+                    reject(error);
+                });
+            }
+        });
+    },
+
     insert: function(sqlStatement)
     {
         return insert(sqlStatement);