diff --git a/bookwyrm/templates/author.html b/bookwyrm/templates/author.html index bc1034a8..0ef876fd 100644 --- a/bookwyrm/templates/author.html +++ b/bookwyrm/templates/author.html @@ -39,3 +39,6 @@ {% endblock %} +{% block scripts %} +{% include 'snippets/datepicker_js.html' %} +{% endblock %} diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index 40da6486..53be123d 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -333,4 +333,5 @@ {% block scripts %} +{% include 'snippets/datepicker_js.html' %} {% endblock %} diff --git a/bookwyrm/templates/book/edit_book.html b/bookwyrm/templates/book/edit_book.html index 8ebbeaae..e75bd96e 100644 --- a/bookwyrm/templates/book/edit_book.html +++ b/bookwyrm/templates/book/edit_book.html @@ -133,7 +133,11 @@

- +

{% for error in form.first_published_date.errors %}

{{ error | escape }}

@@ -141,7 +145,11 @@

- +

{% for error in form.published_date.errors %}

{{ error | escape }}

@@ -239,9 +247,13 @@ {% if not confirm_mode %}
- {% trans "Cancel" %} + {% trans "Cancel" %}
{% endif %} {% endblock %} + +{% block scripts %} +{% include 'snippets/datepicker_js.html' %} +{% endblock %} diff --git a/bookwyrm/templates/book/editions.html b/bookwyrm/templates/book/editions.html index efbe1566..64dd2775 100644 --- a/bookwyrm/templates/book/editions.html +++ b/bookwyrm/templates/book/editions.html @@ -15,14 +15,14 @@ {% for book in editions %}
- + {% include 'snippets/book_cover.html' with book=book cover_class='is-w-m is-h-m align to-l-mobile' %}

- + {{ book.title }}

@@ -51,3 +51,7 @@ {% include 'snippets/pagination.html' with page=editions path=request.path %}
{% endblock %} + +{% block scripts %} +{% include 'snippets/datepicker_js.html' %} +{% endblock %} diff --git a/bookwyrm/templates/discover/large-book.html b/bookwyrm/templates/discover/large-book.html index 1808a0f9..7def6e13 100644 --- a/bookwyrm/templates/discover/large-book.html +++ b/bookwyrm/templates/discover/large-book.html @@ -17,7 +17,7 @@

- {{ book.title }} + {{ book.title }}

{% if book.authors %} diff --git a/bookwyrm/templates/discover/small-book.html b/bookwyrm/templates/discover/small-book.html index ad7e00fb..73133de4 100644 --- a/bookwyrm/templates/discover/small-book.html +++ b/bookwyrm/templates/discover/small-book.html @@ -11,7 +11,7 @@ {% include 'snippets/stars.html' with rating=book|rating:request.user %}

- {{ book.title }} + {{ book.title }}

{% if book.authors %} diff --git a/bookwyrm/templates/edit_author.html b/bookwyrm/templates/edit_author.html index 542b57f9..ecf32358 100644 --- a/bookwyrm/templates/edit_author.html +++ b/bookwyrm/templates/edit_author.html @@ -76,8 +76,12 @@
- {% trans "Cancel" %} + {% trans "Cancel" %}
{% endblock %} + +{% block scripts %} +{% include 'snippets/datepicker_js.html' %} +{% endblock %} diff --git a/bookwyrm/templates/feed/direct_messages.html b/bookwyrm/templates/feed/direct_messages.html index 1e361e61..0b7dcd79 100644 --- a/bookwyrm/templates/feed/direct_messages.html +++ b/bookwyrm/templates/feed/direct_messages.html @@ -10,7 +10,7 @@ {% trans "Direct Messages" %} {% endif %} - {% if partner %}

{% trans "All messages" %}

{% endif %} + {% if partner %}

{% trans "All messages" %}

