Merge branch 'feature/login-and-stuff' of data.coop/membersystem into master

This commit is contained in:
decibyte 2018-06-23 13:25:38 +00:00 committed by Gitea
commit 37973c352c
4 changed files with 10 additions and 16 deletions

1
.gitignore vendored
View file

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

View file

@ -129,3 +129,7 @@ USE_TZ = True
# https://docs.djangoproject.com/en/2.0/howto/static-files/
STATIC_URL = '/static/'
SITE_ID = 1
EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'

View file

@ -1,21 +1,10 @@
"""membersystem URL Configuration
"""URLs for the membersystem"""
The `urlpatterns` list routes URLs to views. For more information please see:
https://docs.djangoproject.com/en/2.0/topics/http/urls/
Examples:
Function views
1. Add an import: from my_app import views
2. Add a URL to urlpatterns: path('', views.home, name='home')
Class-based views
1. Add an import: from other_app.views import Home
2. Add a URL to urlpatterns: path('', Home.as_view(), name='home')
Including another URLconf
1. Import the include() function: from django.urls import include, path
2. Add a URL to urlpatterns: path('blog/', include('blog.urls'))
"""
from django.contrib import admin
from django.urls import path
from django.conf.urls import url
from django.urls import include, path
urlpatterns = [
url(r'^accounts/', include('allauth.urls')),
path('admin/', admin.site.urls),
]

View file

@ -2,4 +2,4 @@ from django.db import models
class Profile(models.Model):
user = models.OneToOneField('auth.User')
user = models.OneToOneField('auth.User', on_delete=models.CASCADE)