From 9afcc981c24b5ff500f079c08fa5acdb15caf73e Mon Sep 17 00:00:00 2001
From: SvyatoslavArtymovych <svyatoslav.artymovych@gmail.com>
Date: Fri, 28 Apr 2023 14:41:29 +0300
Subject: [PATCH 1/3] add {{ flask_form.hidden_tag() }}

---
 app/__init__.py                                 | 7 +++++++
 app/templates/book/add_book_modal.html          | 2 +-
 app/templates/book/add_collection_modal.html    | 1 +
 app/templates/book/add_contributor_modal.html   | 2 +-
 app/templates/book/delete_collection_modal.html | 1 +
 app/templates/book/edit_collection_modal.html   | 1 +
 app/templates/book/settings.html                | 2 ++
 app/templates/user/add.html                     | 1 +
 8 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/__init__.py b/app/__init__.py
index c02a6d8..463108c 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -5,6 +5,7 @@ from flask_sqlalchemy import SQLAlchemy
 from flask_login import LoginManager
 from werkzeug.exceptions import HTTPException
 from flask_migrate import Migrate
+from flask_wtf import FlaskForm
 
 from app.logger import log
 
@@ -60,6 +61,12 @@ def create_app(environment="development"):
     login_manager.login_message_category = "info"
     login_manager.anonymous_user = AnonymousUser
 
+    # Jinja globals
+
+    # Using: {{ flask_form.hidden_tag() }}
+    with app.app_context():
+        app.jinja_env.globals["flask_form"] = FlaskForm()
+
     # Error handlers.
     @app.errorhandler(HTTPException)
     def handle_http_error(exc):
diff --git a/app/templates/book/add_book_modal.html b/app/templates/book/add_book_modal.html
index 68e2b71..1dfb3aa 100644
--- a/app/templates/book/add_book_modal.html
+++ b/app/templates/book/add_book_modal.html
@@ -4,7 +4,7 @@
   <div class="relative w-full max-w-2xl max-h-full">
     <!-- Modal content -->
     <form action="{{ url_for('book.create') }}" method="post" class="relative bg-white rounded-lg shadow dark:bg-gray-700">
-
+      {{ flask_form.hidden_tag() }}
       <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 -->
diff --git a/app/templates/book/add_collection_modal.html b/app/templates/book/add_collection_modal.html
index 20b5f61..9046427 100644
--- a/app/templates/book/add_collection_modal.html
+++ b/app/templates/book/add_collection_modal.html
@@ -10,6 +10,7 @@
         action="{{ url_for('book.collection_create', book_id=book.id) }}"
       {% endif %}
       method="post" class="relative bg-white rounded-lg shadow dark:bg-gray-700">
+      {{ flask_form.hidden_tag() }}
       <!-- 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 {% if collection %}Sub {% endif %}Collection </h3>
diff --git a/app/templates/book/add_contributor_modal.html b/app/templates/book/add_contributor_modal.html
index 7a7b11c..e353e72 100644
--- a/app/templates/book/add_contributor_modal.html
+++ b/app/templates/book/add_contributor_modal.html
@@ -4,7 +4,7 @@
   <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">
-
+      {{ flask_form.hidden_tag() }}
       <input type="hidden" name="user_id" id="user_id" value="0" />
       <input type="hidden" name="" id="user-edit-next_url" value="" />
       <!-- Modal header -->
diff --git a/app/templates/book/delete_collection_modal.html b/app/templates/book/delete_collection_modal.html
index d246c2e..6324569 100644
--- a/app/templates/book/delete_collection_modal.html
+++ b/app/templates/book/delete_collection_modal.html
@@ -10,6 +10,7 @@
         action="{{ url_for('book.collection_delete', book_id=book.id, collection_id=collection.id) }}"
       {% endif %}
       method="post" class="relative bg-white rounded-lg shadow dark:bg-gray-700">
+      {{ flask_form.hidden_tag() }}
       <!-- 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"> Delete Collection </h3>
diff --git a/app/templates/book/edit_collection_modal.html b/app/templates/book/edit_collection_modal.html
index c934b20..b713d85 100644
--- a/app/templates/book/edit_collection_modal.html
+++ b/app/templates/book/edit_collection_modal.html
@@ -10,6 +10,7 @@
         action="{{ url_for('book.collection_edit', book_id=book.id, collection_id=collection.id) }}"
       {% endif %}
       method="post" class="relative bg-white rounded-lg shadow dark:bg-gray-700">
