X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/0bb67240e8bc535ec703e34262487ba902c91079..6b87b2b7014a0441f5f696a35127f12a89e48d2e:/src/wolnelektury/urls.py?ds=inline diff --git a/src/wolnelektury/urls.py b/src/wolnelektury/urls.py index ee807fd2d..eb6a01785 100644 --- a/src/wolnelektury/urls.py +++ b/src/wolnelektury/urls.py @@ -7,6 +7,7 @@ from django.conf import settings from django.contrib import admin from django.views.generic import RedirectView import django.views.static +from migdal.urls import urlpatterns as migdal_urlpatterns import catalogue.views import picture.views from . import views @@ -25,6 +26,7 @@ urlpatterns = [ url(r'^uzytkownik/signup/$', views.RegisterFormView(), name='register'), url(r'^uzytkownik/logout/$', views.logout_then_redirect, name='logout'), url(r'^uzytkownik/zaloguj-utworz/$', views.LoginRegisterFormView(), name='login_register'), + url(r'^uzytkownik/social/signup/$', views.SocialSignupView.as_view(), name='socialaccount_signup'), # Includes. url(r'^latests_blog_posts.html$', views.latest_blog_posts, name='latest_blog_posts'), @@ -49,6 +51,8 @@ urlpatterns += [ url(r'^newsletter/', include('newsletter.urls')), url(r'^formularz/', include('contact.urls')), url(r'^isbn/', include('isbn.urls')), + url(r'^paypal/', include('paypal.urls')), + url(r'^powiadomienie/', include('push.urls')), # Admin panel url(r'^admin/catalogue/book/import$', catalogue.views.import_book, name='import_book'), @@ -63,11 +67,6 @@ urlpatterns += [ url(r'^szukaj/', include('search.urls')), - # Static files - url(r'^%s(?P.*)$' % settings.MEDIA_URL[1:], django.views.static.serve, - {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}), - url(r'^%s(?P.*)$' % settings.STATIC_URL[1:], django.views.static.serve, - {'document_root': settings.STATIC_ROOT, 'show_indexes': True}), url(r'^i18n/', include('django.conf.urls.i18n')), ] @@ -91,3 +90,15 @@ urlpatterns += [ url(r'^error-test/$', views.exception_test), # url(r'^post-test/$', views.post_test), ] + +urlpatterns += migdal_urlpatterns + + +if settings.DEBUG: + urlpatterns += [ + # Static files + url(r'^%s(?P.*)$' % settings.MEDIA_URL[1:], django.views.static.serve, + {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}), + url(r'^%s(?P.*)$' % settings.STATIC_URL[1:], django.views.static.serve, + {'document_root': settings.STATIC_ROOT, 'show_indexes': True}), + ]