Checkpoint commit

Author: Michael Zhang

.gitignore

@@ -3,3 +3,4 @@
 .idea
 .env
 .secret_key
+npm-debug.log

Procfile

@@ -1 +1,2 @@
-web: python manage.py db upgrade && gunicorn cal:app --log-file -
+web: python manage.py db upgrade && gunicorn cal:app --log-file -
+dev: python manage.py db upgrade && python manage.py runserver

config.py

@@ -17,6 +17,7 @@ def __init__(self, app_root=None, testing=False):
         self._load_secret_key()
         self.SQLALCHEMY_DATABASE_URI = self._get_database_url()
         self.SQLALCHEMY_TRACK_MODIFICATIONS = False
+        self.TEMPLATES_AUTO_RELOAD = True
 
         if testing:
             self.TESTING = True

forms.py

@@ -32,8 +32,8 @@ def validate_password(self, field):
 
 class RegisterForm(Form):
     email = StringField('Email', validators=[InputRequired()])
-    username = StringField('Username', validators=[InputRequired(), Length(min=4, max=128)])
-    password = PasswordField('Password', validators=[InputRequired(), Length(min=8, max=56)])
+    username = StringField('Username', validators=[InputRequired(), Length(min=4, max=16, message='Username must be between 4 and 16 characters long.')])
+    password = PasswordField('Password', validators=[InputRequired(), Length(min=8, max=56, message='Password must be between 8 and 56 characters long.')])
 
     def validate_email(self, field):
         if not util.validate_email_format(field.data):

requirements.txt

@@ -3,6 +3,7 @@ bcrypt
 Flask
 Flask-Login
 Flask-Migrate
+Flask-OAuthlib
 Flask-Script
 Flask-SQLAlchemy
 Flask-WTF

setup.sh

@@ -7,4 +7,4 @@ apt-get -y upgrade
 apt-get -y install python-dev python-pip libffi-dev
 apt-get -y install postgresql postgresql-contrib libpq-dev
 
-pip install -r requirements.txt
+pip install -r /vagrant/requirements.txt

templates/events/manage.html

@@ -49,6 +49,7 @@ <h2 class="panel-title">Manage Event</h2>
                                     <label class="col-sm-3 control-label"></label>
                                     <div class="col-sm-9">
                                         <input type="submit" class="btn btn-success" value="Update"/>
+                                        <a href="javascript:delete_event();" class="btn btn-danger btn-sm">Delete</a>
                                     </div>
                                 </div>
                             </div>
@@ -67,4 +68,12 @@ <h4>How does this work?</h4>
             </div>
         </div>
     </div>
+
+    <script type="text/javascript">
+        var delete_event = function() {
+            if (confirm("Are you sure you want to delete this event?")) {
+                
+            }
+        };
+    </script>
 {% endblock %}

templates/layout.html

@@ -25,7 +25,7 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <!-- <a class="navbar-brand" href="/">CTF Calendar</a> -->
+            <a class="navbar-brand" href="/">CTF Calendar</a>
         </div>
         <div id="navbar-content" class="collapse navbar-collapse">
             <ul class="nav navbar-nav">
@@ -54,7 +54,7 @@
             </ul>
             {% if current_user.is_authenticated %}
                 <ul class="nav navbar-nav navbar-right">
-                    <li><a href="{{ url_for('events.events_create') }}">Add CTF</a></li>
+                    <li><a href="{{ url_for('events.events_create') }}">Create CTF</a></li>
                     {% if current_user.admin == true %}
                         <li class="dropdown">
                             <a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" role="button"
@@ -97,19 +97,7 @@
             </div>
         {% endif %}
     {% endwith %}
-    <div class="row">
-        <div class="col-sm-3">
-            <div id="sidebar" data-spy="affix">
-                <div class="jumbotron">
-                    <h3 style="text-align:center;"><a href="/" style="text-decoration:none;"><i
-                            class="fa fa-fw fa-calendar"></i> Calendar</a></h3>
-                </div>
-            </div>
-        </div>
-        <div class="col-sm-9">
-            {% block content %}{% endblock %}
-        </div>
-    </div>
+    {% block content %}{% endblock %}
 </div>
 </body>
 </html>