From 6b9dd1f83890f0b0ee819c7e7f2498a039f88c14 Mon Sep 17 00:00:00 2001
From: Mathis Dedial <mathis@dedial.net>
Date: Fri, 2 Mar 2018 22:38:56 +0100
Subject: [PATCH] Implement sorting by newest and top rated

---
 app/static/images/burger.png | Bin 0 -> 863 bytes
 app/templates/vote.html      |  23 +++++++++++++++++++----
 app/views.py                 |  15 ++++++++++++---
 3 files changed, 31 insertions(+), 7 deletions(-)
 create mode 100644 app/static/images/burger.png

diff --git a/app/static/images/burger.png b/app/static/images/burger.png
new file mode 100644
index 0000000000000000000000000000000000000000..44bddabf77ac207a379174c9dadfdf1d5571ba4a
GIT binary patch
literal 863
zcmV-l1EBngP)<h;3K|Lk000e1NJLTq000*N000#T1^@s6t>Sg700004b3#c}2nYxW
zd<bNS00009a7bBm000Uw000Uw0hqr1VgLXD8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10^CVNK~y-6t(8w`TvZswf9JjsO*(08rA{M_2(1=*L)E$xHxb(T
zgBo3k3zt$ix+;{eq!db#KtOHLP3g)au38YPP3fYDiruK#juD{?QId4jP%{~lW-|A5
zF*9~%8i|&i<>8&*d3^WX?};^38A~(1kAk9Ju)G&|#L$mP5DkeH%&$h@DR5rPzWC7P
z@?tMXUC=_hE1F}#i{J>_yjFQPKz|!2z-LNyB>Tm+>s@ezDuwhN+lNrtgq^GhU8ANU
zT(dNhox1j}zyg@d=T3uP12X>~+9R__;M46><u_F+rLVfdX~ViB_^%QyAl}eyA@{TF
z-5UjN%P`$1;%`#;u~}(h1d9K>g(VY(?s(Wi1Y33oE+CB6^5T|IUl<;@eb#n#q!3LB
z*kSyQ?SV)v8H$eH>d4o&A2bvj#8R~HZ$8JUP0^7;ljC!-f8b@!<<qZho|L)|Q?P32
zyC=^qM){`zJk<r3V{2yZfPr2ws_EbHS~&oVj8K{!+L_IQa=?<r$8tC?*agU@mIO{k
z^CjYOK{VVHd<gy?^cb)TR77|mbRF1fXb4UTV7{2!Q?q{`ohr|_+bd&frrxhDQe)f5
zv(rE5D6uk@X4=>MMlrVsQPYxdbYA^Gp4&Z?4EH~}_4BJ&HJeXA3h4ESR}|y;_Dj>>
z0?h1B4<yp0<%UdoMZ7XPRi2-D>6yW>ynF_D9!cQI?8WkNfoJyRo(RDggdYH%(Of=V
z1U9vbtI-?{(q7BsGD9tY1u?Ivx1u~LGy)!IooF@MSES^V5d9wVW`hK^UN}G%kzfWp
zzW@UPYBqzYd*NYjA?kFmk6It-1o&;xQWpuToq4rwao1|?sH(L914t(YFk5<hTd1!N
z-4(h=HCAseJbd|=KQ)_A{|Y^OeIpdXeW1E=cBA0|=7R79J@efFRUMg-L6!aK!6+RT
p9>(h@|5eTZ+RYd>F><N=!EH3uUeASAvjG4A002ovPDHLkV1mhIh`Im(

literal 0
HcmV?d00001

diff --git a/app/templates/vote.html b/app/templates/vote.html
index 2e79231..6dd4575 100644
--- a/app/templates/vote.html
+++ b/app/templates/vote.html
@@ -25,15 +25,30 @@
     <div class="container">
         <h3>Burger Gallery</h3>
         <hr class="star-dark">
+
+        <div class="dropdown">
+            <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                Sort by
+            </button>
+            <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
+                <a class="dropdown-item" href="?sort=newest">Newest first</a>
+                <a class="dropdown-item" href="?sort=top">Top-rated first</a>
+            </div>
+        </div>
+
         <p class="highlight"></p>
 
         <div class="list-group">
             {% for burger in burger_list %}
             <div class="list-group-item burger">
-                <!-- Ranking -->
-                <h3 class="text-secondary burger__ranking">
-                    {{ loop.index }}.
-                </h3>
+                <!-- Ranking / burger icon -->
+                {% if sort == 'top' %}
+                    <h3 class="text-secondary burger__ranking">
+                        {{ loop.index }}.
+                    </h3>
+                {% else %}
+                    <img class="mr-3 burger__icon" src="/static/images/burger.png" alt="Burger">
+                {% endif %}
                 
                 <div class="burger__info">
                     <!-- Name & Ingredients -->
diff --git a/app/views.py b/app/views.py
index a620644..c3b0496 100644
--- a/app/views.py
+++ b/app/views.py
@@ -14,6 +14,14 @@ def index():
   '''
   Front page. Shows a list of all burgers 
   '''
+
+  # Sort
+  sort = request.args.get('sort')
+  if sort == 'top':
+    order_by = 'vote_count DESC, timestamp'
+  else:
+    order_by = 'timestamp DESC'
+
   # Fetch list of burgers with corresponding vote info
   # Could probably also be done with SQLAlchemy but too lazy to look up how
   querystring = text('SELECT burger.id AS id, name, description, burger.nethz AS nethz, timestamp, '
@@ -22,20 +30,21 @@ def index():
                   'LEFT JOIN vote AS vote_1 ON vote_1.burger_id=burger.id '
                   'LEFT JOIN vote AS vote_2 ON vote_2.burger_id=burger.id AND vote_2.nethz= :nethz ' 
                   'GROUP BY burger.id '
-                  'ORDER BY vote_count DESC, timestamp')
+                  'ORDER BY {}'.format(order_by))
   
   # Display, which burgers have already been liked
   if 'user' in session:
     burger_list = db.engine.execute(querystring, nethz=session['user']).fetchall()
   else:
     burger_list = db.engine.execute(querystring, nethz='').fetchall()
-  
+
   return render_template('vote.html',
                           burger_list=burger_list,
                           bread=BREAD,
                           patty=PATTY,
                           toppings=TOPPINGS,
-                          side=SIDE)
+                          side=SIDE,
+                          sort=sort)
 
 
 @app.route('/vote', methods=['POST'])
-- 
GitLab