Skip to content

S
SkuciSe
Commit d9d860dd by Bogdan Andjelkovic
Options

updateProfileBezSliek finished ( ostao front )

parent 09543786
Showing with 19 additions and 19 deletions
SkuciSe/src/main/java/com/example/SkuciSe/controller/AppController.java
...@@ -58,15 +58,15 @@ public class AppController ...@@ -58,15 +58,15 @@ public class AppController
public String getProfile( Model model, @AuthenticationPrincipal KorisnikDetails loggedUser) public String getProfile( Model model, @AuthenticationPrincipal KorisnikDetails loggedUser)
{ {
model.addAttribute("loggedUser", loggedUser); model.addAttribute("loggedUser", loggedUser);
model.addAttribute("editUser", loggedUser); model.addAttribute("editUser", loggedUser.getKorisnik());
model.addAttribute("profileRole", kRepo.findRoleById( loggedUser.getKorisnik().getTipId())); model.addAttribute("profileRole", kRepo.findRoleById( loggedUser.getKorisnik().getTipId()));
return("profile"); return("profile");
} }
@PostMapping("/profile-edit") @PostMapping("/profile-update")
public String postProfileEdit( @ModelAttribute KorisnikDetails korisnikDetails) public String postProfileEdit( @ModelAttribute Korisnik korisnik)
{ {
kRepo.update( korisnikDetails.getKorisnik()); kRepo.update( korisnik);
return "redirect:/profile"; return "redirect:/profile";
} }
} }
SkuciSe/src/main/java/com/example/SkuciSe/model/korisnik/KorisnikDetailsService.java
...@@ -14,7 +14,6 @@ public class KorisnikDetailsService implements UserDetailsService ...@@ -14,7 +14,6 @@ public class KorisnikDetailsService implements UserDetailsService
@Override @Override
public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException { public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException {
Korisnik korisnik = kRepo.findByEmail(email); Korisnik korisnik = kRepo.findByEmail(email);
System.out.println( korisnik.toString());
if (korisnik != null) if (korisnik != null)
{ {
return new KorisnikDetails( korisnik); return new KorisnikDetails( korisnik);
......
SkuciSe/src/main/java/com/example/SkuciSe/repository/KorisnikRepository.java
...@@ -41,13 +41,13 @@ public class KorisnikRepository ...@@ -41,13 +41,13 @@ public class KorisnikRepository
public void update( Korisnik korisnik) public void update( Korisnik korisnik)
{ {
String sql = " insert into korisnik " + String sql = " update korisnik " +
" where korisnikid = " + korisnik.getKorisnikId() + " set ime = '" + korisnik.getIme() +
" set ime = " + korisnik.getIme() + "',prezime = '" + korisnik.getPrezime() +
",set prezime = " + korisnik.getPrezime() + "',email = '" + korisnik.getEmail() +
",set email = " + korisnik.getEmail() + "',sifra = '" + new BCryptPasswordEncoder().encode(korisnik.getSifra()) +
",set sifra = " + new BCryptPasswordEncoder().encode(korisnik.getSifra()) + "',telefon = '" + korisnik.getTelefon() +
",set telefon = " + korisnik.getTelefon(); "' where korisnikid = " + korisnik.getKorisnikId();
try { try {
System.out.println( sql); System.out.println( sql);
statement.executeUpdate( sql); statement.executeUpdate( sql);
...@@ -64,8 +64,7 @@ public class KorisnikRepository ...@@ -64,8 +64,7 @@ public class KorisnikRepository
try { try {
slika = Base64.getEncoder().encodeToString(file.getBytes()); slika = Base64.getEncoder().encodeToString(file.getBytes());
sql = " insert into korisnik " + sql = " insert into korisnik " +
" where korisnikid = " + korisnik.getKorisnikId() + " set slika = '" + slika + "' where korisnikid = " + korisnik.getKorisnikId();
" set slika = " + slika;
System.out.println( sql); System.out.println( sql);
statement.executeUpdate( sql); statement.executeUpdate( sql);
} catch (SQLException e) { } catch (SQLException e) {
......
SkuciSe/src/main/resources/templates/profile.html
...@@ -92,33 +92,35 @@ ...@@ -92,33 +92,35 @@
</div> </div>
</div> </div>
</div> </div>
<form class="requires-validation" novalidate th:object="${editUser}" method="POST" th:action="@{/profile-update}" enctype="multipart/form-data"> <form class="requires-validation" novalidate th:object="${editUser}" method="POST" th:action="@{/profile-update}" enctype="multipart/form-data">
<input th:field="${editUser.korisnikId}" class="form-control" type="hidden" name="name" placeholder="Ime" required>
<div class="col-md-12"> <div class="col-md-12">
<input th:field="${editUser.getKorisnik().ime}" class="form-control" type="text" name="name" placeholder="Ime" required> <input th:field="${editUser.ime}" class="form-control" type="text" name="name" placeholder="Ime" required>
<div class="valid-feedback">Dobro ime!</div> <div class="valid-feedback">Dobro ime!</div>
<div class="invalid-feedback">Ime ne sme biti prazno!</div> <div class="invalid-feedback">Ime ne sme biti prazno!</div>
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<input th:field="${editUser.getKorisnik().prezime}" class="form-control" type="text" name="surname" placeholder="Prezime" required> <input th:field="${editUser.prezime}" class="form-control" type="text" name="surname" placeholder="Prezime" required>
<div class="valid-feedback">Dobro prezime!</div> <div class="valid-feedback">Dobro prezime!</div>
<div class="invalid-feedback">Prezime ne sme biti prazno!</div> <div class="invalid-feedback">Prezime ne sme biti prazno!</div>
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<input th:field="${editUser.getKorisnik().telefon}" class="form-control" type="text" name="phone" placeholder="Broj telefona" required> <input th:field="${editUser.telefon}" class="form-control" type="text" name="phone" placeholder="Broj telefona" required>
<div class="valid-feedback">Dobar broj!</div> <div class="valid-feedback">Dobar broj!</div>
<div class="invalid-feedback">Broj telefona ne sme biti prazan!</div> <div class="invalid-feedback">Broj telefona ne sme biti prazan!</div>
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<input th:field="${editUser.getKorisnik().email}" class="form-control" type="email" name="email" placeholder="E-mail Adresa" required> <input th:field="${editUser.email}" class="form-control" type="email" name="email" 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">Email ne sme biti prazan!</div>
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<input th:field="${editUser.getKorisnik().sifra}" class="form-control" type="password" name="password" placeholder="Sifra" required> <input th:field="${editUser.sifra}" class="form-control" type="password" name="password" placeholder="Sifra" required>
<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>
......
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