Sorting

controllers/listing.js

@@ -1,28 +1,45 @@
 const tor = require('../lib/tor');
 
+const orderByValues = [
+  {
+    name: 'Consensus Weight',
+    value: 'consensus_weight'
+  },
+  {
+    name: 'First Seen',
+    value: 'first_seen'
+  }
+];
+
 module.exports = (req, res, next) => {
 
-  let title = 'Top nodes by consensus weight';
+  let title = '';
   const query = {
     limit: 10
   };
   if(req.query.s) {
     title = `Search results for "${req.query.s}":`;
     query.search = req.query.s;
-  } else {
+  } else if(Object.keys(req.query).length == 0) {
+    title = 'Top nodes by consensus weight';
     query.order = '-consensus_weight';
     query.running = true;
   }
   if(req.query.p) {
     query.offset = (query.limit * req.query.p) - query.limit;
   }
+  if(req.query.orderBy && orderByValues.map(orderBy => orderBy.value).includes(req.query.orderBy)) {
+    title = `Nodes ordered by "${orderByValues.find(orderBy => orderBy.value == req.query.orderBy).name}" (${req.query.order}):`;
+    query.order = (req.query.order == 'desc') ? `-${req.query.orderBy}` : req.query.orderBy;
+  }
 
   tor.listNodes(query)
     .then(nodes => res.render('listing.html', {
       pageTitle: req.query.s ? `Search: ${req.query.s}` : false,
       title: title,
       nodes: nodes,
-      numOfNodes: query.limit
+      numOfNodes: query.limit,
+      orderByValues: orderByValues
     }))
     .catch(err => {
       if(err.statusCode == 400 && req.query.s) {

lib/tor.js

@@ -1,5 +1,5 @@
 const Onionoo = require('onionoo');
-const onionoo = new Onionoo();
+const onionoo = new Onionoo({ baseUrl: 'https://onionoo.thecthulhu.com' });
 
 module.exports = {
   listNodes: query => {

views/listing.html

@@ -3,6 +3,22 @@
 {% block main %}
 
   <h2>{{ title }}</h2>
+  <form action="/">
+    {% for hiddenValue in ['s'] %}
+      {% if req.query[hiddenValue] %}
+        <input type="hidden" name="{{ hiddenValue }}" value="{{ req.query[hiddenValue] }}" />
+      {% endif %}
+    {% endfor %}
+    <select name="orderBy">
+      {% for orderBy in orderByValues %}
+      <option value="{{ orderBy.value }}" {{ 'selected' if req.query.orderBy == orderBy.value }}>{{ orderBy.name }}</option>
+      {% endfor %}
+    </select>
+    <select name="order">
+      <option value="asc" {{ 'selected' if req.query.order == 'asc' }}>Ascending</option>
+      <option value="desc" {{ 'selected' if req.query.order == 'desc' }}>Descending</option>
+    </select>
+    <input type="submit" />
   {% if nodes.length %}
     <table>
       <thead>