Merge branch 'master' of github.com:easyctf/ctf-calendar

Michael Zhang · Michael Zhang · commit 1cf2d632728f · 2016-08-24T21:02:38.000-05:00
diff --git a/Vagrantfile b/Vagrantfile
@@ -24,6 +24,7 @@ Vagrant.configure(2) do |config|
   # accessing "localhost:8080" will access port 80 on the guest machine.
   # config.vm.network "forwarded_port", guest: 80, host: 8080
   config.vm.network "forwarded_port", guest: 5000, host: 5000
+  config.vm.network "forwarded_port", guest: 5432, host: 5432
 
   # Create a private network, which allows host-only access to the machine
   # using a specific IP.
diff --git a/cal.py b/cal.py
@@ -4,6 +4,7 @@
 
 import config
 import views
+from filters import filters
 from models import db, login_manager
 
 app = Flask(__name__, static_url_path='')
@@ -19,3 +20,6 @@
 
 app.jinja_env.trim_blocks = True
 app.jinja_env.lstrip_blocks = True
+
+for name, func in filters.items():
+    app.add_template_filter(func, name=name)
diff --git a/config.py b/config.py
@@ -28,7 +28,7 @@ def _load_secret_key(self):
             self.SECRET_KEY = os.environ['SECRET_KEY']
         else:
             secret_path = self.app_root / '.secret_key'
-            with secret_path.open('a+b') as secret_file:
+            with secret_path.open('rb') as secret_file:
                 secret_file.seek(0)
                 contents = secret_file.read()
                 if not contents and len(contents) == 0:
diff --git a/constants.py b/constants.py
@@ -0,0 +1,23 @@
+from collections import OrderedDict
+
+SECOND = 1
+MINUTE = 60 * SECOND
+HOUR = 60 * MINUTE
+DAY = 24 * HOUR
+WEEK = 7 * DAY
+
+TIME_UNITS = OrderedDict([
+    ('second', SECOND),
+    ('minute', MINUTE),
+    ('hour', HOUR),
+    ('day', DAY),
+    ('week', WEEK),
+])
+
+TIME_ABBREVIATIONS = OrderedDict([
+    ('second', 's'),
+    ('minute', 'm'),
+    ('hour', 'h'),
+    ('day', 'd'),
+    ('week', 'w'),
+])
diff --git a/filters.py b/filters.py
@@ -0,0 +1,18 @@
+import constants
+
+
+def formatted_duration(duration, input_units):
+    base_duration = float(duration * constants.TIME_UNITS[input_units])
+    if base_duration < 1:
+        return '<1 %s' % constants.TIME_ABBREVIATIONS['second']
+    parts = []
+    for unit, value in constants.TIME_UNITS.items()[::-1]:
+        if base_duration >= value:
+            parts.append((base_duration / value, constants.TIME_ABBREVIATIONS[unit]))
+            base_duration %= value
+    return ' '.join('%d %s' % (value, abbr) for value, abbr in parts)
+
+
+filters = {
+    'duration': formatted_duration,
+}
diff --git a/forms.py b/forms.py
@@ -4,7 +4,7 @@
 from sqlalchemy import func
 from wtforms import ValidationError
 from wtforms.fields import *
-from wtforms.validators import InputRequired, Length
+from wtforms.validators import *
 from wtforms.widgets import TextArea
 
 import util
@@ -50,15 +50,13 @@ def validate_username(self, field):
 
 class EventForm(Form):
     title = StringField('Title', validators=[InputRequired(), Length(max=256)])
-    start_time = IntegerField('Start Time', validators=[InputRequired()])
-    duration = FloatField('Duration (hours)', validators=[InputRequired()])
+    start_time = IntegerField('Start Time',
+                              validators=[InputRequired(), NumberRange(min=0, max=2147483647, message='Start time must be between 0 and 2147483647!')])
+    duration = FloatField('Duration (hours)',
+                          validators=[InputRequired(), NumberRange(min=0, max=2147483647, message='Duration must be between 0 and 2147483647!')])
     description = StringField('Description', widget=TextArea(), validators=[InputRequired(), Length(max=1024)])
     link = StringField('Link', validators=[InputRequired(), Length(max=256)])
 
     def validate_link(self, field):
         if not any(field.data.startswith(prefix) for prefix in [u'http://', u'https://']):
             raise ValidationError('Invalid link')
