Skip to content

S
SkuciSe
Commit 459060ae by Mihailo Sebek
Options

Merge remote-tracking branch 'origin/master'

parents ae7813a1 93675457
Showing with 88 additions and 15 deletions
SkuciSe/src/main/resources/static/css/style.css
...@@ -124,6 +124,11 @@ body{ ...@@ -124,6 +124,11 @@ body{
top: -7px; top: -7px;
} }
} }
@media (max-width: 996px){
#indexCont{
min-height: 900px;
}
}
.container-fluid{ .container-fluid{
overflow:hidden; overflow:hidden;
background:#1c1c1c; /*footer*/ background:#1c1c1c; /*footer*/
......
SkuciSe/src/main/resources/templates/oglas.html
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<!-- Core theme CSS (includes Bootstrap)--> <!-- Core theme CSS (includes Bootstrap)-->
<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}" class="pozadinaSVG">
...@@ -102,7 +102,8 @@ ...@@ -102,7 +102,8 @@
</nav> </nav>
<div class="mt-5 ml-5 mr-0 w-100" th:object="${oglasId}"> <div class="mt-5 ml-5 mr-0 w-100" th:object="${oglasId}">
<div class="alert alert-success d-flex justify-content-between align-items-center" th:object="${zakazan}" th:if="${zakazan == true}" style="width: 96%"> <div class="alert alert-success d-flex justify-content-between align-items-center" th:object="${zakazan}"
th:if="${zakazan == true}" style="width: 96%">
<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>
...@@ -130,8 +131,10 @@ ...@@ -130,8 +131,10 @@
<!-- Thumbnails --> <!-- Thumbnails -->
<ol class="carousel-indicators list-inline" style="height: 100px"> <ol class="carousel-indicators list-inline" style="height: 100px">
<li class="list-inline-item active" th:each="slika: ${slike}"> <li class="list-inline-item active" th:each="slika: ${slike}">
<a th:id="'carousel-selector-' + ${slikaStat.count - 1}" class="selected" th:data-slide-to="${slikaStat.count - 1}" data-target="#custCarousel"> <a th:id="'carousel-selector-' + ${slikaStat.count - 1}" class="selected"
<img th:src="@{'data:image/png;charset=utf-8;base64,'+${slika.slikaCode}}" class="img-fluid"> th:data-slide-to="${slikaStat.count - 1}" data-target="#custCarousel">
<img th:src="@{'data:image/png;charset=utf-8;base64,'+${slika.slikaCode}}"
class="img-fluid">
</a> </a>
</li> </li>
</ol> </ol>
...@@ -168,7 +171,8 @@ ...@@ -168,7 +171,8 @@
<div class="row"><p>Namesten:</p></div> <div class="row"><p>Namesten:</p></div>
</div> </div>
<div class="col"> <div class="col">
<div class="row"><p th:text="${oglas.cena * oglas.kvadratura + '$'}" th:if="${oglas.vrstaOglasaId == 1}"></p></div> <div class="row"><p th:text="${oglas.cena * oglas.kvadratura + '$'}"
th:if="${oglas.vrstaOglasaId == 1}"></p></div>
<div class="row"><p th:text="${oglas.cena + '$'}"></p></div> <div class="row"><p th:text="${oglas.cena + '$'}"></p></div>
<div class="row"><p th:text="${oglas.kvadratura + ' m2'}"></p></div> <div class="row"><p th:text="${oglas.kvadratura + ' m2'}"></p></div>
<div class="row"><p th:text="${oglas.brojSoba}"></p></div> <div class="row"><p th:text="${oglas.brojSoba}"></p></div>
...@@ -184,16 +188,21 @@ ...@@ -184,16 +188,21 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row" th:if="${(loggedUser !=null) && (oglas.korisnikId != loggedUser.getKorisnik().korisnikId)}"> <div class="row"
<button type="button" class="btn btn-primary" id="zahtevDugme" >Zakazite obilazak</button> th:if="${(loggedUser !=null) && (oglas.korisnikId != loggedUser.getKorisnik().korisnikId)}">
<div class="row mt-3" id = "izlazDiv" style="display: none;"> <button type="button" class="btn btn-primary" id="zahtevDugme">Zakazite obilazak</button>
<form class="d-flex justify-content-center flex-column align-items-end" th:if="${loggedUser != null}" th:action="@{/obradi-zahtev/{id}(id=${oglasId})}" method="POST" th:object="${noviZahtev}"> <div class="row mt-3" id="izlazDiv" style="display: none;">
<input type="hidden" th:field="${noviZahtev.korisnikId}" th:value="${loggedUser.korisnik.korisnikId}"> <form class="d-flex justify-content-center flex-column align-items-end"
th:if="${loggedUser != null}" th:action="@{/obradi-zahtev/{id}(id=${oglasId})}" method="POST"
th:object="${noviZahtev}">
<input type="hidden" th:field="${noviZahtev.korisnikId}"
th:value="${loggedUser.korisnik.korisnikId}">
<input type="hidden" th:field="${noviZahtev.oglasId}" th:value="${oglas.oglasId}"> <input type="hidden" th:field="${noviZahtev.oglasId}" th:value="${oglas.oglasId}">
<div class="row w-100"> <div class="row w-100">
<div class="form-group"> <div class="form-group">
<div class="input-group date" id="id_1"> <div class="input-group date" id="id_1">
<input type="text" value="01/01/2022" class="form-control" required="" name="datumIVreme"> <input type="text" value="01/01/2022" class="form-control" required=""
name="datumIVreme">
<div class="input-group-addon input-group-append"> <div class="input-group-addon input-group-append">
<div class="input-group-text"> <div class="input-group-text">
<i class="glyphicon glyphicon-calendar fa fa-calendar"></i> <i class="glyphicon glyphicon-calendar fa fa-calendar"></i>
...@@ -204,7 +213,65 @@ ...@@ -204,7 +213,65 @@
</div> </div>
<button type="submit" class="btn btn-primary w-25">POSALJI ZAHTEV</button> <button type="submit" class="btn btn-primary w-25">POSALJI ZAHTEV</button>
</form> </form>
<h3 th:if="${loggedUser == null}" class="text-center"><a th:href="@{/login-zahtev/{oglasId}(oglasId=${oglasId})}" style="text-decoration: none;color:#495056;">Prijavite se</a></h3> <h3 th:if="${loggedUser == null}" class="text-center"><a
th:href="@{/login-zahtev/{oglasId}(oglasId=${oglasId})}"
style="text-decoration: none;color:#495056;">Prijavite se</a></h3>
</div>
</div>
</div>
</div>
<div class="container container-main d-flex align-items-center justify-content-center flex-column"
th:object="${korisnici}">
<h1>Spisak zahteva za obilazak</h1>
<div class="row w-100 h-50" style="margin-top:50px;">
<div>
<div class="row">
<div class="col ps-md-4">
<div class="row">
<div class="card mb-3" th:each="korisnik: ${korisnici}" style="background: transparent">
<div class="row no-gutters">
<div class="col-md-1">
<div th:if="${zahtevi[korisnikStat.count - 1].status.toString() == 'POTVRDJEN'}" class="col-md-4 h-100" style="background-color: green;border-radius: 5px"></div>
<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 th:if="${zahtevi[korisnikStat.count - 1].status.toString() == 'ZAVRSEN'}" class="col-md-4 h-100" style="background-color: blue;border-radius: 5px"></div>
<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>
<div class="col-md-3 d-flex justify-content-center align-items-center">
<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-6">
<div class="card-body">
<h5 class="card-title"
th:text="${korisnik.getIme() + ' ' + korisnik.getPrezime()}"></h5>
<p class="card-text">
Email:<span th:text="${korisnik.getEmail()}"></span><br>
Telefon:<span th:text="${korisnik.getTelefon()}"></span><br>
Datum i Vreme: <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>
</div> </div>
</div> </div>
...@@ -265,11 +332,12 @@ ...@@ -265,11 +332,12 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.12.0/moment.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.12.0/moment.js"></script>
<script type="text/javascript" src="/js/bootstrap-datetimepicker.min.js"></script> <script type="text/javascript" src="/js/bootstrap-datetimepicker.min.js"></script>
<script type="text/javascript" src="/js/demo.js"></script> <script type="text/javascript" src="/js/demo.js"></script>
<script crossorigin="anonymous" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js"></script> <script crossorigin="anonymous" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q"
src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
<script> <script>
$(document).ready(function(){ $(document).ready(function () {
$("#zahtevDugme").click(function(){ $("#zahtevDugme").click(function () {
$("#izlazDiv").fadeToggle("slow"); $("#izlazDiv").fadeToggle("slow");
}); });
}); });
......
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