From 177db071d8ce0c176e1fa537b7939926c344a19f Mon Sep 17 00:00:00 2001
From: Stephanie Br <stephaniebr@apples-MacBook-Pro-3.local>
Date: Thu, 12 Oct 2017 14:46:26 +0530
Subject: [PATCH 1/6] rename .html to .html.jinja2

---
 geekup/templates/{404.html => 404.html.jinja2}     |  0
 .../{accesskey.html => accesskey.html.jinja2}      |  0
 .../{approve.html => approve.html.jinja2}          |  0
 .../{confirm.html => confirm.html.jinja2}          |  0
 .../{datatable.html => datatable.html.jinja2}      |  0
 geekup/templates/{event.html => event.html.jinja2} |  0
 geekup/templates/{index.html => index.html.jinja2} |  0
 .../templates/{layout.html => layout.html.jinja2}  |  0
 .../templates/{macros.html => macros.html.jinja2}  |  0
 ...{participants.html => participants.html.jinja2} |  0
 .../{regform.html => regform.html.jinja2}          |  0
 .../{regsuccess.html => regsuccess.html.jinja2}    |  0
 geekup/templates/{rsvp.html => rsvp.html.jinja2}   |  0
 .../{rsvpform.html => rsvpform.html.jinja2}        |  0
 .../{rsvpsuccess.html => rsvpsuccess.html.jinja2}  |  0
 geekup/templates/{stats.html => stats.html.jinja2} |  0
 .../{venuereg.html => venuereg.html.jinja2}        |  0
 ...regdetails.html => venueregdetails.html.jinja2} |  0
 ...{venueregform.html => venueregform.html.jinja2} |  0
 .../{venueregnew.html => venueregnew.html.jinja2}  |  0
 ...regsuccess.html => venueregsuccess.html.jinja2} |  0
 .../{venuesheet.html => venuesheet.html.jinja2}    |  0
 geekup/views/errors.py                             |  2 +-
 geekup/views/user.py                               | 14 +++++++-------
 24 files changed, 8 insertions(+), 8 deletions(-)
 rename geekup/templates/{404.html => 404.html.jinja2} (100%)
 rename geekup/templates/{accesskey.html => accesskey.html.jinja2} (100%)
 rename geekup/templates/{approve.html => approve.html.jinja2} (100%)
 rename geekup/templates/{confirm.html => confirm.html.jinja2} (100%)
 rename geekup/templates/{datatable.html => datatable.html.jinja2} (100%)
 rename geekup/templates/{event.html => event.html.jinja2} (100%)
 rename geekup/templates/{index.html => index.html.jinja2} (100%)
 rename geekup/templates/{layout.html => layout.html.jinja2} (100%)
 rename geekup/templates/{macros.html => macros.html.jinja2} (100%)
 rename geekup/templates/{participants.html => participants.html.jinja2} (100%)
 rename geekup/templates/{regform.html => regform.html.jinja2} (100%)
 rename geekup/templates/{regsuccess.html => regsuccess.html.jinja2} (100%)
 rename geekup/templates/{rsvp.html => rsvp.html.jinja2} (100%)
 rename geekup/templates/{rsvpform.html => rsvpform.html.jinja2} (100%)
 rename geekup/templates/{rsvpsuccess.html => rsvpsuccess.html.jinja2} (100%)
 rename geekup/templates/{stats.html => stats.html.jinja2} (100%)
 rename geekup/templates/{venuereg.html => venuereg.html.jinja2} (100%)
 rename geekup/templates/{venueregdetails.html => venueregdetails.html.jinja2} (100%)
 rename geekup/templates/{venueregform.html => venueregform.html.jinja2} (100%)
 rename geekup/templates/{venueregnew.html => venueregnew.html.jinja2} (100%)
 rename geekup/templates/{venueregsuccess.html => venueregsuccess.html.jinja2} (100%)
 rename geekup/templates/{venuesheet.html => venuesheet.html.jinja2} (100%)

