Skip to content
This repository has been archived by the owner on Jun 14, 2019. It is now read-only.

Commit

Permalink
Merge pull request #25 from collinanderson/fblogin
Browse files Browse the repository at this point in the history
#12: facebook login
  • Loading branch information
NathanRSmith committed May 15, 2015
2 parents 01b6fe9 + d20b2ab commit 6e8e61d
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 1 deletion.
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Django==1.7.7
django-allauth0.19.1
django-bower==5.0.4
django-extensions==1.5.5
django-tastypie==0.12.1
Expand Down
25 changes: 25 additions & 0 deletions tree_hugger/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,25 @@

# Application definition

AUTHENTICATION_BACKENDS = [
'django.contrib.auth.backends.ModelBackend',
'allauth.account.auth_backends.AuthenticationBackend',
]

INSTALLED_APPS = (
'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.sites',
'django.contrib.staticfiles',
'django_extensions',
'djangobower',
'allauth',
'allauth.account',
'allauth.socialaccount',
'allauth.socialaccount.providers.facebook',
'tastypie',
'trees'
)
Expand Down Expand Up @@ -84,8 +94,23 @@

WSGI_APPLICATION = 'tree_hugger.wsgi.application'

SITE_ID = 1

TEMPLATE_DIRS = [os.path.join(BASE_DIR, 'templates')]

TEMPLATE_CONTEXT_PROCESSORS = [
'django.contrib.auth.context_processors.auth',
'django.core.context_processors.debug',
'django.core.context_processors.i18n',
'django.core.context_processors.media',
'django.core.context_processors.static',
'django.core.context_processors.tz',
'django.core.context_processors.request',
'django.contrib.messages.context_processors.messages',
'allauth.account.context_processors.account',
'allauth.socialaccount.context_processors.socialaccount',
]

# Database
# https://docs.djangoproject.com/en/1.7/ref/settings/#databases

Expand Down
2 changes: 1 addition & 1 deletion tree_hugger/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# Examples:
# url(r'^$', 'tree_hugger.views.home', name='home'),
# url(r'^blog/', include('blog.urls')),

url(r'^accounts/', include('allauth.urls')),
url(r'^accounts/', include('django.contrib.auth.urls')),
url(r'^admin/', include(admin.site.urls)),
url(r'^api/', include(api.urls)),
Expand Down

0 comments on commit 6e8e61d

Please sign in to comment.