created accounts app

agiliq · Feb 19, 2014 · 1e8cb43 · 1e8cb43
1 parent f0e04cf
commit 1e8cb43
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 98 deletions.
diff --git a/user/__init__.py → accounts/__init__.py b/user/__init__.py → accounts/__init__.py
diff --git a/accounts/admin.py b/accounts/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/accounts/models.py b/accounts/models.py
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
diff --git a/tavern/templates/change_password.html → accounts/templates/change_password.html b/tavern/templates/change_password.html → accounts/templates/change_password.html
diff --git a/tavern/templates/signup.html → accounts/templates/signup.html b/tavern/templates/signup.html → accounts/templates/signup.html
diff --git a/accounts/tests.py b/accounts/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/user/urls.py → accounts/urls.py b/user/urls.py → accounts/urls.py
@@ -1,6 +1,6 @@
 from django.conf.urls import patterns, url
 
-from user import views
+from accounts import views
 
 urlpatterns = patterns('',
                        url(r'^change_password',

diff --git a/user/views.py → accounts/views.py b/user/views.py → accounts/views.py
@@ -8,7 +8,7 @@
 
 
 @login_required
-def change_password(request, template='user/change_password.html'):
+def change_password(request, template='change_password.html'):
     form = PasswordChangeForm(user=request.user)
     if request.method == 'POST':
         form = PasswordChangeForm(request.user, request.POST)
@@ -21,7 +21,7 @@ def change_password(request, template='user/change_password.html'):
     return render(request, template, context)
 
 
-def signup(request, template='user/signup.html'):
+def signup(request, template='signup.html'):
     form = UserCreateForm()
     if request.method == 'POST':
         form = UserCreateForm(request.POST)

diff --git a/opentavern/settings.py b/opentavern/settings.py
@@ -39,6 +39,7 @@
 
     # Our
     'tavern',
+    'accounts',
     'south'
 )
 

diff --git a/opentavern/urls.py b/opentavern/urls.py
@@ -7,5 +7,5 @@
                        url(r'^admin/', include(admin.site.urls)),
                        url(r'^accounts/', include("django.contrib.auth.urls")),
                        url(r'^', include('tavern.urls')),
-                       url(r'^user/', include('user.urls')),
+                       url(r'^user/', include('accounts.urls')),
                        )
diff --git a/tavern/templates/404.html b/tavern/templates/404.html
diff --git a/tavern/templates/user/change_password.html b/tavern/templates/user/change_password.html
diff --git a/tavern/templates/user/signup.html b/tavern/templates/user/signup.html