diff --git a/geekup/templates/404.html b/geekup/templates/404.html.jinja2
similarity index 100%
rename from geekup/templates/404.html
rename to geekup/templates/404.html.jinja2
diff --git a/geekup/templates/accesskey.html b/geekup/templates/accesskey.html.jinja2
similarity index 100%
rename from geekup/templates/accesskey.html
rename to geekup/templates/accesskey.html.jinja2
diff --git a/geekup/templates/approve.html b/geekup/templates/approve.html.jinja2
similarity index 100%
rename from geekup/templates/approve.html
rename to geekup/templates/approve.html.jinja2
diff --git a/geekup/templates/confirm.html b/geekup/templates/confirm.html.jinja2
similarity index 100%
rename from geekup/templates/confirm.html
rename to geekup/templates/confirm.html.jinja2
diff --git a/geekup/templates/datatable.html b/geekup/templates/datatable.html.jinja2
similarity index 100%
rename from geekup/templates/datatable.html
rename to geekup/templates/datatable.html.jinja2
diff --git a/geekup/templates/event.html b/geekup/templates/event.html.jinja2
similarity index 100%
rename from geekup/templates/event.html
rename to geekup/templates/event.html.jinja2
diff --git a/geekup/templates/index.html b/geekup/templates/index.html.jinja2
similarity index 100%
rename from geekup/templates/index.html
rename to geekup/templates/index.html.jinja2
diff --git a/geekup/templates/layout.html b/geekup/templates/layout.html.jinja2
similarity index 100%
rename from geekup/templates/layout.html
rename to geekup/templates/layout.html.jinja2
diff --git a/geekup/templates/macros.html b/geekup/templates/macros.html.jinja2
similarity index 100%
rename from geekup/templates/macros.html
rename to geekup/templates/macros.html.jinja2
diff --git a/geekup/templates/participants.html b/geekup/templates/participants.html.jinja2
similarity index 100%
rename from geekup/templates/participants.html
rename to geekup/templates/participants.html.jinja2
diff --git a/geekup/templates/regform.html b/geekup/templates/regform.html.jinja2
similarity index 100%
rename from geekup/templates/regform.html
rename to geekup/templates/regform.html.jinja2
diff --git a/geekup/templates/regsuccess.html b/geekup/templates/regsuccess.html.jinja2
similarity index 100%
rename from geekup/templates/regsuccess.html
rename to geekup/templates/regsuccess.html.jinja2
diff --git a/geekup/templates/rsvp.html b/geekup/templates/rsvp.html.jinja2
similarity index 100%
rename from geekup/templates/rsvp.html
rename to geekup/templates/rsvp.html.jinja2
diff --git a/geekup/templates/rsvpform.html b/geekup/templates/rsvpform.html.jinja2
similarity index 100%
rename from geekup/templates/rsvpform.html
rename to geekup/templates/rsvpform.html.jinja2
diff --git a/geekup/templates/rsvpsuccess.html b/geekup/templates/rsvpsuccess.html.jinja2
similarity index 100%
rename from geekup/templates/rsvpsuccess.html
rename to geekup/templates/rsvpsuccess.html.jinja2
diff --git a/geekup/templates/stats.html b/geekup/templates/stats.html.jinja2
similarity index 100%
rename from geekup/templates/stats.html
rename to geekup/templates/stats.html.jinja2
diff --git a/geekup/templates/venuereg.html b/geekup/templates/venuereg.html.jinja2
similarity index 100%
rename from geekup/templates/venuereg.html
rename to geekup/templates/venuereg.html.jinja2
diff --git a/geekup/templates/venueregdetails.html b/geekup/templates/venueregdetails.html.jinja2
similarity index 100%
rename from geekup/templates/venueregdetails.html
rename to geekup/templates/venueregdetails.html.jinja2
diff --git a/geekup/templates/venueregform.html b/geekup/templates/venueregform.html.jinja2
similarity index 100%
rename from geekup/templates/venueregform.html
rename to geekup/templates/venueregform.html.jinja2
diff --git a/geekup/templates/venueregnew.html b/geekup/templates/venueregnew.html.jinja2
similarity index 100%
rename from geekup/templates/venueregnew.html
rename to geekup/templates/venueregnew.html.jinja2
diff --git a/geekup/templates/venueregsuccess.html b/geekup/templates/venueregsuccess.html.jinja2
similarity index 100%
rename from geekup/templates/venueregsuccess.html
rename to geekup/templates/venueregsuccess.html.jinja2
diff --git a/geekup/templates/venuesheet.html b/geekup/templates/venuesheet.html.jinja2
similarity index 100%
rename from geekup/templates/venuesheet.html
rename to geekup/templates/venuesheet.html.jinja2
diff --git a/geekup/views/errors.py b/geekup/views/errors.py
index 2e94ec3..30e91b9 100644
--- a/geekup/views/errors.py
+++ b/geekup/views/errors.py
@@ -7,4 +7,4 @@
 
 @app.errorhandler(404)
 def page_not_found(e):
