logos-co/open-law
1
0
Fork 0
mirror of https://github.com/logos-co/open-law.git synced 2025-02-12 23:06:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into kostia/fix/fixing_issues2

Browse Source
This commit is contained in:
Kostiantyn Stoliarskyi 2023-06-22 09:52:15 +03:00
commit 8aea504ef1
7 changed files with 85 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/static/css/styles.css
View File

File diff suppressed because one or more lines are too long

23
app/templates/auth/connect_wallet_alert_modal.html Normal file
View File

@ -0,0 +1,23 @@
<!-- prettier-ignore-->
<div id="connect_wallet_alert_modal" tabindex="-1" aria-hidden="true" class="fixed top-0 left-0 right-0 z-[150] 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 header -->
<div class="relative bg-white rounded-lg shadow dark:bg-gray-700">
<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">Connect your wallet to contribute!</h3>
</div>
<!-- Modal body -->
<!-- Modal footer -->
<div class="flex items-center p-6 space-x-2 border-t border-gray-200 rounded-b dark:border-gray-600">
<button
id="connectWalletBtn"
type="button"
data-is-mobile="true"
class="flex justify-center w-full md:w-auto text-white bg-gradient-to-r from-cyan-500 to-blue-500 hover:bg-gradient-to-bl focus:ring-4 focus:outline-none focus:ring-cyan-300 dark:focus:ring-cyan-800 font-medium rounded-lg text-sm px-5 py-2.5">
Connect wallet
</button>
</div>
</div>
</div>
</div>

20
app/templates/base.html
View File

@ -82,18 +82,20 @@
{% endwith %}
{% block body %}
{% if current_user.is_authenticated %}
{% include 'book/modals/add_book_modal.html' %}
{% endif %}
{% include 'auth/connect_wallet_alert_modal.html' %}
{% if current_user.is_authenticated %}
{% include 'book/modals/add_book_modal.html' %}
{% endif %}
<!-- prettier-ignore -->
<script src="{{ url_for('static', filename='js/main.js') }}" type="text/javascript" defer></script>
<!-- prettier-ignore -->
<script src="{{ url_for('static', filename='js/main.js') }}" type="text/javascript" defer></script>
<div class="p-0 mt-16 md:mt-135 h-auto">
<!-- Main Content -->
{% block content %}{% endblock %}
</div>
<div class="p-0 mt-16 md:mt-135 h-auto">
<!-- Main Content -->
{% block content %}{% endblock %}
</div>
<footer class="w-full h-12"></footer>
{% endblock %}
<!-- scripts -->
{% block scripts %} {% endblock %}

15
app/templates/book/collection_view.html
View File

@ -129,6 +129,8 @@
</div>
<!-- Here start book-preview on right side-->
<div
<<<<<<<
HEAD
class="md:hidden w-full p-3 px-4 md:w-4/6 dark:text-white dark:bg-gray-500 bg-gray-400 {% if book.active_version.active_children %} hidden {% endif %}">
<div class="text-center text-xs">
Editing a book is not available on mobile (yet). Please browse from your
@ -138,6 +140,19 @@
<div
class="w-full p-3 px-6 md:w-4/6 dark:text-white {% if not book.active_version.active_children %} hidden {% endif %} md:inline">
======= class="md:hidden w-full p-3 px-4 md:w-4/6 dark:text-white
dark:bg-gray-500 bg-gray-400 1 {% if
book.active_version.root_collection.active_children %} hidden {% endif %} "
>
<div class="text-center text-xs">
Editing a book is not available on mobile (yet). Please browse from your
desktop to access all the features.
</div>
</div>
<div
class="w-full p-3 px-6 md:w-4/6 dark:text-white {% if not book.active_version.root_collection.active_children %} hidden {% endif %} md:inline">
>>>>>>> develop
<p class="text-xs mb-3">
{% if book.original_book %} Forked by
<a

8
app/templates/book/components/interpretation_list_item.html
View File

