Merge branch 'main' into production

This commit is contained in:
Mouse Reeve 2021-03-29 18:57:48 -07:00
commit d77eb5381d
6 changed files with 2 additions and 17 deletions

View file

@ -44,9 +44,9 @@
<div class="card block"> <div class="card block">
<div class="card-content"> <div class="card-content">
<div class="media"> <div class="media">
<span class="media-left"> <a href="{{ user.local_path }}" class="media-left">
{% include 'snippets/avatar.html' with user=user large=True %} {% include 'snippets/avatar.html' with user=user large=True %}
</span> </a>
<div class="media-content"> <div class="media-content">
<a href="{{ user.local_path }}" class="is-block mb-2"> <a href="{{ user.local_path }}" class="is-block mb-2">
<span class="title is-4 is-block">{{ user.display_name }}</span> <span class="title is-4 is-block">{{ user.display_name }}</span>

View file

@ -23,8 +23,6 @@ status_path = r"%s/(%s)/(?P<status_id>\d+)" % (user_path, "|".join(status_types)
book_path = r"^book/(?P<book_id>\d+)" book_path = r"^book/(?P<book_id>\d+)"
handler404 = "bookwyrm.views.not_found_page"
handler500 = "bookwyrm.views.server_error_page"
urlpatterns = [ urlpatterns = [
path("admin/", admin.site.urls), path("admin/", admin.site.urls),
path( path(

View file

@ -5,7 +5,6 @@ from .block import Block, unblock
from .books import Book, EditBook, ConfirmEditBook, Editions from .books import Book, EditBook, ConfirmEditBook, Editions
from .books import upload_cover, add_description, switch_edition, resolve_book from .books import upload_cover, add_description, switch_edition, resolve_book
from .directory import Directory from .directory import Directory
from .error import not_found_page, server_error_page
from .federation import Federation, FederatedServer from .federation import Federation, FederatedServer
from .feed import DirectMessage, Feed, Replies, Status from .feed import DirectMessage, Feed, Replies, Status
from .follow import follow, unfollow from .follow import follow, unfollow

View file

@ -1,12 +0,0 @@
""" something has gone amiss """
from django.template.response import TemplateResponse
def server_error_page(request):
""" 500 errors """
return TemplateResponse(request, "error.html", status=500)
def not_found_page(request, _):
""" 404s """
return TemplateResponse(request, "notfound.html", status=404)