+      {{ flask_form.hidden_tag() }}
       <!-- 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"> Edit Collection </h3>
diff --git a/app/templates/book/settings.html b/app/templates/book/settings.html
index 7837b57..709e91c 100644
--- a/app/templates/book/settings.html
+++ b/app/templates/book/settings.html
@@ -35,6 +35,7 @@
           <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 flex space-x-2">
+              {{ flask_form.hidden_tag() }}
               <input type="hidden" name="user_id" id="user_id" value="{{ contributor.user_id }}" />
               <select
                 id="role"
@@ -57,6 +58,7 @@
           <td class="px-6 py-4">
             <!-- prettier-ignore -->
             <form action="{{ url_for('book.delete_contributor', book_id=book.id) }}" method="post" class="mb-0">
+              {{ flask_form.hidden_tag() }}
               <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>
diff --git a/app/templates/user/add.html b/app/templates/user/add.html
index 6290010..991fc09 100644
--- a/app/templates/user/add.html
+++ b/app/templates/user/add.html
@@ -4,6 +4,7 @@
   <div class="relative w-full max-w-2xl max-h-full">
     <!-- Modal content -->
     <form action="{{url_for('user.create')}}" method="post" class="relative bg-white rounded-lg shadow dark:bg-gray-700">
+      {{ flask_form.hidden_tag() }}
       <!-- 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 new user </h3>

From 754f93ae737539dadec311b8bc9326a0c9f303b6 Mon Sep 17 00:00:00 2001
From: SvyatoslavArtymovych <svyatoslav.artymovych@gmail.com>
Date: Fri, 28 Apr 2023 13:03:48 +0000
Subject: [PATCH 2/3] refactor jinja global flask_form

---
 app/__init__.py                                 | 6 ++----
 app/controllers/jinja_globals.py                | 7 +++++++
 app/templates/book/add_book_modal.html          | 2 +-
 app/templates/book/add_collection_modal.html    | 2 +-
 app/templates/book/add_contributor_modal.html   | 2 +-
 app/templates/book/delete_collection_modal.html | 2 +-
 app/templates/book/edit_collection_modal.html   | 2 +-
 app/templates/book/settings.html                | 4 ++--
 app/templates/user/add.html                     | 2 +-
 9 files changed, 17 insertions(+), 12 deletions(-)
 create mode 100644 app/controllers/jinja_globals.py

diff --git a/app/__init__.py b/app/__init__.py
index 463108c..7a5e1b3 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -5,7 +5,6 @@ from flask_sqlalchemy import SQLAlchemy
 from flask_login import LoginManager
 from werkzeug.exceptions import HTTPException
 from flask_migrate import Migrate
-from flask_wtf import FlaskForm
 
 from app.logger import log
 
@@ -62,10 +61,9 @@ def create_app(environment="development"):
     login_manager.anonymous_user = AnonymousUser
 
     # Jinja globals
+    from app.controllers.jinja_globals import form_hidden_tag
 
-    # Using: {{ flask_form.hidden_tag() }}
-    with app.app_context():
-        app.jinja_env.globals["flask_form"] = FlaskForm()
+    app.jinja_env.globals["form_hidden_tag"] = form_hidden_tag
 
     # Error handlers.
     @app.errorhandler(HTTPException)
diff --git a/app/controllers/jinja_globals.py b/app/controllers/jinja_globals.py
new file mode 100644
index 0000000..80ca073
--- /dev/null
+++ b/app/controllers/jinja_globals.py
@@ -0,0 +1,7 @@
+from flask_wtf import FlaskForm
+
+
+# Using: {{ form_hidden_tag() }}
+def form_hidden_tag():
+    form = FlaskForm()
+    return form.hidden_tag()
diff --git a/app/templates/book/add_book_modal.html b/app/templates/book/add_book_modal.html
index 1dfb3aa..9bf9e67 100644
--- a/app/templates/book/add_book_modal.html
+++ b/app/templates/book/add_book_modal.html
@@ -4,7 +4,7 @@
   <div class="relative w-full max-w-2xl max-h-full">
     <!-- Modal content -->
     <form action="{{ url_for('book.create') }}" method="post" class="relative bg-white rounded-lg shadow dark:bg-gray-700">
-      {{ flask_form.hidden_tag() }}
+      {{ form_hidden_tag() }}
       <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 -->
