X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/e180be7cce99d59054b206a061386188c5652f02..4cbcf8cac5e8cad592d9d84d76408249ccca8112:/src/wolnelektury/views.py?ds=inline diff --git a/src/wolnelektury/views.py b/src/wolnelektury/views.py index b32c64c52..9f099bd3a 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,25 +10,44 @@ 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 -from ssify import ssi_included - +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')) + if not ctx['widget'] and request.EXPERIMENTS['sowka'].value: + ctx['widget'] = settings.WIDGETS['pan-sowka'] + 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['sowka'].value: + request.EXPERIMENTS['layout'].override(True) + + if request.EXPERIMENTS['layout'].value: + return main_page_2022(request) + ctx = { - 'last_published': Book.objects.exclude(cover_thumb='').filter(parent=None).order_by('-created_at')[:6], + 'last_published': Book.objects.exclude(cover_thumb='').filter(findable=True, parent=None).order_by('-created_at')[:6], 'theme_books': [], } @@ -35,7 +55,7 @@ def main_page(request): 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').order_by('?')[:100] + 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] @@ -46,17 +66,39 @@ def main_page(request): break break - # Choose a collection for main. - try: - ctx['collection'] = Collection.objects.order_by('?')[:1][0] - except IndexError: - pass - - ctx['best'] = Book.objects.order_by('?')[:5] + # Choose collections for main. + ctx['collections'] = Collection.objects.filter(listed=True).order_by('?')[:4] + + best = [] + best_places = 5 + recommended_collection = None + 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 + ctx['recommended_collection'] = recommended_collection + 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) +class WLLoginView(LoginView): + form_class = WLAuthenticationForm + + +wl_login_view = WLLoginView.as_view() + + class LoginFormView(AjaxableFormView): form_class = AuthenticationForm template = "auth/login.html" @@ -66,7 +108,10 @@ class LoginFormView(AjaxableFormView): ajax_redirect = True def __call__(self, request): - if request.user.is_authenticated(): + if request.EXPERIMENTS['layout'].value: + return wl_login_view(request) + + if request.user.is_authenticated: return self.redirect_or_refresh( request, '/', message=_('Already logged in as user %(user)s', ) % {'user': request.user.username}) @@ -76,6 +121,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" @@ -87,7 +148,10 @@ class RegisterFormView(AjaxableFormView): honeypot = True def __call__(self, request): - if request.user.is_authenticated(): + if request.EXPERIMENTS['layout'].value: + return wl_register_view(request) + + if request.user.is_authenticated: return self.redirect_or_refresh( request, '/', message=_('Already logged in as user %(user)s', ) % {'user': request.user.username}) @@ -116,7 +180,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 @@ -153,28 +217,6 @@ def user_settings(request): return render(request, "user.html") -@ssi_included(use_lang=False, timeout=1800) -def latest_blog_posts(request, feed_url=None, posts_to_show=5): - if feed_url is None: - feed_url = settings.LATEST_BLOG_POSTS - try: - feed = feedparser.parse(str(feed_url)) - posts = [] - for i in range(posts_to_show): - pub_date = feed['entries'][i].published_parsed - published = date(pub_date[0], pub_date[1], pub_date[2]) - posts.append({ - 'title': feed['entries'][i].title, - 'summary': feed['entries'][i].summary, - 'link': feed['entries'][i].link, - 'date': published, - }) - except: - posts = [] - return render(request, 'latest_blog_posts.html', {'posts': posts}) - - -@ssi_included(use_lang=False) def widget(request): return render(request, 'widget.html')