Merge pull request #48 from jrtechs/adminAnalytics

Traffic Log on Admin Page

admin/admin.js

@@ -48,6 +48,10 @@ module.exports=
                     {
                         page = "./users.js";
                     }
+                    else if(filename.includes("/analytics"))
+                    {
+                        page = "./analytics.js"
+                    }
 
                     require(page).main(postData, templateContext).then(function(template)
                     {
@@ -61,7 +65,7 @@ module.exports=
             }
             else
             {
-                require("./login/login.js").main(request, clientAddress, templateContext)
+                require("./login.js").main(request, clientAddress, templateContext)
                     .then(function()
                 {
                     resolve();

admin/analytics.js

@@ -0,0 +1,71 @@
+
+/** Whiskers template file */
+const TEMPLATE_FILE = "admin/analytics.html";
+
+
+const includes = require('../includes/includes.js');
+
+//updates db
+const sql = require('../utils/sql');
+
+
+const generateData = function(templateContext)
+{
+    return new Promise(function(resolve, reject)
+    {
+        var data = [];
+
+        sql.getTraffic().then(function(traffic)
+        {
+            var start = traffic[0].date;
+            var currentMonth = new Date(start.getUTCFullYear(), start.getMonth(), 1, 0,0,0);
+            templateContext.start = JSON.stringify(currentMonth);
+            var monthCount = 0;
+            for(var i = 0; i < traffic.length; i++)
+            {
+                var currentDate = traffic[i].date;
+
+                if(currentMonth.getMonth() != currentDate.getMonth())
+                {
+                    var foo = new Object();
+                    foo.x = currentMonth;
+                    foo.y = monthCount;
+                    data.push(foo);
+                    monthCount = 0;
+                    currentMonth = new Date(currentDate.getUTCFullYear(), currentDate.getMonth(), 1, 0,0,0);
+                }
+                monthCount = monthCount + 1;
+            }
+            templateContext.finish = JSON.stringify(currentMonth);
+            templateContext.dataset = JSON.stringify(data);
+            resolve();
+        });
+    });
+};
+
+
+module.exports=
+    {
+        /**
+         * Fetches context information for the admin blog page and handles post
+         * data sent regarding editing blog.
+         *
+         * @param postData posted by user
+         * @param templateContext json object used as the template context
+         * @returns {Promise} renders the template used for this page
+         */
+        main: function(postData, templateContext)
+        {
+            return new Promise(function(resolve, reject)
+            {
+                Promise.all([includes.fetchTemplate(TEMPLATE_FILE), generateData(templateContext)]).then(function(template)
+                {
+                    resolve(template[0]);
+                }).catch(function(error)
+                {
+                    console.log("error in add admin blog.js");
+                    reject(error);
+                });
+            });
+        }
+    };

admin/analytics/analytics.js

@@ -1,24 +0,0 @@
-
-
-
-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/login/login.js → admin/login.js

@@ -1,8 +1,8 @@
 //file io
-const utils = require('../../utils/utils.js');
+const utils = require('../utils/utils.js');
 
 //update db
-const sql = require('../../utils/sql');
+const sql = require('../utils/sql');
 
 const qs = require('querystring');
 

includes/html/adminHeader.html

@@ -41,7 +41,17 @@
     <script type="text/javascript" async
             src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-MML-AM_CHTML">
     </script>
-    <script src="../../admin/login/login.js"></script>
+
+
+    <script src="http://cdnjs.cloudflare.com/ajax/libs/moment.js/2.8.4/moment.min.js"></script>
+
+    <script src="https://code.jquery.com/jquery-3.3.1.min.js"
+            integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8="
+            crossorigin="anonymous">
+    </script>
+
+    <script src="/includes/js/vis/dist/vis.js"></script>
+    <link href="/includes/js/vis/dist/vis-timeline-graph2d.min.css" rel="stylesheet" type="text/css" />
 
 </head>
 
@@ -72,6 +82,9 @@
                 <li class="nav-item">
                     <a class="nav-link" href="/admin/users">Users</a>
                 </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="/admin/analytics">Analytics</a>
+                </li>
             </ul>
             <ul class="nav navbar-nav navbar-right">
                 <li class="nav-item">

sites/admin.js

@@ -31,7 +31,6 @@ module.exports=
                 const clientAddress = (request.headers['x-forwarded-for'] || '').split(',')[0]
                     || request.connection.remoteAddress;
 
-
                 result.writeHead(200, {'Content-Type': 'text/html'});
 
                 const file = "../admin/admin.js";

templates/admin/analytics.html

@@ -0,0 +1,20 @@
+<h4 class="text-center">Traffic Graph</h4>
+<div class="row">
+    <div class="col-12">
+        <div id="visualization"></div>
+    </div>
+    <br><br>
+
+    <script type="text/javascript">
+        var container = document.getElementById('visualization');
+        var items = {dataset};
+
+        var dataset = new vis.DataSet(items);
+        var options = {
+            start: {start},
+            end: {finish},
+        };
+        var graph2d = new vis.Graph2d(container, dataset, options);
+    </script>
+
+</div>

utils/sql.js

@@ -634,5 +634,10 @@ module.exports=
             "('" + page + "', '" + ip + "', now())";
 
         insert(q);
+    },
+
+    getTraffic: function()
+    {
+        return fetch("select * from traffic_log");
     }
 };