Sfranklin/coc reporting

.gitignore

@@ -87,3 +87,7 @@ ENV/
 
 # Rope project settings
 .ropeproject
+
+dev.db
+
+pybay/site_media/*

.travis.yml

@@ -0,0 +1,9 @@
+language: python
+python:
+- 3.5
+- 3.6
+install:
+- pip install -r requirements.txt
+script: ./manage.py collectstatic --no-input && ./manage.py test
+env:
+- TRAVIS=true

README.md

@@ -1,24 +1,30 @@
 # pybay
 
+[![Build Status](https://travis-ci.org/pybay/pybay.svg)](https://travis-ci.org/pybay)
+
 The website for PyBay - the Bay Area Python Conference.
 
 To work on this you'll need Python 3. Then:
 
 1. Fork the repo to your own personal github.
+    - also clone the symposion repository, take note of the path to symposion/
 2. Clone the repo to your local environment.
 3. Create a virtualenv and activate it
 4. `pip install` the requirements
-5. start the management server
+5. `pip install -e` the symposion repository
+6. start the management server
 
 Try:
 
     $ git clone git@github.com:YOURUSERNAME/pybay
+    $ git clone git@github.com:pybay/symposion.git
     $ cd pybay
     $ python3 -m venv ENV
     $ source ENV/bin/activate
     (ENV)$ pip install -r requirements.txt
+    (ENV)$ pip install -e YOUR/PATH/TO/symposion/   # this installs our symposion fork to ENV!
     (ENV)$ ./manage.py migrate
-    (ENV)$ ./manage.py loaddata fixtures/*
+    (ENV)$ ./manage.py loaddata fixtures/*     # doesn't work on Windows, see "Windows instructions" below
     (ENV)$ ./manage.py runserver
 
 The default admin user is test and password is test
@@ -29,4 +35,39 @@ disk. Eg:
 
     $ cd ~/workspace/pybay/ENV/lib/python3.6/site-packages/
     $ rm -rf symposion
-    $ ln -s /Users/sfranklin/workspace/symposion/symposion .
+    $ ln -s ~/workspace/symposion/symposion .
+
+### Windows Instructions
+
+For some reason, running `manage.py loaddata fixtures/*` gives a `No fixture named '*' found` error on Windows. You'll have to load each fixture file individually:
+
+    (ENV)$ python manage.py loaddata fixtures/auth.json
+    (ENV)$ python manage.py loaddata fixtures/conference.json
+    (ENV)$ python manage.py loaddata fixtures/proposal_base.json
+    (ENV)$ python manage.py loaddata fixtures/sites.json
+    (ENV)$ python manage.py loaddata fixtures/sponsor_benefits.json
+    (ENV)$ python manage.py loaddata fixtures/sponsor_levels.json
+
+(You can ignore the "invalid foreign keys" warnings you get. The foreign keys will become valid once you've loaded all the fixture files.)
+
+## Deploying
+
+Install fabric. Then use the `fab` command to run the deploy
+task. You'll need the ssh login password for this.
+
+    $ pip install fabric3
+    $ fab deploy
+    [pyconsf.com] Executing task 'deploy'
+    Start with a git checkout.
+    [pyconsf.com] Passphrase for private key:
+    ... much output...
+    Successfully completed
+
+By default the deploy task deploys to staging.pyconsf.com using pybay's
+staging branch.  To deploy master branch to production (same server but
+virtualhost pyconsf.com) run it with the prod target as an argument.
+
+    $ fab deploy:prod
+    [pyconsf.com] Executing task 'deploy'
+    ... much output...
+    Successfully completed

fabfile.py

@@ -0,0 +1,66 @@
+from __future__ import print_function
+from datetime import datetime as dt
+from os.path import join
+
+from fabric.api import cd, env, hide, local, run, sudo
+from fabric.contrib import files
+
+env.hosts = ['pyconsf.com']
+env.user = 'pybay'
+
+BASE = "/data/websites"
+CHECKOUTS = "/data/websites/checkouts"
+
+def checkout(prod=False):
+    """Git clone pybay project to unique folder"""
+    path = "prod" if prod else "staging"
+    ts = dt.now().strftime("%Y-%m-%d.%H.%M.%S")
+    dirname = join(CHECKOUTS, path, ts)
+    run("mkdir %s" % dirname)
+    with cd(dirname):
+        with hide('running', 'stdout'):
+            clone_args = '' if prod else ' -b staging'
+            run("git clone https://github.com/pybay/pybay.git%s" % clone_args)
+    return dirname
+
+def virtualenv(checkout):
+    """Create virtualenv in checkout directory."""
+    with cd(checkout):
+        run("virtualenv ENV")
+        with hide('running', 'stdout'):
+            run("ENV/bin/pip3 install -r pybay/requirements.txt")
+            run("ENV/bin/pip3 install -r pybay/requirements-server.txt")
+
+def migrate(checkout, prod=False):
+    """Run migrations in checkout."""
+    settings = "pybay.prod_settings" if prod else "pybay.staging_settings"
+    with cd(checkout):
+        run("ENV/bin/python3 pybay/manage.py migrate --settings=%s" % settings)
+        run("ENV/bin/python3 pybay/manage.py collectstatic --noinput --settings=%s" % settings)
+
+def relink(checkout, prod=False):
+    """Move symlink to point to current checkout."""
+    dir = "prod" if prod else "staging"
+    with cd(BASE):
+        run("ln -s %s new && mv -Tf new %s" % (checkout, dir))
+
+def touch(prod):
+    """Touch symlinks to reload uwsgi config."""
+    dir = "prod" if prod else "staging"
+    run("touch /etc/uwsgi-emperor/vassals/%s_uwsgi.ini" % dir)
+
+
+def deploy(version="staging"):
+    """Run this to redeploy site from github master. Run `fab deploy:prod` to deploy main site."""
+    prod = True if version == 'prod' else False
+    print("Start with a git checkout.")
+    dir = checkout(prod)
+    print("Created %s" % dir)
+    print("Now create the virtualenv")
+    virtualenv(dir)
+    print("Run migrations and collectstatic")
+    migrate(dir, prod)
+    print("Update the active version")
+    relink(dir, prod)
+    touch(prod)
+    print("Successfully completed")

infrastructure/prod_nginx.conf

@@ -0,0 +1,21 @@
+# the upstream component nginx needs to connect to
+upstream django_prod {
+    server unix:////data/websites/prod.sock; }
+
+server {
+    listen      80;
+    listen      443 ssl;
+    server_name .pyconsf.com
+                .pybay.com;
+
+
+    location /site_media {
+        alias /data/websites/prod_site_media; }
+
+    location / {
+        uwsgi_pass  django_prod;
+        include     /data/websites/prod/pybay/infrastructure/uwsgi_params; }
+
+    charset     utf-8;
+    client_max_body_size 75M;
+}

infrastructure/prod_uwsgi.ini

@@ -0,0 +1,12 @@
+[uwsgi]
+pybay_path      = /data/websites/prod/pybay
+chdir           = %(pybay_path)
+module          = pybay.prod_wsgi
+home            = /data/websites/prod/ENV
+master          = true
+processes       = 5
+socket          = /data/websites/prod.sock
+uid             = www-data
+gid             = www-data
+chmod-socket    = 777
+vacuum          = true

infrastructure/staging_nginx.conf

@@ -0,0 +1,19 @@
+# the upstream component nginx needs to connect to
+upstream django_staging {
+    server unix:////data/websites/staging.sock; }
+
+server {
+    listen      80;
+    server_name staging.pyconsf.com
+                staging.pybay.com;
+
+    location /site_media {
+        alias /data/websites/staging_site_media; }
+
+    location / {
+        uwsgi_pass  django_staging;
+        include     /data/websites/staging/pybay/infrastructure/uwsgi_params; }
+
+    charset     utf-8;
+    client_max_body_size 75M;
+}

infrastructure/staging_uwsgi.ini

@@ -0,0 +1,12 @@
+[uwsgi]
+pybay_path      = /data/websites/staging/pybay
+chdir           = %(pybay_path)
+module          = pybay.staging_wsgi
+home            = /data/websites/staging/ENV
+master          = true
+processes       = 5
+socket          = /data/websites/staging.sock
+uid             = www-data
+gid             = www-data
+chmod-socket    = 777
+vacuum          = true

infrastructure/uwsgi_params

@@ -0,0 +1,17 @@
+
+uwsgi_param  QUERY_STRING       $query_string;
+uwsgi_param  REQUEST_METHOD     $request_method;
+uwsgi_param  CONTENT_TYPE       $content_type;
+uwsgi_param  CONTENT_LENGTH     $content_length;
+
+uwsgi_param  REQUEST_URI        $request_uri;
+uwsgi_param  PATH_INFO          $document_uri;
+uwsgi_param  DOCUMENT_ROOT      $document_root;
+uwsgi_param  SERVER_PROTOCOL    $server_protocol;
+uwsgi_param  REQUEST_SCHEME     $scheme;
+uwsgi_param  HTTPS              $https if_not_empty;
+
+uwsgi_param  REMOTE_ADDR        $remote_addr;
+uwsgi_param  REMOTE_PORT        $remote_port;
+uwsgi_param  SERVER_PORT        $server_port;
+uwsgi_param  SERVER_NAME        $server_name;

pybay/apps.py

@@ -7,4 +7,4 @@ class AppConfig(BaseAppConfig):
     name = "pybay"
 
     def ready(self):
-        import_module("pybay\.receivers")
+        import_module("pybay.receivers")

pybay/context_processors.py

@@ -0,0 +1,8 @@
+from django.conf import settings
+
+
+def settings_variables(request):
+    return {
+        'SHOW_SPEAKERS_LIST_NAVBAR_LINK': getattr(settings, 'SHOW_SPEAKERS_LIST_NAVBAR_LINK', False),
+        'CANONICAL_HOST': settings.CANONICAL_HOST,
+    }

pybay/countdowns/admin.py

@@ -0,0 +1,10 @@
+from django.contrib import admin
+
+from . import models
+
+
+class CountdownAdmin(admin.ModelAdmin):
+    list_display = 'title', 'date'
+
+
+admin.site.register(models.Countdown, CountdownAdmin)

pybay/countdowns/apps.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class PybayCountdownsConfig(AppConfig):
+    name = 'pybay_countdowns'

pybay/countdowns/migrations/0001_initial.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.2 on 2017-07-24 00:04
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Countdown',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.TextField(help_text='Text above the countdown')),
+                ('date', models.DateTimeField(help_text='The date the countdown counts to')),
+                ('cta', models.TextField(help_text='Text on the button below the countdown', verbose_name="Call to action")),
+                ('link', models.TextField(help_text='Target of the button below the countdown')),
+            ],
+        ),
+    ]

pybay/countdowns/models.py

@@ -0,0 +1,17 @@
+from django.db import models
+from django.utils import timezone
+
+
+class Countdown(models.Model):
+    title = models.TextField(help_text="Text above the countdown")
+    date = models.DateTimeField(help_text="The date the countdown counts to")
+    cta = models.TextField(help_text="Text on the button below the countdown", verbose_name='Call to action')
+    link = models.TextField(help_text="Target of the button below the countdown")
+
+    def context_for_template(self):
+        ret = dict(self.__dict__, reference=timezone.now().timestamp())
+        ret['date'] = ret['date'].timestamp()
+        return ret
+
+    def __str__(self):
+        return '{0.title}: {0.date}'.format(self)

pybay/dbg_settings.py

@@ -0,0 +1,9 @@
+from pybay.settings import *
+
+INSTALLED_APPS += ['debug_toolbar']
+
+MIDDLEWARE_CLASSES = ['debug_toolbar.middleware.DebugToolbarMiddleware'] + MIDDLEWARE_CLASSES
+
+DEBUG_TOOLBAR = True
+
+INTERNAL_IPS = ['127.0.0.1']

pybay/faqs/admin.py

@@ -0,0 +1,10 @@
+from django.contrib import admin
+from .models import Category, Faq
+
+
+class CategoryAdmin(admin.ModelAdmin):
+    prepopulated_fields = {"slug": ("title",)}
+
+
+admin.site.register(Faq)
+admin.site.register(Category, CategoryAdmin)

pybay/faqs/apps.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class FaqsConfig(AppConfig):
+    name = 'faqs'

pybay/faqs/migrations/0001_initial.py

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.2 on 2017-05-07 22:06
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Faq',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=200)),
+                ('body', models.TextField()),
+            ],
+        ),
+    ]

pybay/faqs/migrations/0002_faq_ordering.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.2 on 2017-05-07 22:42
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('faqs', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='faq',
+            name='ordering',
+            field=models.IntegerField(default=0),
+            preserve_default=False,
+        ),
+    ]