diff --git a/app/templates/book/add_collection_modal.html b/app/templates/book/add_collection_modal.html
index 9046427..fb450c9 100644
--- a/app/templates/book/add_collection_modal.html
+++ b/app/templates/book/add_collection_modal.html
@@ -10,7 +10,7 @@
         action="{{ url_for('book.collection_create', book_id=book.id) }}"
       {% endif %}
       method="post" class="relative bg-white rounded-lg shadow dark:bg-gray-700">
-      {{ flask_form.hidden_tag() }}
+      {{ form_hidden_tag() }}
       <!-- 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 {% if collection %}Sub {% endif %}Collection </h3>
diff --git a/app/templates/book/add_contributor_modal.html b/app/templates/book/add_contributor_modal.html
index e353e72..11b555b 100644
--- a/app/templates/book/add_contributor_modal.html
+++ b/app/templates/book/add_contributor_modal.html
@@ -4,7 +4,7 @@
   <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">
-      {{ flask_form.hidden_tag() }}
+      {{ form_hidden_tag() }}
       <input type="hidden" name="user_id" id="user_id" value="0" />
       <input type="hidden" name="" id="user-edit-next_url" value="" />
       <!-- Modal header -->
diff --git a/app/templates/book/delete_collection_modal.html b/app/templates/book/delete_collection_modal.html
index 6324569..ca654f3 100644
--- a/app/templates/book/delete_collection_modal.html
+++ b/app/templates/book/delete_collection_modal.html
@@ -10,7 +10,7 @@
         action="{{ url_for('book.collection_delete', book_id=book.id, collection_id=collection.id) }}"
       {% endif %}
       method="post" class="relative bg-white rounded-lg shadow dark:bg-gray-700">
-      {{ flask_form.hidden_tag() }}
+      {{ form_hidden_tag() }}
       <!-- 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"> Delete Collection </h3>
diff --git a/app/templates/book/edit_collection_modal.html b/app/templates/book/edit_collection_modal.html
index b713d85..d2cda5d 100644
--- a/app/templates/book/edit_collection_modal.html
+++ b/app/templates/book/edit_collection_modal.html
@@ -10,7 +10,7 @@
         action="{{ url_for('book.collection_edit', book_id=book.id, collection_id=collection.id) }}"
       {% endif %}
       method="post" class="relative bg-white rounded-lg shadow dark:bg-gray-700">
-      {{ flask_form.hidden_tag() }}
+      {{ form_hidden_tag() }}
       <!-- 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"> Edit Collection </h3>
diff --git a/app/templates/book/settings.html b/app/templates/book/settings.html
index 709e91c..735fbeb 100644
--- a/app/templates/book/settings.html
+++ b/app/templates/book/settings.html
@@ -35,7 +35,7 @@
           <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 flex space-x-2">
-              {{ flask_form.hidden_tag() }}
+              {{ form_hidden_tag() }}
               <input type="hidden" name="user_id" id="user_id" value="{{ contributor.user_id }}" />
               <select
                 id="role"
@@ -58,7 +58,7 @@
           <td class="px-6 py-4">
             <!-- prettier-ignore -->
             <form action="{{ url_for('book.delete_contributor', book_id=book.id) }}" method="post" class="mb-0">
-              {{ flask_form.hidden_tag() }}
+              {{ form_hidden_tag() }}
               <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>
diff --git a/app/templates/user/add.html b/app/templates/user/add.html
index 991fc09..3a4337c 100644
--- a/app/templates/user/add.html
+++ b/app/templates/user/add.html
@@ -4,7 +4,7 @@
   <div class="relative w-full max-w-2xl max-h-full">
     <!-- Modal content -->
     <form action="{{url_for('user.create')}}" method="post" class="relative bg-white rounded-lg shadow dark:bg-gray-700">
-      {{ flask_form.hidden_tag() }}
+      {{ form_hidden_tag() }}
       <!-- 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 new user </h3>

From ce8bada1a7165631356f9291d5af566b72a42b5a Mon Sep 17 00:00:00 2001
From: SvyatoslavArtymovych <svyatoslav.artymovych@gmail.com>
Date: Mon, 1 May 2023 16:00:40 +0300
Subject: [PATCH 3/3] set default contributor role to moderator

---
 app/templates/book/add_contributor_modal.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/book/add_contributor_modal.html b/app/templates/book/add_contributor_modal.html
index 11b555b..85ab79c 100644
--- a/app/templates/book/add_contributor_modal.html
+++ b/app/templates/book/add_contributor_modal.html
@@ -46,7 +46,7 @@
           <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>
+              <option {% if role == 1 %} selected {% endif %} value="{{ role.value }}">{{ role.name.title() }}</option>
             {% endfor %}
           </select>
         </div>