aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMark Powers <markppowers0@gmail.com>2019-04-06 15:27:13 -0400
committerMark Powers <markppowers0@gmail.com>2019-04-06 15:27:13 -0400
commit7d0aa00e74b1ed2ea2cab9afaf8eb7b7f9280d3d (patch)
tree73ce87ec71409573e9c1d508c696caa8ba5c24a7 /src
parentfd40608784ad428822e7c3ea02d35bca196966fd (diff)
Filter sessions in admin
Diffstat (limited to 'src')
-rw-r--r--src/html/admin.html40
-rw-r--r--src/server.js5
2 files changed, 31 insertions, 14 deletions
diff --git a/src/html/admin.html b/src/html/admin.html
index 1087b51..01a39b4 100644
--- a/src/html/admin.html
+++ b/src/html/admin.html
@@ -13,7 +13,7 @@
var feed = new Vue({
el: '#stats',
data: {
- stats: {session: [], url: []},
+ stats: { session: [], url: [] },
showSessionTable: false,
showUrlTable: false,
showLogData: false,
@@ -33,10 +33,10 @@
<div class="form">
<form action="/posts" method="post" enctype="multipart/form-data">
<div>
- <textarea name="description"></textarea>
+ <textarea name="description"></textarea>
</div>
<div>
- <span>Tags: <input type="text" name="tags"/></span>
+ <span>Tags: <input type="text" name="tags" /></span>
</div>
<div>
Images: <input type="file" name="images" multiple>
@@ -47,7 +47,7 @@
<option value="bread">Bread</option>
<option value="blog">Blog</option>
<option value="index">Index</option>
- </select>
+ </select>
</div>
<input type="submit" value="Submit">
</form>
@@ -59,18 +59,29 @@
<input type="checkbox" id="showSession" v-model="showSessionTable">
<label for="showSession">Show Session Stats</label>
</div>
- <table class="table session-table" v-if="showSessionTable">
- <tr><th>Host</th><th>Total Requests</th></tr>
- <tr v-for="item in stats.session">
- <td>{{item.session.substring(0,10)}}...</td><td>{{item.c}}</td>
- </tr>
- </table>
+ <div v-if="showSessionTable">
+ {{stats.total}} total sessions
+ <table class="table session-table">
+ <tr>
+ <th>Host</th>
+ <th>Total Requests</th>
+ </tr>
+ <tr v-for="item in stats.session">
+ <td>{{item.session.substring(0,10)}}...</td>
+ <td>{{item.c}}</td>
+ </tr>
+ </table>
+ </div>
<div>
<input type="checkbox" id="showUrl" v-model="showUrlTable">
<label for="showUrl">Show URL Stats</label>
</div>
<table class="table url-table" v-if="showUrlTable">
- <tr><th>Method</th><th>Path</th><th>Total Requests</th></tr>
+ <tr>
+ <th>Method</th>
+ <th>Path</th>
+ <th>Total Requests</th>
+ </tr>
<tr v-for="item in stats.url">
<td>{{item.method}}</td>
<td>{{item.url.substring(0, Math.min(30, item.url.length))}}</td>
@@ -82,7 +93,12 @@
<label for="showLog">Show Log</label>
</div>
<table class="table log-table" v-if="showLogData">
- <tr><th>Date</th><th>Session</th><th>Method</th><th>Path</th></tr>
+ <tr>
+ <th>Date</th>
+ <th>Session</th>
+ <th>Method</th>
+ <th>Path</th>
+ </tr>
<tr v-for="item in stats.log">
<td>{{item.createdAt.substring(0,19)}}</td>
<td>{{item.session.substring(0,10)}}...</td>
diff --git a/src/server.js b/src/server.js
index 06a3ec5..eae99e4 100644
--- a/src/server.js
+++ b/src/server.js
@@ -96,10 +96,11 @@ function setUpRoutes(models, jwtFunctions, database) {
})
server.get('/admin/stats', async (req, res, next) => {
try {
- var sessionResult = await database.query("SELECT session, count(id) as c FROM requests GROUP BY session", { type: database.QueryTypes.SELECT })
+ var sessionResult = await database.query("SELECT session, count(id) as c FROM requests GROUP BY session HAVING c > 1", { type: database.QueryTypes.SELECT })
+ var total = await database.query("select count(distinct session) as t FROM requests", { type: database.QueryTypes.SELECT })
var urlResult = await database.query("SELECT method, url, count(id) as c FROM requests GROUP BY method, url", { type: database.QueryTypes.SELECT })
var logResult = await database.query("SELECT createdAt, session, method, url FROM requests order by createdAt desc limit 15", { type: database.QueryTypes.SELECT })
- res.status(200).send({ session: sessionResult, url: urlResult, log: logResult });
+ res.status(200).send({ total: total[0].t, session: sessionResult, url: urlResult, log: logResult });
next();
} catch (e) {
res.status(400).send(e.message);