diff options
| -rw-r--r-- | app.py | 12 | ||||
| -rw-r--r-- | templates/beerpage.jinja2 | 1 |
2 files changed, 9 insertions, 4 deletions
@@ -12,6 +12,9 @@ app = Flask(__name__) with open("./data/beer_info.json") as beers_json: beer = json.loads(beers_json.read()) +with open('./data/brewery_names.json', 'w') as f: + brewery_names = json.load(f) + @app.route('/') def index(): @@ -31,8 +34,8 @@ def get_brewery_list(brewery_id): @app.route('/brewery/<brewery_id>/<beer_id>', methods=['GET', 'POST']) def get_beer_details(brewery_id, beer_id): - beer_result = beer_lookup(brewery_id, beer_id) - beerinfo = BeerInfo(beer_result) + beer_result, brewery_name = beer_lookup(brewery_id, beer_id) + beerinfo = BeerInfo(beer_result, brewery_name) attrs = ['Burnt', 'Bready', 'Malty', 'Dark', 'Floral', 'Hoppy', 'Dank', 'Grassy', 'Boozy', 'Warming', 'Bitter', 'Wheaty', 'Sour', 'Barnyardy', 'Woody', 'Smoky', 'Roasty', 'Yeasty', 'Sweet', @@ -51,7 +54,7 @@ def beer_lookup(brewery_id, beer_id): item_id = brewery_id + "-" + beer_id try: beer_result = beer[item_id] - return beer_result + return beer_result, brewery_names[brewery_id] except: return None @@ -64,11 +67,12 @@ def find_beers_from_brewery(brewery_id): class BeerInfo(object): - def __init__(self, item_json): + def __init__(self, item_json, brewery_name): self.parent_style = item_json[1][1] self.base_style = item_json[1][0] self.name = item_json[0] self.abv = item_json[2] + self.brewer = brewery_name self.num_reviews = item_json[3] diff --git a/templates/beerpage.jinja2 b/templates/beerpage.jinja2 index 92bb896..f16660c 100644 --- a/templates/beerpage.jinja2 +++ b/templates/beerpage.jinja2 @@ -1,6 +1,7 @@ {% extends "base.html" %} {% block content %} <div id="title" class="text-center"> + <h2>{{ beer_data.brewer if beer_data != None else 'DELICOUS BREWER' }}</h2> <h2>{{ beer_data.name if beer_data != None else 'DELICOUS BEER' }}</h2> </div> <div id="stats"> |