Changeset ad4243e in Git for src/main/resources/templates

Timestamp:

02/07/22 21:26:03 (3 years ago)

Author:

GitHub <noreply@…>

Branches:

main

Children:

0226942

Parents:

7f36551 (diff), 3c0f9a9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Mato-77 <56981531+Mato-77@…> (02/07/22 21:26:03)

git-committer:

GitHub <noreply@…> (02/07/22 21:26:03)

Message:

Merge pull request #2 from partaloski/master

Added genre liking, fixed counter, improved paging, improved searches

Location:

src/main/resources/templates

Files:

• genres.html (modified) (1 diff)
• moviesListPaged.html (added)
• personShow.html (modified) (1 diff)
• personsList.html (modified) (1 diff)

src/main/resources/templates/genres.html

@@ -1 @@
-<div class="container mb-4">
-  <div class="row">
-    <div class="col-12">
-      <div class="table-responsive">
-        <table class="table table-striped">
-          <thead>
-          <tr>
-            <th scope="col">Име</th>
-            <th scope="col">Лајкови</th>
-          </tr>
-          </thead>
-          <tbody>
-          <tr th:each="genre : ${genres}" class="elements">
-            <td th:text="${genre.getName()}"></td>
-            <td th:text="${genre.getLikes()}"></td>
+<div class="container mb-4" xmlns:sec="http://www.w3.org/1999/xhtml">
 
-          </tr>
-          </tbody>
-        </table>
+    <div class="row">
+      <div class="col-12">
+        <div class="table-responsive">
+          <table class="table table-striped">
+            <thead>
+            <tr>
+              <th scope="col">Име</th>
+              <th scope="col">Лајкови</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr th:each="genre : ${genres}" class="elements">
+              <td th:text="${genre.getName()}"></td>
+              <td th:text="${genre.getLikes()}" th:id="${genre.getGenreId()+'genre'}"></td>
+              <td>
+                <th:block sec:authorize="isAuthenticated()" th:each="g: ${allGenres}" th:if="${g.getGenreId() == genre.getGenreId()}">
+                  <a class="btn btn-success button-add-genre-liked-list" th:genre-id="${g.getGenreId()}" th:user-id="${user.getUserId()}" th:if="${!likedGenres.contains(g)}">❤</a>
+                  <a class="btn btn-danger button-remove-genre-liked-list" th:genre-id="${g.getGenreId()}" th:user-id="${user.getUserId()}" th:if="${likedGenres.contains(g)}">💔</a>
+                </th:block>
+              </td>
+            </tr>
+            </tbody>
+          </table>
+        </div>
       </div>
-    </div>
+
   </div>
 </div>

src/main/resources/templates/personShow.html

@@ -30 +30 @@
         </div>
     </div>
+    <div style="width: 45%; margin: 25px; float:left; background-color: rgb(200,200,200); padding: 10px; border-radius: 5px">
+        <h2>
+            <span>Бројот на оцени кои филмот ги добил:</span>
+            <span th:text="${movie.getRates().size()}"></span>
+        </h2>
+        <hr>
+        <div th:each="rating: ${movie.getRates()}" style="margin-bottom: 10px; border: 2px solid gray; border-radius: 10px; background-color: lightblue; padding: 10px; border-radius: 10px; min-height: 130px;">
+            <div style="width: 60%; float:left;">
+                <p th:text="${rating.getReason()}" style="text-align: justify"></p>
+            </div>
+            <div style="width: 30%; float:right; background-color: darkorange; border-radius: 10px 30px; color: whitesmoke; padding: 10px;">
+                <h2 style="text-align: center">Rated:</h2>
+                <p th:text="${rating.getStarsRated() + ' out of 10 stars'}" style="text-align: center"></p>
+            </div>
+        </div>
+    </div>
+    <div style="width: 45%; margin: 25px; float:left; background-color: rgb(200,200,200); padding: 10px; border-radius: 5px">
+        <h2>
+            <span>Бројот на лајкови кои филмот ги добил:</span>
+            <span th:text="${movie.getLikes().size()}"></span>
+        </h2>
+        <hr>
+        <div th:each="liked: ${movie.getLikes()}" style="margin-bottom: 10px; border: 2px solid gray; border-radius: 10px; background-color: lightblue; padding: 10px; border-radius: 10px; min-height: 60px;">
+            <div style="width: 100%; float:left;">
+                <h3  style="text-align: center">
+                    <span th:text="${liked.getUser().getName() + ' ' + liked.getUser().getSurname()}"></span>
+                    <span style="color: green; font-size: 100%" >✔</span>
+                </h3>
+            </div>
+        </div>
+    </div>
 </div>

src/main/resources/templates/personsList.html

@@ -57 +57 @@
 
                             </td>
+
+                            <a class="bottom-heart btn btn-success button-add-favourite-list"
+                               th:movie-id="${person.getMovieId()}"
+                               th:user-id="${user.getUserId()}"
+                               th:if="${!likedPersons.contains(movie)}">❤</a>
+
+                            <a class="bottom-heart btn btn-danger button-remove-favourite-list"
+                               th:movie-id="${person.getMovieId()}" th:user-id="${user.getUserId()}"
+                               th:if="${likedPersons.contains(movie)}">💔</a>
+
+
                             </th:block>