- 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
This commit is contained in:
Víðir Valberg Guðmundsson 2016-02-08 22:40:50 +01:00
parent b06174fb6e
commit d91898ff73
7 changed files with 65 additions and 61 deletions

1
.gitignore vendored
View file

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

View file

@ -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',
'camps',
# 'profiles',
# 'camps',
]
STATIC_URL = '/static/'

View file

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

View file

@ -1,14 +1,13 @@
from .base import *
import environ
env = environ.Env(
ENGINE='django.db.backends.postgres_psycopg2',
)
env = environ.Env()
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(),

View file

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

View file

@ -1,9 +1,11 @@
from allauth.account.views import (
SignupView,
LoginView,
LogoutView,
ConfirmEmailView,
EmailVerificationSentView, PasswordResetView)
# from allauth.account.views import (
# SignupView,
# LoginView,
# LogoutView,
# ConfirmEmailView,
# 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(
r'^login/$',
LoginView.as_view(),
name='account_login',
),
url(
r'^logout/$',
LogoutView.as_view(),
name='account_logout',
),
url(
r'^confirm/(?P<key>\S+)$',
ConfirmEmailView.as_view(),
name='account_confirm_email',
),
url(
r'^signup/done/$',
EmailVerificationSentView.as_view(),
name='account_email_verification_sent',
),
url(
r'^signup/$',
SignupView.as_view(),
name='account_signup',
),
url(
r'^reset-password/$',
PasswordResetView.as_view(),
name='account_reset_password',
),
url(
r'^profile/',
include('profiles.urls', namespace='profiles')
),
# url(
# r'^login/$',
# LoginView.as_view(),
# name='account_login',
# ),
# url(
# r'^logout/$',
# LogoutView.as_view(),
# name='account_logout',
# ),
# url(
# r'^confirm/(?P<key>\S+)$',
# ConfirmEmailView.as_view(),
# name='account_confirm_email',
# ),
# url(
# r'^signup/done/$',
# EmailVerificationSentView.as_view(),
# name='account_email_verification_sent',
# ),
# url(
# r'^signup/$',
# SignupView.as_view(),
# name='account_signup',
# ),
# url(
# r'^reset-password/$',
# PasswordResetView.as_view(),
# name='account_reset_password',
# ),
# url(
# r'^profile/',
# include('profiles.urls', namespace='profiles')
# ),
url(r'^admin/', include(admin.site.urls)),
]

View file

@ -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
psycopg2>=2.6.1