Changeset 42d565b in Git for src/main/resources/templates/moviesList.html

Timestamp:

02/06/22 21:38:16 (3 years ago)

Author:

GitHub <noreply@…>

Branches:

main

Children:

7f36551

Parents:

5b447b0 (diff), 2efe93e (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/06/22 21:38:16)

git-committer:

GitHub <noreply@…> (02/06/22 21:38:16)

Message:

Merge pull request #1 from partaloski/master

Fixed and added a better front end, improved clarity

File:

• src/main/resources/templates/moviesList.html (modified) (7 diffs)

src/main/resources/templates/moviesList.html

@@ -1 +1 @@
 <div xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.w3.org/1999/xhtml">
-    <div th:replace="fragments/searchBarGenre">
 
+    <div style="width: 70%; margin: auto">
+        <div th:replace="fragments/searchBarName"></div>
+        <div th:replace="fragments/searchBarGenre"></div>
     </div>
 
@@ -9 +11 @@
 
     <div class="container mb-4">
+        <div class="row" th:each="row: ${movie_rows}" >
+            <div class="col-md-3" th:each="movie: ${row}" >
+                    <div class="card-body card bg-image" th:style="'background:url(' + ${movie.getImageUrl()} + ') no-repeat center #eee;'">
+                        <a class="card-text-center" style="color: white" th:href="@{'/movies/{id}' (id=${movie.getMovieId()})}" >
+                        <h3 class="card-title title" th:text="${movie.getTitle()}"></h3>
+                        </a>
+                        <h3 class="card-text bottom" th:text="${'Rated '+movie.getImdbRating()}"></h3>
+                        <th:block sec:authorize="isAuthenticated()">
+                            <a class="bottom-heart btn btn-success button-add-favourite-list" th:movie-id="${movie.getMovieId()}" th:user-id="${user.getUserId()}" th:if="${!likedMovies.contains(movie)}">❤</a>
+                            <a class="bottom-heart btn btn-danger button-remove-favourite-list" th:movie-id="${movie.getMovieId()}" th:user-id="${user.getUserId()}" th:if="${likedMovies.contains(movie)}">💔</a>
+                        </th:block>
+                    </div>
+            </div>
+        </div>
+    </div>
+    <!--<div class="container mb-4">
         <div class="row">
             <div class="col-12" th:if="${movies.size() > 0}">
@@ -19 +37 @@
                             <th scope="col">Датум издавање</th>
                             <th scope="col">Допаѓања</th>
-                            <th scope="col">Занрови</th>
+                            <th scope="col">Жанрови</th>
                             <th scope="col">Актери</th>
                             <th scope="col">Режисер</th>
@@ -37 +55 @@
                         <tbody>
                         <tr th:each="movie : ${movies}" class="elements">
-                            <td th:text="${movie.getTitle()}"></td>
+                            <td><a th:text="${movie.getTitle()}" th:href="@{'/movies/{id}' (id=${movie.getMovieId()})}"></a></td>
                             <td th:text="${movie.getDescription()}"></td>
                             <td th:text="${movie.getAiringDate()}"></td>
@@ -47 +65 @@
                             </td>
                             <td>
-                                <div th:each="a: ${movie.getActors()}" th:text="${a.getPerson().getName()} "></div>
+                                <div th:each="ac: ${movie.getActors()}">
+                                    <a th:href="@{'/persons/{id}' (id=${ac.getPerson().getPersonId()})}" th:text="${ac.getPerson().getName() + ' ' + ac.getPerson().getSurname()}"></a>
+                                </div>
                             </td>
-                            <td th:text="${movie.getDirector() != null ? movie.getDirector()?.getName() + ' '+ movie.getDirector()?.getSurname() : 'Не е додаен директор'}"></td>
+                            <td th:if="${movie.getDirector() != null}">
+                                <a th:href="@{'/persons/{id}' (id=${movie.getDirector().getPersonId()})}" th:text="${movie.getDirector().getName() + ' ' + movie.getDirector().getSurname()}"></a>
+                            </td>
+                            <td th:if="${movie.getDirector() == null}">
+                                Филмот нема режисер.
+                            </td>
                             <td>
                                 <a class="btn btn-primary" th:href="@{'discussions/all/{id}?type=M' (id=${movie.getMovieId()})}" >Прегледај дискусии</a>
@@ -55 +80 @@
                             <th:block sec:authorize="isAuthenticated()">
                             <td>
-                                <a class="btn btn-primary button-add-favourite-list" th:movie-id="${movie.getMovieId()}" th:user-id="${user.getUserId()}" th:if="${!likedMovies.contains(movie)}">Додади во омилена листа</a>
-                                <a class="btn btn-primary button-remove-favourite-list" th:movie-id="${movie.getMovieId()}" th:user-id="${user.getUserId()}" th:if="${likedMovies.contains(movie)}">Избриши од омилена листа</a>
-
+                                <a class="btn btn-success button-add-favourite-list" th:movie-id="${movie.getMovieId()}" th:user-id="${user.getUserId()}" th:if="${!likedMovies.contains(movie)}">Додади во омилена листа</a>
+                                <a class="btn btn-warning button-remove-favourite-list" th:movie-id="${movie.getMovieId()}" th:user-id="${user.getUserId()}" th:if="${likedMovies.contains(movie)}">Избриши од омилена листа</a>
                             </td>
                             <td>
-                                <a class="btn btn-primary button-add-grade-movie" th:movie-id="${movie.getMovieId()}">Остави оценка</a>
+                                <a class="btn btn-success button-add-grade-movie" th:movie-id="${movie.getMovieId()}">Остави оценка</a>
                             </td>
                             <td>
-                                <a class="btn btn-primary" th:href="@{'/movies/{id}/edit' (id=${movie.getMovieId()})}">Промени</a>
+                                <a class="btn btn-warning" th:href="@{'/movies/{id}/edit' (id=${movie.getMovieId()})}">Измени</a>
                             </td>
                             <td>
-                                <a class="btn btn-primary button-delete-movie" th:movie-id="${movie.getMovieId()}">Избриши филм</a>
+                                <a class="btn btn-danger button-delete-movie" th:movie-id="${movie.getMovieId()}">Избриши филм</a>
                             </td>
                             </th:block>
@@ -75 +99 @@
             </div>
         </div>
-    </div>
+    </div>-->
 
 </div>