Merge branch 'develop' into svyat/feat/comment_interpretation_approve

app/models/section.py

@@ -1,5 +1,6 @@
 from app import db
 from app.models.utils import BaseModel
+from app.controllers import create_breadcrumbs
 
 
 class Section(BaseModel):
@@ -34,6 +35,20 @@ class Section(BaseModel):
         path += self.label
         return path
 
+    @property
+    def breadcrumbs_path(self):
+        parent = self.collection
+        grand_parent = parent.parent
+        if grand_parent.is_root:
+            collection_path = (parent.id,)
+        else:
+            collection_path = (
+                grand_parent.id,
+                parent.id,
+            )
+        breadcrumbs_path = create_breadcrumbs(self.book_id, collection_path)
+        return breadcrumbs_path
+
     @property
     def book_id(self):
         _book_id = self.version.book_id

app/static/css/styles.css

@@ -2265,6 +2265,10 @@ input:checked + .toggle-bg {
   text-align: center;
 }
 
+.align-middle {
+  vertical-align: middle;
+}
+
 .text-2xl {
   font-size: 1.5rem;
   line-height: 2rem;

app/templates/book/local_breadcrumbs_navigation.html

@@ -0,0 +1,26 @@
+<!-- prettier-ignore -->
+<ol class="inline-flex items-center overflow-x-scroll md:overflow-auto p-0">
+{% for breadcrumb in local_breadcrumbs if breadcrumb.type != "MyBookList" and breadcrumb.type != "AuthorBookList" %}
+<li class="inline-flex items-center align-middle justify-center">
+    {% if not loop.index==local_breadcrumbs|length %}
+    <a href="{{ breadcrumb.url }}" class="inline-flex text-xs font-medium text-gray-700 hover:text-blue-600 dark:text-gray-400 dark:hover:text-white" data-tooltip-target="breadcrumb-{{loop.index}}-tooltip" data-tooltip-placement="bottom">
+    {% else %}
+    <span class="inline-flex items-center text-sm font-medium text-gray-700 hover:text-blue-600 dark:text-gray-400 dark:hover:text-white" data-tooltip-target="breadcrumb-{{loop.index}}-tooltip" data-tooltip-placement="bottom">
+    {% endif %}
+    <div id="breadcrumb-{{loop.index}}-tooltip" role="tooltip" class="delay-100 absolute z-[100] invisible inline-block px-3 py-2 text-sm font-medium text-white transition-opacity duration-700 bg-gray-900 rounded-lg shadow-sm opacity-0 tooltip dark:bg-gray-700">
+    {{ breadcrumb.label }}
+    <div class="tooltip-arrow" data-popper-arrow></div>
+    </div>
+    <!-- prettier-ignore -->
+    <span class="select-none">{{ breadcrumb.label }}</span>
+    {% if not loop.index==local_breadcrumbs|length %}
+    </a>
+    {% else %}
+    </span>
+    {% endif %}
+    {% if not loop.index==local_breadcrumbs|length %}
+    <svg aria-hidden="true" class="w-4 h-4 text-gray-400" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"> <path fill-rule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clip-rule="evenodd"></path> </svg>
+    {% endif %}
+</li>
+{% endfor %}
+</ol>

app/templates/book/stat.html

@@ -0,0 +1,66 @@
+<!-- prettier-ignore -->
+{% extends 'base.html' %}
+{% block content %}
+<div class="border-b border-gray-200 dark:border-gray-700 md:mr-64">
+  <!-- prettier-ignore -->
+  <h1 class="hidden md:inline font-extrabold text-lg dark:text-white ml-4 mt-5">{{book.label}}</h1>
+  <!-- prettier-ignore -->
+  <p class="hidden md:block text-sm ml-4 w-1/2 text-gray-500 text-center md:text-left dark:text-gray-400">
+    An open-source law hosting platform that allows online communities to easily
+    create, collaborate, and publish their own body of law.
+  </p>
+  <!-- prettier-ignore -->
+  <ul class="flex md:flex-wrap -mb-px text-xs md:text-sm font-medium text-center" id="myTab" data-tabs-toggle="#myTabContent" role="tablist">
+    <li class="mr-2 w-full md:w-auto" role="presentation">
+      <!-- prettier-ignore -->
+      <button class="inline-flex p-4 border-b-2 rounded-t-lg" id="favorited-tab" data-tabs-target="#favorited" type="button" role="tab" aria-controls="favorited" aria-selected="false"><svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6 mr-3"> <path stroke-linecap="round" stroke-linejoin="round" d="M11.48 3.499a.562.562 0 011.04 0l2.125 5.111a.563.563 0 00.475.345l5.518.442c.499.04.701.663.321.988l-4.204 3.602a.563.563 0 00-.182.557l1.285 5.385a.562.562 0 01-.84.61l-4.725-2.885a.563.563 0 00-.586 0L6.982 20.54a.562.562 0 01-.84-.61l1.285-5.386a.562.562 0 00-.182-.557l-4.204-3.602a.563.563 0 01.321-.988l5.518-.442a.563.563 0 00.475-.345L11.48 3.5z" /> </svg>
+        Favorited by
+      </button>
+    </li>
+    <li class="mr-2 w-full md:w-auto" role="presentation">
+      <!-- prettier-ignore -->
+      <button class="inline-flex p-4 border-b-2 border-transparent rounded-t-lg hover:text-gray-600 hover:border-gray-300 dark:hover:text-gray-300" id="contributors-tab" data-tabs-target="#contributors" type="button" role="tab" aria-controls="contributors" aria-selected="false"><svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6 mr-3"> <path stroke-linecap="round" stroke-linejoin="round" d="M15 19.128a9.38 9.38 0 002.625.372 9.337 9.337 0 004.121-.952 4.125 4.125 0 00-7.533-2.493M15 19.128v-.003c0-1.113-.285-2.16-.786-3.07M15 19.128v.106A12.318 12.318 0 018.624 21c-2.331 0-4.512-.645-6.374-1.766l-.001-.109a6.375 6.375 0 0111.964-3.07M12 6.375a3.375 3.375 0 11-6.75 0 3.375 3.375 0 016.75 0zm8.25 2.25a2.625 2.625 0 11-5.25 0 2.625 2.625 0 015.25 0z" /> </svg>
+        Contributors
+      </button>
+    </li>
+        <li class="mr-2 w-full md:w-auto" role="presentation">
+      <!-- prettier-ignore -->
+      <button class="inline-flex p-4 border-b-2 border-transparent rounded-t-lg hover:text-gray-600 hover:border-gray-300 dark:hover:text-gray-300" id="fork-tab" data-tabs-target="#fork" type="button" role="tab" aria-controls="fork" aria-selected="false"><svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6 mr-3"> <path stroke-linecap="round" stroke-linejoin="round" d="M7.217 10.907a2.25 2.25 0 100 2.186m0-2.186c.18.324.283.696.283 1.093s-.103.77-.283 1.093m0-2.186l9.566-5.314m-9.566 7.5l9.566 5.314m0 0a2.25 2.25 0 103.935 2.186 2.25 2.25 0 00-3.935-2.186zm0-12.814a2.25 2.25 0 103.933-2.185 2.25 2.25 0 00-3.933 2.185z" /> </svg>
+        Forks
+      </button>
+    </li>
+  </ul>
+</div>
+<div id="myTabContent" class="md:mr-64">
+  <!-- prettier-ignore -->
+  <div class="hidden p-4 rounded-lg bg-gray-50 dark:bg-gray-800" id="favorited" role="tabpanel" aria-labelledby="favorited-tab">
+    <div class="relative w-full overflow-x-auto border-2 border-gray-200 border-solid rounded-lg dark:border-gray-700">
+        <table class="w-full text-sm text-left text-gray-500 dark:text-gray-400">
+            <thead class="text-xs text-gray-700 uppercase bg-gray-50 dark:bg-gray-700 dark:text-gray-400"> <tr> <th scope="col" class="px-6 py-3"> Username </th> <th scope="col" class="px-6 py-3"> Address </th> </tr> </thead>
+            <tbody>
+              {% for star in book.stars %}
+                <tr class="bg-white border-b dark:bg-gray-800 dark:border-gray-700"> <th scope="row" class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white"> {{star.user.username}} </th> <td class="px-6 py-4"> {{star.user.wallet_id}} </td> </tr>
+              {% endfor %}
+            </tbody>
+        </table>
+    </div>
+  </div>
+  <!-- prettier-ignore -->
+  <div class="hidden p-4 rounded-lg bg-gray-50 dark:bg-gray-800" id="contributors" role="tabpanel" aria-labelledby="contributors-tab">
+     <div class="relative w-full overflow-x-auto border-2 border-gray-200 border-solid rounded-lg dark:border-gray-700">
+        <table class="w-full text-sm text-left text-gray-500 dark:text-gray-400">
+            <thead class="text-xs text-gray-700 uppercase bg-gray-50 dark:bg-gray-700 dark:text-gray-400"> <tr> <th scope="col" class="px-6 py-3"> Username </th> <th scope="col" class="px-6 py-3"> Address </th> <th scope="col" class="px-6 py-3"> Role </th></tr> </thead>
+            <tbody>
+              {% for contributor in book.contributors %}
+                <tr class="bg-white border-b dark:bg-gray-800 dark:border-gray-700"> <th scope="row" class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white"> {{contributor.user.username}} </th> <td class="px-6 py-4"> {{contributor.user.wallet_id}} </td> <td class="px-6 py-4"> {{contributor.role}} </td></tr>
+              {% endfor %}
+            </tbody>
+        </table>
+    </div>
+  </div>
+  <!-- prettier-ignore -->
+  <div class="hidden p-4 rounded-lg bg-gray-50 dark:bg-gray-800" id="fork" role="tabpanel" aria-labelledby="fork-tab">
+    <p class="text-sm text-gray-500 dark:text-gray-400">Fork sections</p>
+  </div>
+</div>
+{% endblock %}

app/templates/home/index.html

@@ -14,7 +14,7 @@
     <li class="mr-2 w-full md:w-auto" role="presentation">
       <!-- prettier-ignore -->
       <button class="inline-flex p-4 border-b-2 rounded-t-lg" id="last-sections-tab" data-tabs-target="#last-sections" type="button" role="tab" aria-controls="last-sections" aria-selected="false"> <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6 mr-3"> <path stroke-linecap="round" stroke-linejoin="round" d="M3.75 13.5l10.5-11.25L12 10.5h8.25L9.75 21.75 12 13.5H3.75z" /> </svg>
-        Last Sections
+        LAtest Interpretations
       </button>
     </li>
     <li class="mr-2 w-full md:w-auto" role="presentation">
@@ -28,7 +28,74 @@
 <div id="myTabContent" class="md:mr-64">
   <!-- prettier-ignore -->
   <div class="hidden p-4 rounded-lg bg-gray-50 dark:bg-gray-800" id="last-sections" role="tabpanel" aria-labelledby="last-sections-tab">
-    <p class="text-sm text-gray-500 dark:text-gray-400">Last sections</p>
+    {% for interpretation in interpretations %}
+    <!-- prettier-ignore -->
+          <dl class="bg-white dark:bg-gray-900 max-w-full p-3 text-gray-900 divide-y divide-gray-200 dark:text-white dark:divide-gray-700 m-3 border-2 border-gray-200 border-solid rounded-lg dark:border-gray-700">
+            <div class="flex flex-row pb-3 p-3 w-2/3 md:w-10/12">
+              <div class="vote-block flex flex-col m-5 justify-center items-center">
+                {% if interpretation.user_id != current_user.id %}
+                  <div class="vote-button cursor-pointer" data-vote-for="interpretation" data-entity-id="{{ interpretation.id }}" data-positive="true">
+                    <svg class="w-6 h-6 select-none
+                    {% if interpretation.current_user_vote %}
+                      stroke-green-500
+                    {% endif %}
+                    " xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" > <path stroke-linecap="round" stroke-linejoin="round" d="M4.5 10.5L12 3m0 0l7.5 7.5M12 3v18" /> </svg>
+                  </div>
+                {% endif %}
+
+                <span
+                  class="vote-count text-3xl select-none
+                    {% if interpretation.vote_count < 0 %}
+                      text-red-500
+                    {% elif interpretation.vote_count > 0 %}
+                      text-green-500
+                    {% endif %}
+                  "
+                >
+                  {{ interpretation.vote_count }}
+                </span>
+
+                {% if interpretation.user_id != current_user.id %}
+                  <div class="vote-button cursor-pointer" data-vote-for="interpretation" data-entity-id="{{ interpretation.id }}" data-positive="false">
+                    <svg class="w-6 h-6 select-none
+                    {% if interpretation.current_user_vote == False %}
+                      stroke-red-500
+                    {% endif %}
+                    " xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"> <path stroke-linecap="round" stroke-linejoin="round" d="M19.5 13.5L12 21m0 0l-7.5-7.5M12 21V3" /> </svg>
+                  </div>
+                {% endif %}
+              </div>
+              <!-- prettier-ignore -->
+              <dt class="flex w-full mb-1 text-gray-500 md:text-lg dark:text-gray-400 flex-col">
+                <div class="ql-snow truncate md:max-w-xl">
+                  {% set local_breadcrumbs = interpretation.section.breadcrumbs_path %}
+                  {% include 'book/local_breadcrumbs_navigation.html'%}
+                    <p>{{ interpretation.section.label }}</p>
+                  </a>
+                  <div class="dark:text-white h-30 ql-editor">
+                    <p>{{ interpretation.text|safe }}</p>
+                  </div>
+                </div>
+                <div class="flex mt-auto align-center justify-between md:w-full">
+                  <div>
+                    <span class="hidden md:inline-block">Interpretation by</span>
+                    {{interpretation.user.username}} on {{interpretation.created_at.strftime('%B %d, %Y')}}
+                  </div>
+                  <div class="flex ml-auto justify-between w-24">
+                    <span class="space-x-0.5 flex items-center">
+                      <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6"> <path stroke-linecap="round" stroke-linejoin="round" d="M9 8.25H7.5a2.25 2.25 0 00-2.25 2.25v9a2.25 2.25 0 002.25 2.25h9a2.25 2.25 0 002.25-2.25v-9a2.25 2.25 0 00-2.25-2.25H15m0-3l-3-3m0 0l-3 3m3-3V15" /> </svg>
+                    </span>
+                    <div class="space-x-0.5 flex items-center">
+                      <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6"> <path stroke-linecap="round" stroke-linejoin="round" d="M20.25 8.511c.884.284 1.5 1.128 1.5 2.097v4.286c0 1.136-.847 2.1-1.98 2.193-.34.027-.68.052-1.02.072v3.091l-3-3c-1.354 0-2.694-.055-4.02-.163a2.115 2.115 0 01-.825-.242m9.345-8.334a2.126 2.126 0 00-.476-.095 48.64 48.64 0 00-8.048 0c-1.131.094-1.976 1.057-1.976 2.192v4.286c0 .837.46 1.58 1.155 1.951m9.345-8.334V6.637c0-1.621-1.152-3.026-2.76-3.235A48.455 48.455 0 0011.25 3c-2.115 0-4.198.137-6.24.402-1.608.209-2.76 1.614-2.76 3.235v6.226c0 1.621 1.152 3.026 2.76 3.235.577.075 1.157.14 1.74.194V21l4.155-4.155" /> </svg>
+                      <p>{{interpretation.active_comments | length}}</p>
+                    </div>
+                  </div>
+                </div>
+              </dt>
+            </div>
+          </dl>
+
+    {% endfor %}
   </div>
   <!-- prettier-ignore -->
   <div class="hidden p-4 rounded-lg bg-gray-50 dark:bg-gray-800" id="explore-books" role="tabpanel" aria-labelledby="explore-books-tab">

app/views/book.py

@@ -147,6 +147,17 @@ def collection_view(book_id: int):
         )
 
 