-
-
-class EventUpdateForm(EventForm):
-    id = HiddenField()
diff --git a/migrations/versions/daf5b5301c75_.py b/migrations/versions/daf5b5301c75_.py
@@ -0,0 +1,30 @@
+"""empty message
+
+Revision ID: daf5b5301c75
+Revises: f79ba2365689
+Create Date: 2016-06-30 10:08:05.129124
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = 'daf5b5301c75'
+down_revision = 'f79ba2365689'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+### commands auto generated by Alembic - please adjust! ###
+    op.add_column('eventvotes', sa.Column('user_id', sa.Integer(), nullable=True))
+    op.create_unique_constraint('eventvote_user_event_uc', 'eventvotes', ['user_id', 'event_id'])
+    op.create_foreign_key('eventvote_user_id_fk', 'eventvotes', 'users', ['user_id'], ['id'])
+    ### end Alembic commands ###
+
+
+def downgrade():
+### commands auto generated by Alembic - please adjust! ###
+    op.drop_constraint('eventvote_user_id_fk', 'eventvotes', type_='foreignkey')
+    op.drop_constraint('eventvote_user_event_uc', 'eventvotes', type_='unique')
+    op.drop_column('eventvotes', 'user_id')
+    ### end Alembic commands ###
diff --git a/migrations/versions/f79ba2365689_.py b/migrations/versions/f79ba2365689_.py
@@ -0,0 +1,26 @@
+"""empty message
+
+Revision ID: f79ba2365689
+Revises: 10d5b977cbe4
+Create Date: 2016-06-25 18:16:01.508669
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = 'f79ba2365689'
+down_revision = '10d5b977cbe4'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+### commands auto generated by Alembic - please adjust! ###
+    op.add_column('events', sa.Column('removed', sa.Boolean(), nullable=True))
+    ### end Alembic commands ###
+
+
+def downgrade():
+### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('events', 'removed')
+    ### end Alembic commands ###
diff --git a/models.py b/models.py
@@ -1,5 +1,7 @@
 from flask_login import LoginManager
 from flask_sqlalchemy import SQLAlchemy
+from sqlalchemy import UniqueConstraint
+from sqlalchemy.orm import backref
 from sqlalchemy.ext.hybrid import hybrid_property
 
 import util
@@ -81,18 +83,22 @@ class Event(db.Model):
     __tablename__ = 'events'
     id = db.Column(db.Integer, primary_key=True)
     owner_id = db.Column(db.Integer, db.ForeignKey('users.id', name='event_owner_id_fk'))
-    owner = db.relationship('User', backref='events')
+    owner = db.relationship('User', backref=backref('events', lazy='dynamic'))
     approved = db.Column(db.Boolean, default=False)
     title = db.Column(db.Unicode(length=256))
     start_time = db.Column(db.Integer, index=True)
     duration = db.Column(db.Float)
     description = db.Column(db.UnicodeText)
     link = db.Column(db.Unicode(length=256))
+    removed = db.Column(db.Boolean, default=False)
 
 
 class EventVote(db.Model):
     __tablename__ = 'eventvotes'
     id = db.Column(db.Integer, primary_key=True)
+    user_id = db.Column(db.Integer, db.ForeignKey('users.id', name='eventvote_user_id_fk'))
+    user = db.relationship('User', backref='event_votes')
     event_id = db.Column(db.Integer, db.ForeignKey('events.id', name='vote_event_id_fk'), index=True)
     event = db.relationship('Event', backref='votes')
     direction = db.Column(db.Boolean)
+    __table_args__ = (UniqueConstraint('user_id', 'event_id', name='eventvote_user_event_uc'),)
diff --git a/setup.sh b/setup.sh
@@ -7,4 +7,5 @@ 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 /vagrant/requirements.txt
+cd /vagrant
+pip install -r requirements.txt
diff --git a/static/css/calendar.css b/static/css/calendar.css
@@ -1,3 +1,4 @@
+
 #timeline #ctf_schedule {
     /* min-height: 400px; */
     position: relative;
