Skip to content

S
SkuciSe
Commit fd4f4f00 by Milovan Samardzic
Options

kometariFrontZahteviJosPoNesto

parent 3fb1c6a3
Showing with 533 additions and 232 deletions
SkuciSe/src/main/java/com/example/SkuciSe/controller/ZahtevController.java
...@@ -6,6 +6,7 @@ import com.example.SkuciSe.model.oglas.Oglas; ...@@ -6,6 +6,7 @@ import com.example.SkuciSe.model.oglas.Oglas;
import com.example.SkuciSe.model.zahtev.StanjeZahteva; import com.example.SkuciSe.model.zahtev.StanjeZahteva;
import com.example.SkuciSe.model.zahtev.Zahtev; import com.example.SkuciSe.model.zahtev.Zahtev;
import com.example.SkuciSe.repository.OglasRepository; import com.example.SkuciSe.repository.OglasRepository;
import com.example.SkuciSe.repository.SlikeRepository;
import com.example.SkuciSe.repository.ZahtevRepository; import com.example.SkuciSe.repository.ZahtevRepository;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.security.core.annotation.AuthenticationPrincipal;
...@@ -28,6 +29,9 @@ public class ZahtevController { ...@@ -28,6 +29,9 @@ public class ZahtevController {
ZahtevRepository zRepo; ZahtevRepository zRepo;
@Autowired @Autowired
OglasRepository oRepo; OglasRepository oRepo;
@Autowired
SlikeRepository sRepo;
@GetMapping("/profile/moji-zahtevi") @GetMapping("/profile/moji-zahtevi")
public String getMojiZahtevi(Model model, @AuthenticationPrincipal KorisnikDetails loggedUser) public String getMojiZahtevi(Model model, @AuthenticationPrincipal KorisnikDetails loggedUser)
{ {
...@@ -40,7 +44,7 @@ public class ZahtevController { ...@@ -40,7 +44,7 @@ public class ZahtevController {
model.addAttribute("loggedUser", loggedUser); model.addAttribute("loggedUser", loggedUser);
model.addAttribute("zahtevi", mojiZahtevi); model.addAttribute("zahtevi", mojiZahtevi);
model.addAttribute("oglasi", mojiOglasi); model.addAttribute("oglasi", mojiOglasi);
model.addAttribute("slike",sRepo.findAllFirstPics(mojiOglasi));
return "moji-zahtevi"; return "moji-zahtevi";
} }
......
SkuciSe/src/main/resources/static/css/oglasiStyle.css
...@@ -278,4 +278,48 @@ h3{ ...@@ -278,4 +278,48 @@ h3{
.carousel-control-next, .carousel-control-next,
.carousel-control-prev { .carousel-control-prev {
filter: invert(100%); filter: invert(100%);
}
@media (min-width: 0) {
.g-mr-15 {
margin-right: 1.07143rem !important;
}
}
@media (min-width: 0){
.g-mt-3 {
margin-top: 0.21429rem !important;
}
}
.g-height-50 {
height: 50px;
}
.g-width-50 {
width: 50px !important;
}
@media (min-width: 0){
.g-pa-30 {
padding: 2.14286rem !important;
}
}
.g-bg-secondary {
background-color: #fafafa !important;
}
.u-shadow-v18 {
box-shadow: 0 5px 10px -6px rgba(0, 0, 0, 0.15);
}
.g-color-gray-dark-v4 {
color: #777 !important;
}
.g-font-size-12 {
font-size: 0.85714rem !important;
}
.media-comment {
margin-top:20px
} }
\ No newline at end of file
SkuciSe/src/main/resources/static/css/style.css
...@@ -527,4 +527,4 @@ p { ...@@ -527,4 +527,4 @@ p {
background-image:url("https://wallpaperaccess.com/full/1895610.jpg"); background-image:url("https://wallpaperaccess.com/full/1895610.jpg");
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: cover; background-size: cover;
} }
\ No newline at end of file
SkuciSe/src/main/resources/templates/lista-oglasa.html
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<link rel="shortcut icon" type="image/x-icon" href="/images/logo.ico"/> <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='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 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" /> <link rel="stylesheet" href="https://unpkg.com/aos@next/dist/aos.css"/>
<!-- Favicon--> <!-- Favicon-->
<link rel="icon" type="image/x-icon" href="assets/favicon.ico"/> <link rel="icon" type="image/x-icon" href="assets/favicon.ico"/>
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</head> </head>
<body th:object="${loggedUser}" class="pozadinaSVG"> <body th:object="${loggedUser}">
<nav class="navbar navbar-icon-top navbar-expand-lg p-3"> <nav class="navbar navbar-icon-top navbar-expand-lg p-3">
<a class="navbar-brand" href="#"> </a> <a class="navbar-brand" href="#"> </a>
...@@ -115,7 +115,8 @@ ...@@ -115,7 +115,8 @@
<div class="card-body"> <div class="card-body">
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<input type="text" class="form-control" name="pretraga" id="pretraga" placeholder="Pretrazi"> <input type="text" class="form-control" name="pretraga" id="pretraga"
placeholder="Pretrazi">
</div> </div>
</div> </div>
</div> </div>
...@@ -130,11 +131,13 @@ ...@@ -130,11 +131,13 @@
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<label>Min</label> <label>Min</label>
<input type="number" class="form-control" name="cenaMin" id="cena-min" placeholder="$0"> <input type="number" class="form-control" name="cenaMin" id="cena-min"
placeholder="$0">
</div> </div>
<div class="form-group col-md-6 text-right"> <div class="form-group col-md-6 text-right">
<label>Max</label> <label>Max</label>
<input type="number" class="form-control" name="cenaMax" id="cena-max" placeholder="$1,0000"> <input type="number" class="form-control" name="cenaMax" id="cena-max"
placeholder="$1,0000">
</div> </div>
</div> </div>
</div> <!-- card-body.// --> </div> <!-- card-body.// -->
...@@ -147,12 +150,14 @@ ...@@ -147,12 +150,14 @@
<div class="filter-content"> <div class="filter-content">
<div class="card-body"> <div class="card-body">
<div class="custom-control custom-radio"> <div class="custom-control custom-radio">
<input type="radio" class="custom-control-input" name="vrstaOglasaId" value="2" id="radio-izdavanje"> <input type="radio" class="custom-control-input" name="vrstaOglasaId" value="2"
id="radio-izdavanje">
<label class="custom-control-label" for="radio-izdavanje">Izdavanje</label> <label class="custom-control-label" for="radio-izdavanje">Izdavanje</label>
</div> <!-- form-check.// --> </div> <!-- form-check.// -->
<div class="custom-control custom-radio"> <div class="custom-control custom-radio">
<input type="radio" class="custom-control-input" name="vrstaOglasaId" value="1" id="radio-prodaja"> <input type="radio" class="custom-control-input" name="vrstaOglasaId" value="1"
id="radio-prodaja">
<label class="custom-control-label" for="radio-prodaja">Prodaja</label> <label class="custom-control-label" for="radio-prodaja">Prodaja</label>
</div> <!-- form-check.// --> </div> <!-- form-check.// -->
</div> <!-- card-body.// --> </div> <!-- card-body.// -->
...@@ -181,11 +186,13 @@ ...@@ -181,11 +186,13 @@
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<label>Min</label> <label>Min</label>
<input type="number" class="form-control" name="kvadraturaMin" id="kvadratura-min" placeholder="0"> <input type="number" class="form-control" name="kvadraturaMin" id="kvadratura-min"
placeholder="0">
</div> </div>
<div class="form-group col-md-6 text-right"> <div class="form-group col-md-6 text-right">
<label>Max</label> <label>Max</label>
<input type="number" class="form-control" name="kvadraturaMax" id="kvadratura-max" placeholder="1000"> <input type="number" class="form-control" name="kvadraturaMax" id="kvadratura-max"
placeholder="1000">
</div> </div>
</div> </div>
</div> </div>
...@@ -199,7 +206,8 @@ ...@@ -199,7 +206,8 @@
<div class="card-body"> <div class="card-body">
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<label>Broj soba</label> <label>Broj soba</label>
<input type="number" class="form-control" name="brojSoba" id="broj-soba" placeholder="0" min="0"> <input type="number" class="form-control" name="brojSoba" id="broj-soba" placeholder="0"
min="0">
</div> </div>
</div> <!-- card-body.// --> </div> <!-- card-body.// -->
</div> </div>
...@@ -229,7 +237,9 @@ ...@@ -229,7 +237,9 @@
</article> <!-- card-group-item.// --> </article> <!-- card-group-item.// -->
<article class="card-group-item"> <article class="card-group-item">
<div class="card-header d-flex justify-content-between"> <div class="card-header d-flex justify-content-between">
<a th:href="@{/lista-oglasa}"><button type="button" class="btn btn-primary">Resetuj filtere</button></a> <a th:href="@{/lista-oglasa}">
<button type="button" class="btn btn-primary">Resetuj filtere</button>
</a>
<button type="submit" class="btn btn-primary">Primeni filtere</button> <button type="submit" class="btn btn-primary">Primeni filtere</button>
</div> </div>
</article> </article>
...@@ -242,7 +252,8 @@ ...@@ -242,7 +252,8 @@
<div class="section border bg-white rounded p-2"> <div class="section border bg-white rounded p-2">
<div class="row"> <div class="row">
<div class="col-lg-12 img-section"> <div class="col-lg-12 img-section">
<img th:src="@{'data:image/png;charset=utf-8;base64,'+${slikeOglasa[i].slikaCode}}" class="p-0 m-0 img-responsive"> <img th:src="@{'data:image/png;charset=utf-8;base64,'+${slikeOglasa[i].slikaCode}}"
class="p-0 m-0 img-responsive">
<span class="badge badge-danger add-sens p-2 rounded-0" <span class="badge badge-danger add-sens p-2 rounded-0"
th:text="${oglasi[i].kvadratura + 'm2'}"></span> th:text="${oglasi[i].kvadratura + 'm2'}"></span>
</div> </div>
...@@ -261,8 +272,10 @@ ...@@ -261,8 +272,10 @@
<div class="col-lg-12"> <div class="col-lg-12">
<div class="row d-flex justify-content-between"> <div class="row d-flex justify-content-between">
<div class="col-lg-6 pb-2"> <div class="col-lg-6 pb-2">
<span th:if="${oglasi[i].vrstaOglasaId == 1}" class="badge badge-info p-2" th:text="${oglasi[i].cena*oglasi[i].kvadratura + '$'}"></span> <span th:if="${oglasi[i].vrstaOglasaId == 1}" class="badge badge-info p-2"
<span th:if="${oglasi[i].vrstaOglasaId == 2}" class="badge badge-success p-2" th:text="${oglasi[i].cena + '$/mes'}"></span> th:text="${oglasi[i].cena*oglasi[i].kvadratura + '$'}"></span>
<span th:if="${oglasi[i].vrstaOglasaId == 2}" class="badge badge-success p-2"
th:text="${oglasi[i].cena + '$/mes'}"></span>
</div> </div>
<div class="col-lg-6 pb-2 d-flex justify-content-end"> <div class="col-lg-6 pb-2 d-flex justify-content-end">
<a th:href="@{/lista-oglasa/{oglasid}(oglasid=${oglasi[i].getOglasId()})}" <a th:href="@{/lista-oglasa/{oglasid}(oglasid=${oglasi[i].getOglasId()})}"
...@@ -277,7 +290,8 @@ ...@@ -277,7 +290,8 @@
<div class="section border bg-white rounded p-2"> <div class="section border bg-white rounded p-2">
<div class="row"> <div class="row">
<div class="col-lg-12 img-section"> <div class="col-lg-12 img-section">
<img th:src="@{'data:image/png;charset=utf-8;base64,'+${slikeOglasa[i+1].slikaCode}}" class="p-0 m-0 img-responsive"> <img th:src="@{'data:image/png;charset=utf-8;base64,'+${slikeOglasa[i+1].slikaCode}}"
class="p-0 m-0 img-responsive">
<span class="badge badge-danger add-sens p-2 rounded-0" <span class="badge badge-danger add-sens p-2 rounded-0"
th:text="${oglasi[i+1].kvadratura + 'm2'}"></span> th:text="${oglasi[i+1].kvadratura + 'm2'}"></span>
</div> </div>
...@@ -296,8 +310,10 @@ ...@@ -296,8 +310,10 @@
<div class="col-lg-12"> <div class="col-lg-12">
<div class="row d-flex justify-content-between"> <div class="row d-flex justify-content-between">
<div class="col-lg-6 pb-2"> <div class="col-lg-6 pb-2">
<span th:if="${oglasi[i+1].vrstaOglasaId == 1}" class="badge badge-info p-2" th:text="${oglasi[i+1].cena*oglasi[i+1].kvadratura + '$'}"></span> <span th:if="${oglasi[i+1].vrstaOglasaId == 1}" class="badge badge-info p-2"
<span th:if="${oglasi[i+1].vrstaOglasaId == 2}" class="badge badge-success p-2" th:text="${oglasi[i+1].cena + '$/mes'}"></span> th:text="${oglasi[i+1].cena*oglasi[i+1].kvadratura + '$'}"></span>
<span th:if="${oglasi[i+1].vrstaOglasaId == 2}" class="badge badge-success p-2"
th:text="${oglasi[i+1].cena + '$/mes'}"></span>
</div> </div>
<div class="col-lg-6 pb-2 d-flex justify-content-end"> <div class="col-lg-6 pb-2 d-flex justify-content-end">
<a th:href="@{/lista-oglasa/{oglasid}(oglasid=${oglasi[i+1].getOglasId()})}" <a th:href="@{/lista-oglasa/{oglasid}(oglasid=${oglasi[i+1].getOglasId()})}"
...@@ -312,7 +328,8 @@ ...@@ -312,7 +328,8 @@
<div class="section border bg-white rounded p-2"> <div class="section border bg-white rounded p-2">
<div class="row"> <div class="row">
<div class="col-lg-12 img-section"> <div class="col-lg-12 img-section">
<img th:src="@{'data:image/png;charset=utf-8;base64,'+${slikeOglasa[i+2].slikaCode}}" class="p-0 m-0 img-responsive"> <img th:src="@{'data:image/png;charset=utf-8;base64,'+${slikeOglasa[i+2].slikaCode}}"
class="p-0 m-0 img-responsive">
<span class="badge badge-danger add-sens p-2 rounded-0" <span class="badge badge-danger add-sens p-2 rounded-0"
th:text="${oglasi[i+2].kvadratura + 'm2'}"></span> th:text="${oglasi[i+2].kvadratura + 'm2'}"></span>
</div> </div>
...@@ -331,8 +348,10 @@ ...@@ -331,8 +348,10 @@
<div class="col-lg-12"> <div class="col-lg-12">
<div class="row d-flex justify-content-between"> <div class="row d-flex justify-content-between">
<div class="col-lg-6 pb-2"> <div class="col-lg-6 pb-2">
<span th:if="${oglasi[i+2].vrstaOglasaId == 1}" class="badge badge-info p-2" th:text="${oglasi[i+2].cena*oglasi[i+2].kvadratura + '$'}"></span> <span th:if="${oglasi[i+2].vrstaOglasaId == 1}" class="badge badge-info p-2"
<span th:if="${oglasi[i+2].vrstaOglasaId == 2}" class="badge badge-success p-2" th:text="${oglasi[i+2].cena + '$/mes'}"></span> th:text="${oglasi[i+2].cena*oglasi[i+2].kvadratura + '$'}"></span>
<span th:if="${oglasi[i+2].vrstaOglasaId == 2}" class="badge badge-success p-2"
th:text="${oglasi[i+2].cena + '$/mes'}"></span>
</div> </div>
<div class="col-lg-6 pb-2 d-flex justify-content-end"> <div class="col-lg-6 pb-2 d-flex justify-content-end">
<a th:href="@{/lista-oglasa/{oglasid}(oglasid=${oglasi[i+2].getOglasId()})}" <a th:href="@{/lista-oglasa/{oglasid}(oglasid=${oglasi[i+2].getOglasId()})}"
...@@ -355,31 +374,49 @@ ...@@ -355,31 +374,49 @@
<div class="row "> <div class="row ">
<div class="col-xl-8 col-md-4 col-sm-4 col-12 my-auto mx-auto a"><h3 <div class="col-xl-8 col-md-4 col-sm-4 col-12 my-auto mx-auto a"><h3
class="text-muted mb-md-0 mb-5 bold-text">SkuciSe</h3></div> class="text-muted mb-md-0 mb-5 bold-text">SkuciSe</h3></div>
<div class="col-xl-2 col-md-4 col-sm-4 col-12"><h6 class="mb-3 mb-lg-4 bold-text "><b>MENI </b><i class="fa-solid fa-bars"></i></h6> <div class="col-xl-2 col-md-4 col-sm-4 col-12"><h6 class="mb-3 mb-lg-4 bold-text "><b>MENI </b><i
class="fa-solid fa-bars"></i></h6>
<ul class="list-unstyled"> <ul class="list-unstyled">
<li><a href="/index" style="text-decoration: none;color:#627482;" onmouseover="this.style.color='#989c9e'" onMouseOut="this.style.color='#627482'">Pocetna</a></li> <li><a href="/index" style="text-decoration: none;color:#627482;"
<li><a href="/onama" style="text-decoration: none;color:#627482;" onmouseover="this.style.color='#989c9e'" onMouseOut="this.style.color='#627482'">O nama</a></li> onmouseover="this.style.color='#989c9e'" onMouseOut="this.style.color='#627482'">Pocetna</a>
<li><a href="/portfolio" style="text-decoration: none;color:#627482;" onmouseover="this.style.color='#989c9e'" onMouseOut="this.style.color='#627482'">Portfolio</a></li> </li>
<li><a href="/onama" style="text-decoration: none;color:#627482;"
onmouseover="this.style.color='#989c9e'" onMouseOut="this.style.color='#627482'">O
nama</a></li>
<li><a href="/portfolio" style="text-decoration: none;color:#627482;"
onmouseover="this.style.color='#989c9e'" onMouseOut="this.style.color='#627482'">Portfolio</a>
</li>
</ul> </ul>
</div> </div>
<div class="col-xl-2 col-md-4 col-sm-4 col-12"><h6 <div class="col-xl-2 col-md-4 col-sm-4 col-12"><h6
class="mb-3 mb-lg-4 text-muted bold-text mt-sm-0 mt-5"><b>ADRESA </b><i class="fa-solid fa-map-pin"></i></h6> class="mb-3 mb-lg-4 text-muted bold-text mt-sm-0 mt-5"><b>ADRESA </b><i
<p><a href="http://maps.google.com/maps?daddr=Radoja Domanovića 12 Kragujevac&amp;" style="text-decoration: none;color:#627482;" onmouseover="this.style.color='#989c9e'" onMouseOut="this.style.color='#627482'">Radoja Domanovića 12 Kragujevac 34000</a></p> class="fa-solid fa-map-pin"></i></h6>
<p><a href="http://maps.google.com/maps?daddr=Radoja Domanovića 12 Kragujevac&amp;"
style="text-decoration: none;color:#627482;" onmouseover="this.style.color='#989c9e'"
onMouseOut="this.style.color='#627482'">Radoja Domanovića 12 Kragujevac 34000</a></p>
</div> </div>
<div class="row "> <div class="row ">
<div class="col-xl-8 col-md-4 col-sm-4 col-auto my-md-0 mt-5 order-sm-1 order-3 align-self-end"><p <div class="col-xl-8 col-md-4 col-sm-4 col-auto my-md-0 mt-5 order-sm-1 order-3 align-self-end">
class="social text-muted mb-0 pb-0 bold-text"><span class="mx-2"><i class="fa fa-facebook" <p
aria-hidden="true"></i></span> class="social text-muted mb-0 pb-0 bold-text"><span class="mx-2"><i
<span class="mx-2"><i class="fa fa-linkedin-square" aria-hidden="true"></i></span> <span class="fa fa-facebook"
class="mx-2"><i class="fa fa-twitter" aria-hidden="true"></i></span> <span class="mx-2"><i aria-hidden="true"></i></span>
class="fa fa-instagram" aria-hidden="true"></i></span></p><small class="rights"><span>&#174;</span> <span class="mx-2"><i class="fa fa-linkedin-square" aria-hidden="true"></i></span> <span
class="mx-2"><i class="fa fa-twitter" aria-hidden="true"></i></span> <span
class="mx-2"><i
class="fa fa-instagram" aria-hidden="true"></i></span></p><small class="rights"><span>&#174;</span>
SkuciSe. Sva prava zadrzana.</small></div> SkuciSe. Sva prava zadrzana.</small></div>
<div class="col-xl-2 col-md-4 col-sm-4 col-auto order-1 align-self-end "><h6 <div class="col-xl-2 col-md-4 col-sm-4 col-auto order-1 align-self-end "><h6
class="mt-55 mt-2 text-muted bold-text"><b>Korisnicki centar </b><i class="fa-solid fa-phone"></i></h6><small> <span><i class="mt-55 mt-2 text-muted bold-text"><b>Korisnicki centar </b><i
class="fa fa-envelope" aria-hidden="true"></i></span><a href="mailto:someone@yoursite.com" style="text-decoration: none;color:#627482;" onmouseover="this.style.color='#989c9e'" onMouseOut="this.style.color='#627482'"> skucise@gmail.com</a> </small></div> class="fa-solid fa-phone"></i></h6><small> <span><i
class="fa fa-envelope" aria-hidden="true"></i></span><a
href="mailto:someone@yoursite.com" style="text-decoration: none;color:#627482;"
onmouseover="this.style.color='#989c9e'" onMouseOut="this.style.color='#627482'">
skucise@gmail.com</a> </small></div>
</div> </div>
</div> </div>
</div></div> </div>
</div>
</footer> </footer>
</div> </div>
......
SkuciSe/src/main/resources/templates/moji-zahtevi.html
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" xmlns="http://www.w3.org/1999/html" xmlns:th="http://www.w3.org/1999/xhtml"> <html lang="en">
<head> <head>
<meta charset="utf-8"/> <meta charset="utf-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
<meta name="description" content=""/> <meta name="description" content=""/>
<meta name="author" content=""/> <meta name="author" content=""/>
<title>SkuciSe</title> <title>SkuciSe</title>
<link rel="shortcut icon" type="image/x-icon" href="/images/logo.ico"/> <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='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 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" /> <link rel="stylesheet" href="https://unpkg.com/aos@next/dist/aos.css"/>
<!-- Favicon--> <!-- Favicon-->
<link rel="icon" type="image/x-icon" href="assets/favicon.ico"/> <link rel="icon" type="image/x-icon" href="assets/favicon.ico"/>
<!-- CSS only --> <!-- CSS only -->
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css" rel="stylesheet" <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"> integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous">
<!-- Core theme CSS (includes Bootstrap)--> <!-- Core theme CSS (includes Bootstrap)-->
<link href="/css/oglasiStyle.css" rel="stylesheet"/> <link href="/css/oglasiStyle.css" rel="stylesheet"/>
</head> </head>
<body th:object="${loggedUser}" class="pozadinaSVG"> <body th:object="${loggedUser}" class="pozadinaSVG">
<nav class="navbar navbar-icon-top navbar-expand-lg p-3"> <nav class="navbar navbar-icon-top navbar-expand-lg p-3">
<a class="navbar-brand" href="#"> </a> <a class="navbar-brand" href="#"> </a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent"
aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>
<div class="collapse navbar-collapse" id="navbarSupportedContent"> <div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav mr-auto"> <ul class="navbar-nav mr-auto">
<li class="nav-item active"> <li class="nav-item active">
<a class="nav-link" th:href="@{/index}"> <a class="nav-link" th:href="@{/index}">
<i class="fa fa-home"></i> <i class="fa fa-home"></i>
Pocetna Pocetna
<span class="sr-only">(current)</span> <span class="sr-only">(current)</span>
</a> </a>
</li> </li>
<li class="nav-item active"> <li class="nav-item active">
<a class="nav-link" th:href="@{/lista-oglasa}"> <a class="nav-link" th:href="@{/lista-oglasa}">
<i class="fa fa-poll-h"></i> <i class="fa fa-poll-h"></i>
Lista oglasa Lista oglasa
<span class="sr-only">(current)</span> <span class="sr-only">(current)</span>
</a> </a>
</li> </li>
<li class="nav-item active"> <li class="nav-item active">
<a class="nav-link" th:href="@{/onama}"> <a class="nav-link" th:href="@{/onama}">
<i class="fa-sharp fa-solid fa-address-card"></i> <i class="fa-sharp fa-solid fa-address-card"></i>
<p>O nama</p> <p>O nama</p>
<span class="sr-only">(current)</span> <span class="sr-only">(current)</span>
</a> </a>
</li> </li>
<li class="nav-item active"> <li class="nav-item active">
<a class="nav-link" th:href="@{/portfolio}"> <a class="nav-link" th:href="@{/portfolio}">
<i class="fa-solid fa-briefcase"></i> <i class="fa-solid fa-briefcase"></i>
<p>Portfolio</p> <p>Portfolio</p>
<span class="sr-only">(current)</span> <span class="sr-only">(current)</span>
</a> </a>
</li> </li>
</ul> </ul>
<form class="form-inline my-2 my-lg-0" th:if="${loggedUser != null}"> <form class="form-inline my-2 my-lg-0" th:if="${loggedUser != null}">
<a th:href="@{/novi-oglas}"> <a th:href="@{/novi-oglas}">
<button type="button" class="btn btn-primary btn-md mr-2"><i class="fa-solid fa-plus"></i> Postavite <button type="button" class="btn btn-primary btn-md mr-2"><i class="fa-solid fa-plus"></i> Postavite
novi oglas novi oglas
</button> </button>
</a> </a>
</form> </form>
<ul class="navbar-nav"> <ul class="navbar-nav">
<li class="nav-item" th:if="${loggedUser == null}"> <li class="nav-item" th:if="${loggedUser == null}">
<a th:href="@{/login}"><i class="fas fa-sign-in-alt" style="color:#495056"></i><span <a th:href="@{/login}"><i class="fas fa-sign-in-alt" style="color:#495056"></i><span
style="padding:10px;color:#495056">Prijavi se</span></a> style="padding:10px;color:#495056">Prijavi se</span></a>
</li> </li>
<li class="nav-item" th:if="${loggedUser == null}"> <li class="nav-item" th:if="${loggedUser == null}">
<a th:href="@{/register}"><i class="fa-solid fa-circle-user" style="color:#495056"></i><span <a th:href="@{/register}"><i class="fa-solid fa-circle-user" style="color:#495056"></i><span
style="padding:10px;color:#495056">Registruj se</span></a> style="padding:10px;color:#495056">Registruj se</span></a>
</li> </li>
<li th:if="${loggedUser != null}"> <li th:if="${loggedUser != null}">
<div class="dropdown mr-4"> <div class="dropdown mr-4">
<button class="btn btn-secondary dropdown-toggle round" type="button" id="dropdownMenuButton" <button class="btn btn-secondary dropdown-toggle round" type="button" id="dropdownMenuButton"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fa-solid fa-circle-user"></i><span style="padding:10px;" <i class="fa-solid fa-circle-user"></i><span style="padding:10px;"
th:text="${loggedUser.getKorisnik().getIme()}"></span> th:text="${loggedUser.getKorisnik().getIme()}"></span>
</button> </button>
<div class="dropdown-menu" aria-labelledby="dropdownMenuButton"> <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
<a class="dropdown-item" th:href="@{/profile}">Moj Profil</a> <a class="dropdown-item" th:href="@{/profile}">Moj Profil</a>
<a class="dropdown-item" th:href="@{/profile/moji-oglasi}">Moji Oglasi</a> <a class="dropdown-item" th:href="@{/profile/moji-oglasi}">Moji Oglasi</a>
<a class="dropdown-item" th:href="@{/profile/moji-zahtevi}">Moji Zahtevi</a> <a class="dropdown-item" th:href="@{/profile/moji-zahtevi}">Moji Zahtevi</a>
<a th:if="${loggedUser.getKorisnik().getTipId() == 2}" class="dropdown-item" <a th:if="${loggedUser.getKorisnik().getTipId() == 2}" class="dropdown-item"
th:href="@{/lista-korisnika}">Lista Profila</a> th:href="@{/lista-korisnika}">Lista Profila</a>
<form th:action="@{/logout}" method="post" id="my_form" class="dropdown-item"> <form th:action="@{/logout}" method="post" id="my_form" class="dropdown-item">
<a href="#" onclick="document.getElementById('my_form').submit(); return false;"><i <a href="#" onclick="document.getElementById('my_form').submit(); return false;"><i
class="fas fa-sign-in-alt"></i><span style="padding:5px;">Odjavi se</span></a> class="fas fa-sign-in-alt"></i><span style="padding:5px;">Odjavi se</span></a>
</form> </form>
</div> </div>
</div> </div>
</li> </li>
</ul> </ul>
</div> </div>
</nav> </nav>
<div class="container-fluid pb-0 mb-0 justify-content-center text-light "> <div class="container container-main d-flex align-items-center justify-content-center flex-column"
<footer> th:object="${zahtevi}" style="min-height: 600px">
<div class="row my-5 justify-content-center py-5"> <h1>Spisak zahteva za obilazak</h1>
<div class="col-11"> <div class="row w-100 h-50" style="margin-top:50px;">
<div class="row "> <div>
<div class="col-xl-8 col-md-4 col-sm-4 col-12 my-auto mx-auto a"><h3 <div class="row">
class="text-muted mb-md-0 mb-5 bold-text">SkuciSe</h3></div> <div class="col ps-md-4">
<div class="col-xl-2 col-md-4 col-sm-4 col-12"><h6 class="mb-3 mb-lg-4 bold-text "><b>MENI </b><i class="fa-solid fa-bars"></i></h6> <div class="row">
<ul class="list-unstyled"> <h2 th:if="${oglasi.size() == 0}" class="text-center">Jos niste poslali nijedan zahtev!</h2>
<li><a href="/index" style="text-decoration: none;color:#627482;" onmouseover="this.style.color='#989c9e'" onMouseOut="this.style.color='#627482'">Pocetna</a></li> <div class="card mb-3" th:each="oglas: ${oglasi}" style="background: transparent">
<li><a href="/onama" style="text-decoration: none;color:#627482;" onmouseover="this.style.color='#989c9e'" onMouseOut="this.style.color='#627482'">O nama</a></li> <div class="row no-gutters">
<li><a href="/portfolio" style="text-decoration: none;color:#627482;" onmouseover="this.style.color='#989c9e'" onMouseOut="this.style.color='#627482'">Portfolio</a></li> <div class="col-md-1">
</ul> <div th:if="${zahtevi[oglasStat.count - 1].status.toString() == 'POTVRDJEN'}"
</div> class="col-md-4 h-100"
<div class="col-xl-2 col-md-4 col-sm-4 col-12"><h6 style="background-color: green;border-radius: 5px"></div>
class="mb-3 mb-lg-4 text-muted bold-text mt-sm-0 mt-5"><b>ADRESA </b><i class="fa-solid fa-map-pin"></i></h6> <div th:if="${zahtevi[oglasStat.count - 1].status.toString() == 'CEKANJE'}"
<p><a href="http://maps.google.com/maps?daddr=Radoja Domanovića 12 Kragujevac&amp;" style="text-decoration: none;color:#627482;" onmouseover="this.style.color='#989c9e'" onMouseOut="this.style.color='#627482'">Radoja Domanovića 12 Kragujevac 34000</a></p> class="col-md-4 h-100"
</div> style="background-color: yellow;border-radius: 5px"></div>
<div class="row "> <div th:if="${zahtevi[oglasStat.count - 1].status.toString() == 'ZAVRSEN'}"
<div class="col-xl-8 col-md-4 col-sm-4 col-auto my-md-0 mt-5 order-sm-1 order-3 align-self-end"><p class="col-md-4 h-100" style="background-color: blue;border-radius: 5px"></div>
class="social text-muted mb-0 pb-0 bold-text"><span class="mx-2"><i class="fa fa-facebook" <div th:if="${zahtevi[oglasStat.count - 1].status.toString() == 'ODBIJEN'}"
aria-hidden="true"></i></span> class="col-md-4 h-100" style="background-color: red;border-radius: 5px"></div>
<span class="mx-2"><i class="fa fa-linkedin-square" aria-hidden="true"></i></span> <span </div>
class="mx-2"><i class="fa fa-twitter" aria-hidden="true"></i></span> <span class="mx-2"><i <div class="col-md-2 d-flex justify-content-center align-items-center">
class="fa fa-instagram" aria-hidden="true"></i></span></p><small class="rights"><span>&#174;</span> <img
SkuciSe. Sva prava zadrzana.</small></div> th:src="@{'data:image/png;charset=utf-8;base64,'+${slike[oglasStat.count - 1].slikaCode}}"
<div class="col-xl-2 col-md-4 col-sm-4 col-auto order-1 align-self-end "><h6 alt="slika korisnika"
class="mt-55 mt-2 text-muted bold-text"><b>Korisnicki centar </b><i class="fa-solid fa-phone"></i></h6><small> <span><i style="width: 150px;height: 150px;border-radius: 50%;object-fit: cover;">
class="fa fa-envelope" aria-hidden="true"></i></span><a href="mailto:someone@yoursite.com" style="text-decoration: none;color:#627482;" onmouseover="this.style.color='#989c9e'" onMouseOut="this.style.color='#627482'"> skucise@gmail.com</a> </small></div> </div>
</div> <div th:class="${zahtevi[oglasStat.count - 1].status.toString() == 'ZAVRSEN'} ? 'col-md-4' : 'col-md-7'">
</div> <div class="card-body">
</div> <h2 class="card-title"
th:text="${oglas.naslov}">
</h2>
<h4 class="card-title"
th:text="${oglas.lokacija}">
</h4>
</div>
</div>
<div class="col-md-2 d-flex flex-column justify-content-around align-items-center"
th:if="${zahtevi[oglasStat.count - 1].status.toString() != 'ZAVRSEN'}">
<h4 th:text="${zahtevi[oglasStat.count - 1].datum + ' ' + zahtevi[oglasStat.count - 1].vreme}"
th:if="${zahtevi[oglasStat.count - 1].status.toString() == 'POTVRDJEN'}"></h4>
<form method="GET" th:if="${zahtevi[oglasStat.count - 1].status.toString() != 'POTVRDJEN'}"
th:action="@{/oglas-edit/{oglasId}/obrisi-zahtev/{zahtevId}(oglasId=${oglas.oglasId}, zahtevId=${zahtevi[oglasStat.count - 1].zahtevId})}">
<button type="submit" class="btn btn-danger"
th:if="${zahtevi[oglasStat.count - 1].status.toString() == 'CEKANJE'}">
Otkazi zahtev
</button>
<button type="submit" class="btn btn-danger"
th:if="${zahtevi[oglasStat.count - 1].status.toString() == 'ODBIJEN'}">
Obrisi zahtev
</button>
</form>
</div>
<div class="col-5 d-flex align-items-center flex-row justify-content-center"
th:if="${zahtevi[oglasStat.count - 1].status.toString() == 'ZAVRSEN'}">
<div class="col-8 h-100">
<div class="w-100 h-100 d-flex justify-content-center align-items-center">
<textarea id="form7" class="md-textarea form-control h-75" rows="3"></textarea>
</div>
</div>
<div class="col-4">
<button type="submit" class="btn btn-secondary">Postavi komentar</button>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div> </div>
</footer> </div>
</div>
<div class="container-fluid pb-0 mb-0 justify-content-center text-light ">
<footer>
<div class="row my-5 justify-content-center py-5">
<div class="col-11">
<div class="row ">
<div class="col-xl-8 col-md-4 col-sm-4 col-12 my-auto mx-auto a"><h3
class="text-muted mb-md-0 mb-5 bold-text">SkuciSe</h3></div>
<div class="col-xl-2 col-md-4 col-sm-4 col-12"><h6 class="mb-3 mb-lg-4 bold-text "><b>MENI </b><i
class="fa-solid fa-bars"></i></h6>
<ul class="list-unstyled">
<li><a href="/index" style="text-decoration: none;color:#627482;"
onmouseover="this.style.color='#989c9e'" onMouseOut="this.style.color='#627482'">Pocetna</a>
</li>
<li><a href="/onama" style="text-decoration: none;color:#627482;"
onmouseover="this.style.color='#989c9e'" onMouseOut="this.style.color='#627482'">O
nama</a></li>
<li><a href="/portfolio" style="text-decoration: none;color:#627482;"
onmouseover="this.style.color='#989c9e'" onMouseOut="this.style.color='#627482'">Portfolio</a>
</li>
</ul>
</div>
<div class="col-xl-2 col-md-4 col-sm-4 col-12"><h6
class="mb-3 mb-lg-4 text-muted bold-text mt-sm-0 mt-5"><b>ADRESA </b><i
class="fa-solid fa-map-pin"></i></h6>
<p><a href="http://maps.google.com/maps?daddr=Radoja Domanovića 12 Kragujevac&amp;"
style="text-decoration: none;color:#627482;" onmouseover="this.style.color='#989c9e'"
onMouseOut="this.style.color='#627482'">Radoja Domanovića 12 Kragujevac 34000</a></p>
</div>
<div class="row ">
<div class="col-xl-8 col-md-4 col-sm-4 col-auto my-md-0 mt-5 order-sm-1 order-3 align-self-end">
<p
class="social text-muted mb-0 pb-0 bold-text"><span class="mx-2"><i
class="fa fa-facebook"
aria-hidden="true"></i></span>
<span class="mx-2"><i class="fa fa-linkedin-square" aria-hidden="true"></i></span> <span
class="mx-2"><i class="fa fa-twitter" aria-hidden="true"></i></span> <span
class="mx-2"><i
class="fa fa-instagram" aria-hidden="true"></i></span></p><small class="rights"><span>&#174;</span>
SkuciSe. Sva prava zadrzana.</small></div>
<div class="col-xl-2 col-md-4 col-sm-4 col-auto order-1 align-self-end "><h6
class="mt-55 mt-2 text-muted bold-text"><b>Korisnicki centar </b><i
class="fa-solid fa-phone"></i></h6><small> <span><i
class="fa fa-envelope" aria-hidden="true"></i></span><a
href="mailto:someone@yoursite.com" style="text-decoration: none;color:#627482;"
onmouseover="this.style.color='#989c9e'" onMouseOut="this.style.color='#627482'">
skucise@gmail.com</a> </small></div>
</div>
</div>
</div>
</div>
</footer>
</div> </div>
<!-- JavaScript Bundle with Popper --> <!-- JavaScript Bundle with Popper -->
...@@ -157,7 +250,7 @@ ...@@ -157,7 +250,7 @@
<script src="/js/main.js"></script> <script src="/js/main.js"></script>
<script src="https://unpkg.com/aos@next/dist/aos.js"></script> <script src="https://unpkg.com/aos@next/dist/aos.js"></script>
<script> <script>
AOS.init(); AOS.init();
</script> </script>
</body> </body>
</html> </html>
SkuciSe/src/main/resources/templates/oglas.html
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<link href="/css/oglasiStyle.css" rel="stylesheet"/> <link href="/css/oglasiStyle.css" rel="stylesheet"/>
<link rel="stylesheet" href="/css/bootstrap-datetimepicker.min.css" type="text/css" media="all"/> <link rel="stylesheet" href="/css/bootstrap-datetimepicker.min.css" type="text/css" media="all"/>
</head> </head>
<body th:object="${loggedUser}" class="pozadinaSVG"> <body th:object="${loggedUser}">
<nav class="navbar navbar-icon-top navbar-expand-lg p-3"> <nav class="navbar navbar-icon-top navbar-expand-lg p-3">
<a class="navbar-brand" href="#"> </a> <a class="navbar-brand" href="#"> </a>
...@@ -107,7 +107,8 @@ ...@@ -107,7 +107,8 @@
<div><strong>Uspesno!</strong> Uspesno ste poslali zahtev za obilazak!</div> <div><strong>Uspesno!</strong> Uspesno ste poslali zahtev za obilazak!</div>
<button type="button" class="btn-close" data-dismiss="alert"></button> <button type="button" class="btn-close" data-dismiss="alert"></button>
</div> </div>
<div class="alert alert-warning d-flex justify-content-between align-items-center" th:object="${aktivanZahtevPostoji}" <div class="alert alert-warning d-flex justify-content-between align-items-center"
th:object="${aktivanZahtevPostoji}"
th:if="${aktivanZahtevPostoji == true}" style="width: 96%"> th:if="${aktivanZahtevPostoji == true}" style="width: 96%">
<div><strong>Greška!</strong> Vec postoji aktivan zahtev za ovaj oglas!</div> <div><strong>Greška!</strong> Vec postoji aktivan zahtev za ovaj oglas!</div>
<button type="button" class="btn-close" data-dismiss="alert"></button> <button type="button" class="btn-close" data-dismiss="alert"></button>
...@@ -225,61 +226,165 @@ ...@@ -225,61 +226,165 @@
</div> </div>
</div> </div>
</div> </div>
<div class="container container-main d-flex align-items-center justify-content-center flex-column" <div class="row">
th:object="${korisnici}" <div class="col-5">
th:if="${(loggedUser!=null)&&(loggedUser.korisnik.korisnikId == oglas.korisnikId)}"> <div class="container">
<h1>Spisak zahteva za obilazak</h1>
<div class="row w-100 h-50" style="margin-top:50px;">
<div>
<div class="row"> <div class="row">
<div class="col ps-md-4"> <div class="col-md-8">
<div class="media g-mb-30 media-comment">
<img class="d-flex g-width-50 g-height-50 rounded-circle g-mt-3 g-mr-15"
src="https://bootdey.com/img/Content/avatar/avatar7.png" alt="Image Description">
<div class="media-body u-shadow-v18 g-bg-secondary g-pa-30">
<div class="g-mb-15">
<h5 class="h5 g-color-gray-dark-v1 mb-0">John Doe</h5>
<span class="g-color-gray-dark-v4 g-font-size-12">5 days ago</span>
</div>
<p>Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante
sollicitudin. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis.
Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue
felis in faucibus ras purus odio, vestibulum in vulputate at, tempus viverra
turpis.</p>
<ul class="list-inline d-sm-flex my-0">
<li class="list-inline-item g-mr-20">
<a class="u-link-v5 g-color-gray-dark-v4 g-color-primary--hover" href="#!">
<i class="fa fa-thumbs-up g-pos-rel g-top-1 g-mr-3"></i>
178
</a>
</li>
<li class="list-inline-item g-mr-20">
<a class="u-link-v5 g-color-gray-dark-v4 g-color-primary--hover" href="#!">
<i class="fa fa-thumbs-down g-pos-rel g-top-1 g-mr-3"></i>
34
</a>
</li>
<li class="list-inline-item ml-auto">
<a class="u-link-v5 g-color-gray-dark-v4 g-color-primary--hover" href="#!">
<i class="fa fa-reply g-pos-rel g-top-1 g-mr-3"></i>
Reply
</a>
</li>
</ul>
</div>
</div>
</div>
<div class="col-md-8">
<div class="media g-mb-30 media-comment">
<img class="d-flex g-width-50 g-height-50 rounded-circle g-mt-3 g-mr-15"
src="https://bootdey.com/img/Content/avatar/avatar1.png" alt="Image Description">
<div class="media-body u-shadow-v18 g-bg-secondary g-pa-30">
<div class="g-mb-15">
<h5 class="h5 g-color-gray-dark-v1 mb-0">John Doe</h5>
<span class="g-color-gray-dark-v4 g-font-size-12">5 days ago</span>
</div>
<p>Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante
sollicitudin. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis.
Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue
felis in faucibus ras purus odio, vestibulum in vulputate at, tempus viverra
turpis.</p>
<ul class="list-inline d-sm-flex my-0">
<li class="list-inline-item g-mr-20">
<a class="u-link-v5 g-color-gray-dark-v4 g-color-primary--hover" href="#!">
<i class="fa fa-thumbs-up g-pos-rel g-top-1 g-mr-3"></i>
178
</a>
</li>
<li class="list-inline-item g-mr-20">
<a class="u-link-v5 g-color-gray-dark-v4 g-color-primary--hover" href="#!">
<i class="fa fa-thumbs-down g-pos-rel g-top-1 g-mr-3"></i>
34
</a>
</li>
<li class="list-inline-item ml-auto">
<a class="u-link-v5 g-color-gray-dark-v4 g-color-primary--hover" href="#!">
<i class="fa fa-reply g-pos-rel g-top-1 g-mr-3"></i>
Reply
</a>
</li>
</ul>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="col-5">
<div class="container container-main d-flex align-items-center justify-content-center flex-column"
th:object="${korisnici}"
th:if="${(loggedUser!=null)&&(loggedUser.korisnik.korisnikId == oglas.korisnikId)}">
<h1>Spisak zahteva za obilazak</h1>
<div class="row w-100 h-50" style="margin-top:50px;">
<div>
<div class="row"> <div class="row">
<div class="card mb-3" th:each="korisnik: ${korisnici}" style="background: transparent"> <div class="col ps-md-4">
<div class="row no-gutters"> <div class="row">
<div class="col-md-1"> <div class="card mb-3" th:each="korisnik: ${korisnici}"
<div th:if="${zahtevi[korisnikStat.count - 1].status.toString() == 'POTVRDJEN'}" class="col-md-4 h-100" style="background-color: green;border-radius: 5px"></div> style="background: transparent">
<div th:if="${zahtevi[korisnikStat.count - 1].status.toString() == 'CEKANJE'}" class="col-md-4 h-100" style="background-color: yellow;border-radius: 5px"></div> <div class="row no-gutters">
<div th:if="${zahtevi[korisnikStat.count - 1].status.toString() == 'ZAVRSEN'}" class="col-md-4 h-100" style="background-color: blue;border-radius: 5px"></div> <div class="col-md-1">
<div th:if="${zahtevi[korisnikStat.count - 1].status.toString() == 'ODBIJEN'}" class="col-md-4 h-100" style="background-color: red;border-radius: 5px"></div> <div th:if="${zahtevi[korisnikStat.count - 1].status.toString() == 'POTVRDJEN'}"
</div> class="col-md-4 h-100"
<div class="col-md-2 d-flex justify-content-center align-items-center"> style="background-color: green;border-radius: 5px"></div>
<img <div th:if="${zahtevi[korisnikStat.count - 1].status.toString() == 'CEKANJE'}"
th:src="@{'data:image/png;charset=utf-8;base64,'+${korisnik.getSlika()}}" class="col-md-4 h-100"
alt="slika korisnika" style="width: 150px;height: 150px;border-radius: 50%;object-fit: cover;"> style="background-color: yellow;border-radius: 5px"></div>
</div> <div th:if="${zahtevi[korisnikStat.count - 1].status.toString() == 'ZAVRSEN'}"
<div class="col-md-4"> class="col-md-4 h-100"
<div class="card-body"> style="background-color: blue;border-radius: 5px"></div>
<h5 class="card-title" <div th:if="${zahtevi[korisnikStat.count - 1].status.toString() == 'ODBIJEN'}"
th:text="${korisnik.getIme() + ' ' + korisnik.getPrezime()}"></h5> class="col-md-4 h-100"
<p class="card-text" th:if="${zahtevi[korisnikStat.count - 1].status.toString()=='POTVRDJEN'}"> style="background-color: red;border-radius: 5px"></div>
Email:<span th:text="${korisnik.getEmail()}"></span><br> </div>
Telefon:<span th:text="${korisnik.getTelefon()}"></span> <div class="col-md-2 d-flex justify-content-center align-items-center">
</p> <img
th:src="@{'data:image/png;charset=utf-8;base64,'+${korisnik.getSlika()}}"
alt="slika korisnika"
style="width: 150px;height: 150px;border-radius: 50%;object-fit: cover;">
</div>
<div class="col-md-4">
<div class="card-body">
<h5 class="card-title"
th:text="${korisnik.getIme() + ' ' + korisnik.getPrezime()}"></h5>
<p class="card-text"
th:if="${zahtevi[korisnikStat.count - 1].status.toString()=='POTVRDJEN'}">
Email:<span th:text="${korisnik.getEmail()}"></span><br>
Telefon:<span th:text="${korisnik.getTelefon()}"></span>
</p>
</div>
</div>
<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>
</p>
</div>
</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'}">
<form method="GET"
th:action="@{/oglas-edit/{oglasId}/prihvati-zahtev/{zahtevId}(oglasId=${zahtevi[korisnikStat.count - 1].oglasId},zahtevId=${zahtevi[korisnikStat.count - 1].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})}">
<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'}">
<form method="GET"
>
<!--OBRISI ZAHTEV TH:ACTION="@{/oglas-edit/{oglasId}/obrisi-zahtev/}"-->
<button type="submit" class="btn btn-danger">Obrisi zahtev</button>
</form>
</div>
</div> </div>
</div> </div>
<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>
</p>
</div>
</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'}">
<form method="GET"
th:action="@{/oglas-edit/{oglasId}/prihvati-zahtev/{zahtevId}(oglasId=${zahtevi[korisnikStat.count - 1].oglasId},zahtevId=${zahtevi[korisnikStat.count - 1].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})}">
<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'}">
<form method="GET"
><!--OBRISI ZAHTEV TH:ACTION="@{/oglas-edit/{oglasId}/obrisi-zahtev/}"-->
<button type="submit" class="btn btn-danger">Obrisi zahtev</button>
</form>
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -297,31 +402,49 @@ ...@@ -297,31 +402,49 @@
<div class="row "> <div class="row ">
<div class="col-xl-8 col-md-4 col-sm-4 col-12 my-auto mx-auto a"><h3 <div class="col-xl-8 col-md-4 col-sm-4 col-12 my-auto mx-auto a"><h3
class="text-muted mb-md-0 mb-5 bold-text">SkuciSe</h3></div> class="text-muted mb-md-0 mb-5 bold-text">SkuciSe</h3></div>
<div class="col-xl-2 col-md-4 col-sm-4 col-12"><h6 class="mb-3 mb-lg-4 bold-text "><b>MENI </b><i class="fa-solid fa-bars"></i></h6> <div class="col-xl-2 col-md-4 col-sm-4 col-12"><h6 class="mb-3 mb-lg-4 bold-text "><b>MENI </b><i
class="fa-solid fa-bars"></i></h6>
<ul class="list-unstyled"> <ul class="list-unstyled">
<li><a href="/index" style="text-decoration: none;color:#627482;" onmouseover="this.style.color='#989c9e'" onMouseOut="this.style.color='#627482'">Pocetna</a></li> <li><a href="/index" style="text-decoration: none;color:#627482;"
<li><a href="/onama" style="text-decoration: none;color:#627482;" onmouseover="this.style.color='#989c9e'" onMouseOut="this.style.color='#627482'">O nama</a></li> onmouseover="this.style.color='#989c9e'" onMouseOut="this.style.color='#627482'">Pocetna</a>
<li><a href="/portfolio" style="text-decoration: none;color:#627482;" onmouseover="this.style.color='#989c9e'" onMouseOut="this.style.color='#627482'">Portfolio</a></li> </li>
<li><a href="/onama" style="text-decoration: none;color:#627482;"
onmouseover="this.style.color='#989c9e'" onMouseOut="this.style.color='#627482'">O
nama</a></li>
<li><a href="/portfolio" style="text-decoration: none;color:#627482;"
onmouseover="this.style.color='#989c9e'" onMouseOut="this.style.color='#627482'">Portfolio</a>
</li>
</ul> </ul>
</div> </div>
<div class="col-xl-2 col-md-4 col-sm-4 col-12"><h6 <div class="col-xl-2 col-md-4 col-sm-4 col-12"><h6
class="mb-3 mb-lg-4 text-muted bold-text mt-sm-0 mt-5"><b>ADRESA </b><i class="fa-solid fa-map-pin"></i></h6> class="mb-3 mb-lg-4 text-muted bold-text mt-sm-0 mt-5"><b>ADRESA </b><i
<p><a href="http://maps.google.com/maps?daddr=Radoja Domanovića 12 Kragujevac&amp;" style="text-decoration: none;color:#627482;" onmouseover="this.style.color='#989c9e'" onMouseOut="this.style.color='#627482'">Radoja Domanovića 12 Kragujevac 34000</a></p> class="fa-solid fa-map-pin"></i></h6>
<p><a href="http://maps.google.com/maps?daddr=Radoja Domanovića 12 Kragujevac&amp;"
style="text-decoration: none;color:#627482;" onmouseover="this.style.color='#989c9e'"
onMouseOut="this.style.color='#627482'">Radoja Domanovića 12 Kragujevac 34000</a></p>
</div> </div>
<div class="row "> <div class="row ">
<div class="col-xl-8 col-md-4 col-sm-4 col-auto my-md-0 mt-5 order-sm-1 order-3 align-self-end"><p <div class="col-xl-8 col-md-4 col-sm-4 col-auto my-md-0 mt-5 order-sm-1 order-3 align-self-end">
class="social text-muted mb-0 pb-0 bold-text"><span class="mx-2"><i class="fa fa-facebook" <p
aria-hidden="true"></i></span> class="social text-muted mb-0 pb-0 bold-text"><span class="mx-2"><i
<span class="mx-2"><i class="fa fa-linkedin-square" aria-hidden="true"></i></span> <span class="fa fa-facebook"
class="mx-2"><i class="fa fa-twitter" aria-hidden="true"></i></span> <span class="mx-2"><i aria-hidden="true"></i></span>
class="fa fa-instagram" aria-hidden="true"></i></span></p><small class="rights"><span>&#174;</span> <span class="mx-2"><i class="fa fa-linkedin-square" aria-hidden="true"></i></span> <span
class="mx-2"><i class="fa fa-twitter" aria-hidden="true"></i></span> <span
class="mx-2"><i
class="fa fa-instagram" aria-hidden="true"></i></span></p><small class="rights"><span>&#174;</span>
SkuciSe. Sva prava zadrzana.</small></div> SkuciSe. Sva prava zadrzana.</small></div>
<div class="col-xl-2 col-md-4 col-sm-4 col-auto order-1 align-self-end "><h6 <div class="col-xl-2 col-md-4 col-sm-4 col-auto order-1 align-self-end "><h6
class="mt-55 mt-2 text-muted bold-text"><b>Korisnicki centar </b><i class="fa-solid fa-phone"></i></h6><small> <span><i class="mt-55 mt-2 text-muted bold-text"><b>Korisnicki centar </b><i
class="fa fa-envelope" aria-hidden="true"></i></span><a href="mailto:someone@yoursite.com" style="text-decoration: none;color:#627482;" onmouseover="this.style.color='#989c9e'" onMouseOut="this.style.color='#627482'"> skucise@gmail.com</a> </small></div> class="fa-solid fa-phone"></i></h6><small> <span><i
class="fa fa-envelope" aria-hidden="true"></i></span><a
href="mailto:someone@yoursite.com" style="text-decoration: none;color:#627482;"
onmouseover="this.style.color='#989c9e'" onMouseOut="this.style.color='#627482'">
skucise@gmail.com</a> </small></div>
</div> </div>
</div> </div>
</div></div> </div>
</div>
</footer> </footer>
</div> </div>
......
SkuciSe/src/main/resources/templates/portfolio.html
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
<!-- Team item--> <!-- Team item-->
<div class="col-xl-3 col-sm-6 mb-5"> <div class="col-xl-3 col-sm-6 mb-5">
<div class="bg-white rounded shadow-sm py-5 px-4"><img src="images/naocale.jpg" alt="" width="100" class="img-fluid rounded-circle mb-3 img-thumbnail shadow-sm"> <div class="bg-white rounded shadow-sm py-5 px-4"><img src="https://cdn.discordapp.com/attachments/534446980194107395/1020436174436835459/22d0118fab8c343a3e0af4061314f96ce7f4820088857fcf37ed42c2c5a67adc.0.png" alt="" width="100" class="img-fluid rounded-circle mb-3 img-thumbnail shadow-sm">
<h5 class="mb-0">Mihailo Šebek</h5><span class="small text-uppercase text-muted">Back-End Developer</span> <h5 class="mb-0">Mihailo Šebek</h5><span class="small text-uppercase text-muted">Back-End Developer</span>
<ul class="social mb-0 list-inline mt-3"> <ul class="social mb-0 list-inline mt-3">
<li class="list-inline-item"><a href="#" class="social-link"><i class="fa fa-facebook-f"></i></a></li> <li class="list-inline-item"><a href="#" class="social-link"><i class="fa fa-facebook-f"></i></a></li>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment