+ {% if current_user.is_activated %}
- Edit your profile
+ {% endif %} + {% if not current_user.is_activated %} + +Create your profile
+ {% endif %} + +
+
+
+
+
- {{form.avatar_img.label(class='block mb-2 text-sm font-medium text-gray-900 dark:text-white')}}
+ {{form.avatar_img.label(class='block mb-2 text-sm font-medium text-gray-900 dark:text-white')}}
+
+
+
+ {% if current_user.avatar_img %}
+ 
+ {% else %}
+
+ {% endif %}
+
+
+ {% else %}
+
+ {% endif %}
+
+
{{form.avatar_img(type='file', class='bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 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', id="avatar_img",
- value=current_user.avatar_img if current_user.avatar_img else "")}}
+ value=current_user.avatar_img if current_user.avatar_img else "")}}
-
-
-
-
-
-{% if page.pages > 1 %}
-| # | Name | Active | Actions | -
|---|---|---|---|
|
-
- {{ loop.index + page.skip }}
-
- |
-
-
-
- {{ user.username }}
- |
-
-
-
- {% if user.activated %} {% else %} Active Offline {% endif %}
- |
- - - - | -
-
-
-
-{% endif %}
-
-{% include 'user/add.html' %}
-
-{% endblock %}
-
-{% block scripts %}
-{% endblock %}
-
-
diff --git a/app/views/home.py b/app/views/home.py
index 18c6445..e350435 100644
--- a/app/views/home.py
+++ b/app/views/home.py
@@ -10,7 +10,9 @@ 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)
+ books: m.Book = (
+ m.Book.query.filter_by(is_deleted=False).order_by(m.Book.id).limit(5)
+ )
interpretations = (
db.session.query(
m.Interpretation,
diff --git a/app/views/user.py b/app/views/user.py
index 40fc12b..5321e86 100644
--- a/app/views/user.py
+++ b/app/views/user.py
@@ -1,7 +1,7 @@
import base64
from flask import Blueprint, render_template, request, flash, redirect, url_for, jsonify
-from flask_login import login_required, current_user
+from flask_login import login_required, current_user, logout_user
from app.controllers import create_pagination
from sqlalchemy import not_
@@ -98,20 +98,18 @@ def create():
return redirect(url_for("user.get_all"))
-@bp.route("/delete/