-        return render_template('404.html'), 404
+        return render_template('404.html.jinja2'), 404
diff --git a/geekup/views/user.py b/geekup/views/user.py
index 7a6c5eb..0e6a2b1 100755
--- a/geekup/views/user.py
+++ b/geekup/views/user.py
@@ -55,7 +55,7 @@ def eventpage(year, eventname, regform=None):
             'venue_description': Markup(event.venue.description),
             'venue_address': Markup(event.venue.address),
             }
-    return render_template('event.html', **context)
+    return render_template('event.html.jinja2', **context)
 
 
 @app.route('/<year>/<eventname>', methods=['POST'])
@@ -80,10 +80,10 @@ def register(year, eventname):
             mail.send(msg)
             participant.email_sent = True
             db.session.commit()
-        return render_template('regsuccess.html')
+        return render_template('regsuccess.html.jinja2')
     else:
         if request.is_xhr:
-            return render_template('regform.html',
+            return render_template('regform.html.jinja2',
                                    regform=form, ajax_re_register=True)
         else:
             flash("Please check your details and try again.", 'error')
@@ -106,7 +106,7 @@ def confirm_email(pid, key, rsvpform=None):
             'rsvpform': rsvpform,
             'tweet': tweet,
         }
-        return render_template('confirm.html', **context)
+        return render_template('confirm.html.jinja2', **context)
     return redirect(url_for('index'))
 
 
@@ -118,7 +118,7 @@ def rsvp(pid, key):
         if form.validate_on_submit():
             participant.rsvp = form.data['rsvp']
             db.session.commit()
-            return render_template('rsvpsuccess.html')
+            return render_template('rsvpsuccess.html.jinja2')
         else:
             if request.is_xhr:
                 context = {
@@ -126,7 +126,7 @@ def rsvp(pid, key):
                     'participant': participant,
                      'ajax_re_register': True,
                 }
-                return render_template('rsvpform.html', **context)
+                return render_template('rsvpform.html.jinja2', **context)
             else:
                 flash("Please check your details and try again.", 'error')
                 return confirm_email(pid, key, rsvpform=form)
@@ -146,4 +146,4 @@ def participant_list(year, eventname):
         'confirmed_participants': [participant for participant in participants if participant.email_status],
         'unconfirmed_participants': [participant for participant in participants if not participant.email_status],
     }
-    return render_template('participants.html', **context)
+    return render_template('participants.html.jinja2', **context)

From 76415f0794f17d89e53368fc983a1fa379cb2283 Mon Sep 17 00:00:00 2001
From: Stephanie Br <stephaniebr@apples-MacBook-Pro-3.local>
Date: Thu, 12 Oct 2017 15:41:13 +0530
Subject: [PATCH 2/6] renaming .html to .html.jinja2

---
 geekup/templates/404.html.jinja2             |  4 ++--
 geekup/templates/accesskey.html.jinja2       |  4 ++--
 geekup/templates/approve.html.jinja2         |  2 +-
 geekup/templates/confirm.html.jinja2         | 10 +++++-----
 geekup/templates/datatable.html.jinja2       |  2 +-
 geekup/templates/event.html.jinja2           |  8 ++++----
 geekup/templates/index.html.jinja2           |  6 +++---
 geekup/templates/layout.html.jinja2          |  4 ++--
 geekup/templates/participants.html.jinja2    |  4 ++--
 geekup/templates/regform.html.jinja2         |  2 +-
 geekup/templates/rsvp.html.jinja2            |  4 ++--
 geekup/templates/rsvpform.html.jinja2        |  2 +-
 geekup/templates/stats.html.jinja2           |  4 ++--
 geekup/templates/venuereg.html.jinja2        |  2 +-
 geekup/templates/venueregdetails.html.jinja2 |  2 +-
 geekup/templates/venueregnew.html.jinja2     |  6 +++---
 geekup/templates/venuesheet.html.jinja2      |  2 +-
 17 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/geekup/templates/404.html.jinja2 b/geekup/templates/404.html.jinja2
