mirror of https://github.com/logos-co/open-law.git
Merge branch 'base_book_views' into kostia/feature/book_view
This commit is contained in:
SvyatoslavArtymovych
commit
2a0a7958cc
|
|
@ -1,3 +1,9 @@
|
|||
# flake8: noqa F401
|
||||
from .auth import LoginForm
|
||||
from .user import UserForm, NewUserForm
|
||||
from .book import (
|
||||
CreateBookForm,
|
||||
AddContributorForm,
|
||||
DeleteContributorForm,
|
||||
EditContributorRoleForm,
|
||||
)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,42 @@
|
|||
from flask_wtf import FlaskForm
|
||||
from wtforms import StringField, SubmitField, SelectField
|
||||
from wtforms.validators import DataRequired, Length
|
||||
|
||||
from app import models as m
|
||||
|
||||
|
||||
class CreateBookForm(FlaskForm):
|
||||
label = StringField("Label", [DataRequired(), Length(6, 1024)])
|
||||
submit = SubmitField("Add new book")
|
||||
|
||||
|
||||
class AddContributorForm(FlaskForm):
|
||||
user_id = StringField("User ID", [DataRequired()])
|
||||
role = SelectField(
|
||||
"Role",
|
||||
choices=[
|
||||
(member.value, name.capitalize())
|
||||
for name, member in m.BookContributor.Roles.__members__.items()
|
||||
],
|
||||
)
|
||||
|
||||
submit = SubmitField("Add Contributor")
|
||||
|
||||
|
||||
class DeleteContributorForm(FlaskForm):
|
||||
user_id = StringField("User ID", [DataRequired()])
|
||||
|
||||
submit = SubmitField("Delete Contributor")
|
||||
|
||||
|
||||
class EditContributorRoleForm(FlaskForm):
|
||||
user_id = StringField("User ID", [DataRequired()])
|
||||
role = SelectField(
|
||||
"Role",
|
||||
choices=[
|
||||
(member.value, name.capitalize())
|
||||
for name, member in m.BookContributor.Roles.__members__.items()
|
||||
],
|
||||
)
|
||||
|
||||
submit = SubmitField("Edit Contributor")
|
||||
|
|
@ -8,7 +8,7 @@ class BookContributor(BaseModel):
|
|||
__tablename__ = "book_contributors"
|
||||
|
||||
class Roles(IntEnum):
|
||||
UNKNOWN = 10
|
||||
UNKNOWN = 0
|
||||
MODERATOR = 1
|
||||
EDITOR = 2
|
||||
|
||||
|
|
@ -23,4 +23,4 @@ class BookContributor(BaseModel):
|
|||
book = db.relationship("Book", viewonly=True)
|
||||
|
||||
def __repr__(self):
|
||||
return f"<{self.id}: {self.label}>"
|
||||
return f"<{self.id}: u:{self.user_id} b:{self.book_id}>"
|
||||
|
|
|
|||
14899
app/static/js/main.js
14899
app/static/js/main.js
File diff suppressed because one or more lines are too long
|
|
@ -25,6 +25,9 @@
|
|||
document.documentElement.classList.remove('dark');
|
||||
}
|
||||
</script>
|
||||
|
||||
<!-- prettier-ignore -->
|
||||
<script src="{{ url_for('static', filename='js/main.js') }}" type="text/javascript"></script>
|
||||
<!-- prettier-ignore -->
|
||||
{% block links %}
|
||||
{% endblock %}
|
||||
|
|
@ -68,16 +71,18 @@
|
|||
{% endfor %}
|
||||
{% endif %}
|
||||
{% endwith %}
|
||||
|
||||
|
||||
{% block body %}
|
||||
|
||||
<!-- SideBar -->
|
||||
<!-- prettier-ignore -->
|
||||
{% include 'sidebar.html' %}
|
||||
{% include 'right_sidebar.html' %}
|
||||
|
||||
{% block right_sidebar %} {% include 'right_sidebar.html' %} {% endblock %}
|
||||
|
||||
{% include 'book/add_book_modal.html' %}
|
||||
|
||||
<div class="sm:mx-64 p-0 mt-16 h-full overflow-x-scroll">
|
||||
<div class="p-0 mt-16 h-full overflow-x-scroll md:ml-64">
|
||||
<!-- Main Content -->
|
||||
{% block content %}{% endblock %}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,8 @@
|
|||
<div id="add-book-modal" tabindex="-1" aria-hidden="true" class="fixed top-0 left-0 right-0 z-50 hidden w-full p-4 overflow-x-hidden overflow-y-auto md:inset-0 h-[calc(100%-1rem)] max-h-full">
|
||||
<div class="relative w-full max-w-2xl max-h-full">
|
||||
<!-- Modal content -->
|
||||
<form action="#" method="post" class="relative bg-white rounded-lg shadow dark:bg-gray-700">
|
||||
<form action="{{ url_for('book.create') }}" method="post" class="relative bg-white rounded-lg shadow dark:bg-gray-700">
|
||||
|
||||
<input type="hidden" name="user_id" id="user-edit-id" value="0" />
|
||||
<input type="hidden" name="next_url" id="user-edit-next_url" value="" />
|
||||
<!-- Modal header -->
|
||||
|
|
@ -15,8 +16,8 @@
|
|||
<div class="p-6 space-y-6">
|
||||
<div class="grid grid-cols-6 gap-6">
|
||||
<div class="col-span-6 sm:col-span-3">
|
||||
<label for="book_label" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white" >Label</label >
|
||||
<input type="text" name="book_label" class="shadow-sm bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-600 focus:border-blue-600 block w-full p-2.5 dark:bg-gray-600 dark:border-gray-500 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500" placeholder="Name" required />
|
||||
<label for="label" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white" >Label</label >
|
||||
<input type="text" name="label" id="label" class="shadow-sm bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-600 focus:border-blue-600 block w-full p-2.5 dark:bg-gray-600 dark:border-gray-500 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500" placeholder="Name" required />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,63 @@
|
|||
<!-- Edit user modal -->
|
||||
<!-- prettier-ignore-->
|
||||
<div id="add-contributor-modal" tabindex="-1" aria-hidden="true" class="fixed top-0 left-0 right-0 z-50 hidden w-full p-4 overflow-x-hidden overflow-y-auto md:inset-0 h-[calc(100%-1rem)] max-h-full">
|
||||
<div class="relative w-full max-w-2xl max-h-full">
|
||||
<!-- Modal content -->
|
||||
<form action="{{ url_for('book.add_contributor', book_id=book.id) }}" method="post" class="relative bg-white rounded-lg shadow dark:bg-gray-700">
|
||||
|
||||
<input type="hidden" name="user_id" id="user_id" value="0" />
|
||||
<input type="hidden" name="" id="user-edit-next_url" value="" />
|
||||
<!-- Modal header -->
|
||||
<div class="flex items-start justify-between p-4 border-b rounded-t dark:border-gray-600">
|
||||
<h3 class="text-xl font-semibold text-gray-900 dark:text-white"> Add Contributor </h3>
|
||||
<button id="modalAddCloseButton" data-modal-hide="add-contributor-modal" type="button" class="text-gray-400 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm p-1.5 ml-auto inline-flex items-center dark:hover:bg-gray-600 dark:hover:text-white"> <svg aria-hidden="true" class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"> <path fill-rule="evenodd" d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z" clip-rule="evenodd"></path> </svg> </button>
|
||||
</div>
|
||||
<!-- Modal body -->
|
||||
<div class="p-6 space-y-6">
|
||||
<div class="grid gap-2">
|
||||
<div class="col-span-6 sm:col-span-3">
|
||||
<label for="username" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Username</label >
|
||||
<div class="relative">
|
||||
<div class="absolute inset-y-0 left-0 flex items-center pl-3 pointer-events-none">
|
||||
<svg aria-hidden="true" class="w-5 h-5 text-gray-500 dark:text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z"></path></svg>
|
||||
</div>
|
||||
<input id="username" data-book-id="{{ book.id }}" type="search" id="default-search" class="block w-full p-4 pl-10 text-sm text-gray-900 border border-gray-300 rounded-lg bg-gray-50 focus:ring-blue-500 focus:border-blue-500 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500" placeholder="Search users..." required>
|
||||
<button id="search-btn" class="cursor-pointer select-none text-white absolute right-2.5 bottom-2.5 bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-4 py-2 dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800">Search</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div class="col-span-6 sm:col-span-3 overflow-x-auto shadow-md sm:rounded-lg" id="search-results">
|
||||
<table class="w-full text-sm text-left text-gray-500 dark:text-gray-400">
|
||||
<tbody id="search-results-tbody">
|
||||
<tr id="tr-example" class="hidden bg-white border-b dark:bg-gray-800 dark:border-gray-700 ">
|
||||
<th scope="row" class="username-th px-6 py-2 font-medium text-gray-900 whitespace-nowrap dark:text-white">
|
||||
</th>
|
||||
<th scope="row" class="px-6 py-1.5 font-medium text-gray-900 whitespace-nowrap dark:text-white flex justify-end">
|
||||
<button data-user-id type="button" class="select-user-btn text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 font-sm rounded-lg text-sm px-5 py-1.5 dark:bg-blue-600 dark:hover:bg-blue-700 focus:outline-none dark:focus:ring-blue-800">Select</button>
|
||||
</th>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label for="role" class="mb-2 block text-sm font-medium text-gray-900 dark:text-white">Select an option</label >
|
||||
<select id="role" name="role" class="shadow-sm bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-600 focus:border-blue-600 block w-full p-2.5 dark:bg-gray-600 dark:border-gray-500 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500">
|
||||
<option selected> Select a role </option>
|
||||
{% for role in roles if role.value %}
|
||||
<option value="{{ role.value }}">{{ role.name.title() }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<!-- Modal footer -->
|
||||
<div class="flex items-center p-6 space-x-2 border-t border-gray-200 rounded-b dark:border-gray-600">
|
||||
<button name="submit" type="submit" class="text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800">Add</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
<!-- prettier-ignore -->
|
||||
<div class="flex border-b-2 border-gray-200 border-solid dark:border-gray-700 text-gray-900 dark:text-white dark:divide-gray-700">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-8 h-8"> <path stroke-linecap="round" stroke-linejoin="round" d="M16.5 3.75V16.5L12 14.25 7.5 16.5V3.75m9 0H18A2.25 2.25 0 0120.25 6v12A2.25 2.25 0 0118 20.25H6A2.25 2.25 0 013.75 18V6A2.25 2.25 0 016 3.75h1.5m9 0h-9" /> </svg>
|
||||
<h1 class="text-2xl font-extrabold dark:text-white ml-4">My books</h1>
|
||||
<h1 class="text-2xl font-extrabold dark:text-white ml-4">My books</h1>
|
||||
</div>
|
||||
|
||||
{% for book in books %}
|
||||
|
|
@ -16,11 +16,11 @@
|
|||
<dt class="mb-2"> {{book.owner.username}}/{{book.label}} </dt>
|
||||
<dd class=" flex text-lg font-semibold text-gray-500 md:text-lg dark:text-gray-400">Last updated on {{book.versions[-1].updated_at.strftime('%B %d, %Y')}}
|
||||
<div class="flex ml-auto w-1/4 align-center justify-center">
|
||||
<span class="mr-3"><svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 22 22" stroke-width="1" stroke="currentColor" class="w-4 h-4 inline-flex mr-1"> <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>{{ book.stars|length }}</span>
|
||||
<span class="mr-3"><svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 22 22" stroke-width="1" stroke="currentColor" class="w-4 h-4 inline-flex mr-1"> <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> 55</span>
|
||||
<span class="mr-3"><svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 22 22" stroke-width="1" stroke="currentColor" class="w-4 h-4 inline-flex mr-1"> <path stroke-linecap="round" stroke-linejoin="round" d="M19.5 14.25v-2.625a3.375 3.375 0 00-3.375-3.375h-1.5A1.125 1.125 0 0113.5 7.125v-1.5a3.375 3.375 0 00-3.375-3.375H8.25m0 12.75h7.5m-7.5 3H12M10.5 2.25H5.625c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V11.25a9 9 0 00-9-9z" /> </svg> 55</span>
|
||||
<span class="mr-3"><svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 22 22" stroke-width="1" stroke="currentColor" class="w-4 h-4 inline-flex mr-1"> <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>{{ book.stars|length }}</span>
|
||||
<span class="mr-3"><svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 22 22" stroke-width="1" stroke="currentColor" class="w-4 h-4 inline-flex mr-1"> <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> 55</span>
|
||||
<span class="mr-3"><svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 22 22" stroke-width="1" stroke="currentColor" class="w-4 h-4 inline-flex mr-1"> <path stroke-linecap="round" stroke-linejoin="round" d="M19.5 14.25v-2.625a3.375 3.375 0 00-3.375-3.375h-1.5A1.125 1.125 0 0113.5 7.125v-1.5a3.375 3.375 0 00-3.375-3.375H8.25m0 12.75h7.5m-7.5 3H12M10.5 2.25H5.625c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V11.25a9 9 0 00-9-9z" /> </svg> 55</span>
|
||||
</div>
|
||||
</dd>
|
||||
</dd>
|
||||
</a>
|
||||
</dl>
|
||||
{% endfor %}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,72 @@
|
|||
<!-- prettier-ignore -->
|
||||
{% extends 'base.html' %}
|
||||
{% include 'book/add_contributor_modal.html' %}
|
||||
|
||||
{% block content %}
|
||||
<!-- Hide right_sidebar -->
|
||||
<!-- prettier-ignore -->
|
||||
{% block right_sidebar %} {% endblock %}
|
||||
|
||||
<div class="p-5">
|
||||
<div class="flex justify-between ml-4 mb-2">
|
||||
<h1 class="text-2xl font-extrabold dark:text-white">Contributors</h1>
|
||||
<!-- prettier-ignore -->
|
||||
<button
|
||||
type="button" data-modal-target="add-contributor-modal" data-modal-toggle="add-contributor-modal"
|
||||
class="text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-4 py-2.5 text-center inline-flex items-center dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800">
|
||||
<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-1"> <path stroke-linecap="round" stroke-linejoin="round" d="M12 9v6m3-3H9m12 0a9 9 0 11-18 0 9 9 0 0118 0z" /> </svg>
|
||||
Add
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div class="relative overflow-x-auto shadow-md sm:rounded-lg">
|
||||
<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">Role</th>
|
||||
<th scope="col" class="px-6 py-3">Action</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for contributor in book.contributors %}
|
||||
<tr class="bg-white border-b dark:bg-gray-900 dark:border-gray-700">
|
||||
<td class="px-6 py-4">{{ contributor.user.username }}</td>
|
||||
<td class="px-6 py-4">
|
||||
<form action="{{ url_for('book.edit_contributor_role', book_id=book.id) }}" method="post" class="mb-0 shadow flex space-x-2">
|
||||
<input type="hidden" name="user_id" id="user_id" value="{{ contributor.user_id }}" />
|
||||
<select
|
||||
id="role"
|
||||
name="role"
|
||||
data-user-id="{{ contributor.user.id }}"
|
||||
class="contributor-role-select block w-1/2 py-1.5 px-2 text-sm text-gray-900 border border-gray-300 rounded-lg bg-gray-50 focus:ring-blue-500 focus:border-blue-500 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
|
||||
>
|
||||
|
||||
{% for role in roles if role.value %}
|
||||
<option
|
||||
{% if contributor.role == role %} selected {% endif %}
|
||||
value="{{ role.value }}">
|
||||
{{ role.name.title() }}
|
||||
</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
<button type="submit" class="text-gray-900 bg-white border border-gray-300 focus:outline-none hover:bg-gray-100 focus:ring-4 focus:ring-gray-200 font-medium rounded-lg text-sm px-5 py-1 dark:bg-gray-800 dark:text-white dark:border-gray-600 dark:hover:bg-gray-700 dark:hover:border-gray-600 dark:focus:ring-gray-700">Save</button>
|
||||
</form>
|
||||
</td>
|
||||
<td class="px-6 py-4">
|
||||
<!-- prettier-ignore -->
|
||||
<form action="{{ url_for('book.delete_contributor', book_id=book.id) }}" method="post" class="mb-0 shadow">
|
||||
<input type="hidden" name="user_id" id="user_id" value="{{ contributor.user_id }}" />
|
||||
|
||||
<button type="submit" class="text-white bg-red-700 hover:bg-red-800 focus:ring-4 focus:ring-red-300 font-sm rounded-lg text-sm px-5 py-1.5 dark:bg-red-600 dark:hover:bg-red-700 focus:outline-none dark:focus:ring-red-800">Delete</button>
|
||||
</form>
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<aside
|
||||
id="logo-right-sidebar"
|
||||
class="fixed top-0 right-0 left-auto z-40 w-64 h-screen pt-28 transition-transform translate-x-96 bg-white border-r border-gray-200 sm:translate-x-0 dark:bg-gray-800 dark:border-gray-700"
|
||||
class="fixed top-0 right-0 left-auto z-40 w-64 h-screen pt-28 transition-transform translate-x-96 bg-white border-r border-gray-200 md:translate-x-0 dark:bg-gray-800 dark:border-gray-700"
|
||||
aria-label="Right-sidebar">
|
||||
<div class="h-full pb-4 overflow-y-auto bg-white dark:bg-gray-800">
|
||||
<ul class="space-y-4 font-medium">
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<aside
|
||||
id="logo-sidebar"
|
||||
class="fixed top-0 left-0 z-40 w-64 h-screen pt-28 transition-transform -translate-x-full bg-white border-r border-gray-200 sm:translate-x-0 dark:bg-gray-800 dark:border-gray-700"
|
||||
class="fixed top-0 left-0 z-40 w-64 h-screen pt-28 transition-transform -translate-x-full bg-white border-r border-gray-200 md:translate-x-0 dark:bg-gray-800 dark:border-gray-700"
|
||||
aria-label="Sidebar">
|
||||
<div class="h-full px-3 pb-4 overflow-y-auto bg-white dark:bg-gray-800">
|
||||
<ul class="space-y-2 font-medium">
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
{% extends 'base.html' %}
|
||||
{% block content %}
|
||||
<div class="w-full relative overflow-x-auto shadow-md sm:rounded-lg mt-5 mr-64">
|
||||
|
||||
<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"
|
||||
|
|
@ -36,11 +35,11 @@
|
|||
</td>
|
||||
<td class="p-4 space-x-2 whitespace-nowrap">
|
||||
<button type="button" data-target="{{user.json}}" class="user-edit-button inline-flex items-center px-3 py-2 text-sm font-medium text-center text-white rounded-lg bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800">
|
||||
<svg class="w-4 h-4 mr-2" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M17.414 2.586a2 2 0 00-2.828 0L7 10.172V13h2.828l7.586-7.586a2 2 0 000-2.828z"></path><path fill-rule="evenodd" d="M2 6a2 2 0 012-2h4a1 1 0 010 2H4v10h10v-4a1 1 0 112 0v4a2 2 0 01-2 2H4a2 2 0 01-2-2V6z" clip-rule="evenodd"></path></svg>
|
||||
<svg class="w-4 h-4 mr-2" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M17.414 2.586a2 2 0 00-2.828 0L7 10.172V13h2.828l7.586-7.586a2 2 0 000-2.828z"></path><path fill-rule="evenodd" d="M2 6a2 2 0 012-2h4a1 1 0 010 2H4v10h10v-4a1 1 0 112 0v4a2 2 0 01-2 2H4a2 2 0 01-2-2V6z" clip-rule="evenodd"></path></svg>
|
||||
Edit user
|
||||
</button>
|
||||
<button data-user-id={{ user.id }} type="button" class="inline-flex items-center px-3 py-2 text-sm font-medium text-center text-white bg-red-600 rounded-lg hover:bg-red-800 focus:ring-4 focus:ring-red-300 dark:focus:ring-red-900 delete-user-btn">
|
||||
<svg class="w-4 h-4 mr-2" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M9 2a1 1 0 00-.894.553L7.382 4H4a1 1 0 000 2v10a2 2 0 002 2h8a2 2 0 002-2V6a1 1 0 100-2h-3.382l-.724-1.447A1 1 0 0011 2H9zM7 8a1 1 0 012 0v6a1 1 0 11-2 0V8zm5-1a1 1 0 00-1 1v6a1 1 0 102 0V8a1 1 0 00-1-1z" clip-rule="evenodd"></path></svg>
|
||||
<svg class="w-4 h-4 mr-2" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M9 2a1 1 0 00-.894.553L7.382 4H4a1 1 0 000 2v10a2 2 0 002 2h8a2 2 0 002-2V6a1 1 0 100-2h-3.382l-.724-1.447A1 1 0 0011 2H9zM7 8a1 1 0 012 0v6a1 1 0 11-2 0V8zm5-1a1 1 0 00-1 1v6a1 1 0 102 0V8a1 1 0 00-1-1z" clip-rule="evenodd"></path></svg>
|
||||
Delete user
|
||||
</button>
|
||||
</td>
|
||||
|
|
@ -58,18 +57,14 @@
|
|||
<!-- prettier-ignore -->
|
||||
<a href="{{ url_for('user.get_all') }}?page=1&q={{page.query}}" class="block px-3 py-2 ml-0 leading-tight text-gray-500 bg-white border border-gray-300 rounded-l-lg hover:bg-gray-100 hover:text-gray-700 dark:bg-gray-800 dark:border-gray-700 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-white">
|
||||
<span class="sr-only">First</span>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-5 h-5">
|
||||
<path fill-rule="evenodd" d="M15.79 14.77a.75.75 0 01-1.06.02l-4.5-4.25a.75.75 0 010-1.08l4.5-4.25a.75.75 0 111.04 1.08L11.832 10l3.938 3.71a.75.75 0 01.02 1.06zm-6 0a.75.75 0 01-1.06.02l-4.5-4.25a.75.75 0 010-1.08l4.5-4.25a.75.75 0 111.04 1.08L5.832 10l3.938 3.71a.75.75 0 01.02 1.06z" clip-rule="evenodd" />
|
||||
</svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-5 h-5"> <path fill-rule="evenodd" d="M15.79 14.77a.75.75 0 01-1.06.02l-4.5-4.25a.75.75 0 010-1.08l4.5-4.25a.75.75 0 111.04 1.08L11.832 10l3.938 3.71a.75.75 0 01.02 1.06zm-6 0a.75.75 0 01-1.06.02l-4.5-4.25a.75.75 0 010-1.08l4.5-4.25a.75.75 0 111.04 1.08L5.832 10l3.938 3.71a.75.75 0 01.02 1.06z" clip-rule="evenodd" /> </svg>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<!-- prettier-ignore -->
|
||||
<a href="{{ url_for('user.get_all') }}?page={{page.page-1 if page.page > 1 else 1}}&q={{page.query}}" class="block px-3 py-2 ml-0 leading-tight text-gray-500 bg-white border border-gray-300 rounded-l-lg hover:bg-gray-100 hover:text-gray-700 dark:bg-gray-800 dark:border-gray-700 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-white">
|
||||
<span class="sr-only">Previous</span>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-5 h-5">
|
||||
<path fill-rule="evenodd" d="M12.79 5.23a.75.75 0 01-.02 1.06L8.832 10l3.938 3.71a.75.75 0 11-1.04 1.08l-4.5-4.25a.75.75 0 010-1.08l4.5-4.25a.75.75 0 011.06.02z" clip-rule="evenodd" />
|
||||
</svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-5 h-5"> <path fill-rule="evenodd" d="M12.79 5.23a.75.75 0 01-.02 1.06L8.832 10l3.938 3.71a.75.75 0 11-1.04 1.08l-4.5-4.25a.75.75 0 010-1.08l4.5-4.25a.75.75 0 011.06.02z" clip-rule="evenodd" /> </svg>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
|
@ -78,11 +73,11 @@
|
|||
<li>
|
||||
<!-- prettier-ignore -->
|
||||
{% if p == page.page %}
|
||||
<!-- prettier-ignore -->
|
||||
<a href="{{ url_for('user.get_all') }}?page={{p}}&q={{page.query}}" aria-current="page" class="z-10 px-3 py-2 leading-tight text-blue-600 border border-blue-300 bg-blue-50 hover:bg-blue-100 hover:text-blue-700 dark:border-gray-700 dark:bg-gray-700 dark:text-white">{{p}}</a>
|
||||
<!-- prettier-ignore -->
|
||||
<a href="{{ url_for('user.get_all') }}?page={{p}}&q={{page.query}}" aria-current="page" class="z-10 px-3 py-2 leading-tight text-blue-600 border border-blue-300 bg-blue-50 hover:bg-blue-100 hover:text-blue-700 dark:border-gray-700 dark:bg-gray-700 dark:text-white">{{p}}</a>
|
||||
{% else %}
|
||||
<!-- prettier-ignore -->
|
||||
<a href="{{ url_for('user.get_all') }}?page={{p}}&q={{page.query}}" class="px-3 py-2 leading-tight text-gray-500 bg-white border border-gray-300 hover:bg-gray-100 hover:text-gray-700 dark:bg-gray-800 dark:border-gray-700 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-white">{{p}}</a>
|
||||
<!-- prettier-ignore -->
|
||||
<a href="{{ url_for('user.get_all') }}?page={{p}}&q={{page.query}}" class="px-3 py-2 leading-tight text-gray-500 bg-white border border-gray-300 hover:bg-gray-100 hover:text-gray-700 dark:bg-gray-800 dark:border-gray-700 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-white">{{p}}</a>
|
||||
{% endif %}
|
||||
</li>
|
||||
{% endfor %}
|
||||
|
|
@ -92,9 +87,7 @@
|
|||
<a href="{{ url_for('user.get_all') }}?page={{page.page+1 if page.page < page.pages else page.pages}}&q={{page.query}}" class="block px-3 py-2 leading-tight text-gray-500 bg-white border border-gray-300 rounded-r-lg hover:bg-gray-100 hover:text-gray-700 dark:bg-gray-800 dark:border-gray-700 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-white">
|
||||
<!-- prettier-ignore -->
|
||||
<span class="sr-only">Next</span>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-5 h-5">
|
||||
<path fill-rule="evenodd" d="M7.21 14.77a.75.75 0 01.02-1.06L11.168 10 7.23 6.29a.75.75 0 111.04-1.08l4.5 4.25a.75.75 0 010 1.08l-4.5 4.25a.75.75 0 01-1.06-.02z" clip-rule="evenodd" />
|
||||
</svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-5 h-5"> <path fill-rule="evenodd" d="M7.21 14.77a.75.75 0 01.02-1.06L11.168 10 7.23 6.29a.75.75 0 111.04-1.08l4.5 4.25a.75.75 0 010 1.08l-4.5 4.25a.75.75 0 01-1.06-.02z" clip-rule="evenodd" /> </svg>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
|
|
@ -102,10 +95,7 @@
|
|||
<a href="{{ url_for('user.get_all') }}?page={{page.pages}}&q={{page.query}}" class="block px-3 py-2 leading-tight text-gray-500 bg-white border border-gray-300 rounded-r-lg hover:bg-gray-100 hover:text-gray-700 dark:bg-gray-800 dark:border-gray-700 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-white">
|
||||
<!-- prettier-ignore -->
|
||||
<span class="sr-only">Last</span>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-5 h-5">
|
||||
<path fill-rule="evenodd" d="M10.21 14.77a.75.75 0 01.02-1.06L14.168 10 10.23 6.29a.75.75 0 111.04-1.08l4.5 4.25a.75.75 0 010 1.08l-4.5 4.25a.75.75 0 01-1.06-.02z" clip-rule="evenodd" />
|
||||
<path fill-rule="evenodd" d="M4.21 14.77a.75.75 0 01.02-1.06L8.168 10 4.23 6.29a.75.75 0 111.04-1.08l4.5 4.25a.75.75 0 010 1.08l-4.5 4.25a.75.75 0 01-1.06-.02z" clip-rule="evenodd" />
|
||||
</svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-5 h-5"> <path fill-rule="evenodd" d="M10.21 14.77a.75.75 0 01.02-1.06L14.168 10 10.23 6.29a.75.75 0 111.04-1.08l4.5 4.25a.75.75 0 010 1.08l-4.5 4.25a.75.75 0 01-1.06-.02z" clip-rule="evenodd" /> <path fill-rule="evenodd" d="M4.21 14.77a.75.75 0 01.02-1.06L8.168 10 4.23 6.29a.75.75 0 111.04-1.08l4.5 4.25a.75.75 0 010 1.08l-4.5 4.25a.75.75 0 01-1.06-.02z" clip-rule="evenodd" /> </svg>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@ from flask import (
|
|||
url_for,
|
||||
request,
|
||||
)
|
||||
from flask_login import login_required
|
||||
from flask_login import login_required, current_user
|
||||
|
||||
from app import db, models as m, forms as f
|
||||
from app.logger import log
|
||||
from app.controllers import create_pagination
|
||||
from app import models as m, db, forms as f
|
||||
from app.logger import log
|
||||
|
||||
bp = Blueprint("book", __name__, url_prefix="/book")
|
||||
|
||||
|
|
@ -18,7 +18,7 @@ bp = Blueprint("book", __name__, url_prefix="/book")
|
|||
@bp.route("/", methods=["GET"])
|
||||
def get_all():
|
||||
q = request.args.get("q", type=str, default=None)
|
||||
books = m.Book.query.order_by(m.Book.id)
|
||||
books: m.Book = m.Book.query.order_by(m.Book.id)
|
||||
if q:
|
||||
books = books.filter(m.Book.label.like(f"{q}"))
|
||||
|
||||
|
|
@ -35,19 +35,28 @@ def get_all():
|
|||
@bp.route("/create", methods=["POST"])
|
||||
@login_required
|
||||
def create():
|
||||
form = f.NewBookForm()
|
||||
form = f.CreateBookForm()
|
||||
if form.validate_on_submit():
|
||||
book = m.Book(
|
||||
book: m.Book = m.Book(
|
||||
label=form.label.data,
|
||||
)
|
||||
log(log.INFO, "Form submitted. User: [%s]", book)
|
||||
flash("Book added!", "success")
|
||||
log(log.INFO, "Form submitted. Book: [%s]", book)
|
||||
book.save()
|
||||
m.BookVersion(semver="1.0.0", book_id=book.id).save()
|
||||
|
||||
flash("Book added!", "success")
|
||||
return redirect(url_for("book.get_all"))
|
||||
else:
|
||||
log(log.ERROR, "Book create errors: [%s]", form.errors)
|
||||
for field, errors in form.errors.items():
|
||||
field_label = form._fields[field].label.text
|
||||
for error in errors:
|
||||
flash(error.replace("Field", field_label), "danger")
|
||||
return redirect(url_for("book.get_all"))
|
||||
|
||||
|
||||
@bp.route("/<int:book_id>", methods=["GET"])
|
||||
def collection_view(book_id):
|
||||
def collection_view(book_id: int):
|
||||
book = db.session.get(m.Book, book_id)
|
||||
if not book:
|
||||
log(log.WARNING, "Book with id [%s] not found", book_id)
|
||||
|
|
@ -58,17 +67,18 @@ def collection_view(book_id):
|
|||
|
||||
|
||||
@bp.route("/<int:book_id>/<int:collection_id>", methods=["GET"])
|
||||
def sub_collection_view(book_id, collection_id):
|
||||
book = db.session.get(m.Book, book_id)
|
||||
def sub_collection_view(book_id: int, collection_id: int):
|
||||
book: m.Book = db.session.get(m.Book, book_id)
|
||||
if not book:
|
||||
log(log.WARNING, "Book with id [%s] not found", book_id)
|
||||
flash("Book not found", "danger")
|
||||
return redirect(url_for("book.get_all"))
|
||||
|
||||
collection: m.Collection = db.session.get(m.Collection, collection_id)
|
||||
if not collection:
|
||||
log(log.WARNING, "Collection with id [%s] not found", collection_id)
|
||||
flash("Collection not found", "danger")
|
||||
return redirect(url_for("book.get_all"))
|
||||
return redirect(url_for("book.collection_view", book_id=book_id))
|
||||
if collection.is_leaf:
|
||||
return render_template(
|
||||
"book/section_view.html",
|
||||
|
|
@ -83,22 +93,28 @@ def sub_collection_view(book_id, collection_id):
|
|||
|
||||
|
||||
@bp.route("/<int:book_id>/<int:collection_id>/<int:sub_collection_id>", methods=["GET"])
|
||||
def section_view(book_id, collection_id, sub_collection_id):
|
||||
book = db.session.get(m.Book, book_id)
|
||||
def section_view(book_id: int, collection_id: int, sub_collection_id: int):
|
||||
book: m.Book = db.session.get(m.Book, book_id)
|
||||
if not book:
|
||||
log(log.WARNING, "Book with id [%s] not found", book_id)
|
||||
flash("Book not found", "danger")
|
||||
return redirect(url_for("book.get_all"))
|
||||
|
||||
collection: m.Collection = db.session.get(m.Collection, collection_id)
|
||||
if not collection:
|
||||
log(log.WARNING, "Collection with id [%s] not found", collection_id)
|
||||
flash("Collection not found", "danger")
|
||||
return redirect(url_for("book.get_all"))
|
||||
return redirect(url_for("book.collection_view", book_id=book_id))
|
||||
|
||||
sub_collection: m.Collection = db.session.get(m.Collection, sub_collection_id)
|
||||
if not collection:
|
||||
if not sub_collection:
|
||||
log(log.WARNING, "Sub_collection with id [%s] not found", sub_collection_id)
|
||||
flash("Sub_collection not found", "danger")
|
||||
return redirect(url_for("book.get_all"))
|
||||
return redirect(
|
||||
url_for(
|
||||
"book.sub_collection_view", book_id=book_id, collection_id=collection_id
|
||||
)
|
||||
)
|
||||
else:
|
||||
return render_template(
|
||||
"book/section_view.html",
|
||||
|
|
@ -112,27 +128,43 @@ def section_view(book_id, collection_id, sub_collection_id):
|
|||
"/<int:book_id>/<int:collection_id>/<int:sub_collection_id>/<int:section_id>",
|
||||
methods=["GET"],
|
||||
)
|
||||
def interpretation_view(book_id, collection_id, sub_collection_id, section_id):
|
||||
book = db.session.get(m.Book, book_id)
|
||||
def interpretation_view(
|
||||
book_id: int, collection_id: int, sub_collection_id: int, section_id: int
|
||||
):
|
||||
book: m.Book = db.session.get(m.Book, book_id)
|
||||
if not book:
|
||||
log(log.WARNING, "Book with id [%s] not found", book_id)
|
||||
flash("Book not found", "danger")
|
||||
return redirect(url_for("book.get_all"))
|
||||
|
||||
collection: m.Collection = db.session.get(m.Collection, collection_id)
|
||||
if not collection:
|
||||
log(log.WARNING, "Collection with id [%s] not found", collection_id)
|
||||
flash("Collection not found", "danger")
|
||||
return redirect(url_for("book.get_all"))
|
||||
return redirect(url_for("book.collection_view", book_id=book_id))
|
||||
|
||||
sub_collection: m.Collection = db.session.get(m.Collection, sub_collection_id)
|
||||
if not collection:
|
||||
if not sub_collection:
|
||||
log(log.WARNING, "Sub_collection with id [%s] not found", sub_collection_id)
|
||||
flash("Sub_collection not found", "danger")
|
||||
return redirect(url_for("book.get_all"))
|
||||
return redirect(
|
||||
url_for(
|
||||
"book.sub_collection_view", book_id=book_id, collection_id=collection_id
|
||||
)
|
||||
)
|
||||
|
||||
section: m.Section = db.session.get(m.Section, section_id)
|
||||
if not section:
|
||||
log(log.WARNING, "Section with id [%s] not found", section_id)
|
||||
flash("Section not found", "danger")
|
||||
return redirect(url_for("book.get_all"))
|
||||
return redirect(
|
||||
url_for(
|
||||
"book.section_view",
|
||||
book_id=book_id,
|
||||
collection_id=collection_id,
|
||||
sub_collection_id=sub_collection_id,
|
||||
)
|
||||
)
|
||||
else:
|
||||
return render_template(
|
||||
"book/interpretation_view.html",
|
||||
|
|
@ -141,3 +173,138 @@ def interpretation_view(book_id, collection_id, sub_collection_id, section_id):
|
|||
sub_collection=sub_collection,
|
||||
section=section,
|
||||
)
|
||||
|
||||
|
||||
@bp.route("/<int:book_id>/settings", methods=["GET"])
|
||||
@login_required
|
||||
def settings(book_id: int):
|
||||
book: m.Book = db.session.get(m.Book, book_id)
|
||||
|
||||
return render_template(
|
||||
"book/settings.html", book=book, roles=m.BookContributor.Roles
|
||||
)
|
||||
|
||||
|
||||
@bp.route("/<int:book_id>/add_contributor", methods=["POST"])
|
||||
@login_required
|
||||
def add_contributor(book_id: int):
|
||||
book: m.Book = db.session.get(m.Book, book_id)
|
||||
if not book or book.owner != current_user:
|
||||
log(log.INFO, "User: [%s] is not owner of book: [%s]", current_user, book)
|
||||
flash("You are not owner of this book!", "danger")
|
||||
return redirect(url_for("book.get_all"))
|
||||
|
||||
form = f.AddContributorForm()
|
||||
|
||||
if form.validate_on_submit():
|
||||
book_contributor = m.BookContributor.query.filter_by(
|
||||
user_id=form.user_id.data, book_id=book_id
|
||||
).first()
|
||||
if book_contributor:
|
||||
log(log.INFO, "Contributor: [%s] already exists", book_contributor)
|
||||
flash("Already exists!", "danger")
|
||||
return redirect(url_for("book.settings", book_id=book_id))
|
||||
|
||||
role = m.BookContributor.Roles(int(form.role.data))
|
||||
contributor = m.BookContributor(
|
||||
user_id=form.user_id.data, book_id=book_id, role=role
|
||||
)
|
||||
log(log.INFO, "New contributor [%s]", contributor)
|
||||
contributor.save()
|
||||
|
||||
flash("Contributor was added!", "success")
|
||||
return redirect(url_for("book.settings", book_id=book_id))
|
||||
else:
|
||||
log(log.ERROR, "Book create errors: [%s]", form.errors)
|
||||
for field, errors in form.errors.items():
|
||||
field_label = form._fields[field].label.text
|
||||
for error in errors:
|
||||
flash(error.replace("Field", field_label), "danger")
|
||||
return redirect(url_for("book.settings", book_id=book_id))
|
||||
|
||||
|
||||
@bp.route("/<int:book_id>/delete_contributor", methods=["POST"])
|
||||
@login_required
|
||||
def delete_contributor(book_id: int):
|
||||
book: m.Book = db.session.get(m.Book, book_id)
|
||||
if not book or book.owner != current_user:
|
||||
log(log.INFO, "User: [%s] is not owner of book: [%s]", current_user, book)
|
||||
flash("You are not owner of this book!", "danger")
|
||||
return redirect(url_for("book.get_all"))
|
||||
|
||||
form = f.DeleteContributorForm()
|
||||
|
||||
if form.validate_on_submit():
|
||||
book_contributor = m.BookContributor.query.filter_by(
|
||||
user_id=int(form.user_id.data), book_id=book.id
|
||||
).first()
|
||||
if not book_contributor:
|
||||
log(
|
||||
log.INFO,
|
||||
"BookContributor does not exists user: [%s], book: [%s]",
|
||||
form.user_id.data,
|
||||
book.id,
|
||||
)
|
||||
flash("Does not exists!", "success")
|
||||
return redirect(url_for("book.settings", book_id=book_id))
|
||||
|
||||
log(log.INFO, "Delete BookContributor [%s]", book_contributor)
|
||||
db.session.delete(book_contributor)
|
||||
db.session.commit()
|
||||
|
||||
flash("Success!", "success")
|
||||
return redirect(url_for("book.settings", book_id=book_id))
|
||||
else:
|
||||
log(log.ERROR, "Book create errors: [%s]", form.errors)
|
||||
for field, errors in form.errors.items():
|
||||
field_label = form._fields[field].label.text
|
||||
for error in errors:
|
||||
flash(error.replace("Field", field_label), "danger")
|
||||
return redirect(url_for("book.settings", book_id=book_id))
|
||||
|
||||
|
||||
@bp.route("/<int:book_id>/edit_contributor_role", methods=["POST"])
|
||||
@login_required
|
||||
def edit_contributor_role(book_id: int):
|
||||
book: m.Book = db.session.get(m.Book, book_id)
|
||||
if not book or book.owner != current_user:
|
||||
log(log.INFO, "User: [%s] is not owner of book: [%s]", current_user, book)
|
||||
flash("You are not owner of this book!", "danger")
|
||||
return redirect(url_for("book.get_all"))
|
||||
|
||||
form = f.EditContributorRoleForm()
|
||||
|
||||
if form.validate_on_submit():
|
||||
book_contributor = m.BookContributor.query.filter_by(
|
||||
user_id=int(form.user_id.data), book_id=book.id
|
||||
).first()
|
||||
if not book_contributor:
|
||||
log(
|
||||
log.INFO,
|
||||
"BookContributor does not exists user: [%s], book: [%s]",
|
||||
form.user_id.data,
|
||||
book.id,
|
||||
)
|
||||
flash("Does not exists!", "success")
|
||||
return redirect(url_for("book.settings", book_id=book_id))
|
||||
|
||||
role = m.BookContributor.Roles(int(form.role.data))
|
||||
book_contributor.role = role
|
||||
|
||||
log(
|
||||
log.INFO,
|
||||
"Update contributor [%s] role: new role: [%s]",
|
||||
book_contributor,
|
||||
role,
|
||||
)
|
||||
book_contributor.save()
|
||||
|
||||
flash("Success!", "success")
|
||||
return redirect(url_for("book.settings", book_id=book_id))
|
||||
else:
|
||||
log(log.ERROR, "Book create errors: [%s]", form.errors)
|
||||
for field, errors in form.errors.items():
|
||||
field_label = form._fields[field].label.text
|
||||
for error in errors:
|
||||
flash(error.replace("Field", field_label), "danger")
|
||||
return redirect(url_for("book.settings", book_id=book_id))
|
||||
|
|
|
|||
|
|
@ -1,19 +1,14 @@
|
|||
from flask import (
|
||||
Blueprint,
|
||||
render_template,
|
||||
request,
|
||||
flash,
|
||||
redirect,
|
||||
url_for,
|
||||
)
|
||||
from flask import Blueprint, render_template, request, flash, redirect, url_for, jsonify
|
||||
from flask_login import login_required
|
||||
from app.controllers import create_pagination
|
||||
from sqlalchemy import not_
|
||||
|
||||
from app import models as m, db
|
||||
from app import forms as f
|
||||
from app.logger import log
|
||||
from config import config
|
||||
|
||||
|
||||
configuration = config()
|
||||
bp = Blueprint("user", __name__, url_prefix="/user")
|
||||
|
||||
|
||||
|
|
@ -89,3 +84,27 @@ def delete(id):
|
|||
log(log.INFO, "User deleted. User: [%s]", u)
|
||||
flash("User deleted!", "success")
|
||||
return "ok", 200
|
||||
|
||||
|
||||
@bp.route("/search", methods=["GET"])
|
||||
@login_required
|
||||
def search():
|
||||
q = request.args.get("q", type=str, default=None)
|
||||
if not q:
|
||||
return jsonify({"message": "q parameter is required"}), 422
|
||||
|
||||
book_id = request.args.get("book_id", type=str, default=None)
|
||||
|
||||
query_user = m.User.query
|
||||
query_user = query_user.order_by(m.User.username)
|
||||
|
||||
query_user = query_user.filter(m.User.username.ilike(f"{q}%"))
|
||||
if book_id:
|
||||
book_contributors = m.BookContributor.query.filter_by(book_id=book_id).all()
|
||||
user_ids = [contributor.user_id for contributor in book_contributors]
|
||||
query_user = query_user.filter(not_(m.User.id.in_(user_ids)))
|
||||
query_user = query_user.limit(configuration.MAX_SEARCH_RESULTS)
|
||||
|
||||
users = [{"username": user.username, "id": user.id} for user in query_user.all()]
|
||||
|
||||
return jsonify({"users": users})
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ class BaseConfig(BaseSettings):
|
|||
# Pagination
|
||||
DEFAULT_PAGE_SIZE: int
|
||||
PAGE_LINKS_NUMBER: int
|
||||
MAX_SEARCH_RESULTS: int
|
||||
|
||||
@staticmethod
|
||||
def configure(app: Flask):
|
||||
|
|
|
|||
|
|
@ -26,3 +26,4 @@ ADMIN_PASSWORD=admin
|
|||
# Pagination
|
||||
DEFAULT_PAGE_SIZE=8
|
||||
PAGE_LINKS_NUMBER=8
|
||||
MAX_SEARCH_RESULTS=5
|
||||
|
|
|
|||
|
|
@ -0,0 +1,72 @@
|
|||
import {Modal} from 'flowbite';
|
||||
import type {ModalOptions, ModalInterface} from 'flowbite';
|
||||
|
||||
const searchAndShowResults = async (
|
||||
userSearchBtn: any,
|
||||
userSearchbar: any,
|
||||
searchResultsTbody: any,
|
||||
trExample: any,
|
||||
userIdInput: any,
|
||||
) => {
|
||||
searchResultsTbody.innerHTML = '';
|
||||
|
||||
const bookId = userSearchbar.getAttribute("data-book-id")
|
||||
const searchQuery = userSearchbar.value
|
||||
if (!searchQuery.length) {
|
||||
return;
|
||||
}
|
||||
|
||||
const urlParams = new URLSearchParams({
|
||||
q: searchQuery,
|
||||
book_id: bookId
|
||||
});
|
||||
const res = await fetch('/user/search?' + urlParams);
|
||||
const json = await res.json();
|
||||
|
||||
json.users.forEach((user: any) => {
|
||||
let clone = trExample.cloneNode(true);
|
||||
|
||||
const selectUserBtn = clone.querySelector('.select-user-btn');
|
||||
selectUserBtn.setAttribute('data-user-id', user.id);
|
||||
selectUserBtn.addEventListener('click', (e: any) => {
|
||||
const allSelectBtns = document.querySelectorAll('.select-user-btn')
|
||||
allSelectBtns.forEach(btn => {
|
||||
btn.innerHTML = "Select"
|
||||
});
|
||||
|
||||
|
||||
const userId = e.target.getAttribute("data-user-id")
|
||||
userIdInput.value = userId
|
||||
|
||||
selectUserBtn.innerHTML = "Selected"
|
||||
});
|
||||
|
||||
const usernameTh = clone.querySelector('.username-th');
|
||||
usernameTh.innerHTML = user.username;
|
||||
|
||||
clone.classList.remove('hidden');
|
||||
searchResultsTbody.appendChild(clone);
|
||||
});
|
||||
return undefined;
|
||||
};
|
||||
|
||||
export function initContributors() {
|
||||
const searchBtn: HTMLButtonElement = document.querySelector('#search-btn');
|
||||
const userSearchbar: HTMLInputElement = document.querySelector('#username');
|
||||
const userIdInput: HTMLInputElement = document.querySelector('#user_id');
|
||||
|
||||
const searchResultsTbody = document.querySelector('#search-results-tbody');
|
||||
const trExample: HTMLTableRowElement = document.querySelector('#tr-example');
|
||||
|
||||
searchBtn.addEventListener('click', async e => {
|
||||
e.preventDefault()
|
||||
userIdInput.value = ""
|
||||
await searchAndShowResults(
|
||||
searchBtn,
|
||||
userSearchbar
|
||||
searchResultsTbody,
|
||||
trExample,
|
||||
userIdInput
|
||||
);
|
||||
});
|
||||
}
|
||||
|
|
@ -1,6 +1,8 @@
|
|||
import './styles.css';
|
||||
import {initBooks} from './books';
|
||||
import {initContributors} from './contributors';
|
||||
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
initBooks();
|
||||
initContributors();
|
||||
});
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@ def test_auth_pages(client):
|
|||
|
||||
def test_login_and_logout(client):
|
||||
# Access to logout view before login should fail.
|
||||
response = login(client)
|
||||
response, _ = login(client)
|
||||
assert b"Login successful." in response.data
|
||||
# Incorrect login credentials should fail.
|
||||
response = login(client, "sam", "wrongpassword")
|
||||
response, _ = login(client, "sam", "wrongpassword")
|
||||
assert b"Wrong user ID or password." in response.data
|
||||
# Correct credentials should login
|
||||
response = login(client)
|
||||
response, _ = login(client)
|
||||
assert b"Login successful." in response.data
|
||||
|
|
|
|||
|
|
@ -0,0 +1,195 @@
|
|||
from flask import current_app as Response
|
||||
from flask.testing import FlaskClient, FlaskCliRunner
|
||||
|
||||
from app import models as m, db
|
||||
from tests.utils import login
|
||||
|
||||
|
||||
def test_create_book(client: FlaskClient):
|
||||
login(client)
|
||||
|
||||
BOOK_NAME = "Test Book"
|
||||
|
||||
# label len < 6
|
||||
response: Response = client.post(
|
||||
"/book/create",
|
||||
data=dict(
|
||||
label="12345",
|
||||
),
|
||||
follow_redirects=True,
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
assert b"Label must be between 6 and 1024 characters long." in response.data
|
||||
|
||||
book = m.Book.query.filter_by(label=BOOK_NAME).first()
|
||||
|
||||
assert not book
|
||||
assert not m.Book.query.count()
|
||||
|
||||
# label len > 1024
|
||||
response: Response = client.post(
|
||||
"/book/create",
|
||||
data=dict(
|
||||
label="".join(["0" for _ in range(1025)]),
|
||||
),
|
||||
follow_redirects=True,
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
assert b"Label must be between 6 and 1024 characters long." in response.data
|
||||
|
||||
book = m.Book.query.filter_by(label=BOOK_NAME).first()
|
||||
|
||||
assert not book
|
||||
assert not m.Book.query.count()
|
||||
|
||||
response: Response = client.post(
|
||||
"/book/create",
|
||||
data=dict(
|
||||
label=BOOK_NAME,
|
||||
),
|
||||
follow_redirects=True,
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
assert b"Book added!" in response.data
|
||||
|
||||
book = m.Book.query.filter_by(label=BOOK_NAME).first()
|
||||
|
||||
assert book
|
||||
assert book.versions
|
||||
assert len(book.versions) == 1
|
||||
|
||||
|
||||
def test_add_contributor(client: FlaskClient):
|
||||
_, user = login(client)
|
||||
user: m.User
|
||||
|
||||
moderator = m.User(username="Moderator", password="test").save()
|
||||
|
||||
moderators_book = m.Book(label="Test Book", user_id=moderator.id).save()
|
||||
response: Response = client.post(
|
||||
f"/book/{moderators_book.id}/add_contributor",
|
||||
data=dict(user_id=moderator.id, role=m.BookContributor.Roles.MODERATOR),
|
||||
follow_redirects=True,
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
assert b"You are not owner of this book!" in response.data
|
||||
|
||||
book = m.Book(label="Test Book", user_id=user.id).save()
|
||||
|
||||
response: Response = client.post(
|
||||
f"/book/{book.id}/add_contributor",
|
||||
data=dict(user_id=moderator.id, role=m.BookContributor.Roles.MODERATOR),
|
||||
follow_redirects=True,
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
assert b"Contributor was added!" in response.data
|
||||
response: Response = client.post(
|
||||
f"/book/{book.id}/add_contributor",
|
||||
data=dict(user_id=moderator.id, role=m.BookContributor.Roles.MODERATOR),
|
||||
follow_redirects=True,
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
assert b"Already exists!" in response.data
|
||||
|
||||
contributor: m.BookContributor = m.BookContributor.query.filter_by(
|
||||
user=moderator, book=book
|
||||
).first()
|
||||
assert contributor.role == m.BookContributor.Roles.MODERATOR
|
||||
assert len(book.contributors) == 1
|
||||
|
||||
editor = m.User(username="Editor", password="test").save()
|
||||
response: Response = client.post(
|
||||
f"/book/{book.id}/add_contributor",
|
||||
data=dict(user_id=editor.id, role=m.BookContributor.Roles.EDITOR),
|
||||
follow_redirects=True,
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
assert b"Contributor was added!" in response.data
|
||||
|
||||
contributor: m.BookContributor = m.BookContributor.query.filter_by(
|
||||
user=editor, book=book
|
||||
).first()
|
||||
assert contributor.role == m.BookContributor.Roles.EDITOR
|
||||
assert len(book.contributors) == 2
|
||||
|
||||
|
||||
def test_delete_contributor(client: FlaskClient, runner: FlaskCliRunner):
|
||||
_, user = login(client)
|
||||
user: m.User
|
||||
|
||||
# add dummmy data
|
||||
runner.invoke(args=["db-populate"])
|
||||
|
||||
book = db.session.get(m.Book, 1)
|
||||
book.user_id = user.id
|
||||
book.save()
|
||||
|
||||
contributors_len = len(book.contributors)
|
||||
assert contributors_len
|
||||
|
||||
contributor_to_delete = book.contributors[0]
|
||||
|
||||
response: Response = client.post(
|
||||
f"/book/{book.id}/delete_contributor",
|
||||
data=dict(user_id=contributor_to_delete.user_id),
|
||||
follow_redirects=True,
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
assert b"Success!" in response.data
|
||||
|
||||
response: Response = client.post(
|
||||
f"/book/{book.id}/delete_contributor",
|
||||
data=dict(user_id=contributor_to_delete.user_id),
|
||||
follow_redirects=True,
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
assert b"Does not exists!" in response.data
|
||||
|
||||
|
||||
def test_edit_contributor_role(client: FlaskClient, runner: FlaskCliRunner):
|
||||
_, user = login(client)
|
||||
user: m.User
|
||||
|
||||
# add dummmy data
|
||||
runner.invoke(args=["db-populate"])
|
||||
|
||||
book = db.session.get(m.Book, 1)
|
||||
book.user_id = user.id
|
||||
book.save()
|
||||
|
||||
contributors_len = len(book.contributors)
|
||||
assert contributors_len
|
||||
|
||||
contributor_edit = book.contributors[0]
|
||||
|
||||
assert contributor_edit.role == m.BookContributor.Roles.MODERATOR
|
||||
|
||||
response: Response = client.post(
|
||||
f"/book/{book.id}/edit_contributor_role",
|
||||
data=dict(
|
||||
user_id=contributor_edit.user_id,
|
||||
role=m.BookContributor.Roles.MODERATOR.value,
|
||||
),
|
||||
follow_redirects=True,
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
assert b"Success!" in response.data
|
||||
|
||||
# response: Response = client.post(
|
||||
# f"/book/{book.id}/delete_contributor",
|
||||
# data=dict(user_id=contributor_to_delete.user_id),
|
||||
# follow_redirects=True,
|
||||
# )
|
||||
|
||||
# assert response.status_code == 200
|
||||
# assert b"Does not exists!" in response.data
|
||||
|
|
@ -1,7 +1,8 @@
|
|||
from flask import current_app as app
|
||||
from flask.testing import FlaskClient, FlaskCliRunner
|
||||
from click.testing import Result
|
||||
from app import models as m
|
||||
|
||||
from app import models as m, db
|
||||
from tests.utils import login
|
||||
|
||||
|
||||
|
|
@ -43,3 +44,59 @@ def test_delete_user(populate: FlaskClient):
|
|||
response = populate.delete("/user/delete/1")
|
||||
assert m.User.query.count() < uc
|
||||
assert response.status_code == 200
|
||||
|
||||
|
||||
def test_search_user(populate: FlaskClient, runner: FlaskCliRunner):
|
||||
login(populate)
|
||||
MAX_SEARCH_RESULTS = populate.application.config["MAX_SEARCH_RESULTS"]
|
||||
|
||||
response = populate.get("/user/search")
|
||||
assert response.status_code == 422
|
||||
assert response.json["message"] == "q parameter is required"
|
||||
|
||||
q = "user"
|
||||
|
||||
response = populate.get(f"/user/search?q={q}")
|
||||
assert response.json
|
||||
|
||||
users = response.json.get("users")
|
||||
assert users
|
||||
assert len(users) <= MAX_SEARCH_RESULTS
|
||||
|
||||
for user in users:
|
||||
assert q in user["username"]
|
||||
|
||||
q = "user1"
|
||||
|
||||
response = populate.get(f"/user/search?q={q}")
|
||||
assert response.json
|
||||
|
||||
users = response.json.get("users")
|
||||
assert users
|
||||
assert len(users) <= MAX_SEARCH_RESULTS
|
||||
|
||||
user = users[0]
|
||||
assert user["username"] == q
|
||||
|
||||
q = "booboo"
|
||||
|
||||
response = populate.get(f"/user/search?q={q}")
|
||||
assert response.json
|
||||
|
||||
users = response.json.get("users")
|
||||
assert not users
|
||||
|
||||
# add dummmy data
|
||||
runner.invoke(args=["db-populate"])
|
||||
|
||||
response = populate.get("/user/search?q=dummy&book_id=1")
|
||||
assert response.json
|
||||
|
||||
book_1 = db.session.get(m.Book, 1)
|
||||
contributors_ids = [contributor.user_id for contributor in book_1.contributors]
|
||||
|
||||
users = response.json.get("users")
|
||||
assert users
|
||||
for user in users:
|
||||
user_id = user.get("id")
|
||||
assert user_id not in contributors_ids
|
||||
|
|
|
|||
|
|
@ -13,9 +13,11 @@ def create(username=TEST_ADMIN_NAME, password=TEST_ADMIN_PASSWORD):
|
|||
|
||||
|
||||
def login(client, username=TEST_ADMIN_NAME, password=TEST_ADMIN_PASSWORD):
|
||||
return client.post(
|
||||
user = User.query.filter_by(username=username).first()
|
||||
response = client.post(
|
||||
"/login", data=dict(user_id=username, password=password), follow_redirects=True
|
||||
)
|
||||
return response, user
|
||||
|
||||
|
||||
def logout(client):
|
||||
|
|
|
|||
Loading…
Reference in New Issue