From ae0b5d946aa3c0d5c1510450d28eb7b987923e3e Mon Sep 17 00:00:00 2001 From: Ben Burwell Date: Sun, 28 Jul 2019 12:36:47 -0400 Subject: Redirect to random beer details --- app.py | 15 +++++---------- templates/Homepage.jinja2 | 14 +++++--------- templates/base.html | 6 ++++-- 3 files changed, 14 insertions(+), 21 deletions(-) diff --git a/app.py b/app.py index ebf4207..ed927c8 100644 --- a/app.py +++ b/app.py @@ -1,5 +1,7 @@ from flask import Flask from flask import render_template +from flask import redirect +from flask import url_for import json import random import re @@ -11,16 +13,12 @@ with open("./data/beers.json") as beers_json: @app.route('/') def index(): - return render_template('Homepage.jinja2', suggestions=all_beer_names()) + return render_template('Homepage.jinja2') @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=[]) + rando = random.choice(list(beer.keys())).split('-') + return redirect(url_for('get_beer_details', brewery_id=rando[0], beer_id=rando[1])) @app.route('/brewery//') def get_brewery_list(brewery_id): @@ -39,9 +37,6 @@ 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)] diff --git a/templates/Homepage.jinja2 b/templates/Homepage.jinja2 index 191d591..e42128d 100644 --- a/templates/Homepage.jinja2 +++ b/templates/Homepage.jinja2 @@ -1,12 +1,8 @@ {% extends "base.html" %} {% block content %} -

SimilarBeer

-
-
-
- -
- -
-

Random Beer

+
+

Similar.Beer

+ +

Random Beer

+
{% endblock %} diff --git a/templates/base.html b/templates/base.html index a2fe85f..e688c41 100644 --- a/templates/base.html +++ b/templates/base.html @@ -19,7 +19,9 @@ {% endblock %} -
{% block content %}{% endblock %}
+
+ {% block content %}{% endblock %} +
- \ No newline at end of file + -- cgit v1.2.3