@ -9,6 +9,10 @@
{% 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>
{% elif not current_user.is_authenticated %}
<button class="cursor-pointer" data-modal-target="connect_wallet_alert_modal" data-modal-toggle="connect_wallet_alert_modal">
<svg class="w-6 h-6 select-none " 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>
</button>
{% 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 %} " >
@ -23,6 +27,10 @@
{% 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>
{% elif not current_user.is_authenticated %}
<button class="cursor-pointer" data-modal-target="connect_wallet_alert_modal" data-modal-toggle="connect_wallet_alert_modal">
<svg class="w-6 h-6 select-none " 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>
</button>
{% endif %}
{% if show_control_btns %}

6
app/templates/book/components/tab_content_slider.html
View File

@ -10,7 +10,11 @@
<a href="{{ url_for('book.settings', book_id=book.id) }}" type="button" class="ml-2"> <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.594 3.94c.09-.542.56-.94 1.11-.94h2.593c.55 0 1.02.398 1.11.94l.213 1.281c.063.374.313.686.645.87.074.04.147.083.22.127.324.196.72.257 1.075.124l1.217-.456a1.125 1.125 0 011.37.49l1.296 2.247a1.125 1.125 0 01-.26 1.431l-1.003.827c-.293.24-.438.613-.431.992a6.759 6.759 0 010 .255c-.007.378.138.75.43.99l1.005.828c.424.35.534.954.26 1.43l-1.298 2.247a1.125 1.125 0 01-1.369.491l-1.217-.456c-.355-.133-.75-.072-1.076.124a6.57 6.57 0 01-.22.128c-.331.183-.581.495-.644.869l-.213 1.28c-.09.543-.56.941-1.11.941h-2.594c-.55 0-1.02-.398-1.11-.94l-.213-1.281c-.062-.374-.312-.686-.644-.87a6.52 6.52 0 01-.22-.127c-.325-.196-.72-.257-1.076-.124l-1.217.456a1.125 1.125 0 01-1.369-.49l-1.297-2.247a1.125 1.125 0 01.26-1.431l1.004-.827c.292-.24.437-.613.43-.992a6.932 6.932 0 010-.255c.007-.378-.138-.75-.43-.99l-1.004-.828a1.125 1.125 0 01-.26-1.43l1.297-2.247a1.125 1.125 0 011.37-.491l1.216.456c.356.133.751.072 1.076-.124.072-.044.146-.087.22-.128.332-.183.582-.495.644-.869l.214-1.281z" /> <path stroke-linecap="round" stroke-linejoin="round" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" /> </svg> </a>
</div>
<div class="md:hidden w-full mt-3 p-3 px-4 md:w-4/6 dark:text-white dark:bg-gray-500 bg-gray-400 {% if book.active_version.active_children %} hidden {% endif %}">
<div
class="md:hidden w-full mt-3 p-3 px-4 md:w-4/6 dark:text-white dark:bg-gray-500 bg-gray-400
{% if book.active_version.root_collection.active_children %} hidden {% endif %}
"
>
<div class="text-center text-xs ">
Editing a book is not available on mobile (yet). Please browse from your desktop to access all the features.
</div>

28
app/templates/book/qa_view.html
View File

@ -79,15 +79,31 @@
<div class="flex flex-row pb-3 md:p-3 md:w-full">
<div class="vote-block flex flex-col mt-5 ml-1 mr-2 md:m-5 md:mr-8 md:justify-center items-center">
<div class="vote-button cursor-pointer" data-vote-for="comment" data-entity-id="{{ comment.id }}" data-positive="true">
<svg class="w-6 h-6 select-none {% if comment.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>
{% if current_user.is_authenticated %}
<div class="vote-button cursor-pointer" data-vote-for="comment" data-entity-id="{{ comment.id }}" data-positive="true">
<svg class="w-6 h-6 select-none {% if comment.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>
{% elif not current_user.is_authenticated %}
<button class="cursor-pointer" data-modal-target="connect_wallet_alert_modal" data-modal-toggle="connect_wallet_alert_modal">
<svg class="w-6 h-6 select-none " 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>
</button>
{% endif %}
<span class="vote-count text-3xl select-none {% if comment.vote_count < 0 %} text-red-500 {% elif comment.vote_count > 0 %} text-green-500 {% endif %} " >
{{ comment.vote_count }}
</span>
<div class="vote-button cursor-pointer" data-vote-for="comment" data-entity-id="{{ comment.id }}" data-positive="false">
<svg class="w-6 h-6 select-none {% if comment.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>
{% if not hide_vote_btns and current_user.is_authenticated %}
<div class="vote-button cursor-pointer" data-vote-for="comment" data-entity-id="{{ comment.id }}" data-positive="false">
<svg class="w-6 h-6 select-none {% if comment.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>
{% elif not current_user.is_authenticated %}
<button class="cursor-pointer" data-modal-target="connect_wallet_alert_modal" data-modal-toggle="connect_wallet_alert_modal">
<svg class="w-6 h-6 select-none " 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>
</button>
{% endif %}
{% if access_to_approve_comment %}