index d55cbfe..05f2bfd 100644
--- a/geekup/templates/404.html.jinja2
+++ b/geekup/templates/404.html.jinja2
@@ -1,5 +1,5 @@
-{% extends "layout.html" %}
-{% from 'macros.html' import ajaxform %}
+{% extends "layout.html.jinja2" %}
+{% from 'macros.html.jinja2' import ajaxform %}
 {% block title %}This page does not exist{% endblock %}
 {% block content %}
 <h2>This page does not exist</h2>
diff --git a/geekup/templates/accesskey.html.jinja2 b/geekup/templates/accesskey.html.jinja2
index bc6a719..0414a6a 100644
--- a/geekup/templates/accesskey.html.jinja2
+++ b/geekup/templates/accesskey.html.jinja2
@@ -1,6 +1,6 @@
 {# Render a form asking for the access key #}
-{% extends "layout.html" %}
-{% from 'macros.html' import renderform %}
+{% extends "layout.html.jinja2" %}
+{% from 'macros.html.jinja2' import renderform %}
 {% block title %}Access Key Required{% endblock %}
 
 {% block header %}
diff --git a/geekup/templates/approve.html.jinja2 b/geekup/templates/approve.html.jinja2
index 697443a..38c561c 100644
--- a/geekup/templates/approve.html.jinja2
+++ b/geekup/templates/approve.html.jinja2
@@ -1,5 +1,5 @@
 {# Approve participants #}
-{% extends "layout.html" %}
+{% extends "layout.html.jinja2" %}
 {% block title %}Approve Participants{% endblock %}
 
 {% block header %}
diff --git a/geekup/templates/confirm.html.jinja2 b/geekup/templates/confirm.html.jinja2
index 6016793..efc21f9 100644
--- a/geekup/templates/confirm.html.jinja2
+++ b/geekup/templates/confirm.html.jinja2
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "layout.html.jinja2" %}
 {% block title %}{{ participant.event.title|e }}{% endblock %}
 
 {% block header %}
@@ -13,7 +13,7 @@
     #container, footer {
       max-width: 100%;
     }
-    
+
     footer {
       text-align: left;
     }
@@ -26,17 +26,17 @@
   <a href="https://twitter.com/share?url={{ url_for('eventpage', year=participant.event.year, eventname=participant.event.name, _external=True) }}" class="twitter-share-button" data-url="{{ url_for('eventpage', year=participant.event.year, eventname=participant.event.name, _external=True) }}" data-text="{{ tweet }}">Tweet</a>
 <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
 <div id="rsvp-form">
-{% include 'rsvpform.html' %}
+{% include 'rsvpform.html.jinja2' %}
 </div>
 {% endblock %}
 {% block footerscripts %}
 
 <!-- Ajax form -->
-{% from "macros.html" import ajaxform -%}
+{% from "macros.html.jinja2" import ajaxform -%}
 {{ ajaxform('regform', request, True) }}
 
 <!-- Ajax form -->
-{% from "macros.html" import ajaxform %}
+{% from "macros.html.jinja2" import ajaxform %}
 {{ ajaxform('rsvpform', request, True) }}
 
 {% endblock %}
