Changeset 0226942 in Git for src/main/resources/templates/discussion.html

Timestamp:

02/08/22 22:07:07 (2 years ago)

Author:

GitHub <noreply@…>

Branches:

main

Children:

967b414

Parents:

ad4243e (diff), c02189f (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/08/22 22:07:07)

git-committer:

GitHub <noreply@…> (02/08/22 22:07:07)

Message:

Merge pull request #3 from partaloski/master

Added new core functionalities, fixed bugs and improved visual clarity

File:

• src/main/resources/templates/discussion.html (modified) (2 diffs)

src/main/resources/templates/discussion.html

@@ -1 +1 @@
 <div xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.w3.org/1999/xhtml">
     <div style="width: 85%; text-align: justify; margin: auto; clear: both">
-        <div>
-            <h1 th:text="${disc.getTitle()}" style="width: 80%; float: left"></h1>
+        <div style="background-color: rgba(128,128,128, 0.2); border-radius: 20px; padding: 20px">
+            <h1 th:text="${disc.getTitle()}" style="width: 80%; display: inline; height: fit-content; clear: both"></h1>
         </div>
-        <hr><br><br>
+        <hr>
         <div>
             <h5 th:text="${disc.getText()}" style="width: 90%; margin: auto; background-color: lightblue; border-radius: 4px; padding: 20px"></h5>
         </div>
-        <br><br><br>
+        <br>
+        <h4>
+            <span th:if="${!disc.getUser().equals(user)}" sec:authorize="isAuthenticated()">
+                <a class='btn btn-success button-like-discussion' th:if="${!likedDiscussions.contains(disc)}" th:discussion-id="${disc.getDiscussionId()}" th:user-id="${user.getUserId()}" >❤</a>
+                <a class='btn btn-danger button-unlike-discussion' th:if="${likedDiscussions.contains(disc)}" th:discussion-id="${disc.getDiscussionId()}" th:user-id="${user.getUserId()}" >💔</a>
+            </span>
+            <span>Број на допаѓања:</span>
+            <span th:text="${likes}" id="likes_count"></span>
+        </h4>
+        <br>
         <h6 style="width: 60%; float:left;">
             <span th:text="${'Поставено од: '+disc.getUser().getUsername()}"></span>
@@ -17 +26 @@
         </h6>
         <div style="float: right"  sec:authorize="isAuthenticated()">
-        <a th:if="${disc.getUser().equals(user)}" class="btn btn-warning" th:href="@{'/discussions/add/{id}' (id=${disc.getDiscussionId()})}">Промени</a>
-        <a th:if="${disc.getUser().equals(user)}" class="btn btn-danger button-delete-discussion" th:discussion-id="${disc.getDiscussionId()}">Избриши</a>
-        <a class="btn btn-success" th:href="@{'/replies/add/{discussionId}' (discussionId=${disc.getDiscussionId()})}">Реплицирај</a>
-        </div>
+            <a th:if="${disc.getUser().equals(user)}" class="btn btn-warning" th:href="@{'/discussions/add/{id}' (id=${disc.getDiscussionId()})}">Промени</a>
+            <a th:if="${disc.getUser().equals(user)}" class="btn btn-danger button-delete-discussion" th:discussion-id="${disc.getDiscussionId()}">Избриши</a>
+            <a class="btn btn-success" th:href="@{'/replies/add/{discussionId}' (discussionId=${disc.getDiscussionId()})}">Реплицирај</a>
+
+        </div><br>
     </div>
     <table class="table table-striped" style="width: 70%; margin: auto;">