Merge branch 'main' into images-django-imagekit

2021-06-05 11:46:57 -07:00 · 2021-06-05 11:46:57 -07:00 · bbbae9fc9d
parent 8b4cb4aeed 61e55628fa
commit bbbae9fc9d
14 changed files with 439 additions and 609 deletions
--- a/bookwyrm/models/fields.py
+++ b/bookwyrm/models/fields.py
@ -9,6 +9,7 @@ from django.contrib.postgres.fields import ArrayField as DjangoArrayField
 from django.core.exceptions import ValidationError
 from django.core.files.base import ContentFile
 from django.db import models
+from django.forms import ClearableFileInput, ImageField
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 from bookwyrm import activitypub
@ -332,6 +333,14 @@ class TagField(ManyToManyField):
        return items


+class ClearableFileInputWithWarning(ClearableFileInput):
+    template_name = "widgets/clearable_file_input_with_warning.html"
+
+
+class CustomImageField(ImageField):
+    widget = ClearableFileInputWithWarning
+
+
 def image_serializer(value, alt):
    """helper for serializing images"""
    if value and hasattr(value, "url"):
@ -395,6 +404,14 @@ class ImageField(ActivitypubFieldMixin, models.ImageField):
        image_content = ContentFile(response.content)
        return [image_name, image_content]

+    def formfield(self, **kwargs):
+        return super().formfield(
+            **{
+                "form_class": CustomImageField,
+                **kwargs,
+            }
+        )
+

 class DateTimeField(ActivitypubFieldMixin, models.DateTimeField):
    """activitypub-aware datetime field"""
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@ -21,6 +21,7 @@ CELERY_TASK_SERIALIZER = "json"
 CELERY_RESULT_SERIALIZER = "json"

 # email
+EMAIL_BACKEND = env("EMAIL_BACKEND", "django.core.mail.backends.smtp.EmailBackend")
 EMAIL_HOST = env("EMAIL_HOST")
 EMAIL_PORT = env("EMAIL_PORT", 587)
 EMAIL_HOST_USER = env("EMAIL_HOST_USER")
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@ -3,6 +3,7 @@

 let BookWyrm = new class {
    constructor() {
+        this.MAX_FILE_SIZE_BYTES = 10 * 1000000
        this.initOnDOMLoaded();
        this.initReccuringTasks();
        this.initEventListeners();
@ -32,15 +33,26 @@ let BookWyrm = new class {
                'click',
                this.back)
            );
+
+        document.querySelectorAll('input[type="file"]')
+            .forEach(node => node.addEventListener(
+                'change',
+                this.disableIfTooLarge.bind(this)
+            ));
    }

    /**
     * Execute code once the DOM is loaded.
     */
    initOnDOMLoaded() {
+        const bookwyrm = this
+
        window.addEventListener('DOMContentLoaded', function() {
            document.querySelectorAll('.tab-group')
                .forEach(tabs => new TabGroup(tabs));
+            document.querySelectorAll('input[type="file"]').forEach(
+                bookwyrm.disableIfTooLarge.bind(bookwyrm)
+            )
        });
    }

@ -284,4 +296,27 @@ let BookWyrm = new class {
            node.classList.remove(classname);
        }
    }
+
+    disableIfTooLarge(eventOrElement) {
+        const { addRemoveClass, MAX_FILE_SIZE_BYTES } = this
+        const element = eventOrElement.currentTarget || eventOrElement
+
+        const submits = element.form.querySelectorAll('[type="submit"]')
+        const warns = element.parentElement.querySelectorAll('.file-too-big')
+        const isTooBig = element.files &&
+            element.files[0] &&
+            element.files[0].size > MAX_FILE_SIZE_BYTES
+
+        if (isTooBig) {
+            submits.forEach(submitter => submitter.disabled = true)
+            warns.forEach(
+                sib => addRemoveClass(sib, 'is-hidden', false)
+            )
+        } else {
+            submits.forEach(submitter => submitter.disabled = false)
+            warns.forEach(
+                sib => addRemoveClass(sib, 'is-hidden', true)
+            )
+        }
+    }
 }
--- a/bookwyrm/templates/author/author.html
+++ b/bookwyrm/templates/author/author.html
@ -22,42 +22,76 @@
    </div>
 </div>

-<div class="block content columns">
-    {% if author.aliases or author.born or author.died or author.wikipedia_link %}
-    <div class="column is-narrow">
-        <div class="box">
+<div class="block columns" itemscope itemtype="https://schema.org/Person">
+    <meta itemprop="name" content="{{ author.name }}">
+
+    {% if author.aliases or author.born or author.died or author.wikipedia_link or author.openlibrary_key or author.inventaire_id %}
+    <div class="column is-two-fifths">
+        <div class="box py-2">
            <dl>
                {% if author.aliases %}
-                <div class="is-flex">
-                    <dt class="mr-1">{% trans "Aliases:" %}</dt>
-                    <dd itemprop="aliases">{{ author.aliases|join:', ' }}</dd>
+                <div class="is-flex is-flex-wrap-wrap my-1">
+                    <dt class="has-text-weight-bold mr-1">{% trans "Aliases:" %}</dt>
+                    {% for alias in author.aliases %}
+                        <dd itemprop="alternateName" content="{{alias}}">
+                            {{alias}}{% if not forloop.last %},&nbsp;{% endif %}
+                        </dd>
+                    {% endfor %}
                </div>
                {% endif %}
