From 7447ae279d04d25a954e7e84b095572d2f8cf745 Mon Sep 17 00:00:00 2001 From: Sean Dolan Date: Sun, 28 Jul 2019 15:38:49 +0000 Subject: Seans branch --- app.py | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'app.py') diff --git a/app.py b/app.py index f0480da..a05d8a1 100644 --- a/app.py +++ b/app.py @@ -6,27 +6,31 @@ import re app = Flask(__name__) -with open("./static/beers.json") as beers_json: +with open("./data/beers.json") as beers_json: beer = json.loads(beers_json.read()) - @app.route('/') -def hello_world(): - hello_beer = random.choice(list(beer.keys())) - return render_template('Homepage.jinja2', item=beer[hello_beer]) +def index(): + return render_template('Homepage.jinja2', suggestions=all_beer_names()) + +@app.route('/random') +def random_beer(): + rando = random.choice(list(beer.keys())) + return render_template('random_beer.jinja2', beer=beer[rando]) +@app.route('/similar', methods=['POST']) +def similar(): + return render_template('similar.jinja2', beers=[]) @app.route('/brewery//') def get_brewery_list(brewery_id): return json.dumps(find_beers_from_brewery(brewery_id)) - @app.route('/brewery//') def get_beer_details(brewery_id, beer_id): beer_result = beer_lookup(brewery_id,beer_id) return render_template('beerpage.jinja2', beer_data=beer_result) - def beer_lookup(brewery_id, beer_id): item_id = brewery_id + "-" + beer_id try: @@ -35,17 +39,17 @@ def beer_lookup(brewery_id, beer_id): except: return None +def all_beer_names(): + return [value[0] for key, value in beer.items()] def find_beers_from_brewery(brewery_id): pattern = re.compile('^' + brewery_id + '-.*') beers = [value for key, value in beer.items() if pattern.match(key)] return beers - if __name__ == '__main__': app.run() - class BeerInfo(object): def __init__(self, item_json): @@ -54,7 +58,6 @@ class BeerInfo(object): self.name = item_json[0] self.abv = item_json[2] - class Brewery(object): def __init__(self, id): self.id = id -- cgit v1.2.3