diff options
author | Ben Burwell <ben@benburwell.com> | 2019-07-28 12:36:47 -0400 |
---|---|---|
committer | Ben Burwell <ben@benburwell.com> | 2019-07-28 12:37:12 -0400 |
commit | ae0b5d946aa3c0d5c1510450d28eb7b987923e3e (patch) | |
tree | 4f18bfb8e1e458cd60b14b258348def085e8d8e9 | |
parent | 4091a14f26dbc73dccab8a0111436521266c473c (diff) |
Redirect to random beer details
-rw-r--r-- | app.py | 15 | ||||
-rw-r--r-- | templates/Homepage.jinja2 | 14 | ||||
-rw-r--r-- | templates/base.html | 6 |
3 files changed, 14 insertions, 21 deletions
@@ -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/<brewery_id>/') 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 %} -<h1>SimilarBeer</h1> -<form action="/similar" method="post"> - <div> - <label for="q"><strong>Tell us a beer you like:</strong></label><br> - <input type="text" id="q" list="beers" autofocus> - </div> - <input type="submit" value="Show me others!"> -</form> -<p><a href="/random">Random Beer</a></p> +<div class="text-center"> + <h1>Similar.Beer</h1> + <img src="{{ url_for('static', filename='logo.jpg') }}"> + <p><a class="btn btn-primary" href="/random">Random Beer</a></p> +</div> {% 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 %} </head> <body> - <div id="content">{% block content %}{% endblock %}</div> + <div class="container"> + {% block content %}{% endblock %} + </div> <div id="footer"> {% block footer %} <p > @@ -28,4 +30,4 @@ {% endblock %} </div> </body> -</html>
\ No newline at end of file +</html> |