From 1c16cfceca3134b79b9319a3b4d467972dc5989f Mon Sep 17 00:00:00 2001 From: Ben Burwell Date: Sun, 28 Jul 2019 16:17:48 -0400 Subject: Styles --- app.py | 33 ++++++--- templates/beerpage.jinja2 | 166 +++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 171 insertions(+), 28 deletions(-) diff --git a/app.py b/app.py index cab272b..f7e98d6 100644 --- a/app.py +++ b/app.py @@ -3,7 +3,7 @@ from flask import render_template from flask import redirect from flask import request from flask import url_for -from utils import get_closest, translate_to_attr, get_style_preds +from utils import get_closest, translate_to_attr, get_style_preds, translate_to_style import json import random import re @@ -54,16 +54,27 @@ def get_beer_details(brewery_id, beer_id): similar_beer_objects.append(BeerInfo(item, item_brewer, item_result)) if request.method == 'POST': - attr = request.form['attr'] - direction = request.form['direction'] - attr_beers = translate_to_attr(full_id, attr, int(direction)) - attr_beer_objects = [] - for item in attr_beers: - item_result, item_brewer = beer_lookup(item[0]) - attr_beer_objects.append(BeerInfo(item[0], item_brewer, item_result)) - return render_template('beerpage.jinja2', beer_data=beerinfo, - attrs=attrs, similar_beers=similar_beer_objects, attr=attr, - direction=direction, attr_beers=attr_beer_objects, style_preds=similar_beers) + attr = request.form.get('attr') + direction = request.form.get('direction') + style = request.form.get('style') + if attr != None and direction != None: + attr_beers = translate_to_attr(full_id, attr, int(direction)) + attr_beer_objects = [] + for item in attr_beers: + item_result, item_brewer = beer_lookup(item[0]) + attr_beer_objects.append(BeerInfo(item[0], item_brewer, item_result)) + return render_template('beerpage.jinja2', beer_data=beerinfo, + attrs=attrs, similar_beers=similar_beer_objects, attr=attr, + direction=direction, attr_beers=attr_beer_objects, style_preds=similar_beers) + if style != None: + style_beers = translate_to_style(full_id, style) + style_beer_objects = [] + for item in style_beers: + item_result, item_brewer = beer_lookup(item[0]) + style_beer_objects.append(BeerInfo(item[0], item_brewer, item_result)) + return render_template('beerpage.jinja2', beer_data=beerinfo, + attrs=attrs, similar_beers=similar_beer_objects, + style=style, style_beers=style_beer_objects, style_preds=similar_beers) return render_template('beerpage.jinja2', beer_data=beerinfo, attrs=attrs, similar_beers=similar_beer_objects, style_preds=similar_beers) diff --git a/templates/beerpage.jinja2 b/templates/beerpage.jinja2 index 68291af..aa45409 100644 --- a/templates/beerpage.jinja2 +++ b/templates/beerpage.jinja2 @@ -80,23 +80,146 @@ function drawAnnotations() { {% endfor %} -
- Show me beers which are - - - -
+
+
+
+ Show me beers which are + + + +
+
+
+
+ Show me similar beers in the style of + + +
+
+
{% if attr_beers %}
Beers like {{ beer_data.name }} but {{ direction }} {{ attr }}
@@ -107,4 +230,13 @@ function drawAnnotations() { {% endif %} + {% if style_beers %} +
Beers like {{ beer_data.name }} but in the {{ style }} style
+ + {% endif %} + {% endblock %} -- cgit v1.2.3