Minor changes from testing, add favicon

cwang360 · cwang360 · commit eaaa209ef0ea · 2021-09-12T00:08:20.000-04:00
diff --git a/README.md b/README.md
@@ -14,9 +14,7 @@ Automating Individual Event Pages.
 - ~~Current state of this repo automatically deployed [here](http://test-environment.eba-s4xs6euy.us-east-1.elasticbeanstalk.com/Timber%20Woods%20High%20School)~~ (temporarily terminated environment while site is being connected to test data)
 - Test with school examples from test data:
     - `/cumberland%20valley` has sponsor example
+    - `/andover`
     - `/carmel` (missing event date and tree goals, but has tree species, one host, youtube video)
     - `/oakland%20tech-east%20bay` (missing event date and tree goals, but has tree species, multiple hosts, text message)
     - `/deerfield` or `/norwood` or `/paramus` (has event date, tree goals)
-- Need to test: 
-    - price, donate=false (should already work, just don't have test data yet)
-    - volunteer link, tree purchase link, sponsor links, tree info links (should already work, just don't have test data yet)
diff --git a/dataToPickle.py b/dataToPickle.py
@@ -101,6 +101,8 @@
     except:
         print("Order deadline could not be calculated for date: ", eventData[school]['date'], "from school:", school)
         pass
+
+    eventData[school]['price'] = float(eventData[school]['price'])
 # dump dictionary into pickle file
 with open('eventDataDict.pkl', 'wb') as handle:
     pickle.dump(eventData, handle, protocol=pickle.HIGHEST_PROTOCOL)
diff --git a/eventDataDict.pkl b/eventDataDict.pkl
diff --git a/static/images/favicon.png b/static/images/favicon.png
diff --git a/templates/base.html b/templates/base.html
@@ -6,6 +6,7 @@
     <link rel="stylesheet" href="{{ url_for('static', filename='css/main.css') }}">
     <link rel="preconnect" href="https://fonts.gstatic.com">
     <link href="https://fonts.googleapis.com/css2?family=Montserrat&display=swap" rel="stylesheet">
+    <link rel="icon" type="image/png" href="../static/images/favicon.png"/>
     {% block head %}{% endblock %}
   </head>
   <body>
diff --git a/templates/index.html b/templates/index.html
@@ -29,7 +29,7 @@ <h4 style="text-align: center; margin: 5% 10%; line-height: 1.5em">
     <h1>A Message from Our Team</h1>
     <hr />
     {% if event.media_type == 'video' or  event.media_type == 'text' %}
-    {% if event.video %}
+    {% if event.media_type == 'video' and event.video %}
         {% if 'www.youtube.com' in event.video %}
             <div class="video-container">
                 <iframe 
@@ -83,11 +83,11 @@ <h1>How to Participate</h1>
                     <div class="top">
                         <h3>Order a Sapling</h3>
                         <p>
-                            Order a ${{ event.price }} sapling to be planted in your yard by volunteers
+                            Order a {{ "$%.0f"|format(event.price) }} sapling to be planted in your yard by volunteers
                             on {{ event.date }}.
                         </p>
                     </div>
-                    <a href="{{ event.tree_order_ink }}" class="button">Order a Tree</a>
+                    <a href="{{ event.tree_order_link }}" class="button">Order a Tree</a>
                 </div>
                 <div class="card min2">
                     <div class="top">
