Merge remote-tracking branch 'zawadzki/new-design'

[wolnelektury.git] / src / wolnelektury / urls.py

diff --git a/src/wolnelektury/urls.py b/src/wolnelektury/urls.py
index af6244c..11722fc 100644 (file)
--- a/src/wolnelektury/urls.py
+++ b/src/wolnelektury/urls.py
@@ -6,6 +6,7 @@ from django.contrib import admin
 from django.urls import include, path
 from django.views.generic import RedirectView
 import django.views.static
 from django.urls import include, path
 from django.views.generic import RedirectView
 import django.views.static

+from annoy.utils import banner_exempt

 import catalogue.views
 import picture.views
 from . import views
 import catalogue.views
 import picture.views
 from . import views


@@ -20,14 +21,15 @@ urlpatterns = [
 
     # Authentication
     path('uzytkownik/', views.user_settings, name='user_settings'),
 
     # Authentication
     path('uzytkownik/', views.user_settings, name='user_settings'),

-    path('uzytkownik/login/', views.LoginFormView(), name='login'),
-    path('uzytkownik/signup/', views.RegisterFormView(), name='register'),
+    path('uzytkownik/login/', banner_exempt(views.LoginFormView()), name='login'),
+    path('uzytkownik/signup/', banner_exempt(views.RegisterFormView()), name='register'),

     path('uzytkownik/logout/', views.logout_then_redirect, name='logout'),
     path('uzytkownik/logout/', views.logout_then_redirect, name='logout'),

-    path('uzytkownik/zaloguj-utworz/', views.LoginRegisterFormView(), name='login_register'),
-    path('uzytkownik/social/signup/', views.SocialSignupView.as_view(), name='socialaccount_signup'),
+    path('uzytkownik/zaloguj-utworz/', banner_exempt(views.LoginRegisterFormView()), name='login_register'),
+    path('uzytkownik/social/signup/', banner_exempt(views.SocialSignupView.as_view()), name='socialaccount_signup'),

 ]
 
 urlpatterns += [
 ]
 
 urlpatterns += [

+    path('eksperymenty/', include('experiments.urls')),

     path('katalog/', include('catalogue.urls')),
     path('opds/', include('opds.urls')),
     path('sugestia/', include('suggest.urls')),
     path('katalog/', include('catalogue.urls')),
     path('opds/', include('opds.urls')),
     path('sugestia/', include('suggest.urls')),


@@ -45,15 +47,21 @@ urlpatterns += [
     path('formularz/', include('forms_builder.forms.urls')),
     path('isbn/', include('isbn.urls')),
     path('messaging/', include('messaging.urls')),
     path('formularz/', include('forms_builder.forms.urls')),
     path('isbn/', include('isbn.urls')),
     path('messaging/', include('messaging.urls')),

+    path('re/', include('redirects.urls')),
+    path('stats/', include('stats.urls')),

 
     path('paypal/app-form/', RedirectView.as_view(
 
     path('paypal/app-form/', RedirectView.as_view(

-        url='/towarzystwo/?app=1', permanent=False)),
+        url='/towarzystwo/?pk_campaign=aplikacja', permanent=False)),

     path('towarzystwo/dolacz/', RedirectView.as_view(
         url='/towarzystwo/', permanent=False)),
 
     path('paypal/', include('paypal.urls')),
     path('powiadomienie/', include('push.urls')),
     path('towarzystwo/', include('club.urls')),
     path('towarzystwo/dolacz/', RedirectView.as_view(
         url='/towarzystwo/', permanent=False)),
 
     path('paypal/', include('paypal.urls')),
     path('powiadomienie/', include('push.urls')),
     path('towarzystwo/', include('club.urls')),

+    #path('pomagam/', include('club.urls2')),
+    path('pomagam/', RedirectView.as_view(
+        url='/towarzystwo/?pk_campaign=pomagam', permanent=False)),
+    

 
     # Admin panel
     path('admin/catalogue/book/import', catalogue.views.import_book, name='import_book'),
 
     # Admin panel
     path('admin/catalogue/book/import', catalogue.views.import_book, name='import_book'),