{% endif %}
diff --git a/bookwyrm/templates/feed/feed_layout.html b/bookwyrm/templates/feed/feed_layout.html index 75fc1951..431cf6dd 100644 --- a/bookwyrm/templates/feed/feed_layout.html +++ b/bookwyrm/templates/feed/feed_layout.html @@ -105,4 +105,5 @@ {% block scripts %} +{% include 'snippets/datepicker_js.html' %} {% endblock %} diff --git a/bookwyrm/templates/get_started/books.html b/bookwyrm/templates/get_started/books.html index 9613508b..e3fd87bb 100644 --- a/bookwyrm/templates/get_started/books.html +++ b/bookwyrm/templates/get_started/books.html @@ -64,3 +64,7 @@ {% endblock %} + +{% block scripts %} +{% include 'snippets/datepicker_js.html' %} +{% endblock %} diff --git a/bookwyrm/templates/import.html b/bookwyrm/templates/import.html index 239b6914..c4f0dfae 100644 --- a/bookwyrm/templates/import.html +++ b/bookwyrm/templates/import.html @@ -56,7 +56,7 @@ {% endif %}
diff --git a/bookwyrm/templates/import_status.html b/bookwyrm/templates/import_status.html index 3ce929e6..e06392a8 100644 --- a/bookwyrm/templates/import_status.html +++ b/bookwyrm/templates/import_status.html @@ -124,7 +124,7 @@ {% if item.book %} - + {% include 'snippets/book_cover.html' with book=item.book cover_class='is-h-s' %} {% endif %} diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html index c45f2380..bc654401 100644 --- a/bookwyrm/templates/layout.html +++ b/bookwyrm/templates/layout.html @@ -94,12 +94,12 @@
  • - + {% trans 'Import Books' %}
  • - + {% trans 'Settings' %}
    • @@ -122,14 +122,14 @@ {% endif %}
  • - + {% trans 'Log out' %}
    • - + {% trans "Notifications" %} @@ -158,7 +158,7 @@
    -

    {% trans "Forgot your password?" %}

    +

    {% trans "Forgot your password?" %}

    @@ -195,7 +195,7 @@

    - {% trans "About this server" %} + {% trans "About this server" %}

    {% if site.admin_email %}

    diff --git a/bookwyrm/templates/login.html b/bookwyrm/templates/login.html index 063b4b6d..8ed5d044 100644 --- a/bookwyrm/templates/login.html +++ b/bookwyrm/templates/login.html @@ -33,7 +33,7 @@

    - {% trans "Forgot your password?" %} + {% trans "Forgot your password?" %}
    @@ -56,7 +56,7 @@ {% include 'snippets/about.html' %}

    - {% trans "More about this site" %} + {% trans "More about this site" %}

    diff --git a/bookwyrm/templates/notifications.html b/bookwyrm/templates/notifications.html index ba0a25cd..8f8fede2 100644 --- a/bookwyrm/templates/notifications.html +++ b/bookwyrm/templates/notifications.html @@ -107,7 +107,8 @@ {% endif %} {% endif %} {% elif notification.related_import %} - {% blocktrans with related_id=notification.related_import.id %}Your import completed.{% endblocktrans %} + {% url 'import-status' notification.related_import.id as url %} + {% blocktrans %}Your import completed.{% endblocktrans %} {% elif notification.related_report %} {% url 'settings-report' notification.related_report.id as path %} {% blocktrans with related_id=path %}A new report needs moderation.{% endblocktrans %} diff --git a/bookwyrm/templates/preferences/preferences_layout.html b/bookwyrm/templates/preferences/preferences_layout.html index d463d9cb..baf87e47 100644 --- a/bookwyrm/templates/preferences/preferences_layout.html +++ b/bookwyrm/templates/preferences/preferences_layout.html @@ -11,16 +11,19 @@

    {% trans "Account" %}

    {% trans "Relationships" %}

    diff --git a/bookwyrm/templates/snippets/authors.html b/bookwyrm/templates/snippets/authors.html index 9459b0fe..476956b6 100644 --- a/bookwyrm/templates/snippets/authors.html +++ b/bookwyrm/templates/snippets/authors.html @@ -5,7 +5,7 @@ {% endcomment %} {% for author in book.authors.all %}
    + {% include 'snippets/book_cover.html' with book=book cover_class='is-w-l-mobile is-h-l-mobile is-w-l-tablet is-h-xl-tablet' %}
    diff --git a/bookwyrm/templates/snippets/datepicker_js.html b/bookwyrm/templates/snippets/datepicker_js.html new file mode 100644 index 00000000..abfadaaf --- /dev/null +++ b/bookwyrm/templates/snippets/datepicker_js.html @@ -0,0 +1,3 @@ + + + diff --git a/bookwyrm/templates/snippets/readthrough_form.html b/bookwyrm/templates/snippets/readthrough_form.html index c5be295e..256fcea5 100644 --- a/bookwyrm/templates/snippets/readthrough_form.html +++ b/bookwyrm/templates/snippets/readthrough_form.html @@ -5,7 +5,11 @@
    {# Only show progress for editing existing readthroughs #} @@ -28,6 +32,10 @@
    diff --git a/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html b/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html index ca65bf06..6d4ea5ea 100644 --- a/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html +++ b/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html @@ -17,13 +17,21 @@
    diff --git a/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html b/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html index 21341683..47d620e0 100644 --- a/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html +++ b/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html @@ -15,7 +15,11 @@
    diff --git a/bookwyrm/templates/snippets/status/layout.html b/bookwyrm/templates/snippets/status/layout.html index 6014158f..ddbd6f20 100644 --- a/bookwyrm/templates/snippets/status/layout.html +++ b/bookwyrm/templates/snippets/status/layout.html @@ -44,7 +44,7 @@ {% else %}
    - + {% trans "Reply" %} diff --git a/bookwyrm/templates/snippets/status/status_header.html b/bookwyrm/templates/snippets/status/status_header.html index b9faf64e..605b46cc 100644 --- a/bookwyrm/templates/snippets/status/status_header.html +++ b/bookwyrm/templates/snippets/status/status_header.html @@ -47,7 +47,7 @@ {% if status.book %} {% if status.status_type == 'GeneratedNote' or status.status_type == 'Rating' %} - {{ status.book|title }}{% if status.status_type == 'Rating' %}: {% include 'snippets/stars.html' with rating=status.rating %} + {{ status.book|title }}{% if status.status_type == 'Rating' %}: {% include 'snippets/stars.html' with rating=status.rating %} {{ status.book|title }}{% if status.status_type == 'Rating' %}: + {{ status.book|title }}{% if status.status_type == 'Rating' %}: + {{ status.mention_books.first.title }} {% endif %} @@ -86,7 +86,7 @@ {% include 'snippets/book_titleby.html' with book=status.book %} {% endif %} {% elif status.mention_books %} - {{ status.mention_books.first|title }} + {{ status.mention_books.first|title }} {% endif %} diff --git a/bookwyrm/templates/snippets/user_options.html b/bookwyrm/templates/snippets/user_options.html index ec772e54..32e83ed2 100644 --- a/bookwyrm/templates/snippets/user_options.html +++ b/bookwyrm/templates/snippets/user_options.html @@ -10,7 +10,7 @@ {% block dropdown-list %}
  • - {% trans "Send direct message" %} + {% trans "Send direct message" %}
  • {% include 'snippets/report_button.html' with user=user class="is-fullwidth" %} diff --git a/bookwyrm/templates/user/layout.html b/bookwyrm/templates/user/layout.html index 661d8078..1aa76202 100644 --- a/bookwyrm/templates/user/layout.html +++ b/bookwyrm/templates/user/layout.html @@ -81,3 +81,8 @@ {% block panel %}{% endblock %} {% endblock %} + + +{% block scripts %} +{% include 'snippets/datepicker_js.html' %} +{% endblock %} diff --git a/bookwyrm/tests/views/inbox/test_inbox_add.py b/bookwyrm/tests/views/inbox/test_inbox_add.py index 9f237b6d..5f86b121 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_add.py +++ b/bookwyrm/tests/views/inbox/test_inbox_add.py @@ -35,29 +35,49 @@ class InboxAdd(TestCase): work = models.Work.objects.create(title="work title") self.book = models.Edition.objects.create( title="Test", - remote_id="https://bookwyrm.social/book/37292", + remote_id="https://example.com/book/37292", parent_work=work, ) models.SiteSettings.objects.create() + @responses.activate def test_handle_add_book_to_shelf(self): """shelving a book""" shelf = models.Shelf.objects.create(user=self.remote_user, name="Test Shelf") - shelf.remote_id = "https://bookwyrm.social/user/mouse/shelf/to-read" + shelf.remote_id = "https://example.com/user/rat/shelf/to-read" shelf.save() + responses.add( + responses.GET, + "https://example.com/user/rat/shelf/to-read", + json={ + "id": shelf.remote_id, + "type": "Shelf", + "totalItems": 1, + "first": "https://example.com/shelf/22?page=1", + "last": "https://example.com/shelf/22?page=1", + "name": "Test Shelf", + "owner": self.remote_user.remote_id, + "to": ["https://www.w3.org/ns/activitystreams#Public"], + "cc": ["https://example.com/user/rat/followers"], + "summary": "summary text", + "curation": "curated", + "@context": "https://www.w3.org/ns/activitystreams", + }, + ) + activity = { - "id": "https://bookwyrm.social/shelfbook/6189#add", + "id": "https://example.com/shelfbook/6189#add", "type": "Add", "actor": "https://example.com/users/rat", "object": { "actor": self.remote_user.remote_id, "type": "ShelfItem", "book": self.book.remote_id, - "id": "https://bookwyrm.social/shelfbook/6189", + "id": "https://example.com/shelfbook/6189", }, - "target": "https://bookwyrm.social/user/mouse/shelf/to-read", + "target": "https://example.com/user/rat/shelf/to-read", "@context": "https://www.w3.org/ns/activitystreams", } views.inbox.activity_task(activity) @@ -68,7 +88,7 @@ class InboxAdd(TestCase): """listing a book""" responses.add( responses.GET, - "https://bookwyrm.social/user/mouse/list/to-read", + "https://example.com/user/mouse/list/to-read", json={ "id": "https://example.com/list/22", "type": "BookList", @@ -86,17 +106,17 @@ class InboxAdd(TestCase): ) activity = { - "id": "https://bookwyrm.social/listbook/6189#add", + "id": "https://example.com/listbook/6189#add", "type": "Add", "actor": "https://example.com/users/rat", "object": { "actor": self.remote_user.remote_id, "type": "ListItem", "book": self.book.remote_id, - "id": "https://bookwyrm.social/listbook/6189", + "id": "https://example.com/listbook/6189", "order": 1, }, - "target": "https://bookwyrm.social/user/mouse/list/to-read", + "target": "https://example.com/user/mouse/list/to-read", "@context": "https://www.w3.org/ns/activitystreams", } views.inbox.activity_task(activity) @@ -105,4 +125,4 @@ class InboxAdd(TestCase): listitem = models.ListItem.objects.get() self.assertEqual(booklist.name, "Test List") self.assertEqual(booklist.books.first(), self.book) - self.assertEqual(listitem.remote_id, "https://bookwyrm.social/listbook/6189") + self.assertEqual(listitem.remote_id, "https://example.com/listbook/6189") diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py index dce50868..2acdb369 100644 --- a/bookwyrm/tests/views/test_book.py +++ b/bookwyrm/tests/views/test_book.py @@ -47,39 +47,6 @@ class BookViews(TestCase): ) models.SiteSettings.objects.create() - def test_date_regression(self): - """ensure that creating a new book actually saves the published date fields - - this was initially a regression due to using a custom date picker tag - """ - first_published_date = "2021-04-20" - published_date = "2022-04-20" - self.local_user.groups.add(self.group) - view = views.EditBook.as_view() - form = forms.EditionForm( - { - "title": "New Title", - "last_edited_by": self.local_user.id, - "first_published_date": first_published_date, - "published_date": published_date, - } - ) - request = self.factory.post("", form.data) - request.user = self.local_user - - with patch("bookwyrm.connectors.connector_manager.local_search"): - result = view(request) - result.render() - - self.assertContains( - result, - f'', - ) - self.assertContains( - result, - f'', - ) - def test_book_page(self): """there are so many views, this just makes sure it LOADS""" view = views.Book.as_view() diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index 14fe476d..3e7dea58 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -45,8 +45,12 @@ urlpatterns = [ # authentication re_path(r"^login/?$", views.Login.as_view(), name="login"), re_path(r"^register/?$", views.Register.as_view()), - re_path(r"^logout/?$", views.Logout.as_view()), - re_path(r"^password-reset/?$", views.PasswordResetRequest.as_view()), + re_path(r"^logout/?$", views.Logout.as_view(), name="logout"), + re_path( + r"^password-reset/?$", + views.PasswordResetRequest.as_view(), + name="password-reset", + ), re_path( r"^password-reset/(?P[A-Za-z0-9]+)/?$", views.PasswordReset.as_view() ), @@ -134,7 +138,7 @@ urlpatterns = [ re_path(r"^about/?$", views.About.as_view(), name="about"), path("", views.Home.as_view(), name="landing"), re_path(r"^discover/?$", views.Discover.as_view()), - re_path(r"^notifications/?$", views.Notifications.as_view()), + re_path(r"^notifications/?$", views.Notifications.as_view(), name="notifications"), re_path(r"^directory/?", views.Directory.as_view(), name="directory"), # Get started re_path( @@ -165,8 +169,8 @@ urlpatterns = [ # search re_path(r"^search/?$", views.Search.as_view(), name="search"), # imports - re_path(r"^import/?$", views.Import.as_view()), - re_path(r"^import/(\d+)/?$", views.ImportStatus.as_view()), + re_path(r"^import/?$", views.Import.as_view(), name="import"), + re_path(r"^import/(\d+)/?$", views.ImportStatus.as_view(), name="import-status"), # users re_path(r"%s/?$" % user_path, views.User.as_view(), name="user-feed"), re_path(r"%s\.json$" % user_path, views.User.as_view()), @@ -229,7 +233,7 @@ urlpatterns = [ views.ChangePassword.as_view(), name="prefs-password", ), - re_path(r"^preferences/block/?$", views.Block.as_view()), + re_path(r"^preferences/block/?$", views.Block.as_view(), name="prefs-block"), re_path(r"^block/(?P\d+)/?$", views.Block.as_view()), re_path(r"^unblock/(?P\d+)/?$", views.unblock), # statuses