From 94dbe8c766bb35d7a0ee447c616997432cf4f598 Mon Sep 17 00:00:00 2001
From: SimoneS93 <salernosimone.uni@gmail.com>
Date: Fri, 28 Sep 2018 13:34:11 +0200
Subject: [PATCH 1/3] pass dir option to Tags.all + pass query to tags template

---
 routes/app.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/routes/app.js b/routes/app.js
index 2b8304c..5ee0f00 100644
--- a/routes/app.js
+++ b/routes/app.js
@@ -157,6 +157,8 @@ module.exports = app => {
     let options = {};
     if (req.query.sort)
       options.sort = req.query.sort;
+    if (req.query.dir)
+      options.dir = req.query.dir;
     if (req.query.offset)
       options.offset = req.query.offset;
 
@@ -192,7 +194,8 @@ module.exports = app => {
       res.render('tags', render(req, {
         title: 'Tags',
         page: 'tags',
-        data: data
+        data: data,
+        query: req.query
       }));
     })
   });

From b2c7060e59a71895cd5512ac7e3210696e6912aa Mon Sep 17 00:00:00 2001
From: SimoneS93 <salernosimone.uni@gmail.com>
Date: Fri, 28 Sep 2018 13:36:03 +0200
Subject: [PATCH 2/3] allow tags to be sorted by name and delivered count +
 default sort

---
 models/tags.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/models/tags.js b/models/tags.js
index b545230..cf06b3e 100644
--- a/models/tags.js
+++ b/models/tags.js
@@ -34,12 +34,13 @@ exports.all = (domain, options, fn) => {
   let skip = options.offset || 0;
   let sort = null
       , order = null
-      , allowedSort = ['clicked', 'opened', 'date']
+      , allowedSort = ['tag', 'clicked', 'opened', 'delivered', 'date']
       ;
   if (options.sort && allowedSort.indexOf(options.sort) != -1)
     sort = options.sort;
-  if (options.dir && options.dir == 'asc')
-    order = 1;
+  if (options.dir && options.dir == 'desc')
+    order = -1;
+  else order = 1;
 
   let qs = {limit: limit, skip: parseInt(skip), sort: {}};
   if (sort)

From 0259d42d6c29369f8b5887ae824b42d50b7f96cc Mon Sep 17 00:00:00 2001
From: SimoneS93 <salernosimone.uni@gmail.com>
Date: Fri, 28 Sep 2018 13:37:09 +0200
Subject: [PATCH 3/3] fix tags template

---
 public_html/tags.liquid | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/public_html/tags.liquid b/public_html/tags.liquid
index 3652fa1..8f14794 100644
--- a/public_html/tags.liquid
+++ b/public_html/tags.liquid
@@ -12,12 +12,12 @@
     <div class="feed">
       <div class="row th">
         <div class="three columns">
-          Tag
+          <a href="?sort=tag&dir={% if query.dir == 'desc' %}asc{% else %}desc{% endif %}">Tag{% if query.sort == 'tag' %} <i class="icon-arrow-{% if query.dir == 'asc' %}up{% else %}down{% endif %}"></i>{% endif %}</a>
         </div>
         <div class="nine columns center">
           <div class="row">
             <div class="two columns" >
-              <a href="?sort=opened&dir={% if query.dir == 'desc' %}asc{% else %}desc{% endif %}">Delivered{% if query.sort == 'opened' %} <i class="icon-arrow-{% if query.dir == 'asc' %}up{% else %}down{% endif %}"></i>{% endif %}</a>
+              <a href="?sort=delivered&dir={% if query.dir == 'desc' %}asc{% else %}desc{% endif %}">Delivered{% if query.sort == 'opened' %} <i class="icon-arrow-{% if query.dir == 'asc' %}up{% else %}down{% endif %}"></i>{% endif %}</a>
             </div>
             <div class="three columns">
               <a href="?sort=opened&dir={% if query.dir == 'desc' %}asc{% else %}desc{% endif %}">Opened{% if query.sort == 'opened' %} <i class="icon-arrow-{% if query.dir == 'asc' %}up{% else %}down{% endif %}"></i>{% endif %}</a> (<a href="?sort=opened&dir={% if query.dir == 'desc' %}asc{% else %}desc{% endif %}">Unique{% if query.sort == 'opened' %} <i class="icon-arrow-{% if query.dir == 'asc' %}up{% else %}down{% endif %}"></i>{% endif %}</a>)
@@ -26,10 +26,10 @@
               <a href="?sort=clicked&dir={% if query.dir == 'desc' %}asc{% else %}desc{% endif %}">Clicked{% if query.sort == 'clicked' %} <i class="icon-arrow-{% if query.dir == 'asc' %}up{% else %}down{% endif %}"></i>{% endif %}</a> (<a href="?sort=opened&dir={% if query.dir == 'desc' %}asc{% else %}desc{% endif %}">Unique{% if query.sort == 'opened' %} <i class="icon-arrow-{% if query.dir == 'asc' %}up{% else %}down{% endif %}"></i>{% endif %}</a>)
             </div>
             <div class="two columns" >
-              <a href="?sort=clicked&dir={% if query.dir == 'desc' %}asc{% else %}desc{% endif %}">Bounced{% if query.sort == 'clicked' %} <i class="icon-arrow-{% if query.dir == 'asc' %}up{% else %}down{% endif %}"></i>{% endif %}</a>
+              <a href="?sort=bounced&dir={% if query.dir == 'desc' %}asc{% else %}desc{% endif %}">Bounced{% if query.sort == 'clicked' %} <i class="icon-arrow-{% if query.dir == 'asc' %}up{% else %}down{% endif %}"></i>{% endif %}</a>
             </div>
             <div class="two columns" >
-              <a href="?sort=clicked&dir={% if query.dir == 'desc' %}asc{% else %}desc{% endif %}">Complained{% if query.sort == 'clicked' %} <i class="icon-arrow-{% if query.dir == 'asc' %}up{% else %}down{% endif %}"></i>{% endif %}</a>
+              <a href="?sort=complained&dir={% if query.dir == 'desc' %}asc{% else %}desc{% endif %}">Complained{% if query.sort == 'clicked' %} <i class="icon-arrow-{% if query.dir == 'asc' %}up{% else %}down{% endif %}"></i>{% endif %}</a>
             </div>
           </div>
         </div>