Skip to content

S
SkuciSe
Commit 771a6145 by Milovan Samardzic
Options

listaOglasaFrontNijeGotovo

parent 49c26675
Showing with 574 additions and 136 deletions
SkuciSe/src/main/java/com/example/SkuciSe/controller/OglasController.java
package com.example.SkuciSe.controller; package com.example.SkuciSe.controller;
import com.example.SkuciSe.model.korisnik.Korisnik;
import com.example.SkuciSe.model.korisnik.KorisnikDetails; import com.example.SkuciSe.model.korisnik.KorisnikDetails;
import com.example.SkuciSe.model.oglas.Oglas; import com.example.SkuciSe.model.oglas.Oglas;
import com.example.SkuciSe.repository.KorisnikRepository; import com.example.SkuciSe.repository.KorisnikRepository;
...@@ -15,6 +16,9 @@ import org.springframework.web.bind.annotation.PostMapping; ...@@ -15,6 +16,9 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import java.util.ArrayList;
import java.util.List;
@Controller @Controller
public class OglasController public class OglasController
{ {
...@@ -48,6 +52,11 @@ public class OglasController ...@@ -48,6 +52,11 @@ public class OglasController
{ {
model.addAttribute("loggedUser", loggedUser); model.addAttribute("loggedUser", loggedUser);
model.addAttribute("oglasi", oRepo.findAll()); model.addAttribute("oglasi", oRepo.findAll());
List<String> list = new ArrayList<String>();
for (Oglas o:oRepo.findAll()) {
list.add(kRepo.findCity(o.getLokacijaId()));
}
model.addAttribute("gradovi",list);
return "/lista-oglasa"; return "/lista-oglasa";
} }
} }
SkuciSe/src/main/java/com/example/SkuciSe/repository/OglasRepository.java
...@@ -69,7 +69,7 @@ public class OglasRepository ...@@ -69,7 +69,7 @@ public class OglasRepository
while( rs.next()) while( rs.next())
{ {
Oglas oglas = new Oglas( rs.getInt("oglasId"), rs.getInt("korisnikId"), rs.getString("naslov"),rs.getString("opis"),rs.getInt("lokacijaId"),rs.getDouble("cena"),rs.getInt("vrstaOglasaId"),rs.getDouble("kvadratura"),rs.getInt("brojSoba"),rs.getBoolean("namesten"),rs.getBoolean("grejanje"),rs.getBoolean("lift"),rs.getString("lokacija")); Oglas oglas = new Oglas( rs.getInt("oglasId"), rs.getInt("korisnikId"), rs.getString("naslov"),rs.getString("opis"),rs.getInt("lokacijaId"),rs.getDouble("cena"),rs.getInt("vrstaOglasaId"),rs.getDouble("kvadratura"),rs.getInt("brojSoba"),rs.getBoolean("namesten"),rs.getBoolean("grejanje"),rs.getBoolean("lift"),rs.getString("lokacija"));
System.out.println( oglas.toString()); //System.out.println( oglas.toString());
list.add( oglas); list.add( oglas);
} }
} catch (SQLException e) { } catch (SQLException e) {
......
SkuciSe/src/main/resources/static/css/oglasiStyle.css 0 → 100644
@import url("//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css");
body{
font-family: 'Jost', serif;font-size: 22px;
background-color: #d8dde0;
overflow-x: hidden;
}
.navbar a{
text-decoration: none;
color:#495056;
}
.navbar-icon-top .navbar-nav .nav-link > .fa {
position: relative;
width: 36px;
font-size: 24px;
}
.navbar-icon-top .navbar-nav .nav-link > .fa > .badge {
font-size: 0.75rem;
position: absolute;
right: 0;
font-family: sans-serif;
}
.navbar-icon-top .navbar-nav .nav-link > .fa {
top: 3px;
line-height: 12px;
}
.navbar-icon-top .navbar-nav .nav-link > .fa > .badge {
top: -10px;
}
@media (min-width: 576px) {
.navbar-icon-top.navbar-expand-sm .navbar-nav .nav-link {
text-align: center;
display: table-cell;
height: 70px;
vertical-align: middle;
padding-top: 0;
padding-bottom: 0;
}
.navbar-icon-top.navbar-expand-sm .navbar-nav .nav-link > .fa {
display: block;
width: 48px;
margin: 2px auto 4px auto;
top: 0;
line-height: 24px;
}
.navbar-icon-top.navbar-expand-sm .navbar-nav .nav-link > .fa > .badge {
top: -7px;
}
}
@media (min-width: 768px) {
.navbar-icon-top.navbar-expand-md .navbar-nav .nav-link {
text-align: center;
display: table-cell;
height: 70px;
vertical-align: middle;
padding-top: 0;
padding-bottom: 0;
}
.navbar-icon-top.navbar-expand-md .navbar-nav .nav-link > .fa {
display: block;
width: 48px;
margin: 2px auto 4px auto;
top: 0;
line-height: 24px;
}
.navbar-icon-top.navbar-expand-md .navbar-nav .nav-link > .fa > .badge {
top: -7px;
}
}
@media (min-width: 992px) {
.navbar-icon-top.navbar-expand-lg .navbar-nav .nav-link {
text-align: center;
display: table-cell;
height: 70px;
vertical-align: middle;
padding-top: 0;
padding-bottom: 0;
}
.navbar-icon-top.navbar-expand-lg .navbar-nav .nav-link > .fa {
display: block;
width: 48px;
margin: 2px auto 4px auto;
top: 0;
line-height: 24px;
}
.navbar-icon-top.navbar-expand-lg .navbar-nav .nav-link > .fa > .badge {
top: -7px;
}
}
@media (min-width: 1200px) {
.navbar-icon-top.navbar-expand-xl .navbar-nav .nav-link {
text-align: center;
display: table-cell;
height: 70px;
vertical-align: middle;
padding-top: 0;
padding-bottom: 0;
}
.navbar-icon-top.navbar-expand-xl .navbar-nav .nav-link > .fa {
display: block;
width: 48px;
margin: 2px auto 4px auto;
top: 0;
line-height: 24px;
}
.navbar-icon-top.navbar-expand-xl .navbar-nav .nav-link > .fa > .badge {
top: -7px;
}
}
.container-fluid{
overflow:hidden;
margin-top: 250px ;
background:#262626 ;
color: #627482 !important;
margin-bottom: 0 ;
padding-bottom:0 ;
}
small{
font-size: calc(12px + (15 - 12) * ((100vw - 360px) / (1600 - 360))) !important;
}
.bold-text{
color: #989c9e !important;
}
.mt-55{
margin-top: calc(50px + (60 - 50) * ((100vw - 360px) / (1600 - 360))) !important;
}
h3{
font-size: calc(34px + (40 - 34) * ((100vw - 360px) / (1600 - 360))) !important;
}
.social{
font-size: 21px !important;
}
.rights{
font-size: calc(10px + (12 - 10) * ((100vw - 360px) / (1600 - 360))) !important;
}
.img-section{
width: 100%;
height: 30%;
}
\ No newline at end of file
SkuciSe/src/main/resources/static/css/style.css
...@@ -409,4 +409,97 @@ img { ...@@ -409,4 +409,97 @@ img {
} }
.form-check-input{ .form-check-input{
position:relative; position:relative;
}
#ads {
margin: 30px 0 30px 0;
}
#ads .card-notify-badge {
position: absolute;
left: -10px;
top: -20px;
background: #f2d900;
text-align: center;
border-radius: 30px 30px 30px 30px;
color: #000;
padding: 5px 10px;
font-size: 14px;
}
#ads .card-notify-year {
position: absolute;
right: -10px;
top: -20px;
background: #ff4444;
border-radius: 50%;
text-align: center;
color: #fff;
font-size: 14px;
width: 50px;
height: 50px;
padding: 15px 0 0 0;
}
#ads .card-detail-badge {
background: #f2d900;
text-align: center;
border-radius: 30px 30px 30px 30px;
color: #000;
padding: 5px 10px;
font-size: 14px;
}
#ads .card:hover {
background: #fff;
box-shadow: 12px 15px 20px 0px rgba(46,61,73,0.15);
border-radius: 4px;
transition: all 0.3s ease;
}
#ads .card-image-overlay {
font-size: 20px;
}
#ads .card-image-overlay span {
display: inline-block;
}
#ads .ad-btn {
text-transform: uppercase;
width: 150px;
height: 40px;
border-radius: 80px;
font-size: 16px;
line-height: 35px;
text-align: center;
border: 3px solid #e6de08;
display: block;
text-decoration: none;
margin: 20px auto 1px auto;
color: #000;
overflow: hidden;
position: relative;
background-color: #e6de08;
}
#ads .ad-btn:hover {
background-color: #e6de08;
color: #1e1717;
border: 2px solid #e6de08;
background: transparent;
transition: all 0.3s ease;
box-shadow: 12px 15px 20px 0px rgba(46,61,73,0.15);
}
#ads .ad-title h5 {
text-transform: uppercase;
font-size: 18px;
} }
\ No newline at end of file
SkuciSe/src/main/resources/templates/index.html
...@@ -40,6 +40,13 @@ ...@@ -40,6 +40,13 @@
<span class="sr-only">(current)</span> <span class="sr-only">(current)</span>
</a> </a>
</li> </li>
<li class="d-flex flex-column align-items-center justify-content-center ml-4 mt-2">
<a class="d-flex flex-column align-items-center justify-content-center" th:href="@{/lista-oglasa}">
<i class="fas fa-poll-h"></i>
Oglasi
<span class="sr-only">(current)</span>
</a>
</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}"><button type="button" class="btn btn-primary btn-md mr-2"><i class="fa-solid fa-plus"></i> Postavite
......
SkuciSe/src/main/resources/templates/lista-korisnika.html
...@@ -39,6 +39,13 @@ ...@@ -39,6 +39,13 @@
<span class="sr-only">(current)</span> <span class="sr-only">(current)</span>
</a> </a>
</li> </li>
<li class="d-flex flex-column align-items-center justify-content-center ml-4 mt-2">
<a class="d-flex flex-column align-items-center justify-content-center" th:href="@{/lista-oglasa}">
<i class="fas fa-poll-h"></i>
Oglasi
<span class="sr-only">(current)</span>
</a>
</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}"><button type="button" class="btn btn-primary btn-md mr-2"><i class="fa-solid fa-plus"></i> Postavite
...@@ -132,7 +139,6 @@ ...@@ -132,7 +139,6 @@
</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
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
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/style.css" rel="stylesheet"/> <link href="/css/oglasiStyle.css" rel="stylesheet"/>
</head> </head>
...@@ -40,11 +40,19 @@ ...@@ -40,11 +40,19 @@
<span class="sr-only">(current)</span> <span class="sr-only">(current)</span>
</a> </a>
</li> </li>
<li class="d-flex flex-column align-items-center justify-content-center ml-4 mt-2">
<a class="d-flex flex-column align-items-center justify-content-center" th:href="@{/lista-oglasa}">
<i class="fas fa-poll-h"></i>
Oglasi
<span class="sr-only">(current)</span>
</a>
</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">
...@@ -81,6 +89,53 @@ ...@@ -81,6 +89,53 @@
</nav> </nav>
<div class="container main-section d-flex flex-row">
<div class="row" th:each="oglas: ${oglasi}">
<div class="col w-100">
<div class="section border bg-white rounded p-2">
<div class="row">
<div class="col-lg-12 img-section">
<img src="http://nicesnippets.com/demo/re-image6.jpg" class="p-0 m-0 res-ponsive">
</div>
<div class="col-lg-12 sectin-title">
<h1 class="pt-2 pb-2" th:text="${oglas.naslov}"></h1>
</div>
<div class="col-lg-12">
<div class="row">
<div class="col-lg-2">
<span class="badge badge-success p-2" th:text="${oglas.cena} + '$'"></span>
</div>
<div class="col-lg-10 text-right">
<span><i class="fas fa-star"></i></span>
<span><i class="fas fa-star"></i></span>
<span><i class="fas fa-star"></i></span>
<span><i class="fas fa-star"></i></span>
<span><i class="fas fa-star-half-alt"></i></span><br>
</div>
</div>
<hr>
</div>
<div class="col-lg-12 section-detail">
<p class="ml-2" th:text="${oglas.opis}"></p>
<hr>
</div>
<div class="col-lg-12 pb-2">
<div class="row">
<div class="col-lg-6">
<a href="#" class="btn btn-danger btn-block btn-sm">Book Now</a>
</div>
<div class="col-lg-6">
<a href="#" class="btn btn-secondary btn-block btn-sm">Apply For Rent</a>
</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>
......
SkuciSe/src/main/resources/templates/login.html
...@@ -39,6 +39,13 @@ ...@@ -39,6 +39,13 @@
<span class="sr-only">(current)</span> <span class="sr-only">(current)</span>
</a> </a>
</li> </li>
<li class="d-flex flex-column align-items-center justify-content-center ml-4 mt-2">
<a class="d-flex flex-column align-items-center justify-content-center" th:href="@{/lista-oglasa}">
<i class="fas fa-poll-h"></i>
Oglasi
<span class="sr-only">(current)</span>
</a>
</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}"><button type="button" class="btn btn-primary btn-md mr-2"><i class="fa-solid fa-plus"></i> Postavite
......
SkuciSe/src/main/resources/templates/novi-oglas-form.html
...@@ -40,6 +40,13 @@ ...@@ -40,6 +40,13 @@
<span class="sr-only">(current)</span> <span class="sr-only">(current)</span>
</a> </a>
</li> </li>
<li class="d-flex flex-column align-items-center justify-content-center ml-4 mt-2">
<a class="d-flex flex-column align-items-center justify-content-center" th:href="@{/lista-oglasa}">
<i class="fas fa-poll-h"></i>
Oglasi
<span class="sr-only">(current)</span>
</a>
</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}">
......
SkuciSe/src/main/resources/templates/password-edit.html
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <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">
<!-- 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" integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous"> <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous">
<!-- Core theme CSS (includes Bootstrap)--> <!-- Core theme CSS (includes Bootstrap)-->
<link href="/css/style.css" rel="stylesheet" /> <link href="/css/style.css" rel="stylesheet"/>
</head> </head>
<body th:object="${loggedUser}"> <body th:object="${loggedUser}">
<nav class="navbar navbar-icon-top navbar-expand-lg p-3" style="background-color: white;"> <nav class="navbar navbar-icon-top navbar-expand-lg p-3" style="background-color: white;">
<a class="navbar-brand" href="#"> </a> <a class="navbar-brand" href="#"> </a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent"
<span class="navbar-toggler-icon"></span> aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
</button> <span class="navbar-toggler-icon"></span>
</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>
</ul> <li class="d-flex flex-column align-items-center justify-content-center ml-4 mt-2">
<form class="form-inline my-2 my-lg-0" th:if="${loggedUser != null}"> <a class="d-flex flex-column align-items-center justify-content-center" th:href="@{/lista-oglasa}">
<button type="button" class="btn btn-primary btn-md mr-2"><i class="fa-solid fa-plus"></i> Postavite <i class="fas fa-poll-h"></i>
novi oglas Oglasi
</button> <span class="sr-only">(current)</span>
</form> </a>
<ul class="navbar-nav"> </li>
<li class="nav-item" th:if="${loggedUser == null}"> </ul>
<a th:href="@{/login}"><i class="fas fa-sign-in-alt" style="color:#495056"></i><span <form class="form-inline my-2 my-lg-0" th:if="${loggedUser != null}">
style="padding:10px;color:#495056">Prijavi se</span></a> <button type="button" class="btn btn-primary btn-md mr-2"><i class="fa-solid fa-plus"></i> Postavite
</li> novi oglas
<li class="nav-item" th:if="${loggedUser == null}"> </button>
<a th:href="@{/register}"><i class="fa-solid fa-circle-user" style="color:#495056"></i><span </form>
style="padding:10px;color:#495056">Registruj se</span></a> <ul class="navbar-nav">
</li> <li class="nav-item" th:if="${loggedUser == null}">
<li th:if="${loggedUser != null}"> <a th:href="@{/login}"><i class="fas fa-sign-in-alt" style="color:#495056"></i><span
<div class="dropdown mr-4"> style="padding:10px;color:#495056">Prijavi se</span></a>
<button class="btn btn-secondary dropdown-toggle round" type="button" id="dropdownMenuButton" </li>
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <li class="nav-item" th:if="${loggedUser == null}">
<i class="fa-solid fa-circle-user"></i><span style="padding:10px;" <a th:href="@{/register}"><i class="fa-solid fa-circle-user" style="color:#495056"></i><span
th:text="${loggedUser.getKorisnik().getIme()}"></span> style="padding:10px;color:#495056">Registruj se</span></a>
</button> </li>
<div class="dropdown-menu" aria-labelledby="dropdownMenuButton"> <li th:if="${loggedUser != null}">
<a class="dropdown-item" th:href="@{/profile}">Moj Profil</a> <div class="dropdown mr-4">
<a class="dropdown-item" th:href="@{/mojioglasi}">Moji Oglasi</a> <button class="btn btn-secondary dropdown-toggle round" type="button" id="dropdownMenuButton"
<a class="dropdown-item" th:href="@{/mojizahtevi}">Moji Zahtevi</a> data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<a th:if="${loggedUser.getKorisnik().getTipId() == 2}" class="dropdown-item" <i class="fa-solid fa-circle-user"></i><span style="padding:10px;"
th:href="@{/lista-korisnika}">Lista Profila</a> th:text="${loggedUser.getKorisnik().getIme()}"></span>
<form th:action="@{/logout}" method="post" id="my_form" class="dropdown-item"> </button>
<a href="#" onclick="document.getElementById('my_form').submit(); return false;"><i <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
class="fas fa-sign-in-alt"></i><span style="padding:5px;">Odjavi se</span></a> <a class="dropdown-item" th:href="@{/profile}">Moj Profil</a>
</form> <a class="dropdown-item" th:href="@{/mojioglasi}">Moji Oglasi</a>
</div> <a class="dropdown-item" th:href="@{/mojizahtevi}">Moji Zahtevi</a>
</div> <a th:if="${loggedUser.getKorisnik().getTipId() == 2}" class="dropdown-item"
</li> th:href="@{/lista-korisnika}">Lista Profila</a>
</ul> <form th:action="@{/logout}" method="post" id="my_form" class="dropdown-item">
</div> <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>
</form>
</div>
</div>
</li>
</ul>
</div>
</nav> </nav>
<div class="form-body"> <div class="form-body">
<div class="row"> <div class="row">
<div class="form-holder"> <div class="form-holder">
<div class="form-content"> <div class="form-content">
<div class="form-items"> <div class="form-items">
<form class="requires-validation" novalidate th:object="${editUser}" method="POST" <form class="requires-validation" novalidate th:object="${editUser}" method="POST"
th:action="@{/password-edit-save}" enctype="multipart/form-data" onsubmit="return validateForm()"> th:action="@{/password-edit-save}" enctype="multipart/form-data"
onsubmit="return validateForm()">
<div class="col-md-12"> <div class="col-md-12">
<span style="color:white;">Unesite novu sifru</span> <span style="color:white;">Unesite novu sifru</span>
<input th:field="${editUser.sifra}" type="password" <input th:field="${editUser.sifra}" type="password"
name="password" placeholder="Sifra" required name="password" placeholder="Sifra" required
id="prvaSifra"> id="prvaSifra">
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<span style="color:white;">Ponovite novu sifru</span> <span style="color:white;">Ponovite novu sifru</span>
<input type="password" <input type="password"
name="password" placeholder="Sifra" required name="password" placeholder="Sifra" required
id="drugaSifra"> id="drugaSifra">
<div id="errorCode1" style="display: none;color:red">Popunite oba polja!</div> <div id="errorCode1" style="display: none;color:red">Popunite oba polja!</div>
<div id="errorCode2" style="display: none;color:red">Sifre se ne poklapaju!</div> <div id="errorCode2" style="display: none;color:red">Sifre se ne poklapaju!</div>
</div> </div>
<div class="form-button mt-3"> <div class="form-button mt-3">
<button id="submit" type="submit" class="btn btn-primary">Izmeni podatke <button id="submit" type="submit" class="btn btn-primary">Izmeni podatke
</button> </button>
</div>
</form>
</div>
</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">
<div class="col-11"> <div class="col-11">
<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 class="text-muted mb-md-0 mb-5 bold-text">SkuciSe</h3></div> <div class="col-xl-8 col-md-4 col-sm-4 col-12 my-auto mx-auto a"><h3
<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></h6><ul class="list-unstyled"><li>Pocetna</li><li>O nama</li><li>Blog</li><li>Portfolio</li></ul></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 text-muted bold-text mt-sm-0 mt-5"><b>ADRESA</b></h6><p class="mb-1">Radoja Domanovića 12</p><p> Kragujevac 34000</p> </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></h6>
</div> <ul class="list-unstyled">
<div class="row "> <li>Pocetna</li>
<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 All Rights Reserved.</small></div> <li>O nama</li>
<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>PERA PERIC</b></h6><small> <span><i class="fa fa-envelope" aria-hidden="true"></i></span> pera@gmail.com</small></div> <li>Blog</li>
<div class="col-xl-2 col-md-4 col-sm-4 col-auto order-2 align-self-end mt-3 "><h6 class="text-muted bold-text"><b>ACA ACIC</b></h6><small><span><i class="fa fa-envelope" aria-hidden="true"></i></span> aca@gmail.com</small></div> <li>Portfolio</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></h6>
<p class="mb-1">Radoja Domanovića 12</p>
<p> Kragujevac 34000</p></div>
</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 All Rights Reserved.</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>PERA PERIC</b></h6><small> <span><i
class="fa fa-envelope" aria-hidden="true"></i></span> pera@gmail.com</small></div>
<div class="col-xl-2 col-md-4 col-sm-4 col-auto order-2 align-self-end mt-3 "><h6
class="text-muted bold-text"><b>ACA ACIC</b></h6><small><span><i class="fa fa-envelope"
aria-hidden="true"></i></span>
aca@gmail.com</small></div>
</div>
</div>
</div> </div>
</div> </footer>
</div>
</footer>
</div> </div>
<!-- JavaScript Bundle with Popper --> <!-- JavaScript Bundle with Popper -->
<script src="//maxcdn.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js"></script> <script src="//maxcdn.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script> <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script> <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js"
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.12.9/dist/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script> integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN"
<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.0.0/dist/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script> crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.12.9/dist/umd/popper.min.js"
integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q"
crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.0.0/dist/js/bootstrap.min.js"
integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl"
crossorigin="anonymous"></script>
<script src="https://kit.fontawesome.com/51d1fadef3.js" crossorigin="anonymous"></script> <script src="https://kit.fontawesome.com/51d1fadef3.js" crossorigin="anonymous"></script>
<script src="/js/main.js"></script> <script src="/js/main.js"></script>
......
SkuciSe/src/main/resources/templates/profile-edit.html
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <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">
<!-- 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" integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous"> <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous">
<!-- Core theme CSS (includes Bootstrap)--> <!-- Core theme CSS (includes Bootstrap)-->
<link href="/css/style.css" rel="stylesheet" /> <link href="/css/style.css" rel="stylesheet"/>
</head> </head>
<body th:object="${loggedUser}"> <body th:object="${loggedUser}">
<nav class="navbar navbar-icon-top navbar-expand-lg p-3" style="background-color: white;"> <nav class="navbar navbar-icon-top navbar-expand-lg p-3" style="background-color: white;">
<a class="navbar-brand" href="#"> </a> <a class="navbar-brand" href="#"> </a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent"
aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>
...@@ -37,11 +39,19 @@ ...@@ -37,11 +39,19 @@
<span class="sr-only">(current)</span> <span class="sr-only">(current)</span>
</a> </a>
</li> </li>
<li class="d-flex flex-column align-items-center justify-content-center ml-4 mt-2">
<a class="d-flex flex-column align-items-center justify-content-center" th:href="@{/lista-oglasa}">
<i class="fas fa-poll-h"></i>
Oglasi
<span class="sr-only">(current)</span>
</a>
</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">
...@@ -140,14 +150,36 @@ ...@@ -140,14 +150,36 @@
<div class="row my-5 justify-content-center py-5"> <div class="row my-5 justify-content-center py-5">
<div class="col-11"> <div class="col-11">
<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 class="text-muted mb-md-0 mb-5 bold-text">SkuciSe</h3></div> <div class="col-xl-8 col-md-4 col-sm-4 col-12 my-auto mx-auto a"><h3
<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></h6><ul class="list-unstyled"><li>Pocetna</li><li>O nama</li><li>Blog</li><li>Portfolio</li></ul></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 text-muted bold-text mt-sm-0 mt-5"><b>ADRESA</b></h6><p class="mb-1">Radoja Domanovića 12</p><p> Kragujevac 34000</p> </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></h6>
<ul class="list-unstyled">
<li>Pocetna</li>
<li>O nama</li>
<li>Blog</li>
<li>Portfolio</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></h6>
<p class="mb-1">Radoja Domanovića 12</p>
<p> Kragujevac 34000</p></div>
</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 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 All Rights Reserved.</small></div> <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-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>PERA PERIC</b></h6><small> <span><i class="fa fa-envelope" aria-hidden="true"></i></span> pera@gmail.com</small></div> class="social text-muted mb-0 pb-0 bold-text"><span class="mx-2"><i class="fa fa-facebook"
<div class="col-xl-2 col-md-4 col-sm-4 col-auto order-2 align-self-end mt-3 "><h6 class="text-muted bold-text"><b>ACA ACIC</b></h6><small><span><i class="fa fa-envelope" aria-hidden="true"></i></span> aca@gmail.com</small></div> 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 All Rights Reserved.</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>PERA PERIC</b></h6><small> <span><i
class="fa fa-envelope" aria-hidden="true"></i></span> pera@gmail.com</small></div>
<div class="col-xl-2 col-md-4 col-sm-4 col-auto order-2 align-self-end mt-3 "><h6
class="text-muted bold-text"><b>ACA ACIC</b></h6><small><span><i class="fa fa-envelope"
aria-hidden="true"></i></span>
aca@gmail.com</small></div>
</div> </div>
</div> </div>
</div> </div>
...@@ -156,9 +188,15 @@ ...@@ -156,9 +188,15 @@
<!-- JavaScript Bundle with Popper --> <!-- JavaScript Bundle with Popper -->
<script src="//maxcdn.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js"></script> <script src="//maxcdn.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script> <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script> <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js"
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.12.9/dist/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script> integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN"
<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.0.0/dist/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script> crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.12.9/dist/umd/popper.min.js"
integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q"
crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.0.0/dist/js/bootstrap.min.js"
integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl"
crossorigin="anonymous"></script>
<script src="https://kit.fontawesome.com/51d1fadef3.js" crossorigin="anonymous"></script> <script src="https://kit.fontawesome.com/51d1fadef3.js" crossorigin="anonymous"></script>
<script src="/js/main.js"></script> <script src="/js/main.js"></script>
......
SkuciSe/src/main/resources/templates/profile.html
...@@ -39,6 +39,13 @@ ...@@ -39,6 +39,13 @@
<span class="sr-only">(current)</span> <span class="sr-only">(current)</span>
</a> </a>
</li> </li>
<li class="d-flex flex-column align-items-center justify-content-center ml-4 mt-2">
<a class="d-flex flex-column align-items-center justify-content-center" th:href="@{/lista-oglasa}">
<i class="fas fa-poll-h"></i>
Oglasi
<span class="sr-only">(current)</span>
</a>
</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}"><button type="button" class="btn btn-primary btn-md mr-2"><i class="fa-solid fa-plus"></i> Postavite
......
SkuciSe/src/main/resources/templates/register.html
...@@ -39,6 +39,13 @@ ...@@ -39,6 +39,13 @@
<span class="sr-only">(current)</span> <span class="sr-only">(current)</span>
</a> </a>
</li> </li>
<li class="d-flex flex-column align-items-center justify-content-center ml-4 mt-2">
<a class="d-flex flex-column align-items-center justify-content-center" th:href="@{/lista-oglasa}">
<i class="fas fa-poll-h"></i>
Oglasi
<span class="sr-only">(current)</span>
</a>
</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}">
<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
......
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