+@bp.route("/<int:book_id>/statistics", methods=["GET"])
+def statistic_view(book_id: int):
+    book = db.session.get(m.Book, book_id)
+    if not book or book.is_deleted:
+        log(log.WARNING, "Book with id [%s] not found", book_id)
+        flash("Book not found", "danger")
+        return redirect(url_for("book.my_library"))
+    else:
+        return render_template("book/stat.html", book=book)
+
+
 @bp.route("/<int:book_id>/<int:collection_id>/subcollections", methods=["GET"])
 def sub_collection_view(book_id: int, collection_id: int):
     book: m.Book = db.session.get(m.Book, book_id)

app/views/home.py

@@ -2,9 +2,8 @@ from flask import (
     Blueprint,
     render_template,
 )
-from flask_login import current_user
+from sqlalchemy import and_
-
+from app import models as m, db
-from app import models as m
 
 bp = Blueprint("home", __name__, url_prefix="/home")
 
@@ -12,16 +11,30 @@ bp = Blueprint("home", __name__, url_prefix="/home")
 @bp.route("/", methods=["GET"])
 def get_all():
     books: m.Book = m.Book.query.order_by(m.Book.id).limit(5)
-    sections: m.Section = m.Section.query.order_by(m.Section.id).limit(5)
+    interpretations = (
-    last_user_sections = []
+        db.session.query(
-    if current_user.is_authenticated:
+            m.Interpretation,
-        last_user_sections: m.Section = m.Section.query.order_by(
+        )
-            m.Section.created_at
+        .filter(
-        ).limit(5)
+            and_(
+                m.Section.id == m.Interpretation.section_id,
+                m.Collection.id == m.Section.collection_id,
+                m.BookVersion.id == m.Section.version_id,
+                m.Book.id == m.BookVersion.book_id,
+                m.Book.is_deleted.is_(False),
+                m.BookVersion.is_deleted.is_(False),
+                m.Interpretation.is_deleted.is_(False),
+                m.Section.is_deleted.is_(False),
+                m.Collection.is_deleted.is_(False),
+            )
+        )
+        .order_by(m.Interpretation.created_at.desc())
+        .limit(5)
+        .all()
+    )
 
     return render_template(
         "home/index.html",
         books=books,
-        sections=sections,
+        interpretations=interpretations,
-        last_user_sections=last_user_sections,
     )

