diff --git a/bookwyrm/connectors/openlibrary.py b/bookwyrm/connectors/openlibrary.py index ee7c6271..55355131 100644 --- a/bookwyrm/connectors/openlibrary.py +++ b/bookwyrm/connectors/openlibrary.py @@ -108,7 +108,7 @@ class Connector(AbstractConnector): def get_cover_url(self, cover_blob): ''' ask openlibrary for the cover ''' cover_id = cover_blob[0] - image_name = '%s-M.jpg' % cover_id + image_name = '%s-L.jpg' % cover_id return '%s/b/id/%s' % (self.covers_url, image_name) diff --git a/bookwyrm/static/css/format.css b/bookwyrm/static/css/format.css index 5b5ff08d..83dafc28 100644 --- a/bookwyrm/static/css/format.css +++ b/bookwyrm/static/css/format.css @@ -67,11 +67,15 @@ input.toggle-control:checked ~ .modal.toggle-content { width: max-content; max-width: 250px; } +.cover-container.is-large { + height: 500px; + max-width: 500px; +} .cover-container.is-medium { - height: 150px; + height: 200px; } .cover-container.is-small { - height: 100px; + height: 150px; } @media only screen and (max-width: 768px) { .cover-container { diff --git a/bookwyrm/templates/discover.html b/bookwyrm/templates/discover.html new file mode 100644 index 00000000..855868de --- /dev/null +++ b/bookwyrm/templates/discover.html @@ -0,0 +1,97 @@ +{% extends 'layout.html' %} +{% load bookwyrm_tags %} +{% block content %} + +
+

{{ site.name }}: Social Reading and Reviewing

+
+ +
+
+
+ {% include 'snippets/about.html' %} +
+
+
+
+ {% if site.allow_registration %} +

Join {{ site.name }}

+
+ {% include 'snippets/register_form.html' %} +
+ {% else %} +

This instance is closed

+

Contact an administrator to get an invite

+ {% endif %} +
+
+
+ +
+
+
+
+
+
+ {% include 'snippets/book_cover.html' with book=books.2 size="large" %} + {% include 'snippets/stars.html' with rating=books.2.review__rating__avg %} +
+
+ {% include 'snippets/book_titleby.html' with book=books.2 %} +
{{ books.2|book_description|to_markdown|safe|truncatewords_html:50 }}
+
+
+
+
+
+
+
+ {% include 'snippets/book_cover.html' with book=books.0 %} + {% include 'snippets/book_titleby.html' with book=books.0 %} + {% include 'snippets/stars.html' with rating=books.0.review__rating__avg %} +
+
+
+
+ {% include 'snippets/book_cover.html' with book=books.1 %} + {% include 'snippets/book_titleby.html' with book=books.1 %} + {% include 'snippets/stars.html' with rating=books.1.review__rating__avg %} +
+
+
+
+
+
+
+
+ {% include 'snippets/book_cover.html' with book=books.4 %} + {% include 'snippets/book_titleby.html' with book=books.4 %} + {% include 'snippets/stars.html' with rating=books.4.review__rating__avg %} +
+
+
+
+ {% include 'snippets/book_cover.html' with book=books.5 %} + {% include 'snippets/book_titleby.html' with book=books.5 %} + {% include 'snippets/stars.html' with rating=books.5.review__rating__avg %} +
+
+
+
+
+
+
+ {% include 'snippets/book_cover.html' with book=books.3 size="large" %} + {% include 'snippets/stars.html' with rating=books.3.review__rating__avg %} +
+
+ {% include 'snippets/book_titleby.html' with book=books.3 %} +
{{ books.3|book_description|to_markdown|safe|truncatewords_html:50 }}
+
+
+
+
+
+
+ +{% endblock %} diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html index 3e1af28c..a78b847a 100644 --- a/bookwyrm/templates/layout.html +++ b/bookwyrm/templates/layout.html @@ -119,10 +119,28 @@ {% else %}
-
- - Join - +
+
+
+
+
+ + +
+
+ + +

Forgot your password?

+
+ +
+
+
+
+ + Join + +
{% endif %} diff --git a/bookwyrm/templates/snippets/about.html b/bookwyrm/templates/snippets/about.html index 9660f521..65f748a4 100644 --- a/bookwyrm/templates/snippets/about.html +++ b/bookwyrm/templates/snippets/about.html @@ -1,7 +1,12 @@ -

About {{ site.name }}

-
- BookWyrm +
+
+
+ BookWyrm +
+
+
+

+ {{ site.instance_description | safe }} +

+
-

- {{ site.instance_description }} -

diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index 16498fd7..b6b1c8f1 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -52,6 +52,7 @@ urlpatterns = [ path('', views.home), re_path(r'^(?Phome|local|federated)/?$', views.home_tab), + re_path(r'^discover/?$', views.discover_page), re_path(r'^notifications/?$', views.notifications_page), re_path(r'^direct-messages/?$', views.direct_messages_page), re_path(r'^import/?$', views.import_page), diff --git a/bookwyrm/views.py b/bookwyrm/views.py index a926f1e2..300fbace 100644 --- a/bookwyrm/views.py +++ b/bookwyrm/views.py @@ -4,7 +4,7 @@ import re from django.contrib.auth.decorators import login_required, permission_required from django.contrib.postgres.search import TrigramSimilarity from django.core.paginator import Paginator -from django.db.models import Avg, Q +from django.db.models import Avg, Count, Q from django.db.models.functions import Greatest from django.http import HttpResponseNotFound, JsonResponse from django.core.exceptions import PermissionDenied @@ -131,6 +131,26 @@ def get_suggested_books(user, max_books=5): return suggested_books +@require_GET +def discover_page(request): + ''' tiled book activity page ''' + books = models.Edition.objects.exclude( + cover__exact='' + ).annotate( + Count('review') + ).annotate( + Avg('review__rating') + ).order_by('-review__count') + + data = { + 'title': 'Discover', + 'login_form': forms.LoginForm(), + 'register_form': forms.RegisterForm(), + 'books': books + } + return TemplateResponse(request, 'discover.html', data) + + @login_required @require_GET def direct_messages_page(request, page=1):