fix

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

diff --git a/src/wolnelektury/urls.py b/src/wolnelektury/urls.py
index 1fc60fc..afee7f1 100644 (file)
--- a/src/wolnelektury/urls.py
+++ b/src/wolnelektury/urls.py
@@ -1,5 +1,5 @@
-# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
-# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+# This file is part of Wolne Lektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Wolne Lektury. See NOTICE for more information.

 #
 from django.conf import settings
 from django.contrib import admin
 #
 from django.conf import settings
 from django.contrib import admin


@@ -8,6 +8,7 @@ from django.views.generic import RedirectView
 import django.views.static
 from annoy.utils import banner_exempt
 import catalogue.views
 import django.views.static
 from annoy.utils import banner_exempt
 import catalogue.views

+import club.views

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


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

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

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

-    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 += [
     path('uzytkownik/social/signup/', banner_exempt(views.SocialSignupView.as_view()), name='socialaccount_signup'),
 ]
 
 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')),


@@ -42,20 +43,22 @@ urlpatterns += [
     path('wesprzyj/', include('funding.urls')),
     path('ankieta/', include('polls.urls')),
     path('biblioteki/', include('libraries.urls')),
     path('wesprzyj/', include('funding.urls')),
     path('ankieta/', include('polls.urls')),
     path('biblioteki/', include('libraries.urls')),

+    path('mapa/', include('references.urls')),

     path('newsletter/', include('newsletter.urls')),
     path('formularz/', include('forms_builder.forms.urls')),
     path('newsletter/', include('newsletter.urls')),
     path('formularz/', include('forms_builder.forms.urls')),

-    path('isbn/', include('isbn.urls')),

     path('messaging/', include('messaging.urls')),
     path('re/', include('redirects.urls')),
     path('messaging/', include('messaging.urls')),
     path('re/', include('redirects.urls')),

-
-    path('paypal/app-form/', RedirectView.as_view(
-        url='/towarzystwo/?pk_campaign=aplikacja', permanent=False)),
-    path('towarzystwo/dolacz/', RedirectView.as_view(
-        url='/towarzystwo/', permanent=False)),
-
+    path('stats/', include('stats.urls')),

     path('paypal/', include('paypal.urls')),
     path('powiadomienie/', include('push.urls')),
     path('paypal/', include('paypal.urls')),
     path('powiadomienie/', include('push.urls')),

-    path('towarzystwo/', include('club.urls')),
+    path('pomagam/', include('club.urls')),
+    path('szkola-', include('education.urls')),
+    path('towarzystwo/notify/<int:pk>/',  club.views.PayUNotifyView.as_view(), name='club_payu_notify'),
+    path('towarzystwo/', RedirectView.as_view(url='/pomagam/', permanent=False, query_string=True)),
+    path('towarzystwo/<path:path>', RedirectView.as_view(
+        url='/pomagam/%(path)s', permanent=False)),
+
+    path('chunks/', include('chunks.urls')),

 
     # 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'),


@@ -71,13 +74,12 @@ urlpatterns += [
     path('szukaj/', include('search.urls')),
 
     path('i18n/', include('django.conf.urls.i18n')),
     path('szukaj/', include('search.urls')),
 
     path('i18n/', include('django.conf.urls.i18n')),

-    path('forum/', include('machina.urls')),

 ]
 
 urlpatterns += [
     # old static pages - redirected
     path('1procent/', RedirectView.as_view(
 ]
 
 urlpatterns += [
     # old static pages - redirected
     path('1procent/', RedirectView.as_view(

-        url='http://nowoczesnapolska.org.pl/wesprzyj_nas/', permanent=True)),
+        url='https://fundacja.wolnelektury.pl/pomoz-nam/1-procent/', permanent=True)),

     path('epub/', RedirectView.as_view(
         url='/katalog/lektury/', permanent=False)),
     path('mozesz-nam-pomoc/', RedirectView.as_view(
     path('epub/', RedirectView.as_view(
         url='/katalog/lektury/', permanent=False)),
     path('mozesz-nam-pomoc/', RedirectView.as_view(


@@ -90,11 +92,6 @@ urlpatterns += [
         url='/info/wlacz-sie-w-prace/', permanent=False)),
 ]
 
         url='/info/wlacz-sie-w-prace/', permanent=False)),
 ]
 

-urlpatterns += [
-    # path('error-test/', views.exception_test),
-    # path('post-test/', views.post_test),
-]
-

 
 if settings.DEBUG:
     import debug_toolbar
 
 if settings.DEBUG:
     import debug_toolbar


@@ -103,7 +100,12 @@ if settings.DEBUG:
     ] + urlpatterns
 
 if settings.DEBUG:
     ] + urlpatterns
 
 if settings.DEBUG:

+    import functools
+    from django.views.defaults import page_not_found, server_error

     urlpatterns += [
     urlpatterns += [

+        path('error/500/', server_error),
+        path('error/404/', functools.partial(page_not_found, exception=None)),
+

         # Static files
         path('%s<path:path>' % settings.MEDIA_URL[1:], django.views.static.serve,
            {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
         # Static files
         path('%s<path:path>' % settings.MEDIA_URL[1:], django.views.static.serve,
            {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),