diff --git a/geekup/templates/datatable.html.jinja2 b/geekup/templates/datatable.html.jinja2
index 8c7aee5..d22b195 100644
--- a/geekup/templates/datatable.html.jinja2
+++ b/geekup/templates/datatable.html.jinja2
@@ -1,5 +1,5 @@
 {# Render a data table. Nothing fancy #}
-{% extends "layout.html" %}
+{% extends "layout.html.jinja2" %}
 {% block title %}{{ title|e }}{% endblock %}
 
 {% block header %}
diff --git a/geekup/templates/event.html.jinja2 b/geekup/templates/event.html.jinja2
index 0aab74f..936206c 100644
--- a/geekup/templates/event.html.jinja2
+++ b/geekup/templates/event.html.jinja2
@@ -1,5 +1,5 @@
-{% extends "layout.html" %}
-{% from 'macros.html' import ajaxform, render_schedule %}
+{% extends "layout.html.jinja2" %}
+{% from 'macros.html.jinja2' import ajaxform, render_schedule %}
 {% block title %}{{ event.title }}{% endblock %}
 {% block main %}
 <article id="about">
@@ -51,7 +51,7 @@
         </p>
       </div>
       <div id="register-form">
-        {% include 'regform.html' %}
+        {% include 'regform.html.jinja2' %}
       </div>
       {% endif %}
     </div>
@@ -87,7 +87,7 @@
 {% block footerscripts %}
 
 <!-- Ajax form -->
-{% from "macros.html" import ajaxform -%}
+{% from "macros.html.jinja2" import ajaxform -%}
 {{ ajaxform('regform', request, True) }}
 
   <script type="text/javascript">
diff --git a/geekup/templates/index.html.jinja2 b/geekup/templates/index.html.jinja2
index 6d9c1f7..870bfc9 100644
--- a/geekup/templates/index.html.jinja2
+++ b/geekup/templates/index.html.jinja2
@@ -1,9 +1,9 @@
-{% extends "layout.html" %}
-{% from 'macros.html' import ajaxform %}
+{% extends "layout.html.jinja2" %}
+{% from 'macros.html.jinja2' import ajaxform %}
 {% block title %}Geekup{% endblock %}
 {% block content %}
 {% for event in events %}
 <h2><a href="{{ url_for('eventpage', event=event.name) }}">{{ event }}</a></h2>
-{{ event.description | safe }}  
+{{ event.description | safe }}
 {% endfor %}
 {% endblock %}
diff --git a/geekup/templates/layout.html.jinja2 b/geekup/templates/layout.html.jinja2
index a208ec8..b1aeff9 100644
--- a/geekup/templates/layout.html.jinja2
+++ b/geekup/templates/layout.html.jinja2
@@ -1,4 +1,4 @@
-{% from "baseframe/components.html" import networkbar with context -%}
+{% from "baseframe/components.html.jinja2" import networkbar with context -%}
 <!DOCTYPE html>
 <!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"> <![endif]-->
 <!--[if IE 7 ]>    <html lang="en" class="no-js ie7"> <![endif]-->
@@ -7,7 +7,7 @@
 <!--[if (gt IE 9)|!(IE)]><!--> <html lang="en" class="no-js"> <!--<![endif]-->
 <head>
   <!--
-  
+
   Does this website look familiar? That's because it was adapted from
   two earlier websites: Scaling PHP in the Cloud (https://phpcloud.hasgeek.com)
   and DocType HTML5 (http://www.doctypehtml5.in).
diff --git a/geekup/templates/participants.html.jinja2 b/geekup/templates/participants.html.jinja2
index 5dfc549..fb5be94 100644
--- a/geekup/templates/participants.html.jinja2
+++ b/geekup/templates/participants.html.jinja2
@@ -1,5 +1,5 @@
-{% extends "layout.html" %}
-{% from 'macros.html' import ajaxform %}
+{% extends "layout.html.jinja2" %}
+{% from 'macros.html.jinja2' import ajaxform %}
 {% block title %}GeekUp{% endblock %}
 {% block content %}
 <h2><a href="{{ url_for('eventpage', year=event.year, eventname=event.name) }}">{{ event }}</a></h2>
diff --git a/geekup/templates/regform.html.jinja2 b/geekup/templates/regform.html.jinja2
index aaf1769..ca17fa8 100644
--- a/geekup/templates/regform.html.jinja2
+++ b/geekup/templates/regform.html.jinja2
@@ -1,4 +1,4 @@
-{% from 'macros.html' import renderform, ajaxform %}
+{% from 'macros.html.jinja2' import renderform, ajaxform %}
 {{ renderform(regform, 'regform', 'Register') }}
 {% if ajax_re_register %}
   {{ ajaxform('regform', request, False) }}
diff --git a/geekup/templates/rsvp.html.jinja2 b/geekup/templates/rsvp.html.jinja2
index 02def1c..a87dd90 100644
--- a/geekup/templates/rsvp.html.jinja2
+++ b/geekup/templates/rsvp.html.jinja2
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "layout.html.jinja2" %}
 {% block title %}{{ title|e }}{% endblock %}
 
 {% block header %}
@@ -13,7 +13,7 @@
     #container, footer {
       max-width: 100%;
     }
-    
+
     footer {
       text-align: left;
     }
diff --git a/geekup/templates/rsvpform.html.jinja2 b/geekup/templates/rsvpform.html.jinja2
index f3a529e..a65330f 100644
--- a/geekup/templates/rsvpform.html.jinja2
+++ b/geekup/templates/rsvpform.html.jinja2
@@ -1,4 +1,4 @@
-{% from 'macros.html' import renderform, ajaxform %}
+{% from 'macros.html.jinja2' import renderform, ajaxform %}
 {{ renderform(rsvpform, 'rsvpform', 'Submit') }}
 {% if ajax_re_register %}
   {{ ajaxform('rsvpform', request, False) }}
diff --git a/geekup/templates/stats.html.jinja2 b/geekup/templates/stats.html.jinja2
index 868785b..42123c1 100644
--- a/geekup/templates/stats.html.jinja2
+++ b/geekup/templates/stats.html.jinja2
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "layout.html.jinja2" %}
 {% block title %}Statistics{% endblock %}
 
 {% block header %}
