Skip to content
This repository was archived by the owner on Nov 29, 2019. It is now read-only.

Fix tags sorting #4

Open
SimoneS93 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix tags sorting #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
94dbe8c
pass dir option to Tags.all + pass query to tags template
SimoneS93 Sep 28, 2018
b2c7060
allow tags to be sorted by name and delivered count + default sort
SimoneS93 Sep 28, 2018
0259d42
fix tags template
SimoneS93 Sep 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions models/tags.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions public_html/tags.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>)
Expand All @@ -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>
Expand Down
5 changes: 4 additions & 1 deletion routes/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -192,7 +194,8 @@ module.exports = app => {
res.render('tags', render(req, {
title: 'Tags',
page: 'tags',
data: data
data: data,
query: req.query
}));
})
});
Expand Down