Changeset c02189f in Git for src/main/resources/templates/discussionsList.html

Timestamp:

02/08/22 20:13:23 (3 years ago)

Author:

Petar Partaloski <ppartaloski@…>

Branches:

main

Children:

0226942, 3fe36de

Parents:

3c0f9a9

Message:

Added new core functionalities, fixed bugs and improved visual clarity

File:

• src/main/resources/templates/discussionsList.html (modified) (5 diffs)

src/main/resources/templates/discussionsList.html

@@ -4 +4 @@
     </div>
     <div class="container mb-4">
-        <div class="row">
             <div class="col-12" th:if="${discussions.size() > 0}">
                 <div class="table-responsive">
@@ -10 +9 @@
                         <thead>
                         <tr>
+                            <th scope="col">За</th>
                             <th scope="col">Наслов</th>
-                            <th scope="col">Опис</th>
+                            <th scope="col">Допаѓања</th>
                             <th scope="col">Датум</th>
                             <th scope="col">Корисник</th>
@@ -27 +27 @@
                         <tbody>
                         <tr th:each="disc : ${discussions}" class="movie">
-                            <td th:text="${disc.getMovie() != null ? disc.getMovie().getTitle() : disc.getPerson().getName() + ' ' + disc.getPerson().getSurname()}"></td>
+                            <td th:text="${disc.getMovie() != null ? 'Филмот ' + disc.getMovie().getTitle() : 'Актерот ' + disc.getPerson().getName() + ' ' + disc.getPerson().getSurname()}"></td>
                             <td>
                                 <a th:text="${disc.getTitle()}" th:href="@{'/discussions/{id}' (id=${disc.getDiscussionId()})}"></a>
                             </td>
-                            <td th:text="${disc.getText()}"></td>
+                            <td th:each="like : ${likes}" th:if="${like.getDiscussionId().equals(disc.getDiscussionId())}" th:text="${like.getLikes()}" class="likes_count">
+                            </td>
                             <td th:text="${disc.getDate()}"></td>
                             <td th:text="${disc.getUser().getUsername()}"></td>
@@ -40 +41 @@
                             <td th:if="${!disc.getUser().equals(user)}"><a class="btn btn-success" th:href="@{'/replies/add/{discussionId}' (discussionId=${disc.getDiscussionId()})}">Реплицирај</a> </td>
                             <td th:if="${!disc.getUser().equals(user)}">
-                                <a class="btn btn-success">👍 </a>
-                                <a class="btn btn-danger">👎</a>
+                                <a class='btn btn-success button-like-discussion-alt' th:if="${!likedDiscussions.contains(disc)}" th:discussion-id="${disc.getDiscussionId()}" th:user-id="${user.getUserId()}" >❤</a>
+                                <a class='btn btn-danger button-unlike-discussion-alt' th:if="${likedDiscussions.contains(disc)}" th:discussion-id="${disc.getDiscussionId()}" th:user-id="${user.getUserId()}" >💔</a>
                             </td>
                             </th:block>
-
 
                         </tr>
@@ -51 +51 @@
                 </div>
             </div>
-        </div>
     </div>