@@ -16,7 +16,7 @@
     }
     h1 {
       text-transform: none;
-    }    
+    }
   </style>
 {% endblock %}
 
diff --git a/geekup/templates/venuereg.html.jinja2 b/geekup/templates/venuereg.html.jinja2
index 204acca..f3c2c7d 100644
--- a/geekup/templates/venuereg.html.jinja2
+++ b/geekup/templates/venuereg.html.jinja2
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "layout.html.jinja2" %}
 {% block title %}DocType HTML5 At Venue Registration{% endblock %}
 
 {% block pageheaders %}
diff --git a/geekup/templates/venueregdetails.html.jinja2 b/geekup/templates/venueregdetails.html.jinja2
index 1d0da12..5beae2b 100644
--- a/geekup/templates/venueregdetails.html.jinja2
+++ b/geekup/templates/venueregdetails.html.jinja2
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "layout.html.jinja2" %}
 {% block title %}DocType HTML5 At Venue Registration{% endblock %}
 
 {% block pageheaders %}
diff --git a/geekup/templates/venueregnew.html.jinja2 b/geekup/templates/venueregnew.html.jinja2
index 174c92d..34ab30f 100644
--- a/geekup/templates/venueregnew.html.jinja2
+++ b/geekup/templates/venueregnew.html.jinja2
@@ -1,5 +1,5 @@
-{% extends "layout.html" %}
-{% from 'macros.html' import renderform, ajaxform %}
+{% extends "layout.html.jinja2" %}
+{% from 'macros.html.jinja2' import renderform, ajaxform %}
 {% block title %}DocType HTML5 At Venue Registration{% endblock %}
 
 {% block pageheaders %}
@@ -22,7 +22,7 @@
     Hello there! We didn’t recognise you. Would you like to register?
     Or, <a href="{{ url_for('admin_venue', edition=edition) }}">search again</a>.
   </p>
-  {% include 'venueregform.html' %}
+  {% include 'venueregform.html.jinja2' %}
 {% endblock %}
 
 {% block footer %}
