Skip to content

S
SkuciSe
Commit 3796df36 by Milovan Samardzic
Options

frontIzmenaSve

parent 35bdd449
Showing with 35 additions and 32 deletions
SkuciSe/src/main/java/com/example/SkuciSe/controller/AppController.java
...@@ -58,7 +58,6 @@ public class AppController ...@@ -58,7 +58,6 @@ public class AppController
@PostMapping("/register-proccess") @PostMapping("/register-proccess")
public String postRegisterProccess(@ModelAttribute Korisnik korisnik, @RequestParam("image") MultipartFile multipartFile, Model model) public String postRegisterProccess(@ModelAttribute Korisnik korisnik, @RequestParam("image") MultipartFile multipartFile, Model model)
{ {
System.out.println(korisnik);
try { try {
kRepo.insert( korisnik, multipartFile); kRepo.insert( korisnik, multipartFile);
return("redirect:/login"); return("redirect:/login");
......
SkuciSe/src/main/resources/templates/index.html
...@@ -105,22 +105,22 @@ ...@@ -105,22 +105,22 @@
<h1 class="mb-5" style="color:white">Pretrazite oglase</h1> <h1 class="mb-5" style="color:white">Pretrazite oglase</h1>
<form class="form-subscribe" method="GET" th:action="@{/lista-oglasa}"> <form class="form-subscribe" method="GET" th:action="@{/lista-oglasa}">
<div class="row"> <div class="row">
<div class="col-3"> <div class="col-lg-3 col-md-12 col-sm-12 col-xs-12">
<select class="form-select" name="lokacijaId" id="lokacijeopt"> <select class="form-select" name="lokacijaId" id="lokacijeopt">
<option value="" selected>Sve lokacije</option> <option value="" 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>
</select> </select>
</div> </div>
<div class="col-3"> <div class="col-lg-3 col-md-12 col-sm-12 col-xs-12">
<input type="radio" name="vrstaOglasaId" id="radiodugme1" value="1"> <input type="radio" name="vrstaOglasaId" id="radiodugme1" value="1">
<label for="radiodugme1" style="color:white">Prodaja</label> <label for="radiodugme1" style="color:white">Prodaja</label>
</div> </div>
<div class="col-3"> <div class="col-lg-3 col-md-12 col-sm-12 col-xs-12">
<input type="radio" name="vrstaOglasaId" id="radiodugme2" value="2"> <input type="radio" name="vrstaOglasaId" id="radiodugme2" value="2">
<label for="radiodugme2" style="color:white">Iznajmljivanje</label> <label for="radiodugme2" style="color:white">Iznajmljivanje</label>
</div> </div>
<div class="col-3"> <div class="col-lg-3 col-md-12 col-sm-12 col-xs-12">
<button class="btn btn-secondary btn-lg" id="submitButton" type="submit">Pretrazi <button class="btn btn-secondary btn-lg" id="submitButton" type="submit">Pretrazi
</button> </button>
</div> </div>
......
SkuciSe/src/main/resources/templates/korisnik.html
...@@ -222,6 +222,7 @@ ...@@ -222,6 +222,7 @@
<div id="div-ocene" style="display: none" class="row w-100"> <div id="div-ocene" style="display: none" class="row w-100">
<div class="container"> <div class="container">
<div class="row w-100" th:object="${korisniciKomentari}"> <div class="row w-100" th:object="${korisniciKomentari}">
<h4 th:if="${korisniciKomentari.size() == 0}" class="text-center">Nema ocena za ovog korisnika</h4>
<div class="row" th:each="komentar:${komentari}"> <div class="row" th:each="komentar:${komentari}">
<div class="media g-mb-30 media-comment"> <div class="media g-mb-30 media-comment">
<div class="media-body u-shadow-v18 g-bg-secondary g-pa-30"> <div class="media-body u-shadow-v18 g-bg-secondary g-pa-30">
......
SkuciSe/src/main/resources/templates/lista-korisnika.html
...@@ -93,8 +93,9 @@ ...@@ -93,8 +93,9 @@
</div> </div>
</nav> </nav>
<div class="container container-main d-flex align-items-center justify-content-center flex-column"> <div class="container container-main d-flex align-items-center justify-content-center flex-column h-100" style="min-height:600px;">
<h1>Spisak korisnika</h1> <h1>Spisak korisnika</h1>
<h4 th:if="${korisnici.size() == 0}">Nema drugih korisnika!</h4>
<div class="alert alert-info" th:object="${deleted}" th:if="${deleted == true}"> <div class="alert alert-info" th:object="${deleted}" th:if="${deleted == true}">
<strong>Uspesno!</strong> Uspesno ste obrisali korisnika! <strong>Uspesno!</strong> Uspesno ste obrisali korisnika!
<button type="button" class="btn-close" data-dismiss="alert"></button> <button type="button" class="btn-close" data-dismiss="alert"></button>
......
SkuciSe/src/main/resources/templates/lista-oglasa.html
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
<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 w-100"> <div class="row w-100">
<div class="col-3"> <div class="col-lg-3 col-md-3 col-sm-3 col-xs-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">
<header class="card-header"> <header class="card-header">
...@@ -147,16 +147,16 @@ ...@@ -147,16 +147,16 @@
<input type="radio" class="custom-control-input" name="vrstaOglasaId" value="2" <input type="radio" class="custom-control-input" name="vrstaOglasaId" value="2"
id="radio-izdavanje"> 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>
<div class="custom-control custom-radio"> <div class="custom-control custom-radio">
<input type="radio" class="custom-control-input" name="vrstaOglasaId" value="1" <input type="radio" class="custom-control-input" name="vrstaOglasaId" value="1"
id="radio-prodaja"> 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>
</div> <!-- card-body.// --> </div>
</div> </div>
</article> <!-- card-group-item.// --> </article>
<article class="card-group-item"> <article class="card-group-item">
<header class="card-header"> <header class="card-header">
<h6 class="title">Lokacija</h6> <h6 class="title">Lokacija</h6>
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
<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>
</select> </select>
</div> <!-- card-body.// --> </div>
</div> </div>
</article> </article>
<article class="card-group-item"> <article class="card-group-item">
...@@ -203,7 +203,7 @@ ...@@ -203,7 +203,7 @@
<input type="number" class="form-control" name="brojSoba" id="broj-soba" placeholder="0" <input type="number" class="form-control" name="brojSoba" id="broj-soba" placeholder="0"
min="0"> min="0">
</div> </div>
</div> <!-- card-body.// --> </div>
</div> </div>
</article> </article>
<article class="card-group-item"> <article class="card-group-item">
...@@ -215,31 +215,31 @@ ...@@ -215,31 +215,31 @@
<div class="custom-control custom-checkbox"> <div class="custom-control custom-checkbox">
<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>
<div class="custom-control custom-checkbox"> <div class="custom-control custom-checkbox">
<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>
<div class="custom-control custom-checkbox"> <div class="custom-control custom-checkbox">
<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>
</div> <!-- card-body.// --> </div>
</div> </div>
</article> <!-- card-group-item.// --> </article>
<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 flex-wrap">
<a th:href="@{/lista-oglasa}"> <a th:href="@{/lista-oglasa}">
<button type="button" class="btn btn-primary">Resetuj filtere</button> <button type="button" class="btn btn-primary mb-2">Resetuj filtere</button>
</a> </a>
<button type="submit" class="btn btn-primary">Primeni filtere</button> <button type="submit" class="btn btn-primary mb-2">Primeni filtere</button>
</div> </div>
</article> </article>
</div> </div>
</div> </div>
<div class="col-9" th:object="${slikeOglasa}"> <div class="col-lg-9 col-md-9 col-sm-9 col-xs-9" th:object="${slikeOglasa}">
<h1 th:if="${oglasi.size() == 0}" class="text-center">Nema oglasa!</h1> <h1 th:if="${oglasi.size() == 0}" class="text-center">Nema oglasa!</h1>
<div class="row w-100 box " th:each="i : ${#numbers.sequence(0, oglasi.size()-1,3)}"> <div class="row w-100 box " th:each="i : ${#numbers.sequence(0, oglasi.size()-1,3)}">
<div class="col-lg-4 p-2" data-aos="zoom-in" th:if="${oglasi[i].naslov != null}"> <div class="col-lg-4 p-2" data-aos="zoom-in" th:if="${oglasi[i].naslov != null}">
......
SkuciSe/src/main/resources/templates/moji-zahtevi.html
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous"> integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous">
<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}">
<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>
...@@ -96,16 +96,18 @@ ...@@ -96,16 +96,18 @@
<div class="container container-main d-flex align-items-center justify-content-center flex-column" <div class="container container-main d-flex align-items-center justify-content-center flex-column"
th:object="${zahtevi}" style="min-height: 600px"> th:object="${zahtevi}" style="min-height: 600px">
<h1>Spisak zahteva za obilazak</h1> <div class="row w-100 justify-content center">
<h1 class="text-center">Spisak zahteva za obilazak</h1>
</div>
<div class="row w-100 h-50" style="margin-top:50px;"> <div class="row w-100 h-50" style="margin-top:50px;">
<div class="row"> <div class="row">
<h2 th:if="${oglasi.size() == 0}" class="text-center">Jos niste poslali nijedan zahtev!</h2> <h2 th:if="${oglasi.size() == 0}" class="text-center ml-3">Jos niste poslali nijedan zahtev!</h2>
<div class="card mb-3" th:each="oglas: ${oglasi}" style="background: transparent" th:if="${!zahtevi[oglasStat.index].korisnikKom}"> <div class="card mb-3" th:each="oglas: ${oglasi}" style="background: transparent" th:if="${!zahtevi[oglasStat.index].korisnikKom}">
<div class="row"> <div class="row">
<div class="col-lg-2 col-md-12 col-sm-12 col-xs-12 d-flex justify-content-center align-items-center"> <div class="col-lg-2 col-md-12 col-sm-12 col-xs-12 d-flex justify-content-center align-items-center">
<img <img
style="width: 120px;height: 120px;border-radius: 50%;object-fit: cover;" style="width: 120px;height: 120px;border-radius: 50%;object-fit: cover;"
th:src="@{'data:image/png;charset=utf-8;base64,'+${vlasnici[oglasStat.index].getSlika()}}" th:src="@{'data:image/png;charset=utf-8;base64,'+${slike[oglasStat.index].slikaCode}}"
alt="slika korisnika" alt="slika korisnika"
th:styleappend="${zahtevi[oglasStat.index].status.toString() == 'POTVRDJEN' ? 'border: green 3px solid' th:styleappend="${zahtevi[oglasStat.index].status.toString() == 'POTVRDJEN' ? 'border: green 3px solid'
: zahtevi[oglasStat.index].status.toString() == 'CEKANJE' ? 'border: yellow 3px solid' : zahtevi[oglasStat.index].status.toString() == 'CEKANJE' ? 'border: yellow 3px solid'
......
SkuciSe/src/main/resources/templates/novi-oglas-form.html
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
novalidate th:object="${newOglas}" method="POST" novalidate th:object="${newOglas}" method="POST"
th:action="@{/novi-oglas/save}" enctype="multipart/form-data"> th:action="@{/novi-oglas/save}" enctype="multipart/form-data">
<div class="row"> <div class="row">
<div class="col"> <div class="col-lg col-md-12 col-sm-12 col-xs-12">
<div class="row"> <div class="row">
<label class="form-check-label"> <label class="form-check-label">
Naslov Naslov
...@@ -139,13 +139,13 @@ ...@@ -139,13 +139,13 @@
<div class="invalid-feedback">Naselje ne sme biti prazno!</div> <div class="invalid-feedback">Naselje ne sme biti prazno!</div>
</div> </div>
</div> </div>
<div class="col ml-4"> <div class="col-lg col-md-12 col-sm-12 col-xs-12 ml-lg-4">
<div class="row"> <div class="row">
<label class="form-check-label"> <label class="form-check-label">
Kvadratura Kvadratura
</label> </label>
<input th:field="${newOglas.kvadratura}" class="form-control" type="number" <input th:field="${newOglas.kvadratura}" class="form-control" type="number"
placeholder="Kvadratura" required> placeholder="Kvadratura" step="0.01" required>
<div class="invalid-feedback">Kvadratura ne sme biti prazna!</div> <div class="invalid-feedback">Kvadratura ne sme biti prazna!</div>
</div> </div>
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
Cena po m2 Cena po m2
</label> </label>
<input th:field="${newOglas.cena}" class="form-control" type="number" <input th:field="${newOglas.cena}" class="form-control" type="number"
placeholder="Cena po m2" required> step="0.01" placeholder="Cena po m2" required>
<div class="invalid-feedback">Cena ne sme biti prazan!</div> <div class="invalid-feedback">Cena ne sme biti prazan!</div>
</div> </div>
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
</div> </div>
</div> </div>
<div class="row mt-3 mb-3"> <div class="row mt-3 mb-3">
<div class="col-6 d-flex justify-content-between align-items-center flex-wrap"> <div class="col-lg-6 col-md-12 col-sm-12 col-xs-12 d-flex justify-content-between align-items-center flex-wrap">
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
<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="${newOglas.vrstaOglasaId}" id="flexRadioDefault1" value="1" th:field="${newOglas.vrstaOglasaId}"
......
SkuciSe/src/main/resources/templates/oglas.html
...@@ -248,7 +248,7 @@ ...@@ -248,7 +248,7 @@
<div class="container"> <div class="container">
<h1>Komentari</h1> <h1>Komentari</h1>
<div class="row" th:object="${korisniciKomentari}"> <div class="row" th:object="${korisniciKomentari}">
<h4 th:if="${komentari.size() == 0}">Nema komentara na ovom oglasu</h4> <h4 th:if="${komentari.size() == 0}" class="mb-5">Nema komentara na ovom oglasu</h4>
<div class="col-12" th:each="komentar:${komentari}"> <div class="col-12" th:each="komentar:${komentari}">
<div class="media g-mb-30 media-comment"> <div class="media g-mb-30 media-comment">
<div class="media-body u-shadow-v18 g-bg-secondary g-pa-30"> <div class="media-body u-shadow-v18 g-bg-secondary g-pa-30">
......
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