diff --git a/app/static/images/burger.png b/app/static/images/burger.png new file mode 100644 index 0000000000000000000000000000000000000000..44bddabf77ac207a379174c9dadfdf1d5571ba4a Binary files /dev/null and b/app/static/images/burger.png differ diff --git a/app/templates/vote.html b/app/templates/vote.html index 2e79231a5737311aa68378dc9ba6d5790db624ca..6dd4575df49995bd5423c8372063a236718197cf 100644 --- a/app/templates/vote.html +++ b/app/templates/vote.html @@ -25,15 +25,30 @@

Burger Gallery


+ + +

{% for burger in burger_list %}
- -

- {{ loop.index }}. -

+ + {% if sort == 'top' %} +

+ {{ loop.index }}. +

+ {% else %} + Burger + {% endif %}
diff --git a/app/views.py b/app/views.py index a620644213b24b5f17482bf85ad71e200ead98a8..c3b049657792aea22a4516151118d603788221da 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'])