diff --git a/geekup/templates/venuesheet.html.jinja2 b/geekup/templates/venuesheet.html.jinja2
index 897385c..0c258ed 100644
--- a/geekup/templates/venuesheet.html.jinja2
+++ b/geekup/templates/venuesheet.html.jinja2
@@ -1,5 +1,5 @@
 {# Sign-in sheet #}
-{% extends "layout.html" %}
+{% extends "layout.html.jinja2" %}
 {% block title %}At Venue Sign-in{% endblock %}
 
 {% block header %}

From 9b2e780481bd3bc835525b27aa97fd16c37fdda6 Mon Sep 17 00:00:00 2001
From: Stephanie Br <stephaniebr@apples-MacBook-Pro-3.local>
Date: Thu, 12 Oct 2017 16:36:03 +0530
Subject: [PATCH 3/6] removed --use-mirrors

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9571fc4..c745a75 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: python
 python:
   - "2.7"
 install:
-  - pip install -r requirements.txt --use-mirrors
+  - pip install -r requirements.txt
 script:
   - coverage run `which nosetests`
 notifications:

From e05bc182f7f85160d2d60264cfd295950f224332 Mon Sep 17 00:00:00 2001
From: Stephanie Br <stephaniebr@apples-MacBook-Pro-3.local>
Date: Fri, 13 Oct 2017 13:06:51 +0530
Subject: [PATCH 4/6] rename .html to .html.jinja2

---
 geekup/templates/venueregform.html.jinja2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/geekup/templates/venueregform.html.jinja2 b/geekup/templates/venueregform.html.jinja2
index 26479af..fef42c7 100644
--- a/geekup/templates/venueregform.html.jinja2
+++ b/geekup/templates/venueregform.html.jinja2
@@ -1,4 +1,4 @@
-{% from 'macros.html' import renderform, ajaxform %}
+{% from 'macros.html.jinja2' import renderform, ajaxform %}
 {{ renderform(regform, 'venueregform', url_for('admin_venue', edition=edition), 'Register') }}
 {% if ajax_re_register %}
   {{ ajaxform('venueregform') }}

From f29973c2ea5cb59a79b424819fd61d88166781d5 Mon Sep 17 00:00:00 2001
From: Stephanie Br <stephaniebr@apples-MacBook-Pro-3.local>
Date: Fri, 13 Oct 2017 14:21:48 +0530
Subject: [PATCH 5/6] added test_requirements.txt

---
 .travis.yml           | 4 +++-
 runtests.sh           | 5 +++++
 test_requirements.txt | 5 +++++
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100755 runtests.sh
 create mode 100644 test_requirements.txt

diff --git a/.travis.yml b/.travis.yml
index c745a75..95ffadd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,10 +3,12 @@ python:
   - "2.7"
 install:
   - pip install -r requirements.txt
+  - pip install -r test_requirements.txt
 script:
-  - coverage run `which nosetests`
+  - ./runtests.sh
 notifications:
   email: false
   slack:
     - hasgeek:HDCoMDj3T4ICB59qFFVorCG8
     - friendsofhasgeek:3bLViYSzhfaThJovFYCVD3fX
+
diff --git a/runtests.sh b/runtests.sh
new file mode 100755
index 0000000..2e9cb98
--- /dev/null
+++ b/runtests.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+set -e
+export FLASK_ENV="TESTING"
+coverage run `which nosetests` "$@"
+coverage report -m
diff --git a/test_requirements.txt b/test_requirements.txt
new file mode 100644
index 0000000..176dbd4
--- /dev/null
+++ b/test_requirements.txt
@@ -0,0 +1,5 @@
+coverage
+nose
+mock
+coveralls
+

From 9dcfc231b8792a9d25991e4091f62313f764da5e Mon Sep 17 00:00:00 2001
From: Stephanie Br <stephaniebr@apples-MacBook-Pro-3.local>
Date: Fri, 13 Oct 2017 14:36:28 +0530
Subject: [PATCH 6/6] edited testing.py

---
 instance/testing.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/instance/testing.py b/instance/testing.py
index 0cbd31a..18d7277 100644
--- a/instance/testing.py
+++ b/instance/testing.py
@@ -1,2 +1,6 @@
 #: Database backend
 SQLALCHEMY_DATABASE_URI = 'sqlite:///'
+LASTUSER_SERVER = 'https://auth.hasgeek.com'
+LASTUSER_CLIENT_ID = ''
+LASTUSER_CLIENT_SECRET = ''
+