+
                {% if author.born %}
-                <div class="is-flex">
-                    <dt class="mr-1">{% trans "Born:" %}</dt>
-                    <dd itemprop="aliases">{{ author.born|naturalday }}</dd>
+                <div class="is-flex my-1">
+                    <dt class="has-text-weight-bold mr-1">{% trans "Born:" %}</dt>
+                    <dd itemprop="birthDate">{{ author.born|naturalday }}</dd>
                </div>
                {% endif %}
-                {% if author.aliases %}
-                <div class="is-flex">
-                    <dt class="mr-1">{% trans "Died:" %}</dt>
-                    <dd itemprop="aliases">{{ author.died|naturalday }}</dd>
+
+                {% if author.died %}
+                <div class="is-flex my-1">
+                    <dt class="has-text-weight-bold mr-1">{% trans "Died:" %}</dt>
+                    <dd itemprop="deathDate">{{ author.died|naturalday }}</dd>
                </div>
                {% endif %}
            </dl>

            {% if author.wikipedia_link %}
-            <p><a href="{{ author.wikipedia_link }}" rel=”noopener” target="_blank">{% trans "Wikipedia" %}</a></p>
-            {% endif %}
-            {% if author.openlibrary_key %}
-            <p class="mb-0">
-                <a href="https://openlibrary.org/authors/{{ author.openlibrary_key }}" target="_blank" rel="noopener">{% trans "View on OpenLibrary" %}</a>
+            <p class="my-1">
+                <a itemprop="sameAs" href="{{ author.wikipedia_link }}" rel=”noopener” target="_blank">
+                    {% trans "Wikipedia" %}
+                </a>
            </p>
            {% endif %}
+
+            {% if author.openlibrary_key %}
+            <p class="my-1">
+                <a itemprop="sameAs" href="https://openlibrary.org/authors/{{ author.openlibrary_key }}" target="_blank" rel="noopener">
+                    {% trans "View on OpenLibrary" %}
+                </a>
+            </p>
+            {% endif %}
+            
            {% if author.inventaire_id %}
-            <p class="mb-0">
-                <a href="https://inventaire.io/entity/{{ author.inventaire_id }}" target="_blank" rel="noopener">{% trans "View on Inventaire" %}</a>
+            <p class="my-1">
+                <a itemprop="sameAs" href="https://inventaire.io/entity/{{ author.inventaire_id }}" target="_blank" rel="noopener">
+                    {% trans "View on Inventaire" %}
+                </a>
+            </p>
+            {% endif %}
+
+            {% if author.librarything_key %}
+            <p class="my-1">
+                <a itemprop="sameAs" href="https://www.librarything.com/author/{{ author.librarything_key }}" target="_blank" rel="noopener">
+                    {% trans "View on LibraryThing" %}
+                </a>
+            </p>
+            {% endif %}
+            
+            {% if author.goodreads_key %}
+            <p class="my-1">
+                <a itemprop="sameAs" href="https://www.goodreads.com/author/show/{{ author.goodreads_key }}" target="_blank" rel="noopener">
+                    {% trans "View on Goodreads" %}
+                </a>
            </p>
            {% endif %}
        </div>
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@ -1,7 +1,7 @@
 {% extends 'layout.html' %}
 {% load i18n %}{% load bookwyrm_tags %}{% load humanize %}{% load utilities %}

-{% block title %}{{ book|title }}{% endblock %}
+{% block title %}{{ book|book_title }}{% endblock %}

 {% block content %}
 {% with user_authenticated=request.user.is_authenticated can_edit_book=perms.bookwyrm.edit_book %}
--- a/bookwyrm/templates/widgets/clearable_file_input_with_warning.html
+++ b/bookwyrm/templates/widgets/clearable_file_input_with_warning.html
@ -0,0 +1,3 @@
+{% load i18n %}
+{% include "django/forms/widgets/clearable_file_input.html" %}
+<span class="help file-cta is-hidden file-too-big">{% trans "File exceeds maximum size: 10MB" %}</span>
--- a/locale/es/LC_MESSAGES/django.mo
+++ b/locale/es/LC_MESSAGES/django.mo
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
--- a/locale/fr_FR/LC_MESSAGES/django.mo
+++ b/locale/fr_FR/LC_MESSAGES/django.mo
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
--- a/nginx/development
+++ b/nginx/development
@ -1,3 +1,5 @@
+include /etc/nginx/conf.d/server_config;
+
 upstream web {
    server web:8000;
 }
--- a/nginx/production
+++ b/nginx/production
@ -1,3 +1,5 @@
+include /etc/nginx/conf.d/server_config;
+
 upstream web {
    server web:8000;
 }
--- a/nginx/server_config
+++ b/nginx/server_config
@ -0,0 +1 @@
+client_max_body_size 10m;
--- a/requirements.txt
+++ b/requirements.txt
@ -1,5 +1,5 @@
 celery==4.4.2
-Django==3.2.0
+Django==3.2.1
 django-imagekit==4.0.2
 django-model-utils==4.0.0
 environs==7.2.0