komentarOcena

eec3757f · Milovan Samardzic · 56bced2d · eec3757f · eec3757f · eec3757f
Commit eec3757f authored Sep 19, 2022 by Milovan Samardzic
16 changed files
--- a/SkuciSe/src/main/java/com/example/SkuciSe/controller/OglasController.java
+++ b/SkuciSe/src/main/java/com/example/SkuciSe/controller/OglasController.java
@@ -87,6 +87,7 @@ public class OglasController
        }
        model.addAttribute("korisniciKomentari", korisniciKomentari);
+        model.addAttribute("vlasnik",kRepo.findById(oglas.getKorisnikId()));
        model.addAttribute("likesCount", lajkRepo.countLajks(oglasId));
        if( loggedUser!=null)
        {

--- a/SkuciSe/src/main/resources/templates/chat.html
+++ b/SkuciSe/src/main/resources/templates/chat.html
@@ -10,19 +10,10 @@
    <link rel="shortcut icon" type="image/x-icon" href="/images/logo.ico"/>
    <link href='https://fonts.googleapis.com/css?family=Jost' rel='stylesheet'>
    <link href="//maxcdn.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css" rel="stylesheet" id="bootstrap-css">
-    <link
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css"/>
-            rel="stylesheet"
-            href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css"
-    />
-    <!-- Favicon-->
    <link rel="icon" type="image/x-icon" href="assets/favicon.ico"/>
-    <!-- CSS only -->
    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css" rel="stylesheet"
          integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous">
-    <!-- Core theme CSS (includes Bootstrap)-->
    <link href="/css/style.css" rel="stylesheet"/>
@@ -53,7 +44,6 @@
    </div>
 </section>
-<!-- JavaScript Bundle with Popper -->
 <script src="//maxcdn.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/sockjs-client/1.6.1/sockjs.min.js"></script>

--- a/SkuciSe/src/main/resources/templates/index.html
+++ b/SkuciSe/src/main/resources/templates/index.html
@@ -9,19 +9,10 @@
    <link rel="shortcut icon" type="image/x-icon" href="/images/logo.ico"/>
    <link href='https://fonts.googleapis.com/css?family=Jost' rel='stylesheet'>
    <link href="//maxcdn.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css" rel="stylesheet" id="bootstrap-css">
-    <link
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css"/>
-            rel="stylesheet"
-            href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css"
-    />
-    <!-- Favicon-->
    <link rel="icon" type="image/x-icon" href="assets/favicon.ico"/>
-    <!-- CSS only -->
    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css" rel="stylesheet"
          integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous">
-    <!-- Core theme CSS (includes Bootstrap)-->
    <link href="/css/style.css" rel="stylesheet"/>
@@ -206,7 +197,6 @@
        </div></div>
    </footer>
 </div>
-<!-- JavaScript Bundle with Popper -->
 <script src="//maxcdn.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
 <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js"

--- a/SkuciSe/src/main/resources/templates/korisnik.html
+++ b/SkuciSe/src/main/resources/templates/korisnik.html
@@ -10,15 +10,8 @@
    <link href='https://fonts.googleapis.com/css?family=Jost' rel='stylesheet'>
    <link href="//maxcdn.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css" rel="stylesheet" id="bootstrap-css">
    <link rel="stylesheet" href="https://unpkg.com/aos@next/dist/aos.css"/>
-    <!-- Favicon-->
-    <link rel="icon" type="image/x-icon" href="assets/favicon.ico"/>
-    <!-- CSS only -->
    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css" rel="stylesheet"
          integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous">
-    <!-- Core theme CSS (includes Bootstrap)-->
    <link href="/css/oglasiStyle.css" rel="stylesheet"/>
@@ -247,9 +240,9 @@
                <div class="media g-mb-30 media-comment">
                    <div class="media-body u-shadow-v18 g-bg-secondary g-pa-30">
                        <img class="d-flex g-width-50 g-height-50 rounded-circle g-mt-3 g-mr-15"
-                             th:src="@{'data:image/png;charset=utf-8;base64,'+${korisniciKomentari[komentarStat.count -1].slika}}" alt="Image Description">
+                             th:src="@{'data:image/png;charset=utf-8;base64,'+${korisniciKomentari[komentarStat.index].slika}}" alt="Image Description">
                        <div class="g-mb-15">
-                            <h5 class="h5 g-color-gray-dark-v1 mb-0" th:text="${korisniciKomentari[komentarStat.count -1].ime + ' ' + korisniciKomentari[komentarStat.count -1].prezime}">John Doe</h5>
+                            <h5 class="h5 g-color-gray-dark-v1 mb-0" th:text="${korisniciKomentari[komentarStat.index].ime + ' ' + korisniciKomentari[komentarStat.index].prezime}">John Doe</h5>
                            <span class="g-color-gray-dark-v4 g-font-size-12" th:text="${komentar.vreme + ' ' + komentar.datum}"></span>
                        </div>

--- a/SkuciSe/src/main/resources/templates/lista-korisnika.html
+++ b/SkuciSe/src/main/resources/templates/lista-korisnika.html
@@ -9,15 +9,8 @@
    <link rel="shortcut icon" type="image/x-icon" href="/images/logo.ico"/>
    <link href='https://fonts.googleapis.com/css?family=Jost' rel='stylesheet'>
    <link href="//maxcdn.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css" rel="stylesheet" id="bootstrap-css">
-    <!-- Favicon-->
-    <link rel="icon" type="image/x-icon" href="assets/favicon.ico"/>
-    <!-- CSS only -->
    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css" rel="stylesheet"
          integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous">
-    <!-- Core theme CSS (includes Bootstrap)-->
    <link href="/css/style.css" rel="stylesheet"/>
@@ -129,7 +122,7 @@
                                        <p class="card-text">
                                            Email:<span th:text="${korisnik.getEmail()}"></span><br>
                                            Telefon:<span th:text="${korisnik.getTelefon()}"></span><br>
-                                            Grad:<span th:text="${gradovi[korisnikStat.count - 1]}"></span>
+                                            Grad:<span th:text="${gradovi[korisnikStat.index]}"></span>
                                        </p>
                                    </div>
                                </div>
@@ -188,7 +181,6 @@
        </div>
    </footer>
 </div>
-<!-- JavaScript Bundle with Popper -->
 <script src="//maxcdn.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
 <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js"

--- a/SkuciSe/src/main/resources/templates/lista-oglasa.html
+++ b/SkuciSe/src/main/resources/templates/lista-oglasa.html
@@ -10,15 +10,9 @@
    <link href='https://fonts.googleapis.com/css?family=Jost' rel='stylesheet'>
    <link href="//maxcdn.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css" rel="stylesheet" id="bootstrap-css">
    <link rel="stylesheet" href="https://unpkg.com/aos@next/dist/aos.css"/>
-    <!-- Favicon-->
    <link rel="icon" type="image/x-icon" href="assets/favicon.ico"/>
-    <!-- CSS only -->
    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css" rel="stylesheet"
          integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous">
-    <!-- Core theme CSS (includes Bootstrap)-->
    <link href="/css/oglasiStyle.css" rel="stylesheet"/>
@@ -140,9 +134,9 @@
                                           placeholder="$1,0000">
                                </div>
                            </div>
-                        </div> <!-- card-body.// -->
                        </div>
-                </article> <!-- card-group-item.// -->
+                    </div>
+                </article>
                <article class="card-group-item">
                    <header class="card-header">
                        <h6 class="title">Vrsta oglasa </h6>

--- a/SkuciSe/src/main/resources/templates/login.html
+++ b/SkuciSe/src/main/resources/templates/login.html
@@ -9,15 +9,9 @@
    <link rel="shortcut icon" type="image/x-icon" href="/images/logo.ico"/>
    <link href='https://fonts.googleapis.com/css?family=Jost' rel='stylesheet'>
    <link href="//maxcdn.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css" rel="stylesheet" id="bootstrap-css">
-    <!-- Favicon-->
    <link rel="icon" type="image/x-icon" href="assets/favicon.ico"/>
-    <!-- CSS only -->
    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css" rel="stylesheet"
          integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous">
-    <!-- Core theme CSS (includes Bootstrap)-->
    <link href="/css/style.css" rel="stylesheet"/>
 </head>
 <body>
@@ -164,7 +158,6 @@
            </div></div>
    </footer>
 </div>
-<!-- JavaScript Bundle with Popper -->
 <script src="//maxcdn.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
 <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js"

--- a/SkuciSe/src/main/resources/templates/moji-zahtevi.html
+++ b/SkuciSe/src/main/resources/templates/moji-zahtevi.html
@@ -104,24 +104,24 @@
                <div class="row">
                    <div class="col-lg-2 col-md-3 col-sm-2 col-xs-2 d-flex justify-content-center align-items-center">
                        <img
-                                th:if="${zahtevi[oglasStat.count - 1].status.toString() == 'POTVRDJEN'}"
+                                th:if="${zahtevi[oglasStat..index].status.toString() == 'POTVRDJEN'}"
-                                th:src="@{'data:image/png;charset=utf-8;base64,'+${slike[oglasStat.count - 1].slikaCode}}"
+                                th:src="@{'data:image/png;charset=utf-8;base64,'+${slike[oglasStat..index].slikaCode}}"
                                alt="slika korisnika"
                                style="width: 150px;height: 150px;border-radius: 50%;object-fit: cover; border: green 3px solid">
                        <img
-                                th:if="${zahtevi[oglasStat.count - 1].status.toString() == 'CEKANJE'}"
+                                th:if="${zahtevi[oglasStat..index].status.toString() == 'CEKANJE'}"
-                                th:src="@{'data:image/png;charset=utf-8;base64,'+${slike[oglasStat.count - 1].slikaCode}}"
+                                th:src="@{'data:image/png;charset=utf-8;base64,'+${slike[oglasStat..index].slikaCode}}"
                                alt="slika korisnika"
                                style="width: 150px;height: 150px;border-radius: 50%;object-fit: cover; border: yellow 3px solid">
                        <img
-                                th:if="${zahtevi[oglasStat.count - 1].status.toString() == 'ZAVRSEN'}"
+                                th:if="${zahtevi[oglasStat..index].status.toString() == 'ZAVRSEN'}"
-                                th:src="@{'data:image/png;charset=utf-8;base64,'+${slike[oglasStat.count - 1].slikaCode}}"
+                                th:src="@{'data:image/png;charset=utf-8;base64,'+${slike[oglasStat..index].slikaCode}}"
                                alt="slika korisnika"
                                style="width: 150px;height: 150px;border-radius: 50%;object-fit: cover; border: blue 3px solid"
                                class="w-sm-50">
                        <img
-                                th:if="${zahtevi[oglasStat.count - 1].status.toString() == 'ODBIJEN'}"
+                                th:if="${zahtevi[oglasStat..index].status.toString() == 'ODBIJEN'}"
-                                th:src="@{'data:image/png;charset=utf-8;base64,'+${slike[oglasStat.count - 1].slikaCode}}"
+                                th:src="@{'data:image/png;charset=utf-8;base64,'+${slike[oglasStat..index].slikaCode}}"
                                alt="slika korisnika"
                                style="width: 150px;height: 150px;border-radius: 50%;object-fit: cover; border: red 3px solid">
                    </div>
@@ -135,29 +135,29 @@
                            </h4>
                            <p th:text="'Vlasnik: ' + ${vlasnici[oglasStat.index].ime}"></p>
                            <button class="btn btn-dark"
-                                    th:onclick="window.open('/chat?email='+[[${vlasnici[oglasStat.count - 1].email}]],'mywindow','menubar=1,width=650,height=900')">
+                                    th:onclick="window.open('/chat?email='+[[${vlasnici[oglasStat..index].email}]],'mywindow','menubar=1,width=650,height=900')">
                                <i class="fas fa-sms"></i> Chat
                            </button>
                        </div>
                    </div>
                    <div class="col-lg-7 col-md-7 col-sm-7 col-xs-7 d-flex flex-column justify-content-around align-items-end"
-                         th:if="${zahtevi[oglasStat.count - 1].status.toString() != 'ZAVRSEN'}">
+                         th:if="${zahtevi[oglasStat..index].status.toString() != 'ZAVRSEN'}">
-                        <h4 th:text="${zahtevi[oglasStat.count - 1].datum + ' ' + zahtevi[oglasStat.count - 1].vreme}"
+                        <h4 th:text="${zahtevi[oglasStat..index].datum + ' ' + zahtevi[oglasStat..index].vreme}"
-                            th:if="${zahtevi[oglasStat.count - 1].status.toString() == 'POTVRDJEN'}"></h4>
+                            th:if="${zahtevi[oglasStat..index].status.toString() == 'POTVRDJEN'}"></h4>
                        <form method="GET" class="w-50 h-50 d-flex justify-content-center align-items-center"
-                              th:if="${zahtevi[oglasStat.count - 1].status.toString() != 'POTVRDJEN'}"
+                              th:if="${zahtevi[oglasStat..index].status.toString() != 'POTVRDJEN'}"
-                              th:action="@{/oglas-edit/{oglasId}/obrisi-zahtev/{zahtevId}(oglasId=${oglas.oglasId}, zahtevId=${zahtevi[oglasStat.count - 1].zahtevId})}">
+                              th:action="@{/oglas-edit/{oglasId}/obrisi-zahtev/{zahtevId}(oglasId=${oglas.oglasId}, zahtevId=${zahtevi[oglasStat..index].zahtevId})}">
                            <button type="submit" class="btn btn-danger"
-                                    th:if="${zahtevi[oglasStat.count - 1].status.toString() == 'CEKANJE'}">
+                                    th:if="${zahtevi[oglasStat..index].status.toString() == 'CEKANJE'}">
                                Otkazi zahtev
                            </button>
                            <button type="submit" class="btn btn-danger"
-                                    th:if="${zahtevi[oglasStat.count - 1].status.toString() == 'ODBIJEN'}">
+                                    th:if="${zahtevi[oglasStat..index].status.toString() == 'ODBIJEN'}">
                                Obrisi zahtev
                            </button>
                        </form>
                    </div>
-                    <div class="col-lg-7 col-md-5 col-sm-7 col-xs-7 d-flex align-items-center flex-row justify-content-center" th:if="${zahtevi[oglasStat.count - 1].status.toString() == 'ZAVRSEN'}">
+                    <div class="col-lg-7 col-md-5 col-sm-7 col-xs-7 d-flex align-items-center flex-row justify-content-center" th:if="${zahtevi[oglasStat..index].status.toString() == 'ZAVRSEN'}">
                        <form method="get" class="row w-100 h-100 flex-wrap flex-row"
                              th:action="@{/profile/moji-zahtevi/sacuvaj-komentar}"
                              th:if="${zahtevi[oglasStat.index].status.toString() == 'ZAVRSEN'}">
@@ -168,7 +168,7 @@
                                    <input th:value="${loggedUser.korisnik.korisnikId}" name="korisnikId"
                                           style="display: none">
                                    <input th:value="${oglas.oglasId}" name="oglasId" style="display: none">
-                                    <input th:value="${zahtevi[oglasStat.count - 1].zahtevId}"
+                                    <input th:value="${zahtevi[oglasStat..index].zahtevId}"
                                           name="zahtevId" style="display: none">
                                </div>
                                <div class="starrating risingstar d-flex justify-content-center flex-row-reverse">

--- a/SkuciSe/src/main/resources/templates/novi-oglas-form.html
+++ b/SkuciSe/src/main/resources/templates/novi-oglas-form.html
@@ -9,15 +9,8 @@
    <link rel="shortcut icon" type="image/x-icon" href="/images/logo.ico"/>
    <link href='https://fonts.googleapis.com/css?family=Jost' rel='stylesheet'>
    <link href="//maxcdn.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css" rel="stylesheet" id="bootstrap-css">
-    <!-- Favicon-->
-    <link rel="icon" type="image/x-icon" href="assets/favicon.ico"/>
-    <!-- CSS only -->
    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css" rel="stylesheet"
          integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous">
-    <!-- Core theme CSS (includes Bootstrap)-->
    <link href="/css/style.css" rel="stylesheet"/>
@@ -290,7 +283,6 @@
            </div></div>
    </footer>
 </div>
-<!-- JavaScript Bundle with Popper -->
 <script src="//maxcdn.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
 <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js"

--- a/SkuciSe/src/main/resources/templates/oglas.html
+++ b/SkuciSe/src/main/resources/templates/oglas.html
@@ -9,17 +9,11 @@
    <link rel="shortcut icon" type="image/x-icon" href="/images/logo.ico"/>
    <link href='https://fonts.googleapis.com/css?family=Jost' rel='stylesheet'>
    <link href="//maxcdn.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css" rel="stylesheet" id="bootstrap-css">
-    <!-- Favicon-->
-    <link rel="icon" type="image/x-icon" href="assets/favicon.ico"/>
-    <!-- CSS only -->
    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css" rel="stylesheet"
          integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous">
-    <!-- Core theme CSS (includes Bootstrap)-->
    <link href="/css/oglasiStyle.css" rel="stylesheet"/>
    <link rel="stylesheet" href="/css/bootstrap-datetimepicker.min.css" type="text/css" media="all"/>
 </head>
 <body th:object="${loggedUser}">
@@ -137,8 +131,8 @@
                <!-- Thumbnails -->
                <ol class="carousel-indicators list-inline" style="height: 100px">
                    <li class="list-inline-item active" th:each="slika: ${slike}">
-                        <a th:id="'carousel-selector-' + ${slikaStat.count - 1}" class="selected"
+                        <a th:id="'carousel-selector-' + ${slikaStat.index}" class="selected"
-                           th:data-slide-to="${slikaStat.count - 1}" data-target="#custCarousel">
+                           th:data-slide-to="${slikaStat.index}" data-target="#custCarousel">
                            <img th:src="@{'data:image/png;charset=utf-8;base64,'+${slika.slikaCode}}"
                                 class="img-fluid">
                        </a>
@@ -151,6 +145,11 @@
                        <div class="row">
                            <h1 th:text="${oglas.naslov}" class="oglas-naslov"></h1>
                        </div>
+                        <div class="row w-100 border-bottom-grey my-3 flex-row justify-content-end align-items-center pb-3">
+                            <a th:href="@{/korisnik/{korisnikId}(korisnikId=${vlasnik.korisnikId})}" th:text="${vlasnik.ime + ' '+ vlasnik.prezime}" class="text-right w-50" style="color:#495056;text-decoration: none"></a>
+                            <img class="d-flex rounded-circle" style="width: 13%;"
+                                 th:src="@{'data:image/png;charset=utf-8;base64,'+${vlasnik.getSlika()}}" alt="Image Description">
+                        </div>
                        <div class="col d-flex justify-content-evenly" style="color: #777;">
                                <h4 th:text="${oglas.cena*oglas.kvadratura} + '$'"></h4>
                                <h4 th:text="${oglas.lokacija} + ', '+${grad}"></h4>
@@ -224,14 +223,28 @@
                    <div class="col-md-8" th:each="komentar:${komentari}">
                        <div class="media g-mb-30 media-comment">
                            <div class="media-body u-shadow-v18 g-bg-secondary g-pa-30">
-                                <img class="d-flex g-width-50 g-height-50 rounded-circle g-mt-3 g-mr-15"
+                                <img class="d-flex rounded-circle" style="width: 30%;"
-                                     th:src="@{'data:image/png;charset=utf-8;base64,'+${korisniciKomentari[komentarStat.count -1].slika}}" alt="Image Description">
+                                     th:src="@{'data:image/png;charset=utf-8;base64,'+${korisniciKomentari[komentarStat.index].slika}}" alt="Image Description">
                                <div class="g-mb-15">
-                                    <h5 class="h5 g-color-gray-dark-v1 mb-0" th:text="${korisniciKomentari[komentarStat.count -1].ime + ' ' + korisniciKomentari[komentarStat.count -1].prezime}">John Doe</h5>
+                                    <a th:href="@{/korisnik/{korisnikId}(korisnikId=${vlasnik.korisnikId})}" th:text="${korisniciKomentari[komentarStat.index].ime + ' '+ korisniciKomentari[komentarStat.index].prezime}" class="text-right w-50" style="color:#495056;text-decoration: none"></a>
+                                    <br>
                                    <span class="g-color-gray-dark-v4 g-font-size-12" th:text="${komentar.vreme + ' ' + komentar.datum}"></span>
                                </div>
                                <p th:text="${komentar.komentar}"></p>
+                                <div class="starrating risingstar d-flex justify-content-end flex-row-reverse">
+                                    <img src th:onload="postaviZvezdice([[${komentar.ocena}]])">
+                                    <input type="radio" id="star5" name="ocenaRadio" value="5" th:checked="${komentar.ocena == 5}" disabled/><label
+                                        for="star5" title="5 star" style="pointer-events:none"></label>
+                                    <input type="radio" id="star4" name="ocenaRadio" value="4" th:checked="${komentar.ocena == 4}" disabled/><label
+                                        for="star4" title="4 star" style="pointer-events:none"></label>
+                                    <input type="radio" id="star3" name="ocenaRadio" value="3" th:checked="${komentar.ocena == 3}" disabled/><label
+                                        for="star3" title="3 star" style="pointer-events:none"></label>
+                                    <input type="radio" id="star2" name="ocenaRadio" value="2" th:checked="${komentar.ocena == 2}" disabled/><label
+                                        for="star2" title="2 star" style="pointer-events:none"></label>
+                                    <input type="radio" id="star1" name="ocenaRadio" value="1" th:checked="${komentar.ocena == 1}" disabled/><label
+                                        for="star1" title="1 star" style="pointer-events:none"></label>
+                                </div>
                            </div>
                        </div>
                    </div>
@@ -284,7 +297,7 @@
                                                    <h5 class="card-title"
                                                        th:text="${korisnik.getIme() + ' ' + korisnik.getPrezime()}"></h5>
                                                    <p class="card-text"
-                                                       th:if="${zahtevi[korisnikStat.count - 1].status.toString()=='POTVRDJEN'}">
+                                                       th:if="${zahtevi[korisnikStat.index].status.toString()=='POTVRDJEN'}">
                                                        Email:<span th:text="${korisnik.getEmail()}"></span><br>
                                                        Telefon:<span th:text="${korisnik.getTelefon()}"></span>
                                                    </p>
@@ -295,7 +308,7 @@
                                            <div class="col-md-3 d-flex flex-column justify-content-around align-items-center">
                                                <div class="card-body">
                                                    <p class="card-text">
-                                                        <span th:text="${zahtevi[korisnikStat.count - 1].datum + ' ' + zahtevi[korisnikStat.count - 1].vreme}"></span>
+                                                        <span th:text="${zahtevi[korisnikStat.index].datum + ' ' + zahtevi[korisnikStat.index].vreme}"></span>
                                                    </p>
                                                </div>
                                            </div>
@@ -309,19 +322,19 @@
                                                </form>
                                            </div>
                                            <div class="col-md-2 d-flex flex-column justify-content-around align-items-center"
-                                                 th:if="${zahtevi[korisnikStat.count - 1].status.toString() == 'CEKANJE'}">
+                                                 th:if="${zahtevi[korisnikStat.index].status.toString() == 'CEKANJE'}">
                                                <form method="GET"
-                                                      th:action="@{/oglas-edit/{oglasId}/prihvati-zahtev/{zahtevId}(oglasId=${zahtevi[korisnikStat.count - 1].oglasId},zahtevId=${zahtevi[korisnikStat.count - 1].zahtevId})}">
+                                                      th:action="@{/oglas-edit/{oglasId}/prihvati-zahtev/{zahtevId}(oglasId=${zahtevi[korisnikStat.index].oglasId},zahtevId=${zahtevi[korisnikStat.index].zahtevId})}">
                                                    <button type="submit" class="btn btn-success">Prihvati zahtev
                                                    </button>
                                                </form>
                                                <form method="GET"
-                                                      th:action="@{/oglas-edit/{oglasId}/odbi-zahtev/{zahtevId}(oglasId=${zahtevi[korisnikStat.count - 1].oglasId},zahtevId=${zahtevi[korisnikStat.count - 1].zahtevId})}">
+                                                      th:action="@{/oglas-edit/{oglasId}/odbi-zahtev/{zahtevId}(oglasId=${zahtevi[korisnikStat.index].oglasId},zahtevId=${zahtevi[korisnikStat.index].zahtevId})}">
                                                    <button type="submit" class="btn btn-danger">Odbij zahtev</button>
                                                </form>
                                            </div>
                                            <div class="col-md-2 d-flex flex-column justify-content-around align-items-center"
-                                                 th:if="${zahtevi[korisnikStat.count - 1].status.toString() == 'ODBIJEN'}">
+                                                 th:if="${zahtevi[korisnikStat.index].status.toString() == 'ODBIJEN'}">
                                                <form method="GET"
                                                >
                                                    <!--OBRISI ZAHTEV TH:ACTION="@{/oglas-edit/{oglasId}/obrisi-zahtev/}"-->
@@ -392,9 +405,6 @@
        </div>
    </footer>
 </div>
-<!-- JavaScript Bundle with Popper -->
 <script src="//maxcdn.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
 <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js"

--- a/SkuciSe/src/main/resources/templates/onama.html
+++ b/SkuciSe/src/main/resources/templates/onama.html
@@ -13,18 +13,10 @@
            rel="stylesheet"
            href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css"
    />
-    <!-- Favicon-->
-    <link rel="icon" type="image/x-icon" href="assets/favicon.ico"/>
-    <!-- CSS only -->
    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css" rel="stylesheet"
          integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous">
-    <!-- Core theme CSS (includes Bootstrap)-->
    <link href="/css/style.css" rel="stylesheet"/>
 </head>
 <body th:object="${loggedUser}">
@@ -152,7 +144,7 @@
        </div>
    </footer>
 </div>
-<!-- JavaScript Bundle with Popper -->
 <script src="//maxcdn.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
 <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js"

--- a/SkuciSe/src/main/resources/templates/password-edit.html
+++ b/SkuciSe/src/main/resources/templates/password-edit.html
@@ -9,15 +9,8 @@
    <link rel="shortcut icon" type="image/x-icon" href="/images/logo.ico"/>
    <link href='https://fonts.googleapis.com/css?family=Jost' rel='stylesheet'>
    <link href="//maxcdn.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css" rel="stylesheet" id="bootstrap-css">
-    <!-- Favicon-->
-    <link rel="icon" type="image/x-icon" href="assets/favicon.ico"/>
-    <!-- CSS only -->
    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css" rel="stylesheet"
          integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous">
-    <!-- Core theme CSS (includes Bootstrap)-->
    <link href="/css/style.css" rel="stylesheet"/>
@@ -172,7 +165,6 @@
            </div></div>
    </footer>
 </div>
-<!-- JavaScript Bundle with Popper -->
 <script src="//maxcdn.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
 <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js"
@@ -187,6 +179,5 @@
 <script src="https://kit.fontawesome.com/51d1fadef3.js" crossorigin="anonymous"></script>
 <script src="/js/main.js"></script>
-<!-- Core theme JS-->
 </body>
 </html>
--- a/SkuciSe/src/main/resources/templates/portfolio.html
+++ b/SkuciSe/src/main/resources/templates/portfolio.html
@@ -13,15 +13,8 @@
          rel="stylesheet"
          href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css"
  />
-  <!-- Favicon-->
-  <link rel="icon" type="image/x-icon" href="assets/favicon.ico"/>
-  <!-- CSS only -->
  <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css" rel="stylesheet"
        integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous">
-  <!-- Core theme CSS (includes Bootstrap)-->
  <link href="/css/style.css" rel="stylesheet"/>
@@ -170,8 +163,6 @@
          </ul>
        </div>
      </div>
-      <!-- End-->
    </div>
  </div>
 </div>
@@ -211,7 +202,6 @@
    </div>
  </footer>>
 </div>
-<!-- JavaScript Bundle with Popper -->
 <script src="//maxcdn.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
 <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js"

--- a/SkuciSe/src/main/resources/templates/profile-edit.html
+++ b/SkuciSe/src/main/resources/templates/profile-edit.html
@@ -9,18 +9,10 @@
    <link rel="shortcut icon" type="image/x-icon" href="/images/logo.ico"/>
    <link href='https://fonts.googleapis.com/css?family=Jost' rel='stylesheet'>
    <link href="//maxcdn.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css" rel="stylesheet" id="bootstrap-css">
-    <!-- Favicon-->
-    <link rel="icon" type="image/x-icon" href="assets/favicon.ico"/>
-    <!-- CSS only -->
    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css" rel="stylesheet"
          integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous">
-    <!-- Core theme CSS (includes Bootstrap)-->
    <link href="/css/style.css" rel="stylesheet"/>
 </head>
 <body th:object="${loggedUser}">
 <nav class="navbar navbar-icon-top navbar-expand-lg p-3">
@@ -195,7 +187,6 @@
            </div></div>
    </footer>
 </div>
-<!-- JavaScript Bundle with Popper -->
 <script src="//maxcdn.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
 <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js"
@@ -210,6 +201,5 @@
 <script src="https://kit.fontawesome.com/51d1fadef3.js" crossorigin="anonymous"></script>
 <script src="/js/main.js"></script>
-<!-- Core theme JS-->
 </body>
 </html>
--- a/SkuciSe/src/main/resources/templates/profile.html
+++ b/SkuciSe/src/main/resources/templates/profile.html
@@ -9,18 +9,10 @@
    <link rel="shortcut icon" type="image/x-icon" href="/images/logo.ico"/>
    <link href='https://fonts.googleapis.com/css?family=Jost' rel='stylesheet'>
    <link href="//maxcdn.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css" rel="stylesheet" id="bootstrap-css">
-    <!-- Favicon-->
-    <link rel="icon" type="image/x-icon" href="assets/favicon.ico"/>
-    <!-- CSS only -->
    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css" rel="stylesheet"
          integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous">
-    <!-- Core theme CSS (includes Bootstrap)-->
    <link href="/css/style.css" rel="stylesheet"/>
 </head>
 <body th:object="${loggedUser}">
 <nav class="navbar navbar-icon-top navbar-expand-lg p-3">
@@ -197,7 +189,6 @@
            </div></div>
    </footer>
 </div>
-<!-- JavaScript Bundle with Popper -->
 <script src="//maxcdn.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
 <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js"

--- a/SkuciSe/src/main/resources/templates/register.html
+++ b/SkuciSe/src/main/resources/templates/register.html
@@ -9,18 +9,10 @@
    <link rel="shortcut icon" type="image/x-icon" href="/images/logo.ico"/>
    <link href='https://fonts.googleapis.com/css?family=Jost' rel='stylesheet'>
    <link href="//maxcdn.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css" rel="stylesheet" id="bootstrap-css">
-    <!-- Favicon-->
-    <link rel="icon" type="image/x-icon" href="assets/favicon.ico"/>
-    <!-- CSS only -->
    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css" rel="stylesheet"
          integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous">
-    <!-- Core theme CSS (includes Bootstrap)-->
    <link href="/css/style.css" rel="stylesheet"/>
 </head>
 <body>
 <nav class="navbar navbar-icon-top navbar-expand-lg p-3">
@@ -210,7 +202,6 @@
        </div>
    </footer>
 </div>
-<!-- JavaScript Bundle with Popper -->
 <script src="//maxcdn.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
 <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js"
@@ -225,6 +216,5 @@
 <script src="https://kit.fontawesome.com/51d1fadef3.js" crossorigin="anonymous"></script>
 <script src="/js/main.js"></script>
-<!-- Core theme JS-->
 </body>
 </html>