polishing map fixes

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

diff --git a/src/club/urls.py b/src/club/urls.py
index 844359b..28cf959 100644 (file)
--- a/src/club/urls.py
+++ b/src/club/urls.py
@@ -1,22 +1,32 @@
-from django.conf.urls import url
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#
+from django.urls import path
+from django.views.generic import RedirectView
+from annoy.utils import banner_exempt

 from . import views
 
 
 urlpatterns = [
 from . import views
 
 
 urlpatterns = [

-    url(r'^$', views.JoinView.as_view(), name='club_join'),
-    url(r'^info/$', views.ClubView.as_view(), name='club'),
+    path('', banner_exempt(views.JoinView.as_view()), name='club_join'),
+    path('dolacz/', RedirectView.as_view(
+        url='/pomagam/', permanent=False)),
+    path('info/', banner_exempt(views.ClubView.as_view()), name='club'),

 
 

-    url(r'^plan/(?P<key>[-a-z0-9]+)/$', views.ScheduleView.as_view(), name='club_schedule'),
-    url(r'^plan/(?P<key>[-a-z0-9]+)/dziekujemy/$', views.ScheduleThanksView.as_view(), name='club_thanks'),
+    path('plan/<key>/', banner_exempt(views.ScheduleView.as_view()), name='club_schedule'),
+    path('plan/<key>/dziekujemy/', banner_exempt(views.ScheduleThanksView.as_view()), name='club_thanks'),
+    path('plan/<key>/zestawienie/<int:year>/', banner_exempt(views.YearSummaryView.as_view()), name='club_year_summary'),
+    path('plan/<key>/rodzaj/', banner_exempt(views.DonationStep1.as_view()), name='donation_step1'),
+    path('plan/<key>/dane/', banner_exempt(views.DonationStep2.as_view()), name='donation_step2'),

 
 

-    url(r'^przylacz/(?P<key>[-a-z0-9]+)/$', views.claim, name='club_claim'),
-    url(r'^anuluj/(?P<key>[-a-z0-9]+)/$', views.cancel, name='club_cancel'),
-    url(r'^testowa-platnosc/(?P<key>[-a-z0-9]+)/$', views.DummyPaymentView.as_view(), name='club_dummy_payment'),
+    path('przylacz/<key>/', views.claim, name='club_claim'),
+    path('anuluj/<key>/', views.cancel, name='club_cancel'),
+    path('testowa-platnosc/<key>/', views.DummyPaymentView.as_view(), name='club_dummy_payment'),

 
 

-    url(r'platnosc/payu/cykl/(?P<key>.+)/', views.PayURecPayment.as_view(), name='club_payu_rec_payment'),
-    url(r'platnosc/payu/(?P<key>.+)/', views.PayUPayment.as_view(), name='club_payu_payment'),
+    path('platnosc/payu/cykl/<key>/', banner_exempt(views.PayURecPayment.as_view()), name='club_payu_rec_payment'),
+    path('platnosc/payu/<key>/', banner_exempt(views.PayUPayment.as_view()), name='club_payu_payment'),

 
 

-    url(r'notify/(?P<pk>\d+)/', views.PayUNotifyView.as_view(), name='club_payu_notify'),
+    path('notify/<int:pk>/', views.PayUNotifyView.as_view(), name='club_payu_notify'),

 
 

-    url(r'czlonek/', views.MembershipView.as_view(), name='club_membership'),
+    path('weryfikacja/', views.member_verify, name='club_member_verify'),

 ]
 ]