aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Dolan <sed9182@rit.edu>2019-07-27 22:37:37 -0400
committerSean Dolan <sed9182@rit.edu>2019-07-27 22:37:37 -0400
commite3fbc5b232dfad18d9b23e7636e655acacbe7f63 (patch)
treee8903bacbaa3219da3c678ea94a132350e11a12e
parenta5a4efe60cb0878150ef5e5d19cd578ade757e60 (diff)
At work I have to have good commit messages
-rw-r--r--app.py11
-rw-r--r--templates/beerpage.jinja220
2 files changed, 28 insertions, 3 deletions
diff --git a/app.py b/app.py
index 5a075e9..f0480da 100644
--- a/app.py
+++ b/app.py
@@ -13,7 +13,7 @@ with open("./static/beers.json") as beers_json:
@app.route('/')
def hello_world():
hello_beer = random.choice(list(beer.keys()))
- return render_template('./Homepage.jinja2', item=beer[hello_beer])
+ return render_template('Homepage.jinja2', item=beer[hello_beer])
@app.route('/brewery/<brewery_id>/')
@@ -23,12 +23,17 @@ def get_brewery_list(brewery_id):
@app.route('/brewery/<brewery_id>/<beer_id>')
def get_beer_details(brewery_id, beer_id):
- return json.dumps(beer_lookup(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
- return beer[item_id]
+ try:
+ beer_result = beer[item_id]
+ return beer_result
+ except:
+ return None
def find_beers_from_brewery(brewery_id):
diff --git a/templates/beerpage.jinja2 b/templates/beerpage.jinja2
new file mode 100644
index 0000000..f743d1b
--- /dev/null
+++ b/templates/beerpage.jinja2
@@ -0,0 +1,20 @@
+{% extends "base.html" %}
+{% block content %}
+ <div id="title" class="text-center">
+ <h2>{{ beer_data['name'] if beer_data != None else 'DELICOUS BEER' }}</h2>
+ </div>
+ <div id="stats">
+ <table class="table">
+ <tr>
+ <th scope="col">Parent Style</th>
+ <th scope="col">Specific Style</th>
+ <th scope="col">Alcohol by Volume </th>
+ </tr>
+ <tr>
+ <td>{{ beer_data['parent_style'] if beer_data != None else 'ASS BEER' }}</td>
+ <td>{{ beer_data['parent_style'] if beer_data != None else 'TURBO ASS BEER' }}</td>
+ <td>{{ beer_data['parent_style'] if beer_data != None else 'BETWEEN 0 and 100' }}</td>
+ </tr>
+ </table>
+ </div>
+{% endblock %} \ No newline at end of file