mirror of
https://github.com/pinry/pinry.git
synced 2025-11-13 00:25:41 +01:00
Refactor apps to be in repo folder
This commit is contained in:
@@ -7,7 +7,7 @@ from tastypie.resources import ModelResource
|
|||||||
from django_images.models import Thumbnail
|
from django_images.models import Thumbnail
|
||||||
|
|
||||||
from .models import Pin, Image
|
from .models import Pin, Image
|
||||||
from ..users.models import User
|
from users.models import User
|
||||||
|
|
||||||
|
|
||||||
class PinryAuthorization(DjangoAuthorization):
|
class PinryAuthorization(DjangoAuthorization):
|
||||||
@@ -9,7 +9,7 @@ from django.db import models, transaction
|
|||||||
from django_images.models import Image as BaseImage, Thumbnail
|
from django_images.models import Image as BaseImage, Thumbnail
|
||||||
from taggit.managers import TaggableManager
|
from taggit.managers import TaggableManager
|
||||||
|
|
||||||
from ..users.models import User
|
from users.models import User
|
||||||
|
|
||||||
|
|
||||||
class ImageManager(models.Manager):
|
class ImageManager(models.Manager):
|
||||||
@@ -26,8 +26,8 @@ INSTALLED_APPS = [
|
|||||||
'taggit',
|
'taggit',
|
||||||
'compressor',
|
'compressor',
|
||||||
'django_images',
|
'django_images',
|
||||||
'pinry.core',
|
'core',
|
||||||
'pinry.users',
|
'users',
|
||||||
]
|
]
|
||||||
|
|
||||||
ROOT_URLCONF = 'pinry.urls'
|
ROOT_URLCONF = 'pinry.urls'
|
||||||
@@ -39,7 +39,7 @@ MIDDLEWARE_CLASSES = [
|
|||||||
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
||||||
'django.contrib.messages.middleware.MessageMiddleware',
|
'django.contrib.messages.middleware.MessageMiddleware',
|
||||||
'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
||||||
'pinry.users.middleware.Public',
|
'users.middleware.Public',
|
||||||
]
|
]
|
||||||
|
|
||||||
TEMPLATES = [
|
TEMPLATES = [
|
||||||
@@ -53,7 +53,7 @@ TEMPLATES = [
|
|||||||
'django.template.context_processors.request',
|
'django.template.context_processors.request',
|
||||||
'django.contrib.auth.context_processors.auth',
|
'django.contrib.auth.context_processors.auth',
|
||||||
'django.contrib.messages.context_processors.messages',
|
'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
|
PUBLIC = True
|
||||||
|
|
||||||
AUTHENTICATION_BACKENDS = [
|
AUTHENTICATION_BACKENDS = [
|
||||||
'pinry.users.auth.backends.CombinedAuthBackend',
|
'users.auth.backends.CombinedAuthBackend',
|
||||||
'django.contrib.auth.backends.ModelBackend',
|
'django.contrib.auth.backends.ModelBackend',
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -145,7 +145,7 @@ MESSAGE_TAGS = {
|
|||||||
|
|
||||||
API_LIMIT_PER_PAGE = 50
|
API_LIMIT_PER_PAGE = 50
|
||||||
|
|
||||||
IMAGE_PATH = 'pinry.core.utils.upload_path'
|
IMAGE_PATH = 'core.utils.upload_path'
|
||||||
|
|
||||||
IMAGE_SIZES = {
|
IMAGE_SIZES = {
|
||||||
'thumbnail': {'size': [240, 0]},
|
'thumbnail': {'size': [240, 0]},
|
||||||
|
|||||||
@@ -9,8 +9,8 @@ admin.autodiscover()
|
|||||||
|
|
||||||
urlpatterns = patterns('',
|
urlpatterns = patterns('',
|
||||||
url(r'^admin/', include(admin.site.urls)),
|
url(r'^admin/', include(admin.site.urls)),
|
||||||
url(r'', include('pinry.core.urls', namespace='core')),
|
url(r'', include('core.urls', namespace='core')),
|
||||||
url(r'', include('pinry.users.urls', namespace='users')),
|
url(r'', include('users.urls', namespace='users')),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import re
|
import re
|
||||||
|
|
||||||
from pinry.core.models import Pin
|
from core.models import Pin
|
||||||
from pinry.users.models import User
|
from users.models import User
|
||||||
|
|
||||||
email_re = re.compile(
|
email_re = re.compile(
|
||||||
r"(^[-!#$%&'*+/=?^_`{}|~0-9A-Z]+(\.[-!#$%&'*+/=?^_`{}|~0-9A-Z]+)*" # dot-atom
|
r"(^[-!#$%&'*+/=?^_`{}|~0-9A-Z]+(\.[-!#$%&'*+/=?^_`{}|~0-9A-Z]+)*" # dot-atom
|
||||||
@@ -3,9 +3,9 @@ from django.conf.urls import patterns, url
|
|||||||
from .views import CreateUser
|
from .views import CreateUser
|
||||||
|
|
||||||
urlpatterns = patterns('',
|
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'^register/$', CreateUser.as_view(), name='register'),
|
||||||
url(r'^login/$', 'django.contrib.auth.views.login',
|
url(r'^login/$', 'django.contrib.auth.views.login',
|
||||||
{'template_name': 'users/login.html'}, name='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'),
|
||||||
)
|
)
|
||||||
@@ -10,7 +10,7 @@ from django.utils.functional import lazy
|
|||||||
from django.views.generic import CreateView
|
from django.views.generic import CreateView
|
||||||
|
|
||||||
from .forms import UserCreationForm
|
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)
|
reverse_lazy = lambda name=None, *args: lazy(reverse, str)(name, args=args)
|
||||||
Reference in New Issue
Block a user