tests/test_book.py

@@ -1101,3 +1101,113 @@ def test_access_to_settings_page(client: FlaskClient):
 
     assert response.status_code == 200
     assert b"You are not owner of this book!" in response.data
+
+
+def test_interpretation_in_home_last_inter_section(
+    client: FlaskClient, runner: FlaskCliRunner
+):
+    _, user = login(client)
+    user: m.User
+
+    # add dummmy data
+    runner.invoke(args=["db-populate"])
+
+    book: m.Book = db.session.get(m.Book, 1)
+    book.user_id = user.id
+    book.save()
+
+    leaf_collection: m.Collection = m.Collection(
+        label="Test Leaf Collection #1 Label",
+        version_id=book.last_version.id,
+        is_leaf=True,
+        parent_id=book.last_version.root_collection.id,
+    ).save()
+    section_in_collection: m.Section = m.Section(
+        label="Test Section in Collection #1 Label",
+        about="Test Section in Collection #1 About",
+        collection_id=leaf_collection.id,
+        version_id=book.last_version.id,
+    ).save()
+
+    collection: m.Collection = m.Collection(
+        label="Test Collection #1 Label", version_id=book.last_version.id
+    ).save()
+    sub_collection: m.Collection = m.Collection(
+        label="Test SubCollection #1 Label",
+        version_id=book.last_version.id,
+        parent_id=collection.id,
+        is_leaf=True,
+    ).save()
+    section_in_subcollection: m.Section = m.Section(
+        label="Test Section in Subcollection #1 Label",
+        about="Test Section in Subcollection #1 About",
+        collection_id=sub_collection.id,
+        version_id=book.last_version.id,
+    ).save()
+
+    label_1 = "Test Interpretation #1 Label"
+    text_1 = "Test Interpretation #1 Text"
+
+    response: Response = client.post(
+        f"/book/{book.id}/{collection.id}/{sub_collection.id}/{section_in_subcollection.id}/create_interpretation",
+        data=dict(section_id=section_in_subcollection.id, label=label_1, text=text_1),
+        follow_redirects=True,
+    )
+
+    assert response.status_code == 200
+    interpretation: m.Interpretation = m.Interpretation.query.filter_by(
+        label=label_1, section_id=section_in_subcollection.id
+    ).first()
+    assert interpretation
+    assert interpretation.section_id == section_in_subcollection.id
+    assert not interpretation.comments
+
+    response: Response = client.post(
+        f"/book/{book.id}/{leaf_collection.id}/{section_in_collection.id}/create_interpretation",
+        data=dict(section_id=section_in_collection.id, label=label_1, text=text_1),
+        follow_redirects=True,
+    )
+
+    assert response.status_code == 200
+    interpretation: m.Interpretation = m.Interpretation.query.filter_by(
+        label=label_1, section_id=section_in_collection.id
+    ).first()
+    assert interpretation
+    assert interpretation.section_id == section_in_collection.id
+    assert not interpretation.comments
+
+    response: Response = client.post(
+        f"/book/{book.id}/{collection.id}/999/create_section",
+        data=dict(collection_id=999, label=label_1, text=text_1),
+        follow_redirects=True,
+    )
+
+    assert response.status_code == 200
+    assert b"Subcollection not found" in response.data
+
+    response: Response = client.post(
+        f"/book/{book.id}/{leaf_collection.id}/999/create_interpretation",
+        data=dict(collection_id=999, label=label_1, text=text_1),
+        follow_redirects=True,
+    )
+
+    assert response.status_code == 200
+    assert b"Section not found" in response.data
+
+    response: Response = client.post(
+        f"/book/{book.id}/{collection.id}/{sub_collection.id}/888/create_interpretation",
+        data=dict(collection_id=999, label=label_1, text=text_1),
+        follow_redirects=True,
+    )
+
+    assert response.status_code == 200
+    assert b"Section not found" in response.data
+
+    response: Response = client.get(
+        f"/home",
+        follow_redirects=True,
+    )
+
+    assert response
+    assert response.status_code == 200
+    assert str.encode(text_1) in response.data