diff --git a/templates/events/detail.html b/templates/events/detail.html
@@ -9,7 +9,7 @@
     <br/>
     Start: {{ event.start_time }}
     <br/>
-    Duration: {{ event.duration }}
+    Duration: {{ event.duration|duration('hour') }}
     <br/>
     Link: <a href="{{ event.link }}">link</a>
     <br/>
diff --git a/templates/events/list.html b/templates/events/list.html
@@ -44,23 +44,29 @@
                         <td><a href="{{ url_for('events.events_detail', event_id=event.id) }}">{{ event.title }}</a></td>
                         <td>{{ event.description }}</td>
                         <td><time class="timeago" datetime="{{ event.start_time_format }}">{{ event.start_time_format }}</time></td>
-                        <td>{{ event.duration / 24 }} days</td>
+                        <td>{{ event.duration|duration('hour') }}</td>
                         <td><a href="{{ event.link }}" target="_blank">Website</a></td>
                         {% if enabled_actions %}
                             <td>
                                 <form>
                                     {% if 'approve' in enabled_actions %}
-                                        <button id="approve_{{ event.id }}" type="submit"
+                                        <button id="approve_{{ event.id }}" class="btn btn-xs btn-success" type="submit"
                                                 formaction="{{ url_for('events.events_approve', event_id=event.id) }}"
                                                 formmethod="post">Approve
                                         </button>
                                     {% endif %}
                                     {% if 'manage' in enabled_actions %}
-                                        <button id="approve_{{ event.id }}" type="submit"
+                                        <button id="approve_{{ event.id }}" class="btn btn-xs btn-primary" type="submit"
                                                 formaction="{{ url_for('events.events_manage', event_id=event.id) }}"
                                                 formmethod="get">Manage
                                         </button>
                                     {% endif %}
+                                    {% if 'remove' in enabled_actions %}
+                                        <button id="remove_{{ event.id }}" class="btn btn-xs btn-danger" type="submit"
+                                                formaction="{{ url_for('events.events_remove', event_id=event.id) }}"
+                                                formmethod="post">Delete
+                                        </button>
+                                    {% endif %}
                                 </form>
                             </td>
                         {% endif %}
diff --git a/templates/events/manage.html b/templates/events/manage.html
@@ -12,13 +12,13 @@
                     <h2 class="panel-title">Manage Event</h2>
                 </div>
                 <div class="panel-body">
-                    <form class="form-horizontal" method="POST" id="event_manage_form">
-                        {{ event_manage_form.csrf_token }}
-                        {% if event_manage_form.errors %}
+                    <form class="form-horizontal" method="POST" id="event_form">
+                        {{ event_form.csrf_token }}
+                        {% if event_form.errors %}
                             <div class="alert alert-danger">
                                 <ul>
                                     Please correct the following errors.
-                                    {% for field in event_manage_form %}
+                                    {% for field in event_form %}
                                         {% if field.errors %}
                                             {% for error in field.errors %}
                                                 <li>{{ error }}</li>
@@ -32,8 +32,7 @@ <h2 class="panel-title">Manage Event</h2>
                             <div id="login_msg"></div>
                         </fieldset>
                         <fieldset class="container-fluid">
-                            {{ event_manage_form.id() }}
-                            {% for field in event_manage_form if field.id != 'csrf_token' and field.id != 'id' %}
+                            {% for field in event_form if field.id != 'csrf_token' and field.id != 'id' %}
                                 <div class="row">
                                     <div class="col-sm-12 form-group">
                                         {{ field.label(class_="col-sm-3 control-label") }}
@@ -65,6 +64,12 @@ <h4>How does this work?</h4>
                     believes your CTF meets the requirements, may approve your CTF.</p>
                 <p>When your CTF is approved, it will appear in the listing, and will also be added to our
                     newsletter.</p>
+                <form>
+                    <button id="button_remove" class="btn btn-danger" type="submit"
+                            formaction="{{ url_for('events.events_remove', event_id=event.id) }}"
+                            formmethod="post">Delete Event
+                    </button>
+                </form>
             </div>
         </div>
     </div>
