Skip to content

S
SkuciSe
Commit 0df60b72 by Milovan Samardzic
Options

izmenaJSIndexListaOglasa

parent 6233250f
Showing with 99 additions and 63 deletions
SkuciSe/src/main/resources/static/css/style.css
...@@ -181,16 +181,14 @@ h3{ ...@@ -181,16 +181,14 @@ h3{
-webkit-align-items: center; -webkit-align-items: center;
align-items: center; align-items: center;
padding: 60px; padding: 60px;
height: 700px;
} }
.form-content .form-items { .form-content .form-items {
/*border: 3px solid #fff;*/ /*border: 3px solid #fff;*/
background-color: #3c3c3c; /*forma*/ background-color: #3c3c3c; /*forma*/
padding: 40px; padding: 40px;
display: inline-block;
width: 100%; width: 100%;
min-width: 540px; min-width: 350px;
-webkit-border-radius: 10px; -webkit-border-radius: 10px;
-moz-border-radius: 10px; -moz-border-radius: 10px;
border-radius: 10px; border-radius: 10px;
...@@ -391,9 +389,6 @@ img { ...@@ -391,9 +389,6 @@ img {
width: 50%; width: 50%;
text-align: center; text-align: center;
} }
.form-check-input{
position:relative;
}
#ads { #ads {
margin: 30px 0 30px 0; margin: 30px 0 30px 0;
......
SkuciSe/src/main/resources/static/js/main.js
...@@ -15,36 +15,84 @@ ...@@ -15,36 +15,84 @@
})() })()
window.onload = proveraLogin(); window.onload = proveraLogin();
window.onload = postaviFiltere();
function proveraLogin(){ function proveraLogin() {
const queryString = window.location.search; const queryString = window.location.search;
console.log(queryString) if (queryString === "?error") {
if(queryString === "?error"){
document.getElementById("losaSifra").style.display = "block"; document.getElementById("losaSifra").style.display = "block";
} } else {
else if (document.getElementById("losaSifra") != null)
{ document.getElementById("losaSifra").style.display = "none";
if(document.getElementById("losaSifra") != null)
document.getElementById("losaSifra").style.display = "none";
} }
} }
function validateForm() { function validateForm() {
var prva = document.getElementById("prvaSifra").value; var prva = document.getElementById("prvaSifra").value;
var druga = document.getElementById("drugaSifra").value; var druga = document.getElementById("drugaSifra").value;
var errorCode1 = document.getElementById("errorCode1"); var errorCode1 = document.getElementById("errorCode1");
var errorCode2 = document.getElementById("errorCode2"); var errorCode2 = document.getElementById("errorCode2");
if(prva.trim().length === 0 || druga.trim().length === 0){ if (prva.trim().length === 0 || druga.trim().length === 0) {
errorCode1.style.display = "block"; errorCode1.style.display = "block";
return false; return false;
} } else if (prva != druga) {
else if(prva != druga){
errorCode1.style.display = "none"; errorCode1.style.display = "none";
errorCode2.style.display = "block"; errorCode2.style.display = "block";
return false; return false;
} } else
else
return true; return true;
} }
document.getElementById("flexRadioDefault1").setAttribute("checked","checked")
document.getElementById("flexRadioDefault1").setAttribute("checked", "checked")
function postaviFiltere() {
const params = new URLSearchParams(window.location.search)
let cenaMin = document.getElementById("cena-min")
let cenaMax = document.getElementById("cena-max")
let radioIzdavanje = document.getElementById("radio-izdavanje")
let radioProdaja = document.getElementById("radio-prodaja")
let lokacijeOpt = document.getElementById("lokacijeopt")
let kvadraturaMin = document.getElementById("kvadratura-min")
let kvadraturaMax = document.getElementById("kvadratura-max")
let brojSoba = document.getElementById("broj-soba")
let lift = document.getElementById("check-lift")
let grejanje = document.getElementById("check-grejanje")
let namesten = document.getElementById("check-namesten")
for (const param of params) {
console.log(param[0], param[1])
if (param[0] === "cenaMin" && param[1] !== "") {
cenaMin.value = param[1];
}
if (param[0] === "cenaMax" && param[1] !== "") {
cenaMax.value = param[1];
}
if (param[0] === "vrstaOglasaId" && param[1] !== "") {
if (param[1] === "2")
radioIzdavanje.setAttribute("checked", "checked")
else
radioProdaja.setAttribute("checked", "checked")
}
if (param[0] === "lokacijaId" && param[1] !== "0") {
lokacijeOpt.value = param[1];
}
if (param[0] === "kvadraturaMin" && param[1] !== "") {
kvadraturaMin.value = param[1];
}
if (param[0] === "kvadraturaMax" && param[1] !== "") {
kvadraturaMax.value = param[1];
}
if (param[0] === "brojSoba" && param[1] !== "") {
brojSoba.value = param[1];
}
if (param[0] === "lift" && param[1] !== "") {
lift.checked = true;
}
if (param[0] === "grejanje" && param[1] !== "") {
grejanje.checked = true;
}
if (param[0] === "namesten" && param[1] !== "") {
namesten.checked = true;
}
}
}
\ No newline at end of file
SkuciSe/src/main/resources/templates/index.html
...@@ -53,9 +53,10 @@ ...@@ -53,9 +53,10 @@
</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}"><button type="button" class="btn btn-primary btn-md mr-2"><i class="fa-solid fa-plus"></i> Postavite <a th:href="@{/novi-oglas}">
novi oglas <button type="button" class="btn btn-primary btn-md mr-2"><i class="fa-solid fa-plus"></i> Postavite
</button> novi oglas
</button>
</a> </a>
</form> </form>
<ul class="navbar-nav"> <ul class="navbar-nav">
...@@ -90,18 +91,17 @@ ...@@ -90,18 +91,17 @@
</ul> </ul>
</div> </div>
</nav> </nav>
<div class="container-main pozadinaSVG d-flex justify-content-center align-items-center"> <div class="container-main pozadinaSVG d-flex justify-content-center align-items-center">
<div class="row"> <div class="row" style="width: 40%;z-index: 100">
<div class="form-holder"> <div class="form-content p-0 w-100">
<div class="form-content"> <div class="form-items w-100 p-0" style="background: transparent;color:black">
<div class="form-items" style="width: 50vw"> <h1>Pretrazite smestaj</h1>
<h1>Pretrazite smestaj</h1> <form class="requires-validation d-flex flex-wrap justify-content-around align-items-center w-100"
<form class="requires-validation d-flex flex-wrap justify-content-around align-items-center" novalidate
novalidate th:object="${filter}" method="GET" th:object="${filter}" method="GET" th:action="@{/lista-oglasa}" enctype="multipart/form-data">
th:action="@{/lista-oglasa}" enctype="multipart/form-data"> <div class="row w-100">
<div> <div class="col-md-4 col-sm-4 col-xs-4 d-flex justify-content-start align-items-center">
<div class="col-md-12"> <div class="row">
<select th:field="${filter.lokacijaId}"> <select th:field="${filter.lokacijaId}">
<option th:each="lokacija: ${lokacije}" th:value="${lokacija.getLokacijaId()}" <option th:each="lokacija: ${lokacije}" th:value="${lokacija.getLokacijaId()}"
th:text="${lokacija.getNaziv()}"> th:text="${lokacija.getNaziv()}">
...@@ -109,35 +109,31 @@ ...@@ -109,35 +109,31 @@
</select> </select>
</div> </div>
</div> </div>
<div class="col-md-7 col-sm-7 col-xs-7 d-flex justify-content-between align-items-center flex-row">
<div class="d-flex justify-content-between align-items-center flex-row w-50">
<div class="col-6 d-flex justify-content-around align-items-center flex-row mt-3" /*style="min-width:250px*/">
<div>
<input checked class="form-check-input" type="radio" name="flexRadioDefault" <input checked class="form-check-input" type="radio" name="flexRadioDefault"
id="flexRadioDefault1" value="1" th:field="${filter.vrstaOglasaId}"> id="flexRadioDefault1" value="1" th:field="${filter.vrstaOglasaId}">
<label class="form-check-label" for="flexRadioDefault1"> <span class="ml-1">
Prodaja Prodaja
</label> </span>
</div> </div>
<div> <div class="d-flex justify-content-between align-items-center flex-row w-50">
<input class="form-check-input" type="radio" name="flexRadioDefault" <input class="form-check-input" type="radio" name="flexRadioDefault"
id="flexRadioDefault2" value="2" th:field="${filter.vrstaOglasaId}"> id="flexRadioDefault2" value="2" th:field="${filter.vrstaOglasaId}">
<label class="form-check-label" for="flexRadioDefault2"> <span class="ml-1">
Izdavanje Izdavanje
</label> </span>
</div> </div>
</div> </div>
<div class="col-md-1 col-sm-1 col-xs-1 form-button mt-3">
<div class="form-button mt-3">
<button id="submit" type="submit" class="btn btn-primary">Pretrazi</button> <button id="submit" type="submit" class="btn btn-primary">Pretrazi</button>
</div> </div>
</form> </div>
</div> </form>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="container-fluid pb-0 mb-0 justify-content-center text-light "> <div class="container-fluid pb-0 mb-0 justify-content-center text-light ">
<footer> <footer>
<div class="row my-5 justify-content-center py-5"> <div class="row my-5 justify-content-center py-5">
......
SkuciSe/src/main/resources/templates/lista-oglasa.html
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
</nav> </nav>
<form class="main-section mb-5 d-flex flew-row m-4" <form class="main-section mb-5 d-flex flew-row m-4"
method="GET" th:action="@{/lista-oglasa}" id="filter"> method="GET" th:action="@{/lista-oglasa}" id="filter">
<div class="row"> <div class="row w-100">
<div class="col-3"> <div class="col-3">
<div class="card mt-2" style="min-width: 130px"> <div class="card mt-2" style="min-width: 130px">
<article class="card-group-item"> <article class="card-group-item">
...@@ -119,13 +119,11 @@ ...@@ -119,13 +119,11 @@
<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">
<span class="float-right badge badge-light round">52</span>
<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">
<span class="float-right badge badge-light round">132</span>
<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.// -->
...@@ -138,7 +136,7 @@ ...@@ -138,7 +136,7 @@
</header> </header>
<div class="filter-content"> <div class="filter-content">
<div class="card-body"> <div class="card-body">
<select class="form-select" name="lokacijaId"> <select class="form-select" name="lokacijaId" id="lokacijeopt">
<option value="0" selected>Sve lokacije</option> <option value="0" selected>Sve lokacije</option>
<option th:each="lokacija: ${lokacije}" th:value="${lokacija.getLokacijaId()}" <option th:each="lokacija: ${lokacije}" th:value="${lokacija.getLokacijaId()}"
th:text="${lokacija.getNaziv()}"></option> th:text="${lokacija.getNaziv()}"></option>
...@@ -185,19 +183,16 @@ ...@@ -185,19 +183,16 @@
<div class="filter-content"> <div class="filter-content">
<div class="card-body"> <div class="card-body">
<div class="custom-control custom-checkbox"> <div class="custom-control custom-checkbox">
<span class="float-right badge badge-light round">52</span>
<input type="checkbox" class="custom-control-input" name="lift" id="check-lift"> <input type="checkbox" class="custom-control-input" name="lift" id="check-lift">
<label class="custom-control-label" for="check-lift">Lift</label> <label class="custom-control-label" for="check-lift">Lift</label>
</div> <!-- form-check.// --> </div> <!-- form-check.// -->
<div class="custom-control custom-checkbox"> <div class="custom-control custom-checkbox">
<span class="float-right badge badge-light round">132</span>
<input type="checkbox" class="custom-control-input" name="grejanje" id="check-grejanje"> <input type="checkbox" class="custom-control-input" name="grejanje" id="check-grejanje">
<label class="custom-control-label" for="check-grejanje">Grejanje</label> <label class="custom-control-label" for="check-grejanje">Grejanje</label>
</div> <!-- form-check.// --> </div> <!-- form-check.// -->
<div class="custom-control custom-checkbox"> <div class="custom-control custom-checkbox">
<span class="float-right badge badge-light round">17</span>
<input type="checkbox" class="custom-control-input" name="namesten" id="check-namesten"> <input type="checkbox" class="custom-control-input" name="namesten" id="check-namesten">
<label class="custom-control-label" for="check-namesten">Namesten</label> <label class="custom-control-label" for="check-namesten">Namesten</label>
</div> <!-- form-check.// --> </div> <!-- form-check.// -->
...@@ -205,9 +200,10 @@ ...@@ -205,9 +200,10 @@
</div> </div>
</article> <!-- card-group-item.// --> </article> <!-- card-group-item.// -->
<article class="card-group-item"> <article class="card-group-item">
<header class="card-header d-flex justify-content-center"> <div class="card-header d-flex justify-content-between">
<button type="submit" class="btn btn-primary">Primeni filtere</button> <button type="submit" class="btn btn-primary">Primeni filtere</button>
</header> <a th:href="@{/lista-oglasa}"><button type="button" class="btn btn-primary">Resetuj filtere</button></a>
</div>
</article> </article>
</div> <!-- card.// --> </div> <!-- card.// -->
</div> </div>
......
SkuciSe/src/main/resources/templates/register.html
...@@ -85,10 +85,10 @@ ...@@ -85,10 +85,10 @@
</div> </div>
</nav> </nav>
<div class="form-body d-flex justify-content-center w-100 h-100"> <div class="form-body d-flex justify-content-center">
<div class="row"> <div class="row">
<div class="form-holder"> <div class="form-holder">
<div class="form-content" style="bottom:50px;height: auto;"> <div class="form-content">
<div class="form-items"> <div class="form-items">
<form class="requires-validation" novalidate th:object="${newUser}" method="POST" <form class="requires-validation" novalidate th:object="${newUser}" method="POST"
th:action="@{/register-proccess}" enctype="multipart/form-data"> th:action="@{/register-proccess}" enctype="multipart/form-data">
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
<input th:field="${newUser.email}" class="form-control" type="email" name="email" <input th:field="${newUser.email}" class="form-control" type="email" name="email"
placeholder="E-mail Adresa" required> placeholder="E-mail Adresa" required>
<div class="valid-feedback">Dobar email!</div> <div class="valid-feedback">Dobar email!</div>
<div class="invalid-feedback">Email ne sme biti prazan!</div> <div class="invalid-feedback">Neispravan email!</div>
</div> </div>
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
<div class="invalid-feedback">Molim vas da potvrdite da su svi podaci tacni!</div> <div class="invalid-feedback">Molim vas da potvrdite da su svi podaci tacni!</div>
</div> </div>
<div th:if="${emailZauzet == true}" style="color:white">Korisnik sa tim emailom vec postoji! <br>Da li zelite da se ulogujete <a th:href="@{/login}" style="color:dimgrey;">Login</a></div> <div class="mt-2" th:if="${emailZauzet == true}" style="color:white">Korisnik sa tim emailom vec postoji! <br>Da li zelite da se ulogujete <a th:href="@{/login}" style="color:dimgrey;">Login</a></div>
<div class="form-button mt-3"> <div class="form-button mt-3">
<button id="submit" type="submit" class="btn btn-primary">Registruj se</button> <button id="submit" type="submit" class="btn btn-primary">Registruj se</button>
</div> </div>
......
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