- Upgrading to django 1.9.x

- Disabling apps for now
- Fix some frontpage text
- Add env.dist for an .env example
- Adjust django-environ setup
- Add vim swap files to gitignore

.gitignore

@@ -1,3 +1,4 @@
 .idea/
 __pycache__/
 db.sqlite3
+*.sw*

bornhack/settings/base.py

@@ -13,7 +13,6 @@ ROOT_URLCONF = 'bornhack.urls'
 SITE_ID = 1
 
 INSTALLED_APPS = [
-    'flat',
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -26,8 +25,8 @@ INSTALLED_APPS = [
     'allauth.account',
     'bootstrap3',
 
-    'profiles',
+    # 'profiles',
-    'camps',
+    # 'camps',
 ]
 
 STATIC_URL = '/static/'

bornhack/settings/env.dist

@@ -0,0 +1,3 @@
+DATABASE_URL=postgres://username:password@host:port/database
+SECRET_KEY=somethingverysecretandunique
+ALLOWED_HOSTS=a,seperated,list,without,spaces

bornhack/settings/production.py

@@ -1,14 +1,13 @@
 from .base import *
 import environ
 
-env = environ.Env(
+env = environ.Env()
-    ENGINE='django.db.backends.postgres_psycopg2',
+
-)
 environ.Env.read_env()
 
-SECRET_KEY = env('SECRET_KEY')
 DEBUG = False
-ALLOWED_HOSTS = env('ALLOWED_HOSTS')
+SECRET_KEY = env('SECRET_KEY')
+ALLOWED_HOSTS = env('ALLOWED_HOSTS').split(',')
 
 DATABASES = {
     'default': env.db(),

bornhack/templates/frontpage.html

@@ -25,12 +25,13 @@
   </p>
 
   <p class="lead">
-    We hope you will show your interest by signing up such that you
+    We hope you will show your interest by signing onto our mailing-list as
-    can help us understand what you think would be fun.
+    soon as we get it up. In the meantime you are very much welcome to ask
-    This is a new event, so we don't yet know exactly where this is
+    questions and show your interest on IRC at #bornhack on irc.freenode.net
-    going - but give us your feedback and you can help us form this.
+    such that you can help us understand what you
-    We are also on IRC at #bornhack on irc.freenode.net where you are
+    think would be fun to do.  This is a new event, so we don't yet
-    always welcome.
+    know exactly where this is going - but give us your feedback and
+    you can help us form it.
   </p>
 
   <p class="lead">
@@ -43,10 +44,10 @@
       The Bornhack Team
 
     </p>
-    <a href="{% url 'account_signup' %}"
+{#     <a href="{% url 'account_signup' %}" #}
-       class="btn btn-primary btn-lg">
+{#        class="btn btn-primary btn-lg"> #}
-      Signup for more info
+{#       Signup for more info #}
-    </a>
+{#     </a> #}
   </div>
 
 </div>

bornhack/urls.py

@@ -1,9 +1,11 @@
-from allauth.account.views import (
+# from allauth.account.views import (
-    SignupView,
+#     SignupView,
-    LoginView,
+#     LoginView,
-    LogoutView,
+#     LogoutView,
-    ConfirmEmailView,
+#     ConfirmEmailView,
-    EmailVerificationSentView, PasswordResetView)
+#     EmailVerificationSentView,
+#     PasswordResetView
+# )
 from django.conf.urls import include, url
 from django.contrib import admin
 from django.views.generic import TemplateView
@@ -14,40 +16,40 @@ urlpatterns = [
         TemplateView.as_view(template_name='frontpage.html'),
         name='frontpage'
     ),
-    url(
+    # url(
-        r'^login/$',
+    #     r'^login/$',
-        LoginView.as_view(),
+    #     LoginView.as_view(),
-        name='account_login',
+    #     name='account_login',
-    ),
+    # ),
-    url(
+    # url(
-        r'^logout/$',
+    #     r'^logout/$',
-        LogoutView.as_view(),
+    #     LogoutView.as_view(),
-        name='account_logout',
+    #     name='account_logout',
-    ),
+    # ),
-    url(
+    # url(
-        r'^confirm/(?P<key>\S+)$',
+    #     r'^confirm/(?P<key>\S+)$',
-        ConfirmEmailView.as_view(),
+    #     ConfirmEmailView.as_view(),
-        name='account_confirm_email',
+    #     name='account_confirm_email',
-    ),
+    # ),
-    url(
+    # url(
-        r'^signup/done/$',
+    #     r'^signup/done/$',
-        EmailVerificationSentView.as_view(),
+    #     EmailVerificationSentView.as_view(),
-        name='account_email_verification_sent',
+    #     name='account_email_verification_sent',
-    ),
+    # ),
-    url(
+    # url(
-        r'^signup/$',
+    #     r'^signup/$',
-        SignupView.as_view(),
+    #     SignupView.as_view(),
-        name='account_signup',
+    #     name='account_signup',
-    ),
+    # ),
-    url(
+    # url(
-        r'^reset-password/$',
+    #     r'^reset-password/$',
-        PasswordResetView.as_view(),
+    #     PasswordResetView.as_view(),
-        name='account_reset_password',
+    #     name='account_reset_password',
-    ),
+    # ),
-    url(
+    # url(
-        r'^profile/',
+    #     r'^profile/',
-        include('profiles.urls', namespace='profiles')
+    #     include('profiles.urls', namespace='profiles')
-    ),
+    # ),
 
     url(r'^admin/', include(admin.site.urls)),
 ]

requirements/base.txt

@@ -1,6 +1,5 @@
-django>=1.8
+django>=1.9
 django-allauth>=0.23.0
 django-bootstrap3>=6.2.2
-django-flat-theme>=1.1.1
 django-environ>=0.4.0
 psycopg2>=2.6.1