diff --git a/views/events.py b/views/events.py
@@ -1,10 +1,10 @@
 import json
 import time
 
-from flask import Blueprint, redirect, render_template, url_for, flash
+from flask import abort, Blueprint, redirect, render_template, url_for, flash
 from flask_login import current_user, login_required
 
-from forms import EventForm, EventUpdateForm
+from forms import EventForm
 from models import db, Event
 from util import admin_required, isoformat
 
@@ -46,7 +46,7 @@ def events_list_json():
 @blueprint.route('/')
 @blueprint.route('/all')
 def events_all():
-    events = Event.query.filter_by(approved=True).order_by(Event.start_time.desc()).all()
+    events = Event.query.filter_by(approved=True, removed=False).order_by(Event.start_time.desc()).all()
     for event in events:
         event.start_time_format = isoformat(event.start_time)
     return render_template('events/list.html', tab='all', events=events)
@@ -55,7 +55,7 @@ def events_all():
 # todo
 @blueprint.route('/upcoming')
 def events_upcoming():
-    events = Event.query.filter_by(approved=True).order_by(Event.start_time.desc()).all()
+    events = Event.query.filter_by(approved=True, removed=False).order_by(Event.start_time.desc()).all()
     for event in events:
         event.start_time_format = isoformat(event.start_time)
     return render_template('events/list.html', tab='upcoming', events=events)
@@ -64,7 +64,7 @@ def events_upcoming():
 # todo
 @blueprint.route('/past')
 def events_past():
-    events = Event.query.filter_by(approved=True).order_by(Event.start_time.desc()).all()
+    events = Event.query.filter_by(approved=True, removed=False).order_by(Event.start_time.desc()).all()
     for event in events:
         event.start_time_format = isoformat(event.start_time)
     return render_template('events/list.html', tab='past', events=events)
@@ -73,7 +73,7 @@ def events_past():
 @blueprint.route('/unapproved')
 @admin_required
 def events_unapproved():
-    unapproved_events = Event.query.filter_by(approved=False).order_by(Event.start_time.desc()).all()
+    unapproved_events = Event.query.filter_by(approved=False, removed=False).order_by(Event.start_time.desc()).all()
     for event in unapproved_events:
         event.start_time_format = isoformat(event.start_time)
     return render_template('events/list.html', tab='unapproved', events=unapproved_events, enabled_actions=['approve'])
@@ -82,10 +82,10 @@ def events_unapproved():
 @blueprint.route('/owned')
 @login_required
 def events_owned():
-    owned_events = current_user.events
+    owned_events = current_user.events.filter_by(removed=False)
     for event in owned_events:
         event.start_time_format = isoformat(event.start_time)
-    return render_template('events/list.html', tab='owned', events=owned_events, enabled_actions=['manage'])
+    return render_template('events/list.html', tab='owned', events=owned_events, enabled_actions=['manage', 'remove'])
 
 
 @blueprint.route('/<int:event_id>')
@@ -111,8 +111,21 @@ def events_approve(event_id):
 @login_required
 def events_manage(event_id):
     event = Event.query.get_or_404(event_id)
-    event_manage_form = EventUpdateForm(obj=event)
-    if event_manage_form.validate_on_submit():
-        event_manage_form.populate_obj(event)
-        return redirect(url_for('.events_detail', event_id=event.id))
-    return render_template('events/manage.html', event_manage_form=event_manage_form)
+    if current_user != event.owner:
+        abort(403)
+    event_form = EventForm(obj=event)
+    if event_form.validate_on_submit():
+        event_form.populate_obj(event)
+        return redirect(url_for('.events_detail', event_id=event_id))
+    return render_template('events/manage.html', event=event, event_form=event_form)
+
+
+@blueprint.route('/<int:event_id>/delete', methods=['POST'])
+@login_required
+def events_remove(event_id):
+    event = Event.query.get_or_404(event_id)
+    if current_user != event.owner:
+        abort(403)
+    event.removed = True
+    db.session.commit()
+    return redirect(url_for('.events_owned'))
