X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/907aba88951334676a259dccc8f7edd8934d5e00..HEAD:/src/wolnelektury/views.py diff --git a/src/wolnelektury/views.py b/src/wolnelektury/views.py index 1c0f40cd3..611ee3c89 100644 --- a/src/wolnelektury/views.py +++ b/src/wolnelektury/views.py @@ -1,7 +1,8 @@ -# 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 datetime import date, datetime +from urllib.parse import quote_plus import feedparser from allauth.socialaccount.views import SignupView @@ -9,128 +10,58 @@ 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.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 @never_cache def main_page(request): - ctx = { - 'last_published': Book.objects.exclude(cover_thumb='').filter(findable=True, parent=None).order_by('-created_at')[:6], - 'theme_books': [], - } - - # FIXME: find this theme and books properly. - if Fragment.objects.exists(): - while True: - ctx['theme'] = Tag.objects.filter(category='theme').order_by('?')[:1][0] - tf = Fragment.tagged.with_any([ctx['theme']]).select_related('book').filter(book__findable=True).order_by('?')[:100] - if not tf: - continue - ctx['theme_fragment'] = tf[0] - for f in tf: - if f.book not in ctx['theme_books']: - ctx['theme_books'].append(f.book) - if len(ctx['theme_books']) == 3: - break - break - - # Choose a collection for main. - try: - ctx['collection'] = Collection.objects.order_by('?')[:1][0] - except IndexError: - pass - - best = [] - best_places = 5 - for recommended in Collection.objects.filter(role='recommend').order_by('?'): - 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 - if best_places: - best.extend( - list( - Book.objects.filter(findable=True).exclude(id__in=[b.id for b in best]).order_by('?')[:best_places] - ) - ) - ctx['best'] = best - - return render(request, "main_page.html", ctx) + if request.GET.get('w') in settings.WIDGETS: + request.EXPERIMENTS['layout'].override(True) + if request.EXPERIMENTS['sowka'].value: + request.EXPERIMENTS['layout'].override(True) + 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')) + if not ctx['widget'] and request.EXPERIMENTS['sowka'].value: + ctx['widget'] = settings.WIDGETS['pan-sowka'] + return render(request, 'main_page.html', ctx) -class LoginFormView(AjaxableFormView): - form_class = AuthenticationForm - template = "auth/login.html" - placeholdize = True - title = _('Sign in') - submit = _('Sign in') - ajax_redirect = True - def __call__(self, request): - if request.user.is_authenticated: - return self.redirect_or_refresh( - request, '/', - message=_('Already logged in as user %(user)s', ) % {'user': request.user.username}) - return super(LoginFormView, self).__call__(request) +class WLLoginView(LoginView): + form_class = WLAuthenticationForm - def success(self, form, request): - auth.login(request, form.get_user()) - -class RegisterFormView(AjaxableFormView): +class WLRegisterView(FormView): form_class = RegistrationForm - template = "auth/register.html" - placeholdize = True - title = _('Register') - submit = _('Register') - ajax_redirect = True - form_prefix = 'register' - honeypot = True - - def __call__(self, request): - if request.user.is_authenticated: - return self.redirect_or_refresh( - request, '/', - message=_('Already logged in as user %(user)s', ) % {'user': request.user.username}) - return super(RegisterFormView, self).__call__(request) - - def success(self, form, request): + 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(request, user) - - -class LoginRegisterFormView(LoginFormView): - template = 'auth/login_register.html' - title = _('You have to be logged in to continue') - - def extra_context(self, request, obj): - return { - "register_form": placeholdized(RegistrationForm(prefix='register')), - "register_submit": _('Register'), - } + auth.login(self.request, user) + return HttpResponseRedirect(quote_plus(self.request.GET.get('next', '/'), safe='/?=')) @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 @@ -173,15 +104,3 @@ def widget(request): class SocialSignupView(SignupView): form_class = SocialSignupForm - - -def exception_test(request): - msg = request.GET.get('msg') - if msg: - raise Exception('Exception test: %s' % msg) - else: - raise Exception('Exception test') - - -def post_test(request): - return render(request, 'post_test.html', {'action': '/api/reading/jego-zasady/complete/'})