Form thank you

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

diff --git a/src/wolnelektury/views.py b/src/wolnelektury/views.py
index 48063d2..eaec832 100644 (file)
--- a/src/wolnelektury/views.py
+++ b/src/wolnelektury/views.py
@@ -2,6 +2,7 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from datetime import date, datetime
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from datetime import date, datetime

+from urllib.parse import quote_plus

 import feedparser
 from allauth.socialaccount.views import SignupView
 
 import feedparser
 from allauth.socialaccount.views import SignupView
 


@@ -9,23 +10,34 @@ from django.conf import settings
 from django.contrib import auth
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.forms import AuthenticationForm
 from django.contrib import auth
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.forms import AuthenticationForm

+from django.contrib.auth.views import LoginView

 from django.core.cache import cache
 from django.core.cache import cache

+from django.views.generic import FormView

 from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import render
 from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import render

-from django.utils.http import urlquote_plus
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 from django.views.decorators.cache import never_cache
 
 from ajaxable.utils import AjaxableFormView
 from ajaxable.utils import placeholdized
 from catalogue.models import Book, Collection, Tag, Fragment
 from django.views.decorators.cache import never_cache
 
 from ajaxable.utils import AjaxableFormView
 from ajaxable.utils import placeholdized
 from catalogue.models import Book, Collection, Tag, Fragment

-
+import club.models

 from social.utils import get_or_choose_cite
 from social.utils import get_or_choose_cite

-from wolnelektury.forms import RegistrationForm, SocialSignupForm
+from wolnelektury.forms import RegistrationForm, SocialSignupForm, WLAuthenticationForm
+

 
 

+def main_page_2022(request):
+    ctx = {}
+    ctx['last_published'] = Book.objects.exclude(cover_clean='').filter(findable=True, parent=None).order_by('-created_at')[:10]
+    ctx['recommended_collection'] = Collection.objects.filter(listed=True, role='recommend').order_by('?').first()
+    ctx['ambassadors'] = club.models.Ambassador.objects.all().order_by('?')
+    return render(request, '2022/main_page.html', ctx)

 
 @never_cache
 def main_page(request):
 
 @never_cache
 def main_page(request):

+    if request.EXPERIMENTS['layout'].value:
+        return main_page_2022(request)
+

     ctx = {
         'last_published': Book.objects.exclude(cover_thumb='').filter(findable=True, parent=None).order_by('-created_at')[:6],
         'theme_books': [],
     ctx = {
         'last_published': Book.objects.exclude(cover_thumb='').filter(findable=True, parent=None).order_by('-created_at')[:6],
         'theme_books': [],


@@ -46,20 +58,21 @@ def main_page(request):
                     break
             break
 
                     break
             break
 

-    # Choose a collection for main.
-    try:
-        ctx['collection'] = Collection.objects.filter(listed=True).order_by('?')[:1][0]
-    except IndexError:
-        pass
+    # Choose collections for main.
+    ctx['collections'] = Collection.objects.filter(listed=True).order_by('?')[:4]

 
     best = []
     best_places = 5
 
     best = []
     best_places = 5

+    recommended_collection = None

     for recommended in Collection.objects.filter(listed=True, role='recommend').order_by('?'):
     for recommended in Collection.objects.filter(listed=True, role='recommend').order_by('?'):

+        if recommended_collection is None:
+            recommended_collection = recommended

         books = list(recommended.get_books().exclude(id__in=[b.id for b in best]).order_by('?')[:best_places])
         best.extend(books)
         best_places -= len(books)
         if not best_places:
             break
         books = list(recommended.get_books().exclude(id__in=[b.id for b in best]).order_by('?')[:best_places])
         best.extend(books)
         best_places -= len(books)
         if not best_places:
             break

+    ctx['recommended_collection'] = recommended_collection

     if best_places:
         best.extend(
             list(
     if best_places:
         best.extend(
             list(


@@ -71,6 +84,13 @@ def main_page(request):
     return render(request, "main_page.html", ctx)
 
 
     return render(request, "main_page.html", ctx)
 
 

+class WLLoginView(LoginView):
+    form_class = WLAuthenticationForm
+
+
+wl_login_view = WLLoginView.as_view()
+
+

 class LoginFormView(AjaxableFormView):
     form_class = AuthenticationForm
     template = "auth/login.html"
 class LoginFormView(AjaxableFormView):
     form_class = AuthenticationForm
     template = "auth/login.html"


@@ -80,6 +100,9 @@ class LoginFormView(AjaxableFormView):
     ajax_redirect = True
 
     def __call__(self, request):
     ajax_redirect = True
 
     def __call__(self, request):

+        if request.EXPERIMENTS['layout'].value:
+            return wl_login_view(request)
+

         if request.user.is_authenticated:
             return self.redirect_or_refresh(
                 request, '/',
         if request.user.is_authenticated:
             return self.redirect_or_refresh(
                 request, '/',


@@ -90,6 +113,13 @@ class LoginFormView(AjaxableFormView):
         auth.login(request, form.get_user())
 
 
         auth.login(request, form.get_user())
 
 

+class WLRegisterView(FormView):
+    form_class = RegistrationForm
+    template_name = 'registration/register.html'
+
+wl_register_view = WLRegisterView.as_view()
+
+

 class RegisterFormView(AjaxableFormView):
     form_class = RegistrationForm
     template = "auth/register.html"
 class RegisterFormView(AjaxableFormView):
     form_class = RegistrationForm
     template = "auth/register.html"


@@ -101,6 +131,9 @@ class RegisterFormView(AjaxableFormView):
     honeypot = True
 
     def __call__(self, request):
     honeypot = True
 
     def __call__(self, request):

+        if request.EXPERIMENTS['layout'].value:
+            return wl_register_view(request)
+

         if request.user.is_authenticated:
             return self.redirect_or_refresh(
                 request, '/',
         if request.user.is_authenticated:
             return self.redirect_or_refresh(
                 request, '/',


@@ -130,7 +163,7 @@ class LoginRegisterFormView(LoginFormView):
 @never_cache
 def logout_then_redirect(request):
     auth.logout(request)
 @never_cache
 def logout_then_redirect(request):
     auth.logout(request)

-    return HttpResponseRedirect(urlquote_plus(request.GET.get('next', '/'), safe='/?='))
+    return HttpResponseRedirect(quote_plus(request.GET.get('next', '/'), safe='/?='))

 
 
 @never_cache
 
 
 @never_cache