diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css index e42ab860b..144d5aecd 100644 --- a/bookwyrm/static/css/bookwyrm.css +++ b/bookwyrm/static/css/bookwyrm.css @@ -603,6 +603,37 @@ ol.ordered-list li::before { padding: 0 0.75em; } +/* Breadcrumbs + ******************************************************************************/ + +.books-grid { + display: grid; + grid-template-columns: repeat(auto-fit, minmax(10em, 1fr)); + gap: 1.5rem; + align-items: end; + justify-items: center; +} + +.books-grid > .is-big { + grid-column: span 2; + grid-row: span 2; + justify-self: stretch; + padding: 1.5rem 1.5rem 0; +} + +.books-grid .book-cover { + width: 100%; +} + +.books-grid .book-title { + --height-basis: 1.35rem; + + display: block; + margin-top: 0.5rem; + line-height: var(--height-basis); + min-height: calc(2 * var(--height-basis)); +} + /* Dimensions * @todo These could be in rem. ******************************************************************************/ diff --git a/bookwyrm/static/css/fonts/dm_serif_display/OFL.txt b/bookwyrm/static/css/fonts/dm_serif_display/OFL.txt new file mode 100644 index 000000000..929fd66e7 --- /dev/null +++ b/bookwyrm/static/css/fonts/dm_serif_display/OFL.txt @@ -0,0 +1,95 @@ +Copyright 2014-2018 Adobe (http://www.adobe.com/), with Reserved Font Name +'Source'. All Rights Reserved. Source is a trademark of Adobe in the United +States and/or other countries. Copyright 2019 Google LLC. + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/bookwyrm/static/css/fonts/dm_serif_display/dmserifdisplay-italic-webfont.woff b/bookwyrm/static/css/fonts/dm_serif_display/dmserifdisplay-italic-webfont.woff new file mode 100644 index 000000000..a51242aeb Binary files /dev/null and b/bookwyrm/static/css/fonts/dm_serif_display/dmserifdisplay-italic-webfont.woff differ diff --git a/bookwyrm/static/css/fonts/dm_serif_display/dmserifdisplay-italic-webfont.woff2 b/bookwyrm/static/css/fonts/dm_serif_display/dmserifdisplay-italic-webfont.woff2 new file mode 100644 index 000000000..a2058d588 Binary files /dev/null and b/bookwyrm/static/css/fonts/dm_serif_display/dmserifdisplay-italic-webfont.woff2 differ diff --git a/bookwyrm/static/css/fonts/dm_serif_display/dmserifdisplay-regular-webfont.woff b/bookwyrm/static/css/fonts/dm_serif_display/dmserifdisplay-regular-webfont.woff new file mode 100644 index 000000000..db28fb1de Binary files /dev/null and b/bookwyrm/static/css/fonts/dm_serif_display/dmserifdisplay-regular-webfont.woff differ diff --git a/bookwyrm/static/css/fonts/dm_serif_display/dmserifdisplay-regular-webfont.woff2 b/bookwyrm/static/css/fonts/dm_serif_display/dmserifdisplay-regular-webfont.woff2 new file mode 100644 index 000000000..ac4cd6b4f Binary files /dev/null and b/bookwyrm/static/css/fonts/dm_serif_display/dmserifdisplay-regular-webfont.woff2 differ diff --git a/bookwyrm/static/css/fonts/dm_serif_display/generator_config.txt b/bookwyrm/static/css/fonts/dm_serif_display/generator_config.txt new file mode 100644 index 000000000..dd0e038cf --- /dev/null +++ b/bookwyrm/static/css/fonts/dm_serif_display/generator_config.txt @@ -0,0 +1,30 @@ +# Font Squirrel Font-face Generator Configuration File +# Upload this file to the generator to recreate the settings +# you used to create these fonts. + +{ + "mode": "optimal", + "formats": + [ + "woff", + "woff2" + ], + "tt_instructor": "default", + "fix_gasp": "xy", + "fix_vertical_metrics": "Y", + "metrics_ascent": "", + "metrics_descent": "", + "metrics_linegap": "", + "add_spaces": "Y", + "add_hyphens": "Y", + "fallback": "none", + "fallback_custom": "100", + "options_subset": "basic", + "subset_custom": "", + "subset_custom_range": "", + "subset_ot_features_list": "", + "css_stylesheet": "stylesheet.css", + "filename_suffix": "-webfont", + "emsquare": "2048", + "spacing_adjustment": "0" +} diff --git a/bookwyrm/static/css/vendor/dm_serif_display.css b/bookwyrm/static/css/vendor/dm_serif_display.css new file mode 100644 index 000000000..53a014b0e --- /dev/null +++ b/bookwyrm/static/css/vendor/dm_serif_display.css @@ -0,0 +1,19 @@ +@font-face { + font-family: 'dm_serif_display'; + src: url('../fonts/dm_serif_display/dmserifdisplay-italic-webfont.woff2') format('woff2'), + url('../fonts/dm_serif_display/dmserifdisplay-italic-webfont.woff') format('woff'); + font-weight: normal; + font-style: italic; +} + +@font-face { + font-family: 'dm_serif_display'; + src: url('../fonts/dm_serif_display/dmserifdisplay-regular-webfont.woff2') format('woff2'), + url('../fonts/dm_serif_display/dmserifdisplay-regular-webfont.woff') format('woff'); + font-weight: normal; + font-style: normal; +} + +.is-serif { + font-family: 'dm_serif_display', Georgia, serif; +} diff --git a/bookwyrm/templates/annual_summary/layout.html b/bookwyrm/templates/annual_summary/layout.html new file mode 100644 index 000000000..99c5343db --- /dev/null +++ b/bookwyrm/templates/annual_summary/layout.html @@ -0,0 +1,184 @@ +{% extends 'layout.html' %} +{% load i18n %} +{% load static %} + + +{% block title %}{% blocktrans %}{{ year }} in the books{% endblocktrans %}{% endblock %} + +{% block head_links %} + +{% endblock %} + +{% block content %} +
+ {% with year=paginated_years|first %} +
+ + + {% blocktrans %}{{ year }} in the books{% endblocktrans %} + +
+ {% endwith %} + + {% with year=paginated_years|last %} + {% if year %} +
+ + {% blocktrans %}{{ year }} in the books{% endblocktrans %} + + +
+ {% endif %} + {% endwith %} +
+ +

+ 📚✨ + {% blocktrans %}{{ year }} in the books{% endblocktrans %} + ✨📚 +

+ + {% if not books %} +

{% blocktrans %}Sadly you didn't finish any book in {{ year }}{% endblocktrans %}

+ {% else %} + +
+
+

+ {% blocktrans %}In {{ year }}, you read {{ books_total }} books
for a total of {{ pages_total }} pages!{% endblocktrans %} +

+

{% trans "That’s great!" %}

+ +

+ {% blocktrans %}That makes an average of {{ pages_average }} pages per book.{% endblocktrans %} +

+ + {% if no_page_number %} +

{% blocktrans %}({{ no_page_number }} books don’t have pages){% endblocktrans %}

+ {% endif %} +
+
+ + {% if book_pages_lowest and book_pages_highest %} +
+
+ {% include 'snippets/book_cover.html' with book=book_pages_lowest cover_class='is-w-auto-tablet is-h-l-mobile' %} +
+
+ {% trans "Your shortest read this year" %} +

+ + {{ book_pages_lowest.title }} + +

+ {% if book_pages_lowest.authors.exists %} +

{% trans "by" %} + {% include 'snippets/authors.html' with book=book_pages_lowest link_class="has-text-success-dark" %} +

+ {% endif %} +

+ {% with pages=book_pages_lowest.pages %} + {% blocktrans %}{{ pages }} pages{% endblocktrans%} + {% endwith %} +

+
+
+ {% include 'snippets/book_cover.html' with book=book_pages_highest cover_class='is-w-auto-tablet is-h-l-mobile' %} +
+
+ {% trans "and the longest read" %} +

+ + {{ book_pages_highest.title }} + +

+ {% if book_pages_highest.authors.exists %} +

{% trans "by" %} + {% include 'snippets/authors.html' with book=book_pages_highest link_class="has-text-success-dark" %} +

+ {% endif %} +

+ {% with pages=book_pages_highest.pages %} + {% blocktrans %}{{ pages }} pages{% endblocktrans%} + {% endwith %} +

+
+
+ {% endif %} + +
+
+
+
+
+ +
+
+

+ {% blocktrans %}You left {{ ratings_total }} ratings,
your average rating is {{ rating_average }}{% endblocktrans %} +

+
+
+
+
+ {% include 'snippets/book_cover.html' with book=book_rating_highest.book cover_class='is-w-auto-tablet is-h-l-mobile' %} +
+
+ {% trans "Your best rated review" %} +

+ + {{ book_rating_highest.book.title }} + +

+ {% if book_rating_highest.book.authors.exists %} +

{% trans "by" %} + {% include 'snippets/authors.html' with book=book_rating_highest.book link_class="has-text-success-dark" %} +

+ {% endif %} +

+ {% with rating=book_rating_highest.rating|floatformat %} + {% blocktrans %}Your rating: {{ rating }}{% endblocktrans%} + {% endwith %} +

+
+
+ +
+
+
+
+
+ +
+
+

+ {% blocktrans %}All the books you read in 2021{% endblocktrans %} +

+
+
+ +
+
+
+ {% for book in books %} + {% if book.id in best_ratings_books_ids %} + + {% include 'snippets/book_cover.html' with book=book cover_class='is-w-auto' %} + + {{ book.title }} + + + {% else %} + + {% include 'snippets/book_cover.html' with book=book cover_class='is-w-auto' %} + + {{ book.title }} + + + {% endif %} + {% endfor %} +
+
+
+ {% endif %} +{% endblock %} diff --git a/bookwyrm/templates/feed/feed.html b/bookwyrm/templates/feed/feed.html index 010ba0f9d..f25ec869b 100644 --- a/bookwyrm/templates/feed/feed.html +++ b/bookwyrm/templates/feed/feed.html @@ -64,14 +64,20 @@ {{ allowed_status_types|json_script:"unread-notifications-wrapper" }} -{% if request.user.show_goal and not goal and tab.key == 'home' %} -{% now 'Y' as year %} -
- {% include 'feed/goal_card.html' with year=year %} -
-
-{% endif %} + {% if request.user.show_goal and not goal and tab.key == 'home' %} + {% now 'Y' as year %} +
+ {% include 'feed/goal_card.html' with year=year %} +
+
+ {% endif %} + {% if annual_summary_year and tab.key == 'home' %} +
+ {% include 'feed/summary_card.html' with year=annual_summary_year %} +
+
+ {% endif %} {% endif %} {# activity feed #} diff --git a/bookwyrm/templates/feed/summary_card.html b/bookwyrm/templates/feed/summary_card.html new file mode 100644 index 000000000..e726792e9 --- /dev/null +++ b/bookwyrm/templates/feed/summary_card.html @@ -0,0 +1,22 @@ +{% extends 'components/card.html' %} +{% load i18n %} + +{% block card-header %} +

+ + + {% blocktrans %}{{ year }} in the books{% endblocktrans %} +

+{% endblock %} + +{% block card-content %} +

+{% blocktrans %}The end of the year is the best moment to take stock of all the books read during the last 12 months. How many pages have you read? Which book is your best-rated of the year? We compiled these stats, and more!{% endblocktrans %} +

+ +

+ + {% blocktrans %}Discover your stats for {{ year }}!{% endblocktrans %} + +

+{% endblock %} diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html index 25aaf1b6b..d7710a2ab 100644 --- a/bookwyrm/templates/layout.html +++ b/bookwyrm/templates/layout.html @@ -28,6 +28,8 @@ {% include 'snippets/opengraph_images.html' %} {% endblock %} + + {% block head_links %}{% endblock %}