From d83f37d8b6a030ac926d6f58562b6479d6897161 Mon Sep 17 00:00:00 2001
From: Maryna <m51571750@gmail.com>
Date: Wed, 8 Jan 2025 13:07:45 +0200
Subject: [PATCH] Small fixes in admin section files

---
 core/src/main/resources/static/css/slider.css |  63 --
 .../static/css/table_Modal_Pagination.css     |   3 +-
 .../core/management_habit_statistics.html     |  14 +-
 .../templates/core/management_user.html       | 584 +++++++++---------
 4 files changed, 297 insertions(+), 367 deletions(-)
 delete mode 100644 core/src/main/resources/static/css/slider.css

diff --git a/core/src/main/resources/static/css/slider.css b/core/src/main/resources/static/css/slider.css
deleted file mode 100644
index 51081c59a..000000000
--- a/core/src/main/resources/static/css/slider.css
+++ /dev/null
@@ -1,63 +0,0 @@
-.slider {
-    position: relative;
-    z-index: 1;
-    height: 2px;
-    margin: 0 15px;
-}
-.slider > .track {
-    position: absolute;
-    z-index: 1;
-    left: 0;
-    right: 0;
-    top: 0;
-    bottom: 0;
-    border-radius: 5px;
-    background-color: var(--green);
-}
-.slider > .range {
-    position: absolute;
-    z-index: 2;
-    left: 25%;
-    right: 25%;
-    top: 0;
-    bottom: 0;
-    border-radius: 5px;
-    background-color: var(--green);
-}
-.slider > .thumb {
-    position: absolute;
-    z-index: 3;
-    width: 17px;
-    height: 17px;
-    background-color: var(--green);
-    border-radius: 50%;
-    /*box-shadow: 0 0 0 0 rgba(98,0,238,.1);*/
-    /*transition: box-shadow .3s ease-in-out;*/
-}
-.slider > .thumb.left {
-    left: 25%;
-    transform: translate(-15px, -10px);
-}
-.slider > .thumb.right {
-    right: 25%;
-    transform: translate(15px, -10px);
-}
-
-input[type=range] {
-    position: absolute;
-    pointer-events: none;
-    -webkit-appearance: none;
-    z-index: 2;
-    height: 2px;
-    width: 100%;
-    opacity: 0;
-}
-input[type=range]::-webkit-slider-thumb {
-    pointer-events: all;
-    width: 20px;
-    height: 20px;
-    border-radius: 0;
-    border: 10px solid var(--white);
-    background-color: var(--red);
-    -webkit-appearance: none;
-}
\ No newline at end of file
diff --git a/core/src/main/resources/static/css/table_Modal_Pagination.css b/core/src/main/resources/static/css/table_Modal_Pagination.css
index 7a8cfd2fe..772bd5646 100644
--- a/core/src/main/resources/static/css/table_Modal_Pagination.css
+++ b/core/src/main/resources/static/css/table_Modal_Pagination.css
@@ -362,7 +362,8 @@ table.table .avatar {
     height: 26px;
     padding: 0px;
     margin-top: 12px;
-    margin-left: 0px;
+    margin-left: 0;
+    margin-right: 0;
 }
 
 .dropdown-content.userpage {
diff --git a/core/src/main/resources/templates/core/management_habit_statistics.html b/core/src/main/resources/templates/core/management_habit_statistics.html
index 7fbe2ef6c..db8e7de85 100644
--- a/core/src/main/resources/templates/core/management_habit_statistics.html
+++ b/core/src/main/resources/templates/core/management_habit_statistics.html
@@ -5,11 +5,7 @@
     <meta charset="utf-8"/>
     <title>Eco News Statistic</title>
     <link rel="icon" type="image/x-icon" th:href="@{/img/favicon.ico}"/>
-    <link rel="stylesheet" th:href="@{/css/header.css}">
-    <link rel="stylesheet" th:href="@{/css/footer.css}">
-    <link rel="stylesheet" th:href="@{/css/position.css}">
     <link rel="stylesheet" th:href="@{/css/main.css}">
-
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"
           integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous"/>
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.2.0/css/all.css"
@@ -27,12 +23,10 @@
             src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.4.1/js/bootstrap-datepicker.min.js"></script>
     <link rel="stylesheet"
           href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.4.1/css/bootstrap-datepicker3.css"/>
-    <link rel="stylesheet" th:href="@{/management/css/table_Modal_Pagination.css}">
-    <link rel="stylesheet" th:href="@{/management/css/slider.css}">
-    <link rel="stylesheet" th:href="@{/css/sidebar.css}">
     <script th:src="@{/management/localization/buttonsAJAX.js}"></script>
     <script th:src="@{/management/econews/buttonsAJAX.js}"></script>
     <script th:src="@{/management/tinymce/tinymce.min.js}" referrerpolicy="origin"></script>
+    <script defer type="text/javascript" th:src="@{/management/sidebar/sidebar.js}"></script>
     <script src="https://cdn.jsdelivr.net/npm/randomcolor@0.6.2/randomColor.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/moment@2.29.1/moment.min.js"></script>
@@ -148,10 +142,8 @@
 </head>
 <body>
 <div id="header" th:insert="core/header"></div>
-<div>
-    <div id="sidebar" th:insert="core/sidepanel"></div>
-</div>
 <div class="main-content">
+    <div id="sidebar" th:insert="core/sidepanel"></div>
     <div class="container-xl">
         <h2>Habit Statistics</h2>
         <!-- Menu Button -->
@@ -186,8 +178,8 @@ <h3>User interaction</h3>
 
             </div>
         </div>
+        <div class="grid-stack" id="chartsGrid"></div>
     </div>
-    <div class="grid-stack" id="chartsGrid"></div>
 </div>
 <div id="footer" th:insert="core/footer"></div>
 <script type="module">
diff --git a/core/src/main/resources/templates/core/management_user.html b/core/src/main/resources/templates/core/management_user.html
index ad8b05191..5cebbcac0 100644
--- a/core/src/main/resources/templates/core/management_user.html
+++ b/core/src/main/resources/templates/core/management_user.html
@@ -180,328 +180,328 @@ <h4 class="modal-title-act">[[#{greenCity.user.page.add.user}]]</h4>
                             </div>
                         </div>
                     </div>
-<!--                    Table header-->
-                    <table class="table table-bordered">
-                        <thead>
-                        <tr>
-                            <th style="width: 48px;">
+                </div>
+                <!--Table header-->
+                <table class="table table-bordered">
+                    <thead>
+                    <tr>
+                        <th style="width: 48px;">
+                            <span class="custom-checkbox">
+                                <input type="checkbox" id="selectAll">
+                                <label for="selectAll"></label>
+                            </span>
+                        </th>
+                        <th style="width: 120px;">
+                            <span>[[#{greenCity.pages.table.id}]]</span>
+                            <img id="id-icon" class="sorting" src="/img/arrow-up.svg" alt="arrow-icon" onclick="sortByFieldName('id')">
+                            <span class="table-filter-icon"></span>
+                        </th>
+                        <th class="username" style="width: 180px">
+                            [[#{greenCity.pages.table.userName}]]
+                            <img id="user-icon" class="sorting" src="/img/arrow-up.svg" alt="arrow-icon"onclick="sortByFieldName('name')">
+                            <span class="table-filter-icon"></span>
+                        </th>
+                        <th style="width: 241px;">
+                            [[#{greenCity.pages.table.email}]]
+                            <img id="email-icon" class="sorting" style="left: 65%" src="/img/arrow-up.svg" alt="arrow-icon" onclick="sortByFieldName('email')">
+                            <span class="table-filter-icon"></span>
+                        </th>
+                        <th>
+                            [[#{greenCity.pages.table.credo}]]
+                            <img id="credo-icon" class="sorting" src="/img/arrow-up.svg" alt="arrow-icon" onclick="sortByFieldName('userCredo')">
+                            <span class="table-filter-icon"></span>
+                        </th>
+                        <th style="width: 235px;">
+                            [[#{greenCity.pages.table.role}]]
+                            <img id="role-icon" class="sorting" src="/img/arrow-up.svg" alt="arrow-icon" onclick="sortByFieldName('role')">
+                            <span class="table-filter-icon"></span>
+                        </th>
+                        <th style="width: 131px;">
+                            [[#{greenCity.pages.table.status}]]
+                            <img id="tags-icon" class="sorting" src="/img/arrow-up.svg" alt="arrow-icon" onclick="sortByFieldName('userStatus')">
+                            <span class="table-filter-icon"></span>
+                        </th>
+                        <th>
+                            <span>[[#{greenCity.pages.table.actions}]]</span>
+                        </th>
+                    </tr>
+                    <!--Table content-->
+                    </thead>
+                    <th:block class="list-of" th:each="user, iterStatus :${users.getPage()}">
+                        <tr class="clickable-row" th:href="@{/management/users/{id}/friends/(id=${user.id})}">
+                            <td>
                                 <span class="custom-checkbox">
-                                    <input type="checkbox" id="selectAll">
-                                    <label for="selectAll"></label>
+                                    <input type="checkbox" th:id="checkbox+${iterStatus.count}"
+                                           name="options[]" th:value="${user.id}"
+                                           th:onclick="'updateCheckBoxCount('+${iterStatus.count}+')'">
+                                    <label th:for="checkbox+${iterStatus.count}"></label>
                                 </span>
-                            </th>
-                            <th style="width: 120px;">
-                                <span>[[#{greenCity.pages.table.id}]]</span>
-                                <img id="id-icon" class="sorting" src="/img/arrow-up.svg" alt="arrow-icon" onclick="sortByFieldName('id')">
-                                <span class="table-filter-icon"></span>
-                            </th>
-                            <th class="username" style="width: 180px">
-                                [[#{greenCity.pages.table.userName}]]
-                                <img id="user-icon" class="sorting" src="/img/arrow-up.svg" alt="arrow-icon"onclick="sortByFieldName('name')">
-                                <span class="table-filter-icon"></span>
-                            </th>
-                            <th style="width: 241px;">
-                                [[#{greenCity.pages.table.email}]]
-                                <img id="email-icon" class="sorting" style="left: 65%" src="/img/arrow-up.svg" alt="arrow-icon" onclick="sortByFieldName('email')">
-                                <span class="table-filter-icon"></span>
-                            </th>
-                            <th>
-                                [[#{greenCity.pages.table.credo}]]
-                                <img id="credo-icon" class="sorting" src="/img/arrow-up.svg" alt="arrow-icon" onclick="sortByFieldName('userCredo')">
-                                <span class="table-filter-icon"></span>
-                            </th>
-                            <th style="width: 235px;">
-                                [[#{greenCity.pages.table.role}]]
-                                <img id="role-icon" class="sorting" src="/img/arrow-up.svg" alt="arrow-icon" onclick="sortByFieldName('role')">
-                                <span class="table-filter-icon"></span>
-                            </th>
-                            <th style="width: 131px;">
-                                [[#{greenCity.pages.table.status}]]
-                                <img id="tags-icon" class="sorting" src="/img/arrow-up.svg" alt="arrow-icon" onclick="sortByFieldName('userStatus')">
-                                <span class="table-filter-icon"></span>
-                            </th>
-                            <th>
-                                <span>[[#{greenCity.pages.table.actions}]]</span>
-                            </th>
-                        </tr>
-                        <!--Table content-->
-                        </thead>
-                        <th:block class="list-of" th:each="user, iterStatus :${users.getPage()}">
-                            <tr class="clickable-row" th:href="@{/management/users/{id}/friends/(id=${user.id})}">
-                                <td>
-                                    <span class="custom-checkbox">
-                                        <input type="checkbox" th:id="checkbox+${iterStatus.count}"
-                                               name="options[]" th:value="${user.id}"
-                                               th:onclick="'updateCheckBoxCount('+${iterStatus.count}+')'">
-                                        <label th:for="checkbox+${iterStatus.count}"></label>
-                                    </span>
-                                </td>
-                                <td style="width: 50px;">
-                                    <a class="id-link" th:text="${user.id}" th:href="@{/management/users/{id} (id=${user.id})}"/>
-                                </td>
-                                <td th:text="${user.name}"></td>
-                                <td th:text="${user.email}"></td>
-                                <td class="column-credo-text" th:text="${user.userCredo}"></td>
-                                <td class="column-role">
-                                    <div class="dropdown role" >
-                                        <button class="dropbtn role"  th:text="${user.getRole().toString()}">
-                                        </button>
-                                        <img class="rotate dropdown-arrow" src="/img/arrow-down.svg" alt="arrow-icon">
-                                        <div class="dropdown-content role">
-                                            <a
-                                                    th:each="role : ${T(greencity.enums.Role).values()}"
-                                                    th:if="${!role.equals(user.getRole())}"
-                                                    th:text="${role}"
-                                                    th:value="${role}"
-                                                    th:selected="${role} == ${user.getRole()}"
-                                                    th:data-role="${role}"
-                                                    th:data-userId="${user.id}"
-                                                    onclick="changeRole(this.getAttribute('data-userId'), this.getAttribute('data-role'));"
-                                            ></a>
-                                        </div>
+                            </td>
+                            <td style="width: 50px;">
+                                <a class="id-link" th:text="${user.id}" th:href="@{/management/users/{id} (id=${user.id})}"/>
+                            </td>
+                            <td th:text="${user.name}"></td>
+                            <td th:text="${user.email}"></td>
+                            <td class="column-credo-text" th:text="${user.userCredo}"></td>
+                            <td class="column-role">
+                                <div class="dropdown role" >
+                                    <button class="dropbtn role"  th:text="${user.getRole().toString()}">
+                                    </button>
+                                    <img class="rotate dropdown-arrow" src="/img/arrow-down.svg" alt="arrow-icon">
+                                    <div class="dropdown-content role">
+                                        <a
+                                                th:each="role : ${T(greencity.enums.Role).values()}"
+                                                th:if="${!role.equals(user.getRole())}"
+                                                th:text="${role}"
+                                                th:value="${role}"
+                                                th:selected="${role} == ${user.getRole()}"
+                                                th:data-role="${role}"
+                                                th:data-userId="${user.id}"
+                                                onclick="changeRole(this.getAttribute('data-userId'), this.getAttribute('data-role'));"
+                                        ></a>
                                     </div>
-                                </td>
-                                <td
-                                    th:class="|${user.userStatus.name().equals('BLOCKED') ? 'whiteHover cyan':''}
-                                    ${user.userStatus.name().equals('ACTIVATED') ? 'whiteHover lightgreen':''}
-                                    ${user.userStatus.name().equals('CREATED') ? 'whiteHover lightmustard':''}
-                                    ${user.userStatus.name().equals('DEACTIVATED') ? 'whiteHover lightpink':''}|"
-                                >
-                                    <div class="dropdown status" >
-                                        <button class="dropbtn status"  th:text="${user.userStatus.name()}">
-                                        </button>
-                                        <img class="rotate dropdown-arrow" src="/img/arrow-down.svg" alt="arrow-icon">
-                                        <div class="dropdown-content status">
-                                            <a
-                                               th:each="userStatus : ${T(greencity.enums.UserStatus).values()}"
-                                               th:text="${userStatus}"
-                                               th:value="${userStatus}"
-                                               th:selected="${userStatus} == ${user.getUserStatus()}"
-                                               th:data-status="${userStatus}"
-                                               th:data-userId="${user.id}"
-                                               onclick="changeStatus(this.getAttribute('data-userId'), this.getAttribute('data-status'));"
-                                            ></a>
-                                        </div>
+                                </div>
+                            </td>
+                            <td
+                                th:class="|${user.userStatus.name().equals('BLOCKED') ? 'whiteHover cyan':''}
+                                ${user.userStatus.name().equals('ACTIVATED') ? 'whiteHover lightgreen':''}
+                                ${user.userStatus.name().equals('CREATED') ? 'whiteHover lightmustard':''}
+                                ${user.userStatus.name().equals('DEACTIVATED') ? 'whiteHover lightpink':''}|"
+                            >
+                                <div class="dropdown status" >
+                                    <button class="dropbtn status"  th:text="${user.userStatus.name()}">
+                                    </button>
+                                    <img class="rotate dropdown-arrow" src="/img/arrow-down.svg" alt="arrow-icon">
+                                    <div class="dropdown-content status">
+                                        <a
+                                           th:each="userStatus : ${T(greencity.enums.UserStatus).values()}"
+                                           th:text="${userStatus}"
+                                           th:value="${userStatus}"
+                                           th:selected="${userStatus} == ${user.getUserStatus()}"
+                                           th:data-status="${userStatus}"
+                                           th:data-userId="${user.id}"
+                                           onclick="changeStatus(this.getAttribute('data-userId'), this.getAttribute('data-status'));"
+                                        ></a>
                                     </div>
-                                </td>
-                                <td>
-                                    <a th:if="${user.getId()} != ${currentUser.getId()}"
-                                       th:href="'#editUserModal'+${user.getId()}"
-                                       id="editUserModalBtn" class="edit eBtn" data-toggle="modal">
-                                        <i class="material-icons" data-toggle="tooltip" th:title="#{greenCity.pages.edit}">&#xE254;</i>
-                                    </a>
-                                    <!--Edit user Modal HTML -->
-                                    <div th:id="'editUserModal'+${user.getId()}" class="modal fade">
-                                        <div class="modal-dialog">
-                                            <div class="modal-content">
-                                                <form th:id="'editUserForm'+${user.getId()}" class="needs-validation" novalidate>
-                                                    <div class="modal-header">
-                                                        <h4 class="modal-title">Edit User</h4>
-                                                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                                </div>
+                            </td>
+                            <td>
+                                <a th:if="${user.getId()} != ${currentUser.getId()}"
+                                   th:href="'#editUserModal'+${user.getId()}"
+                                   id="editUserModalBtn" class="edit eBtn" data-toggle="modal">
+                                    <i class="material-icons" data-toggle="tooltip" th:title="#{greenCity.pages.edit}">&#xE254;</i>
+                                </a>
+                                <!--Edit user Modal HTML -->
+                                <div th:id="'editUserModal'+${user.getId()}" class="modal fade">
+                                    <div class="modal-dialog">
+                                        <div class="modal-content">
+                                            <form th:id="'editUserForm'+${user.getId()}" class="needs-validation" novalidate>
+                                                <div class="modal-header">
+                                                    <h4 class="modal-title">Edit User</h4>
+                                                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                                                </div>
+                                                <div class="modal-body" th:id="'editModalBody'+${user.getId()}">
+                                                    <div class="form-group">
+                                                        <label>ID</label>
+                                                        <input th:value="${user.getId()}" type="text" class="form-control" id="id" name="id" readonly required>
                                                     </div>
-                                                    <div class="modal-body" th:id="'editModalBody'+${user.getId()}">
-                                                        <div class="form-group">
-                                                            <label>ID</label>
-                                                            <input th:value="${user.getId()}" type="text" class="form-control" id="id" name="id" readonly required>
-                                                        </div>
-                                                        <div class="form-group">
-                                                            <label>User name</label>
-                                                            <input th:value="${user.getName()}" type="text"  class="form-control" id="name" name="name" minlength="6" maxlength="30" required>
-                                                            <div class="invalid-feedback">
-                                                                [[#{greenCity.user.page.name.validation.error}]]
-                                                            </div>
-                                                        </div>
-                                                        <div class="form-group">
-                                                            <label>Email</label>
-                                                            <input th:value="${user.getEmail()}" type="email" class="form-control" id="email" name="email" required>
-                                                            <div class="invalid-feedback">
-                                                                [[#{greenCity.user.page.email.validation.error}]]
-                                                            </div>
-                                                        </div>
-                                                        <div class="form-group">
-                                                            <label>Credo</label>
-                                                            <input th:value="${user.getUserCredo()}" type="text" class="form-control" id="userCredo" name="userCredo" required>
-                                                        </div>
-                                                        <div class="form-group">
-                                                            <label>Role</label>
-                                                            <select class="form-control" name="role" id="role">
-                                                                <option th:each="role : ${T(greencity.enums.Role).values()}"
-                                                                        th:value="${role}"
-                                                                        th:text="${role}"
-                                                                        th:selected="${role} == ${user.getRole()}">
-                                                                </option>
-                                                            </select>
-                                                            <div class="invalid-feedback">
-                                                                [[#{greenCity.user.page.role.validation.error}]]
-                                                            </div>
+                                                    <div class="form-group">
+                                                        <label>User name</label>
+                                                        <input th:value="${user.getName()}" type="text"  class="form-control" id="name" name="name" minlength="6" maxlength="30" required>
+                                                        <div class="invalid-feedback">
+                                                            [[#{greenCity.user.page.name.validation.error}]]
                                                         </div>
-                                                        <div class="form-group">
-                                                            <label for="userStatus">Status</label>
-                                                            <input th:value="${user.getUserStatus().name()}" type="text" class="form-control" id="userStatus" name="userStatus" required>
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label>Email</label>
+                                                        <input th:value="${user.getEmail()}" type="email" class="form-control" id="email" name="email" required>
+                                                        <div class="invalid-feedback">
+                                                            [[#{greenCity.user.page.email.validation.error}]]
                                                         </div>
-                                                        <div class="form-group">
-                                                            <span th:id="serverErrorEditModal+${user.getId()}" class="errorSpan"></span>
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label>Credo</label>
+                                                        <input th:value="${user.getUserCredo()}" type="text" class="form-control" id="userCredo" name="userCredo" required>
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label>Role</label>
+                                                        <select class="form-control" name="role" id="role">
+                                                            <option th:each="role : ${T(greencity.enums.Role).values()}"
+                                                                    th:value="${role}"
+                                                                    th:text="${role}"
+                                                                    th:selected="${role} == ${user.getRole()}">
+                                                            </option>
+                                                        </select>
+                                                        <div class="invalid-feedback">
+                                                            [[#{greenCity.user.page.role.validation.error}]]
                                                         </div>
                                                     </div>
-                                                    <div class="modal-footer">
-                                                        <input type="button" class="btn btn-default btn-tertiary" data-dismiss="modal"
-                                                               value="Cancel">
-                                                        <input type="button" class="btn btn-success btn-primary" th:value="#{greenCity.pages.popup.save.}" th:onclick="'updateUser(' + ${user.getId()} + ');'" id="submitEditBtn">
+                                                    <div class="form-group">
+                                                        <label for="userStatus">Status</label>
+                                                        <input th:value="${user.getUserStatus().name()}" type="text" class="form-control" id="userStatus" name="userStatus" required>
                                                     </div>
-                                                </form>
-                                            </div>
+                                                    <div class="form-group">
+                                                        <span th:id="serverErrorEditModal+${user.getId()}" class="errorSpan"></span>
+                                                    </div>
+                                                </div>
+                                                <div class="modal-footer">
+                                                    <input type="button" class="btn btn-default btn-tertiary" data-dismiss="modal"
+                                                           value="Cancel">
+                                                    <input type="button" class="btn btn-success btn-primary" th:value="#{greenCity.pages.popup.save.}" th:onclick="'updateUser(' + ${user.getId()} + ');'" id="submitEditBtn">
+                                                </div>
+                                            </form>
                                         </div>
                                     </div>
-                                </td>
-                            </tr>
-                        </th:block>
-                    </table>
-                    <div class="clearfix" th:if="${users.getPage().size() > 0}">
-                        <ul class="pagination">
-                            <!-- Previous page button -->
-                            <li class="page-item" th:classappend="${isFirst} ? 'disabled' : ''">
-                                <a class="page-link" th:if="${!isFirst}"
-                                   th:href="@{/management/users(page=${previousPage}, size=${pageSize}, sort=${sortModel},
-                                   query=${request.query}, role=${request.role}, status=${request.status})}">
-                                    <i class="arrow fas fa-chevron-left"></i>
-                                </a>
-                                <a class="page-link" th:if="${isFirst}">
-                                    <i class="arrow fas fa-chevron-left"></i>
-                                </a>
-                            </li>
+                                </div>
+                            </td>
+                        </tr>
+                    </th:block>
+                </table>
+                <div class="clearfix" th:if="${users.getPage().size() > 0}">
+                    <ul class="pagination">
+                        <!-- Previous page button -->
+                        <li class="page-item" th:classappend="${isFirst} ? 'disabled' : ''">
+                            <a class="page-link" th:if="${!isFirst}"
+                               th:href="@{/management/users(page=${previousPage}, size=${pageSize}, sort=${sortModel},
+                               query=${request.query}, role=${request.role}, status=${request.status})}">
+                                <i class="arrow fas fa-chevron-left"></i>
+                            </a>
+                            <a class="page-link" th:if="${isFirst}">
+                                <i class="arrow fas fa-chevron-left"></i>
+                            </a>
+                        </li>
 
-                            <!-- Page numbers -->
-                            <li class="page-item" th:each="pageNum : ${pageNumbers}"
-                                th:if="${pageNum >= 0 && pageNum < users.getTotalPages()}"
-                                th:classappend="${pageNum == pageNumber} ? 'active' : ''">
-                                <a class="page-link"
-                                   th:href="@{/management/users(page=${pageNum}, size=${pageSize}, sort=${sortModel},
-                                   query=${request.query}, role=${request.role}, status=${request.status})}">
-                                    [[${pageNum + 1}]]
-                                </a>
-                            </li>
+                        <!-- Page numbers -->
+                        <li class="page-item" th:each="pageNum : ${pageNumbers}"
+                            th:if="${pageNum >= 0 && pageNum < users.getTotalPages()}"
+                            th:classappend="${pageNum == pageNumber} ? 'active' : ''">
+                            <a class="page-link"
+                               th:href="@{/management/users(page=${pageNum}, size=${pageSize}, sort=${sortModel},
+                               query=${request.query}, role=${request.role}, status=${request.status})}">
+                                [[${pageNum + 1}]]
+                            </a>
+                        </li>
 
-                            <!-- Next page button -->
-                            <li class="page-item" th:classappend="${isLast} ? 'disabled' : ''">
-                                <a class="page-link" th:if="${!isLast}"
-                                   th:href="@{/management/users(page=${nextPage}, size=${pageSize}, sort=${sortModel},
-                                   query=${request.query}, role=${request.role}, status=${request.status})}">
-                                    <i class="arrow fas fa-chevron-right"></i>
-                                </a>
-                                <a class="page-link" th:if="${isLast}">
-                                    <i class="arrow fas fa-chevron-right"></i>
-                                </a>
-                            </li>
-                        </ul>
-                    </div>
-                    <!-- End of Paging -->
-                    <!-- Deactivate user Modal HTML -->
-                    <div id="deactivateUserModal" class="modal fade">
-                        <div class="modal-dialog">
-                            <div class="modal-content">
-                                <form id="deactivateUserForm">
-                                    <div class="modal-header">
-                                        <h4 class="modal-title-deac">[[#{greenCity.user.page.popup.deactivated.h}]]</h4>
-                                    </div>
-                                    <div class="modal-body">
-                                        <p class="deactivate-warning">[[#{greenCity.user.page.popup.deactivated.p1}]]</p>
-                                        <div class="modal-reasons">
-                                            <input type="checkbox" id="first-click" class="deactivate-checkbox">
-                                            <p class="deactivation-reasons">[[#{greenCity.user.page.popup.deactivated.fieldset.input}]]</p><br>
-                                        </div>
-                                        <div class="modal-reasons">
-                                            <input type="checkbox" id="second-click" class="deactivate-checkbox">
-                                            <p class="deactivation-reasons">[[#{greenCity.user.page.popup.deactivated.fieldset.input1}]]</p><br>
-                                        </div>
-                                        <div class="modal-reasons">
-                                            <input type="checkbox" id="other" onclick="otherCheck()" class="deactivate-checkbox">
-                                            <p class="deactivation-reasons">[[#{greenCity.user.page.popup.deactivated.fieldset.input2}]]</p><br>
-                                        </div>
-                                        <div id="user-lang" style="display: none">
-                                        </div>
-                                        <input type="text" id="othertext" style="display: none" class="custom-reason">
-                                        <span th:id="errorDeactivateUser" class="errorSpan"></span>
-                                    </div>
-                                    <div class="modal-footer">
-                                        <input type="button" class="btn btn-default btn-tertiary" data-dismiss="modal"
-                                               th:value="#{greenCity.pages.popup.cancel.}">
-                                        <a href="" id="deactivateOneSubmit" class="btn btn-remove" disabled="true">
-                                            <div>[[#{greenCity.user.page.deactivated}]]</div>
-                                        </a>
-                                    </div>
-                                </form>
-                            </div>
-                        </div>
-                    </div>
-                    <!-- Activate user Modal HTML -->
-                    <div id="activateUserModal" class="modal fade">
-                        <div class="modal-dialog">
-                            <div class="modal-content">
-                                <!--<form id="activateUserForm">-->
+                        <!-- Next page button -->
+                        <li class="page-item" th:classappend="${isLast} ? 'disabled' : ''">
+                            <a class="page-link" th:if="${!isLast}"
+                               th:href="@{/management/users(page=${nextPage}, size=${pageSize}, sort=${sortModel},
+                               query=${request.query}, role=${request.role}, status=${request.status})}">
+                                <i class="arrow fas fa-chevron-right"></i>
+                            </a>
+                            <a class="page-link" th:if="${isLast}">
+                                <i class="arrow fas fa-chevron-right"></i>
+                            </a>
+                        </li>
+                    </ul>
+                </div>
+                <!-- End of Paging -->
+                <!-- Deactivate user Modal HTML -->
+                <div id="deactivateUserModal" class="modal fade">
+                    <div class="modal-dialog">
+                        <div class="modal-content">
+                            <form id="deactivateUserForm">
                                 <div class="modal-header">
-                                    <h4 class="modal-title-act">[[#{greenCity.user.page.popup.activated.h}]]</h4>
+                                    <h4 class="modal-title-deac">[[#{greenCity.user.page.popup.deactivated.h}]]</h4>
                                 </div>
                                 <div class="modal-body">
-                                    <p class="modal-body-act">[[#{greenCity.user.page.popup.activated.p1}]]</p>
-                                    <p class="modal-body-act1">[[#{greenCity.user.page.popup.activated.p1.was}]]</p>
-                                </div>
-                                <div id="reasons">
+                                    <p class="deactivate-warning">[[#{greenCity.user.page.popup.deactivated.p1}]]</p>
+                                    <div class="modal-reasons">
+                                        <input type="checkbox" id="first-click" class="deactivate-checkbox">
+                                        <p class="deactivation-reasons">[[#{greenCity.user.page.popup.deactivated.fieldset.input}]]</p><br>
+                                    </div>
+                                    <div class="modal-reasons">
+                                        <input type="checkbox" id="second-click" class="deactivate-checkbox">
+                                        <p class="deactivation-reasons">[[#{greenCity.user.page.popup.deactivated.fieldset.input1}]]</p><br>
+                                    </div>
+                                    <div class="modal-reasons">
+                                        <input type="checkbox" id="other" onclick="otherCheck()" class="deactivate-checkbox">
+                                        <p class="deactivation-reasons">[[#{greenCity.user.page.popup.deactivated.fieldset.input2}]]</p><br>
+                                    </div>
+                                    <div id="user-lang" style="display: none">
+                                    </div>
+                                    <input type="text" id="othertext" style="display: none" class="custom-reason">
+                                    <span th:id="errorDeactivateUser" class="errorSpan"></span>
                                 </div>
                                 <div class="modal-footer">
                                     <input type="button" class="btn btn-default btn-tertiary" data-dismiss="modal"
                                            th:value="#{greenCity.pages.popup.cancel.}">
-                                    <a href="" id="activateOneSubmit" class="btn btn-success btn-primary">
-                                        <div>[[#{greenCity.user.page.popup.activated.div}]]</div>
+                                    <a href="" id="deactivateOneSubmit" class="btn btn-remove" disabled="true">
+                                        <div>[[#{greenCity.user.page.deactivated}]]</div>
                                     </a>
                                 </div>
-                                <!--</form>-->
-                            </div>
+                            </form>
                         </div>
                     </div>
-                    <!-- Deactivate all selected users Modal HTML -->
-                    <div id="deactivateAllSelectedModal" class="modal fade">
-                        <div class="modal-dialog">
-                            <div class="modal-content">
-                                <form id="">
-                                    <div class="modal-header">
-                                        <h4 class="modal-title-deac">[[#{greenCity.pages.popup.delete.all.h}]]</h4>
-                                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                                    </div>
-                                    <div class="modal-body">
-                                        <p>[[#{greenCity.pages.popup.delete.all.h1}]]</p>
-                                        <p class="text-warning"><small>[[#{greenCity.pages.popup.delete.all.h2}]]</small></p>
-                                    </div>
-                                    <div class="modal-footer">
-                                        <input type="button" class="wbtn btn-default btn-tertiary" data-dismiss="modal"
-                                               th:value="#{greenCity.pages.popup.cancel.}">
-                                        <a href="" id="deactivateAllSubmit" class="btn-remove" style="display: flex; align-items: center;">
-                                            <div>[[#{greenCity.user.page.deactivated}]]</div>
-                                        </a>
-                                    </div>
-                                </form>
+                </div>
+                <!-- Activate user Modal HTML -->
+                <div id="activateUserModal" class="modal fade">
+                    <div class="modal-dialog">
+                        <div class="modal-content">
+                            <!--<form id="activateUserForm">-->
+                            <div class="modal-header">
+                                <h4 class="modal-title-act">[[#{greenCity.user.page.popup.activated.h}]]</h4>
+                            </div>
+                            <div class="modal-body">
+                                <p class="modal-body-act">[[#{greenCity.user.page.popup.activated.p1}]]</p>
+                                <p class="modal-body-act1">[[#{greenCity.user.page.popup.activated.p1.was}]]</p>
+                            </div>
+                            <div id="reasons">
+                            </div>
+                            <div class="modal-footer">
+                                <input type="button" class="btn btn-default btn-tertiary" data-dismiss="modal"
+                                       th:value="#{greenCity.pages.popup.cancel.}">
+                                <a href="" id="activateOneSubmit" class="btn btn-success btn-primary">
+                                    <div>[[#{greenCity.user.page.popup.activated.div}]]</div>
+                                </a>
                             </div>
+                            <!--</form>-->
                         </div>
                     </div>
-                    <!-- User's friends Modal HTML -->
-                    <div id="userFriendsModal" class="modal fade">
-                        <div class="modal-dialog modal-dialog-scrollable">
-                            <div class="modal-content">
-                                <h4 class="modal-title">User's Friends</h4>
+                </div>
+                <!-- Deactivate all selected users Modal HTML -->
+                <div id="deactivateAllSelectedModal" class="modal fade">
+                    <div class="modal-dialog">
+                        <div class="modal-content">
+                            <form id="">
+                                <div class="modal-header">
+                                    <h4 class="modal-title-deac">[[#{greenCity.pages.popup.delete.all.h}]]</h4>
+                                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                                </div>
                                 <div class="modal-body">
-                                    <table class="table table-hover" id="friendsTable">
-                                        <thead>
-                                        <tr class="table-primary">
-                                            <th>ID</th>
-                                            <th>Username</th>
-                                            <th>Email</th>
-                                            <th>Credo</th>
-                                            <th>Role</th>
-                                            <th>Status</th>
-                                        </tr>
-                                        </thead>
-                                        <tbody></tbody>
-                                    </table>
+                                    <p>[[#{greenCity.pages.popup.delete.all.h1}]]</p>
+                                    <p class="text-warning"><small>[[#{greenCity.pages.popup.delete.all.h2}]]</small></p>
+                                </div>
+                                <div class="modal-footer">
+                                    <input type="button" class="wbtn btn-default btn-tertiary" data-dismiss="modal"
+                                           th:value="#{greenCity.pages.popup.cancel.}">
+                                    <a href="" id="deactivateAllSubmit" class="btn-remove" style="display: flex; align-items: center;">
+                                        <div>[[#{greenCity.user.page.deactivated}]]</div>
+                                    </a>
                                 </div>
+                            </form>
+                        </div>
+                    </div>
+                </div>
+                <!-- User's friends Modal HTML -->
+                <div id="userFriendsModal" class="modal fade">
+                    <div class="modal-dialog modal-dialog-scrollable">
+                        <div class="modal-content">
+                            <h4 class="modal-title">User's Friends</h4>
+                            <div class="modal-body">
+                                <table class="table table-hover" id="friendsTable">
+                                    <thead>
+                                    <tr class="table-primary">
+                                        <th>ID</th>
+                                        <th>Username</th>
+                                        <th>Email</th>
+                                        <th>Credo</th>
+                                        <th>Role</th>
+                                        <th>Status</th>
+                                    </tr>
+                                    </thead>
+                                    <tbody></tbody>
+                                </table>
                             </div>
                         </div>
                     </div>