From 1fcdf2a9a3db7e79a77d8c49afa29b58ff7bf34a Mon Sep 17 00:00:00 2001 From: Isaac Bythewood Date: Thu, 8 Feb 2018 21:57:49 -0500 Subject: [PATCH] Refactor apps to be in repo folder --- {pinry/core => core}/__init__.py | 0 {pinry/core => core}/admin.py | 0 {pinry/core => core}/api.py | 2 +- {pinry/core => core}/apps.py | 0 {pinry/core => core}/context_processors.py | 0 {pinry/core => core}/forms.py | 0 {pinry/core => core}/migrations/0001_initial.py | 0 {pinry/core => core}/migrations/__init__.py | 0 {pinry/core => core}/models.py | 2 +- {pinry/core => core}/templatetags/__init__.py | 0 {pinry/core => core}/templatetags/bootstrap_field.py | 0 {pinry/core => core}/tests/__init__.py | 0 {pinry/core => core}/tests/api.py | 0 {pinry/core => core}/tests/forms.py | 0 {pinry/core => core}/tests/helpers.py | 0 {pinry/core => core}/tests/views.py | 0 {pinry/core => core}/urls.py | 0 {pinry/core => core}/utils.py | 0 {pinry/core => core}/views.py | 0 pinry/settings.py | 12 ++++++------ pinry/urls.py | 4 ++-- {pinry/users => users}/__init__.py | 0 {pinry/users => users}/apps.py | 0 {pinry/users => users}/auth/__init__.py | 0 {pinry/users => users}/auth/backends.py | 4 ++-- {pinry/users => users}/forms.py | 0 {pinry/users => users}/middleware.py | 0 {pinry/users => users}/migrations/0001_initial.py | 0 {pinry/users => users}/migrations/__init__.py | 0 {pinry/users => users}/models.py | 0 {pinry/users => users}/tests.py | 0 {pinry/users => users}/urls.py | 4 ++-- {pinry/users => users}/views.py | 2 +- 33 files changed, 15 insertions(+), 15 deletions(-) rename {pinry/core => core}/__init__.py (100%) rename {pinry/core => core}/admin.py (100%) rename {pinry/core => core}/api.py (99%) rename {pinry/core => core}/apps.py (100%) rename {pinry/core => core}/context_processors.py (100%) rename {pinry/core => core}/forms.py (100%) rename {pinry/core => core}/migrations/0001_initial.py (100%) rename {pinry/core => core}/migrations/__init__.py (100%) rename {pinry/core => core}/models.py (98%) rename {pinry/core => core}/templatetags/__init__.py (100%) rename {pinry/core => core}/templatetags/bootstrap_field.py (100%) rename {pinry/core => core}/tests/__init__.py (100%) rename {pinry/core => core}/tests/api.py (100%) rename {pinry/core => core}/tests/forms.py (100%) rename {pinry/core => core}/tests/helpers.py (100%) rename {pinry/core => core}/tests/views.py (100%) rename {pinry/core => core}/urls.py (100%) rename {pinry/core => core}/utils.py (100%) rename {pinry/core => core}/views.py (100%) rename {pinry/users => users}/__init__.py (100%) rename {pinry/users => users}/apps.py (100%) rename {pinry/users => users}/auth/__init__.py (100%) rename {pinry/users => users}/auth/backends.py (95%) rename {pinry/users => users}/forms.py (100%) rename {pinry/users => users}/middleware.py (100%) rename {pinry/users => users}/migrations/0001_initial.py (100%) rename {pinry/users => users}/migrations/__init__.py (100%) rename {pinry/users => users}/models.py (100%) rename {pinry/users => users}/tests.py (100%) rename {pinry/users => users}/urls.py (67%) rename {pinry/users => users}/views.py (98%) diff --git a/pinry/core/__init__.py b/core/__init__.py similarity index 100% rename from pinry/core/__init__.py rename to core/__init__.py diff --git a/pinry/core/admin.py b/core/admin.py similarity index 100% rename from pinry/core/admin.py rename to core/admin.py diff --git a/pinry/core/api.py b/core/api.py similarity index 99% rename from pinry/core/api.py rename to core/api.py index 77034be..be03038 100644 --- a/pinry/core/api.py +++ b/core/api.py @@ -7,7 +7,7 @@ from tastypie.resources import ModelResource from django_images.models import Thumbnail from .models import Pin, Image -from ..users.models import User +from users.models import User class PinryAuthorization(DjangoAuthorization): diff --git a/pinry/core/apps.py b/core/apps.py similarity index 100% rename from pinry/core/apps.py rename to core/apps.py diff --git a/pinry/core/context_processors.py b/core/context_processors.py similarity index 100% rename from pinry/core/context_processors.py rename to core/context_processors.py diff --git a/pinry/core/forms.py b/core/forms.py similarity index 100% rename from pinry/core/forms.py rename to core/forms.py diff --git a/pinry/core/migrations/0001_initial.py b/core/migrations/0001_initial.py similarity index 100% rename from pinry/core/migrations/0001_initial.py rename to core/migrations/0001_initial.py diff --git a/pinry/core/migrations/__init__.py b/core/migrations/__init__.py similarity index 100% rename from pinry/core/migrations/__init__.py rename to core/migrations/__init__.py diff --git a/pinry/core/models.py b/core/models.py similarity index 98% rename from pinry/core/models.py rename to core/models.py index e80f61e..6cbdc4e 100644 --- a/pinry/core/models.py +++ b/core/models.py @@ -9,7 +9,7 @@ from django.db import models, transaction from django_images.models import Image as BaseImage, Thumbnail from taggit.managers import TaggableManager -from ..users.models import User +from users.models import User class ImageManager(models.Manager): diff --git a/pinry/core/templatetags/__init__.py b/core/templatetags/__init__.py similarity index 100% rename from pinry/core/templatetags/__init__.py rename to core/templatetags/__init__.py diff --git a/pinry/core/templatetags/bootstrap_field.py b/core/templatetags/bootstrap_field.py similarity index 100% rename from pinry/core/templatetags/bootstrap_field.py rename to core/templatetags/bootstrap_field.py diff --git a/pinry/core/tests/__init__.py b/core/tests/__init__.py similarity index 100% rename from pinry/core/tests/__init__.py rename to core/tests/__init__.py diff --git a/pinry/core/tests/api.py b/core/tests/api.py similarity index 100% rename from pinry/core/tests/api.py rename to core/tests/api.py diff --git a/pinry/core/tests/forms.py b/core/tests/forms.py similarity index 100% rename from pinry/core/tests/forms.py rename to core/tests/forms.py diff --git a/pinry/core/tests/helpers.py b/core/tests/helpers.py similarity index 100% rename from pinry/core/tests/helpers.py rename to core/tests/helpers.py diff --git a/pinry/core/tests/views.py b/core/tests/views.py similarity index 100% rename from pinry/core/tests/views.py rename to core/tests/views.py diff --git a/pinry/core/urls.py b/core/urls.py similarity index 100% rename from pinry/core/urls.py rename to core/urls.py diff --git a/pinry/core/utils.py b/core/utils.py similarity index 100% rename from pinry/core/utils.py rename to core/utils.py diff --git a/pinry/core/views.py b/core/views.py similarity index 100% rename from pinry/core/views.py rename to core/views.py diff --git a/pinry/settings.py b/pinry/settings.py index a3e2f4e..cf6529b 100644 --- a/pinry/settings.py +++ b/pinry/settings.py @@ -26,8 +26,8 @@ INSTALLED_APPS = [ 'taggit', 'compressor', 'django_images', - 'pinry.core', - 'pinry.users', + 'core', + 'users', ] ROOT_URLCONF = 'pinry.urls' @@ -39,7 +39,7 @@ MIDDLEWARE_CLASSES = [ 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', - 'pinry.users.middleware.Public', + 'users.middleware.Public', ] TEMPLATES = [ @@ -53,7 +53,7 @@ TEMPLATES = [ 'django.template.context_processors.request', 'django.contrib.auth.context_processors.auth', 'django.contrib.messages.context_processors.messages', - 'pinry.core.context_processors.template_settings', + 'core.context_processors.template_settings', ], }, }, @@ -128,7 +128,7 @@ ALLOW_NEW_REGISTRATIONS = True PUBLIC = True AUTHENTICATION_BACKENDS = [ - 'pinry.users.auth.backends.CombinedAuthBackend', + 'users.auth.backends.CombinedAuthBackend', 'django.contrib.auth.backends.ModelBackend', ] @@ -145,7 +145,7 @@ MESSAGE_TAGS = { API_LIMIT_PER_PAGE = 50 -IMAGE_PATH = 'pinry.core.utils.upload_path' +IMAGE_PATH = 'core.utils.upload_path' IMAGE_SIZES = { 'thumbnail': {'size': [240, 0]}, diff --git a/pinry/urls.py b/pinry/urls.py index 5813db2..793a60d 100644 --- a/pinry/urls.py +++ b/pinry/urls.py @@ -9,8 +9,8 @@ admin.autodiscover() urlpatterns = patterns('', url(r'^admin/', include(admin.site.urls)), - url(r'', include('pinry.core.urls', namespace='core')), - url(r'', include('pinry.users.urls', namespace='users')), + url(r'', include('core.urls', namespace='core')), + url(r'', include('users.urls', namespace='users')), ) diff --git a/pinry/users/__init__.py b/users/__init__.py similarity index 100% rename from pinry/users/__init__.py rename to users/__init__.py diff --git a/pinry/users/apps.py b/users/apps.py similarity index 100% rename from pinry/users/apps.py rename to users/apps.py diff --git a/pinry/users/auth/__init__.py b/users/auth/__init__.py similarity index 100% rename from pinry/users/auth/__init__.py rename to users/auth/__init__.py diff --git a/pinry/users/auth/backends.py b/users/auth/backends.py similarity index 95% rename from pinry/users/auth/backends.py rename to users/auth/backends.py index f79c005..8efd152 100644 --- a/pinry/users/auth/backends.py +++ b/users/auth/backends.py @@ -1,7 +1,7 @@ import re -from pinry.core.models import Pin -from pinry.users.models import User +from core.models import Pin +from users.models import User email_re = re.compile( r"(^[-!#$%&'*+/=?^_`{}|~0-9A-Z]+(\.[-!#$%&'*+/=?^_`{}|~0-9A-Z]+)*" # dot-atom diff --git a/pinry/users/forms.py b/users/forms.py similarity index 100% rename from pinry/users/forms.py rename to users/forms.py diff --git a/pinry/users/middleware.py b/users/middleware.py similarity index 100% rename from pinry/users/middleware.py rename to users/middleware.py diff --git a/pinry/users/migrations/0001_initial.py b/users/migrations/0001_initial.py similarity index 100% rename from pinry/users/migrations/0001_initial.py rename to users/migrations/0001_initial.py diff --git a/pinry/users/migrations/__init__.py b/users/migrations/__init__.py similarity index 100% rename from pinry/users/migrations/__init__.py rename to users/migrations/__init__.py diff --git a/pinry/users/models.py b/users/models.py similarity index 100% rename from pinry/users/models.py rename to users/models.py diff --git a/pinry/users/tests.py b/users/tests.py similarity index 100% rename from pinry/users/tests.py rename to users/tests.py diff --git a/pinry/users/urls.py b/users/urls.py similarity index 67% rename from pinry/users/urls.py rename to users/urls.py index 9e9840f..fd92f83 100644 --- a/pinry/users/urls.py +++ b/users/urls.py @@ -3,9 +3,9 @@ from django.conf.urls import patterns, url from .views import CreateUser urlpatterns = patterns('', - url(r'^private/$', 'pinry.users.views.private', name='private'), + url(r'^private/$', 'users.views.private', name='private'), url(r'^register/$', CreateUser.as_view(), name='register'), url(r'^login/$', 'django.contrib.auth.views.login', {'template_name': 'users/login.html'}, name='login'), - url(r'^logout/$', 'pinry.users.views.logout_user', name='logout'), + url(r'^logout/$', 'users.views.logout_user', name='logout'), ) diff --git a/pinry/users/views.py b/users/views.py similarity index 98% rename from pinry/users/views.py rename to users/views.py index 09f4f42..703aead 100644 --- a/pinry/users/views.py +++ b/users/views.py @@ -10,7 +10,7 @@ from django.utils.functional import lazy from django.views.generic import CreateView from .forms import UserCreationForm -from pinry.users.models import User +from users.models import User reverse_lazy = lambda name=None, *args: lazy(reverse, str)(name, args=args)