From 4508c1e48ed47b099a0ac53082c08ea8b8598e2a Mon Sep 17 00:00:00 2001 From: Kostiantyn Stoliarskyi Date: Tue, 20 Jun 2023 16:50:30 +0300 Subject: [PATCH] remove shadows done stat and fix users in search --- app/templates/book/favorite_books.html | 2 +- app/templates/book/my_contributions.html | 2 +- app/templates/book/my_library.html | 141 ++++++++++-------- app/templates/book/stat.html | 10 +- app/templates/notifications/index.html | 16 +- .../search/search_results_users.html | 10 +- 6 files changed, 98 insertions(+), 83 deletions(-) diff --git a/app/templates/book/favorite_books.html b/app/templates/book/favorite_books.html index c6df468..6efe043 100644 --- a/app/templates/book/favorite_books.html +++ b/app/templates/book/favorite_books.html @@ -6,7 +6,7 @@ {% block content %}
+ class="pt-1 relative sm:rounded-lg mt-1 h-box flex"> {% if not current_user.is_authenticated %}
diff --git a/app/templates/book/my_contributions.html b/app/templates/book/my_contributions.html index bb4a820..625c38d 100644 --- a/app/templates/book/my_contributions.html +++ b/app/templates/book/my_contributions.html @@ -6,7 +6,7 @@ {% block content %}
+ class="pt-1 relative sm:rounded-lg mt-1 h-box flex"> {% if not current_user.is_authenticated %}
diff --git a/app/templates/book/my_library.html b/app/templates/book/my_library.html index cb612a1..946db64 100644 --- a/app/templates/book/my_library.html +++ b/app/templates/book/my_library.html @@ -10,98 +10,107 @@ {% include 'book/modals/add_book_modal.html' %} {% endif %} - -
+
{% if not current_user.is_authenticated %} -
- -
- {% endif %} - - {% if current_user.is_authenticated and not books.total %} -
- -
+
+ +
+ {% endif %} {% if current_user.is_authenticated and not books.total %} +
+ +
{% endif %} {% if current_user.is_authenticated and books.total %} -
-
-

My library

- {% if current_user.is_authenticated %} - {% include 'book/components/header_buttons.html' %} - {% endif %} -
+
+
+

My library

+ {% if current_user.is_authenticated %} {% include + 'book/components/header_buttons.html' %} {% endif %}
- {% endif %} - - {% for book in books if not book.is_deleted %} - {% include 'book/components/book_list_item.html' %} - {% endfor %} +
+ {% endif %} {% for book in books if not book.is_deleted %} {% include + 'book/components/book_list_item.html' %} {% endfor %} {% if current_user.is_authenticated and page.pages > 1 %} -
- +
{% endif %}
diff --git a/app/templates/book/stat.html b/app/templates/book/stat.html index 3261974..3ae0af6 100644 --- a/app/templates/book/stat.html +++ b/app/templates/book/stat.html @@ -13,29 +13,29 @@ -
    +
    diff --git a/app/templates/notifications/index.html b/app/templates/notifications/index.html index a6e945f..fdff2a1 100644 --- a/app/templates/notifications/index.html +++ b/app/templates/notifications/index.html @@ -7,17 +7,19 @@ {% block content %}
    -
    - -

    Notifications

    - Mark all notifications as READ +
    + +

    Notifications

    + Mark all as READ
    - {% if not current_user.notifications %} + {% if not notifications.total %} - {% endif %} {% for notification in notifications %} + {% endif %} + + {% for notification in notifications %}
    {{notification.text}}
    diff --git a/app/templates/search/search_results_users.html b/app/templates/search/search_results_users.html index 91a268a..ed3d24b 100644 --- a/app/templates/search/search_results_users.html +++ b/app/templates/search/search_results_users.html @@ -53,10 +53,14 @@ {% for user in users if not user.is_deleted %} - User's avatar + {% if current_user.avatar_img %} + user avatar + {% else %} + + {% endif %}
    -
    {{user.username}}
    -
    {{user.wallet_id}}
    +
    {{user.username}}
    +