X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/d6f190d50127a1aca615ff505a8a2595b4cfb7de..ad5acb886787871a70eee6385cddbb4238d3adb2:/src/wolnelektury/urls.py?ds=sidebyside diff --git a/src/wolnelektury/urls.py b/src/wolnelektury/urls.py index fbc458d16..0ebc4891d 100644 --- a/src/wolnelektury/urls.py +++ b/src/wolnelektury/urls.py @@ -25,6 +25,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'), @@ -50,6 +51,16 @@ urlpatterns += [ url(r'^formularz/', include('contact.urls')), url(r'^isbn/', include('isbn.urls')), + url(r'^paypal/app-form/$', RedirectView.as_view( + url='/towarzystwo/?app=1', permanent=False)), + url(r'^towarzystwo/dolacz/$', RedirectView.as_view( + url='/towarzystwo/', permanent=False)), + + + url(r'^paypal/', include('paypal.urls')), + url(r'^powiadomienie/', include('push.urls')), + url(r'^towarzystwo/', include('club.urls')), + # Admin panel url(r'^admin/catalogue/book/import$', catalogue.views.import_book, name='import_book'), url(r'^admin/catalogue/picture/import$', picture.views.import_picture, name='import_picture'), @@ -63,11 +74,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')), ] @@ -89,4 +95,15 @@ urlpatterns += [ urlpatterns += [ url(r'^error-test/$', views.exception_test), + # url(r'^post-test/$', views.post_test), ] + + +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}), + ]