From 93c492c8990e5707f513a9c2bcee3c35631e2841 Mon Sep 17 00:00:00 2001
From: jrtechs <jrtechs@hotmail.com>
Date: Tue, 6 Feb 2018 19:18:38 -0500
Subject: [PATCH] Updated look and feel

---
 includes/footer.html         |  9 +++++++++
 includes/header.html         |  9 ++++++---
 sidebar/categoriesSideBar.js | 12 ++++--------
 sidebar/popularPosts.js      | 10 +++++-----
 sidebar/recentPosts.js       | 10 ++++------
 utils/sql.js                 |  2 +-
 6 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/includes/footer.html b/includes/footer.html
index 4482490..c7f942f 100644
--- a/includes/footer.html
+++ b/includes/footer.html
@@ -22,6 +22,15 @@
 </footer>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.9.1/highlight.min.js"></script>
 <script>hljs.initHighlightingOnLoad();</script>
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-51392711-1"></script>
+<script>
+    window.dataLayer = window.dataLayer || [];
+    function gtag(){dataLayer.push(arguments);}
+    gtag('js', new Date());
+
+    gtag('config', 'UA-51392711-1');
+</script>
 
 </body>
 
diff --git a/includes/header.html b/includes/header.html
index e6c6c6d..11feafe 100644
--- a/includes/header.html
+++ b/includes/header.html
@@ -19,10 +19,13 @@
 
 <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
 
-<style>
-
-    body,h1,h2,h3,h4,h5 {font-family: "Raleway", sans-serif}
+<link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet">
 
+<style>
+    html, body, h1, h2, h3, h4, h5, h6 {
+        font-family: 'Open Sans', sans-serif;
+    }
+    p{font-size:18px;}
 </style>
 
 <!-- Navbar -->
diff --git a/sidebar/categoriesSideBar.js b/sidebar/categoriesSideBar.js
index b9f4421..d5ce1cd 100644
--- a/sidebar/categoriesSideBar.js
+++ b/sidebar/categoriesSideBar.js
@@ -16,22 +16,18 @@ module.exports=
             {
                 res.write("<div class=\"w3-card w3-margin\">");
 
-                res.write("<div class=\"w3-container w3-padding\"><h4>Categories</h4></div>");
+                res.write("<div class=\"w3-container w3-padding w3-gray\"><h4>Categories</h4></div>");
 
-                res.write("<ul class=\"w3-ul w3-hoverable w3-white\">");
+                res.write("<div class=\"w3-bar-block w3-white\">");
 
                 sql.getCategories().then(function(categories)
                 {
                     categories.forEach(function(cat)
                     {
                         //res.write(cat.name);
-                        res.write("<li class=\"w3-padding-16\">");
-
-                        res.write("<a href='/category/" + cat.url + "'><span class=\"w3-large\">" + cat.name + "</span><br></a>");
-                        res.write("</li>");
-
+                        res.write("<a class=\"w3-bar-item w3-button\" href='/category/" + cat.url + "'>" + cat.name + "<br></a>");
                     });
-                    res.write("</ul></div>");
+                    res.write("</div></div>");
                     resolve();
                 })
 
diff --git a/sidebar/popularPosts.js b/sidebar/popularPosts.js
index cae4c32..ee29702 100644
--- a/sidebar/popularPosts.js
+++ b/sidebar/popularPosts.js
@@ -13,18 +13,18 @@ module.exports=
 
                 res.write("<div class=\"w3-container w3-padding\"><h4>Popular Posts</h4></div>");
 
-                res.write("<ul class=\"w3-ul w3-hoverable w3-white\">");
+                res.write("<div class=\"w3-sidebar w3-bar-block\">");
 
                 sql.getPopularPosts().then(function(posts)
                 {
                     posts.forEach(function(cat)
                     {
                         console.log(cat);
-                        res.write("<li class=\"w3-padding-16\">");
-                        res.write("<a href='" + url + "'><span class=\"w3-large\">" + p.name + "</span><br></a>");
-                        res.write("</li>");
+
+                        res.write("<a class=\"w3-bar-item w3-button\" href='" + url + "'>" + p.name + "<br></a>");
+
                     });
-                    res.write("</ul></div>");
+                    res.write("</div></div>");
                     resolve();
                 })
             });
diff --git a/sidebar/recentPosts.js b/sidebar/recentPosts.js
index 97f4ab0..79c7df7 100644
--- a/sidebar/recentPosts.js
+++ b/sidebar/recentPosts.js
@@ -10,20 +10,18 @@ module.exports=
 
                 res.write("<div class=\"w3-card w3-margin\">");
 
-                res.write("<div class=\"w3-container w3-padding\"><h4>Recent Posts</h4></div>");
+                res.write("<div class=\"w3-container w3-padding w3-gray\"><h4>Recent Posts</h4></div>");
 
-                res.write("<ul class=\"w3-ul w3-hoverable w3-white\">");
+                res.write("<div class=\"w3-bar-block w3-white\">");
 
                 sql.getRecentPosts().then(function(posts)
                 {
                     posts.forEach(function(p)
                     {
                         var url = '/' +  p.category + '/' + p.url;
-                        res.write("<li class=\"w3-padding-16\">");
-                        res.write("<a href='" + url + "'><span class=\"w3-large\">" + p.name + "</span><br></a>");
-                        res.write("</li>");
+                        res.write("<a class=\"w3-bar-item w3-button\" href='" + url + "'>" + p.name + "<br></a>");
                     });
-                    res.write("</ul></div>");
+                    res.write("</div></div>");
                     resolve();
                 })
 
diff --git a/utils/sql.js b/utils/sql.js
index 7bc6402..635241e 100644
--- a/utils/sql.js
+++ b/utils/sql.js
@@ -132,7 +132,7 @@ module.exports=
     {
         return new Promise(function(resolve, reject)
         {
-            var q = "select * from categories where name ='" + requestURL + "' limit 1";
+            var q = "select * from categories where url ='" + requestURL + "'";
             fetch(q).then(function(categories)
             {
                 if(categories.length != 0)