Differentiate friends/local/federated reviews

fedireads/models/status.py

@@ -7,6 +7,8 @@ import re
 
 from fedireads.utils.models import FedireadsModel
 
+# TODO: quote, comment, poll, recommendation, content warning, image
+
 
 class Status(FedireadsModel):
     ''' any post, like a reply to a review, etc '''

fedireads/static/format.css

@@ -87,11 +87,11 @@ h2 {
     margin-right: 0;
 }
 
-#feed-tabs {
+.tabs {
     display: flex;
     flex-direction: row;
 }
-.active {
+.tab.active {
     background-color: #FF1654;
 }
 

fedireads/templates/book.html

@@ -1,14 +1,15 @@
 {% extends 'layout.html' %}
 {% load fr_display %}
 {% block content %}
-<div id="content">
+<div id="sidebar">
     <div>
-        <div class="book-preview">
+        <h2><q>{{ book.data.title }}</q> and You</h2>
-            {% include 'snippets/book.html' with book=book size=large rating=rating description=True shelf_pulldown=True %}
+        <p>{% if shelf %}On shelf <q>{{ shelf.name }}</q>{% endif %}</p>
-        </div>
+        {% include 'snippets/shelve-button.html' with book=book pulldown=True %}
+
         <div id="tag-cloud">
-            {% for tag in tags %}
+            {% for tag in user_tags %}
-            {% include 'snippets/tag.html' with tag=tag user=request.user %}
+            {% include 'snippets/tag.html' with tag=tag user=request.user user_tags=user_tag_names %}
             {% endfor %}
         </div>
         <form class="tag-form" name="tag" action="/tag/" method="post">
@@ -18,6 +19,33 @@
             <button type="submit">Add tag</button>
         </form>
     </div>
+</div>
+
+<div id="content">
+    <div>
+        <h2><q>{{ book.data.title }}</q> by 
+            {% include 'snippets/authors.html' with book=book %}</h2>
+        <div class="book-preview">
+            {% include 'snippets/book_cover.html' with book=book size=large %}
+            <p>{{ active_tab }} rating: {{ rating | stars }}</p>
+            {% if description %}
+            <blockquote>{{ book.data.description | description }}</blockquote>
+            {% endif %}
+            {% for review in user_reviews %}
+            {% include 'snippets/review.html' with review=review %}
+            {% endfor %}
+            <div>
+                <div id="tag-cloud">
+                    {% for tag in tags %}
+                    {% include 'snippets/tag.html' with tag=tag user=request.user user_tags=user_tag_names %}
+                    {% endfor %}
+                </div>
+            </div>
+
+        </div>
+    </div>
+
+    {% include 'snippets/tabs.html' with tabs=feed_tabs active_tab=active_tab path=path %}
     <div class="reviews">
         <h2>Reviews</h2>
         {% if not reviews %}
@@ -29,13 +57,9 @@
             {{ review_form.as_p }}
             <button type="submit">Post review</button>
         </form>
+        <p>Average rating: {{ rating | stars }}</p>
         {% for review in reviews %}
-        <div class="review">
+        {% include 'snippets/review.html' with review=review %}
-            <h4>{{ review.name }}
-                <small>{{ review.rating | stars }} stars, by {% include 'snippets/username.html' with user=review.user %}</small>
-            </h4>
-            <blockquote>{{ review.content }}</blockquote>
-        </div>
         {% endfor %}
     </div>
 </div>

fedireads/templates/feed.html

@@ -1,8 +1,8 @@
 {% extends 'layout.html' %}
 {% load fr_display %}
 {% block content %}
-<div id="sidebar">
 
+<div id="sidebar">
     <div>
         {% if shelves %}
         {% for shelf in shelves %}
@@ -33,17 +33,13 @@
     </div>
 </div>
 
+
 <div id="feed">
-    <div id="feed-tabs">
+    {% include 'snippets/tabs.html' with tabs=feed_tabs active_tab=active_tab %}
-        {% for tab in feed_tabs %}
-        <div class="{% if tab == active_tab %}active{% endif %}">
-            <a href="/{{ tab }}">{{ tab }}</a>
-        </div>
-        {% endfor %}
-    </div>
 
     {% for activity in activities %}
         {% include 'snippets/status.html' with activity=activity %}
     {% endfor %}
 </div>
+
 {% endblock %}

fedireads/templates/snippets/authors.html

@@ -0,0 +1 @@
+by <a href="/author/{{ book.authors.first.openlibrary_key }}" class="author">{{ book.authors.first.data.name }}</a>

fedireads/templates/snippets/book.html

@@ -3,7 +3,9 @@
 <p class="title">
     <a href="/book/{{ book.openlibrary_key }}">{{ book.data.title }}</a>
 </p>
-<p>by <a href="/author/{{ book.authors.first.openlibrary_key }}" class="author">{{ book.authors.first.data.name }}</a></p>
+<p>
+    {% include 'snippets/authors.html' with book=book %}
+</p>
 
 {% if rating %}
 {{ rating | stars }} {{ rating }}
@@ -13,4 +15,4 @@
 <blockquote>{{ book.data.description | description }}</blockquote>
 {% endif %}
 
-{% include 'snippets/shelve-button.html' with book=book pulldown=shelf_pulldown%}
+{% include 'snippets/shelve-button.html' with book=book pulldown=shelf_pulldown %}

fedireads/templates/snippets/review.html

@@ -0,0 +1,8 @@
+{% load fr_display %}
+<div class="review">
+    <h4>{{ review.name }}
+        <small>{{ review.rating | stars }} stars, by {% include 'snippets/username.html' with user=review.user %}</small>
+    </h4>
+    <blockquote>{{ review.content }}</blockquote>
+</div>
+

fedireads/templates/snippets/tabs.html

@@ -0,0 +1,8 @@
+<div class="tabs">
+    {% for tab in tabs %}
+    <div class="tab {% if tab == active_tab %}active{% endif %}">
+        <a href="{{ path }}/{{ tab }}">{{ tab }}</a>
+    </div>
+    {% endfor %}
+</div>
+

fedireads/templates/snippets/tag.html

@@ -1,6 +1,6 @@
 <div class="tag">
     <a href="/tag/{{ tag.identifier }}">{{ tag.name }}</a>
-    {% if tag.name in user_tags %}
+    {% if tag.identifier in user_tags %}
     <form class="tag-form" name="tag" action="/untag/" method="post">
         {% csrf_token %}
         <input type="hidden" name="book" value="{{ book.openlibrary_key }}"></input>

fedireads/templatetags/fr_display.py

@@ -80,3 +80,16 @@ def shelve_button_text(context, book):
         return 'I\'m done!'
     return 'Want to read'
 
+
+@register.simple_tag(takes_context=True)
+def current_shelf(context, book):
+    ''' check what shelf a user has a book on, if any '''
+    try:
+        shelf = models.ShelfBook.objects.get(
+            shelf__user=context['user'],
+            book=book
+        )
+    except models.ShelfBook.DoesNotExist:
+        return None
+    return shelf.name
+

fedireads/urls.py

@@ -43,6 +43,7 @@ urlpatterns = [
     re_path(r'%s/edit/?$' % user_path, views.edit_profile_page),
     re_path(r'^user/edit/?$', views.edit_profile_page),
     re_path(r'^book/(?P<book_identifier>\w+)/?$', views.book_page),
+    re_path(r'^book/(?P<book_identifier>\w+)/(?P<tab>friends|local|federated)?$', views.book_page),
     re_path(r'^author/(?P<author_identifier>\w+)/?$', views.author_page),
     re_path(r'^tag/(?P<tag_id>[\w-]+)/?$', views.tag_page),
     re_path(r'^shelf/%s/(?P<shelf_identifier>[\w-]+)/?$' % username_regex, views.shelf_page),

fedireads/views.py

@@ -185,12 +185,38 @@ def edit_profile_page(request, username):
     return TemplateResponse(request, 'edit_user.html', data)
 
 
-
+@login_required
-def book_page(request, book_identifier):
+def book_page(request, book_identifier, tab='friends'):
     ''' info about a book '''
     book = openlibrary.get_or_create_book(book_identifier)
-    # TODO: again, post privacy?
+
-    reviews = models.Review.objects.filter(book=book)
+    user_reviews = models.Review.objects.filter(user=request.user, book=book).all()
+
+    if tab == 'friends':
+        reviews = models.Review.objects.filter(
+            Q(user__followers=request.user, privacy='public') | \
+                Q(mention_users=request.user),
+            book=book,
+        )
+    elif tab == 'local':
+        reviews = models.Review.objects.filter(
+            Q(privacy='public') | \
+                Q(mention_users=request.user),
+            user__local=True,
+            book=book,
+        )
+    else:
+        reviews = models.Review.objects.filter(
+            Q(privacy='public') | \
+                Q(mention_users=request.user),
+            book=book,
+        )
+
+    try:
+        shelf = models.Shelf.objects.get(user=request.user, book=book)
+    except models.Shelf.DoesNotExist:
+        shelf = None
+
     rating = reviews.aggregate(Avg('rating'))
     tags = models.Tag.objects.filter(
         book=book
@@ -199,18 +225,25 @@ def book_page(request, book_identifier):
     ).distinct().all()
     user_tags = models.Tag.objects.filter(
         book=book, user=request.user
-    ).values_list('name', flat=True)
+    ).all()
 
     review_form = forms.ReviewForm()
     tag_form = forms.TagForm()
     data = {
         'book': book,
+        'shelf': shelf,
+        'user_reviews': user_reviews,
+        'user_rating': user_reviews.aggregate(Avg('rating')),
         'reviews': reviews,
         'rating': rating['rating__avg'],
         'tags': tags,
         'user_tags': user_tags,
+        'user_tag_names': user_tags.values_list('identifier', flat=True),
         'review_form': review_form,
         'tag_form': tag_form,
+        'feed_tabs': ['friends', 'local', 'federated'],
+        'active_tab': tab,
+        'path': '/book/%s' % book_identifier,
     }
     return TemplateResponse(request, 'book.html', data)