X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/b39c329ecd604d815de1f772ed9c2e9598db4c46..b0fadf2591f3af957c1c8e0307d0bcef9e9f8538:/src/wolnelektury/views.py diff --git a/src/wolnelektury/views.py b/src/wolnelektury/views.py index 5e56f5906..49110e938 100644 --- 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 +from urllib.parse import quote_plus import feedparser from allauth.socialaccount.views import SignupView @@ -9,23 +10,38 @@ 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.auth.views import LoginView 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.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 - +import club.models 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('?') + ctx['widget'] = settings.WIDGETS.get(request.GET.get('w')) + return render(request, '2022/main_page.html', ctx) @never_cache def main_page(request): + if request.GET.get('w') in settings.WIDGETS: + request.EXPERIMENTS['layout'].override(True) + + 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': [], @@ -72,6 +88,13 @@ def main_page(request): 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" @@ -81,6 +104,9 @@ class LoginFormView(AjaxableFormView): 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, '/', @@ -91,6 +117,22 @@ class LoginFormView(AjaxableFormView): auth.login(request, form.get_user()) +class WLRegisterView(FormView): + form_class = RegistrationForm + template_name = 'registration/register.html' + + def form_valid(self, form): + form.save() + user = auth.authenticate( + username=form.cleaned_data['username'], + password=form.cleaned_data['password1'] + ) + auth.login(self.request, user) + return HttpResponseRedirect(quote_plus(self.request.GET.get('next', '/'), safe='/?=')) + +wl_register_view = WLRegisterView.as_view() + + class RegisterFormView(AjaxableFormView): form_class = RegistrationForm template = "auth/register.html" @@ -102,6 +144,9 @@ class RegisterFormView(AjaxableFormView): 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, '/', @@ -131,7 +176,7 @@ class LoginRegisterFormView(LoginFormView): @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