fix reader

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

diff --git a/src/wolnelektury/views.py b/src/wolnelektury/views.py
index 1a6738b..611ee3c 100644 (file)
--- a/src/wolnelektury/views.py
+++ b/src/wolnelektury/views.py
@@ -1,125 +1,67 @@
-# -*- coding: utf-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 datetime import date, datetime

+from urllib.parse import quote_plus

 import feedparser
 import feedparser

+from allauth.socialaccount.views import SignupView

 
 from django.conf import settings
 from django.contrib import auth
 from django.contrib.auth.decorators import login_required
 
 from django.conf import settings
 from django.contrib import auth
 from django.contrib.auth.decorators import login_required

-from django.contrib.auth.forms import UserCreationForm, AuthenticationForm
+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.views.decorators.cache import never_cache
 
 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 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, WLAuthenticationForm

 
 
 
 

+@never_cache

 def main_page(request):
 def main_page(request):

-    ctx = {
-        'last_published': Book.objects.exclude(cover_thumb='').filter(parent=None).order_by('-created_at')[:6],
-        'theme_books': []
-    }
-
-    # for category in ('author', 'epoch', 'genre', 'kind'):
-    #     try:
-    #         ctx[category] = Tag.objects.filter(category=category).order_by('?')[:1][0]
-    #     except IndexError:
-    #         pass
-
-    # 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').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
-
-    ctx['best'] = Book.objects.order_by('?')[:5]
-
-    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)
-
-    def success(self, form, request):
-        auth.login(request, form.get_user())
-
-
-class RegisterFormView(AjaxableFormView):
-    form_class = UserCreationForm
-    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):
+    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 WLLoginView(LoginView):
+    form_class = WLAuthenticationForm
+
+
+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']
         )
         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(UserCreationForm(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)
 
 
 @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


@@ -156,27 +98,9 @@ def user_settings(request):
     return render(request, "user.html")
 
 
     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')
 def widget(request):
     return render(request, 'widget.html')

+
+
+class SocialSignupView(SignupView):
+    form_class = SocialSignupForm