Skip to content

S
SkuciSe
Commit 71ac5d4c by Milovan Samardzic
Options

UploadSlika

parent fe7e995c
Showing with 182 additions and 5 deletions
SkuciSe/src/main/resources/static/css/style.css
...@@ -166,6 +166,7 @@ h3{ ...@@ -166,6 +166,7 @@ h3{
text-align: left; text-align: left;
-webkit-transition: all 0.4s ease; -webkit-transition: all 0.4s ease;
transition: all 0.4s ease; transition: all 0.4s ease;
color:lightblue;
} }
.form-content h3 { .form-content h3 {
...@@ -262,3 +263,48 @@ h3{ ...@@ -262,3 +263,48 @@ h3{
.valid-feedback{ .valid-feedback{
color: #2acc80; color: #2acc80;
} }
#losaSifra{
display: none;
margin-top:10px;
}
.breadcrumb {
background-color: #c5cee4;
}
.breadcrumb a {
text-decoration: none;
}
.container {
max-width: 1000px;
padding: 0;
}
p {
margin: 0;
}
.d-flex a {
text-decoration: none;
color: #686868;
}
img {
width: 100px;
height: 100px;
border-radius: 50%;
object-fit: cover;
}
.fab.fa-twitter {
color: #8ab7f1;
}
.fab.fa-instagram {
color: #E1306C;
}
.fab.fa-facebook-f {
color: #5999ec;
}
\ No newline at end of file
SkuciSe/src/main/resources/static/js/main.js
...@@ -13,3 +13,17 @@ ...@@ -13,3 +13,17 @@
}, false) }, false)
}) })
})() })()
window.onload = proveraLogin();
function proveraLogin(){
const queryString = window.location.search;
console.log(queryString)
if(queryString === "?error"){
document.getElementById("losaSifra").style.display = "block";
}
else
{
document.getElementById("losaSifra").style.display = "none";
}
}
\ No newline at end of file
SkuciSe/src/main/resources/templates/login.html
...@@ -56,6 +56,7 @@ ...@@ -56,6 +56,7 @@
<div class="invalid-feedback">Sifra ne sme biti prazna!</div> <div class="invalid-feedback">Sifra ne sme biti prazna!</div>
</div> </div>
<div class="invalid-feedback" id="losaSifra">Uneli ste pogresne podatke!</div>
<div class="form-button mt-3"> <div class="form-button mt-3">
<button id="submit" type="submit" class="btn btn-primary">Prijavi se</button> <button id="submit" type="submit" class="btn btn-primary">Prijavi se</button>
......
SkuciSe/src/main/resources/templates/profile.html
...@@ -32,19 +32,125 @@ ...@@ -32,19 +32,125 @@
<div id="navbar-login"> <div id="navbar-login">
<ul> <ul>
<li th:if="${loggedUser == null}"><a th:href="@{/login}"><i class="fas fa-sign-in-alt"></i><span style="padding:5px;">Prijavi se</span></a></li> <li th:if="${loggedUser == null}"><a th:href="@{/login}"><i class="fas fa-sign-in-alt"></i><span style="padding:5px;">Prijavi se</span></a></li>
<li th:if="${loggedUser == null}"><a th:href="@{/register}"><i class="fa-solid fa-circle-user"></i><span style="padding:5px;">Registruj se</span></a></li>
<li th:if="${loggedUser != null}"> <li th:if="${loggedUser != null}">
<form th:action="@{/logout}" method="post" id="my_form"> <div class="dropdown">
<button class="btn btn-secondary dropdown-toggle round" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fa-solid fa-circle-user"></i><span style="padding:5px;" th:text="${loggedUser.getKorisnik().getIme()}"></span>
</button>
<div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
<a class="dropdown-item" th:href="@{/profile/{korisnikid}(korisnikid=${loggedUser.getKorisnik().getKorisnikId()})}">Moj Profil</a>
<a class="dropdown-item" th:href="@{/mojioglasi/{korisnikid}(korisnikid=${loggedUser.getKorisnik().getKorisnikId()})}">Moji Oglasi</a>
<a class="dropdown-item" th:href="@{/mojizahtevi/{korisnikid}(korisnikid=${loggedUser.getKorisnik().getKorisnikId()})}">Moji Zahtevi</a>
<form th:action="@{/logout}" method="post" id="my_form" class="dropdown-item">
<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> <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> </form>
</div>
</div>
</li> </li>
<li th:if="${loggedUser == null}"><a th:href="@{/register}"><i class="fa-solid fa-circle-user"></i><span style="padding:5px;">Registruj se</span></a></li>
<li th:if="${loggedUser != null}"><a th:href="@{/profile/{korisnikid}(korisnikid=${loggedUser.getKorisnik().getKorisnikId()})}"><i class="fa-solid fa-circle-user"></i><span style="padding:5px;" th:text="${loggedUser.getKorisnik().getIme()}"></span></a></li>
<li><button type="button" class="btn btn-primary btn-md"><i class="fa-regular fa-message"></i> Postavite novi oglas</button></li> <li><button type="button" class="btn btn-primary btn-md"><i class="fa-regular fa-message"></i> Postavite novi oglas</button></li>
</ul> </ul>
</div> </div>
</header> </header>
<div class="container">
<div class="row" style="margin-top:50px;">
<div class="col-md-5">
<div class="row">
<div class="col-12 bg-white p-0 px-3 py-3 mb-3">
<div class="d-flex flex-column align-items-center">
<img class="photo"
src="https://images.unsplash.com/photo-1541647376583-8934aaf3448a?ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&ixlib=rb-1.2.1&auto=format&fit=crop&w=634&q=80"
alt="">
<p class="fw-bold h4 mt-3"><span th:text="${loggedUser.getKorisnik().getIme()}"></span></p>
<p class="text-muted">Korisnik</p>
<br>
<div class="d-flex ">
<div class="btn btn-outline-primary message">Poruka</div>
</div>
</div>
</div>
<div class="col-12 bg-white p-0 px-2 pb-3 mb-3">
<div class="d-flex justify-content-between border-bottom py-2 px-3">
<p><span class="fas fa-globe me-2"></span>Website</p>
<a href="#">https://bootdey.com</a>
</div>
<div class="d-flex justify-content-between border-bottom py-2 px-3">
<p><span class="fab fa-github-alt me-2"></span>Github</p>
<a href="">bootdey</a>
</div>
<div class="d-flex justify-content-between border-bottom py-2 px-3">
<p><span class="fab fa-twitter me-2"></span>Twitter</p>
<a href="">@bootdey</a>
</div>
<div class="d-flex justify-content-between border-bottom py-2 px-3">
<p><span class="fab fa-instagram me-2"></span>Instagram</p>
<a href="">bootdey</a>
</div>
<div class="d-flex justify-content-between py-2 px-3">
<p><span class="fab fa-facebook-f me-2"></span>facebook</p>
<a href="">bootdey</a>
</div>
</div>
</div>
</div>
<div class="col-md-7 ps-md-4">
<div class="row">
<div class="col-12 bg-white px-3 mb-3 pb-3">
<div class="d-flex align-items-center justify-content-between border-bottom">
<p class="py-2">Ime i Prezime</p>
<p class="py-2 text-muted" th:text="${loggedUser.getKorisnik().getIme() + ' '+ loggedUser.getKorisnik().getPrezime()}"></p>
</div>
<div class="d-flex align-items-center justify-content-between border-bottom">
<p class="py-2">Email</p>
<p class="py-2 text-muted" th:text="${loggedUser.getKorisnik().getEmail()}"></p>
</div>
<div class="d-flex align-items-center justify-content-between border-bottom">
<p class="py-2">Broj telefona</p>
<p class="py-2 text-muted" th:text="${loggedUser.getKorisnik().getTelefon()}"></p>
</div>
<div class="d-flex align-items-center justify-content-between">
<p class="py-2">Grad</p>
<p class="py-2 text-muted"> Kragujevac</p>
</div>
</div>
<div class="col-12 bg-white px-3 pb-2">
<h6 class="d-flex align-items-center mb-3 fw-bold py-3"><i
class="text-info me-2">assignment</i>Project
Status</h6>
<small>Web Design</small>
<div class="progress mb-3" style="height: 5px">
<div class="progress-bar bg-primary" role="progressbar" style="width: 60%"
aria-valuenow="72" aria-valuemin="0" aria-valuemax="100"></div>
</div>
<small>One Page</small>
<div class="progress mb-3" style="height: 5px">
<div class="progress-bar bg-primary" role="progressbar" style="width: 72%"
aria-valuenow="72" aria-valuemin="0" aria-valuemax="100"></div>
</div>
<small>Mobile Template</small>
<div class="progress mb-3" style="height: 5px">
<div class="progress-bar bg-primary" role="progressbar" style="width: 50%"
aria-valuenow="72" aria-valuemin="0" aria-valuemax="100"></div>
</div>
<small>Backend API</small>
<div class="progress mb-3" style="height: 5px">
<div class="progress-bar bg-primary" role="progressbar" style="width: 90%"
aria-valuenow="72" aria-valuemin="0" aria-valuemax="100"></div>
</div>
<small>Website Markup</small>
<div class="progress mb-3" style="height: 5px">
<div class="progress-bar bg-primary" role="progressbar" style="width: 80%"
aria-valuenow="72" aria-valuemin="0" aria-valuemax="100"></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 ">
...@@ -65,7 +171,9 @@ ...@@ -65,7 +171,9 @@
</div> </div>
</footer> </footer>
</div> </div>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.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://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>
</body> </body>
......
SkuciSe/src/main/resources/templates/register.html
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<div class="form-items"> <div class="form-items">
<h3>Registrujte se</h3> <h3>Registrujte se</h3>
<p>Popunite podatke ispod.</p> <p>Popunite podatke ispod.</p>
<form class="requires-validation" novalidate th:object="${newUser}" method="POST" th:action="@{/register-proccess}"> <form class="requires-validation" novalidate th:object="${newUser}" method="POST" th:action="@{/register-proccess}" enctype="multipart/form-data">
<div class="col-md-12"> <div class="col-md-12">
<input th:field="${newUser.ime}" class="form-control" type="text" name="name" placeholder="Ime" required> <input th:field="${newUser.ime}" class="form-control" type="text" name="name" placeholder="Ime" required>
...@@ -78,6 +78,12 @@ ...@@ -78,6 +78,12 @@
<div class="valid-feedback">Dobra sifra!</div> <div class="valid-feedback">Dobra sifra!</div>
<div class="invalid-feedback">Sifra ne sme biti prazna!</div> <div class="invalid-feedback">Sifra ne sme biti prazna!</div>
</div> </div>
<div class="col-md-12 mt-2" style="color:white;">
<input type="file" name="slika" accept="image/png, image/jpeg" />
<div class="invalid-feedback">Unesite sliku!</div>
</div>
<div class="form-check"> <div class="form-check">
<input class="form-check-input" type="checkbox" value="" id="invalidCheck" required> <input class="form-check-input" type="checkbox" value="" id="invalidCheck" required>
<label class="form-check-label">Potvrdjujem da su svi podaci tacni</label> <label class="form-check-label">Potvrdjujem da su svi podaci tacni</label>
......
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