fixing beer page

2 files changed, 11 insertions, 11 deletions

diff --git a/app.py b/app.py
index ed927c8..d84f9a3 100644
--- a/app.py
+++ b/app.py
@@ -27,7 +27,8 @@ def get_brewery_list(brewery_id):
 @app.route('/brewery/<brewery_id>/<beer_id>')
 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)
+    beerinfo = BeerInfo(beer_result)
+    return render_template('beerpage.jinja2', beer_data=beerinfo)
 
 def beer_lookup(brewery_id, beer_id):
     item_id = brewery_id + "-" + beer_id
@@ -42,8 +43,6 @@ def find_beers_from_brewery(brewery_id):
     beers =  [value for key, value in beer.items() if pattern.match(key)]
     return beers
 
-if __name__ == '__main__':
-    app.run(host='0.0.0.0')
 
 class BeerInfo(object):
 
@@ -53,6 +52,7 @@ class BeerInfo(object):
         self.name = item_json[0]
         self.abv = item_json[2]
 
+
 class Brewery(object):
     def __init__(self, id):
         self.id = id
@@ -60,3 +60,7 @@ class Brewery(object):
 
     def add_brew(self, brew):
         self.brews.append(brew)
+
+
+if __name__ == '__main__':
+    app.run(host='0.0.0.0')
diff --git a/templates/beerpage.jinja2 b/templates/beerpage.jinja2
index 65b9fb1..1fead45 100644
--- a/templates/beerpage.jinja2
+++ b/templates/beerpage.jinja2
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% block content %}
     <div id="title" class="text-center">
-        <h2>{{ beer_data['name'] if beer_data != None else 'DELICOUS BEER' }}</h2>
+        <h2>{{ beer_data.name if beer_data != None else 'DELICOUS BEER' }}</h2>
     </div>
     <div id="stats">
         <table class="table">
@@ -11,18 +11,14 @@
                 <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>
+                <td>{{ beer_data.parent_style if beer_data != None else 'ASS BEER' }}</td>
+                <td>{{ beer_data.base_style if beer_data != None else 'TURBO ASS BEER' }}</td>
+                <td>{{ beer_data.abv if beer_data != None else 'BETWEEN 0 and 100' }}</td>
             </tr>
         </table>
     </div>
     <div id="machine">
     <select>
-    {% for item in beer_data['attributes']%}
-        <option>{{ item['name'] }}</option>
-
-    {% endfor  %}
     </select>
     </div>
 {% endblock %}
\ No newline at end of file