Commit fd4f4f00 by Milovan Samardzic

kometariFrontZahteviJosPoNesto

parent 3fb1c6a3
...@@ -6,6 +6,7 @@ import com.example.SkuciSe.model.oglas.Oglas; ...@@ -6,6 +6,7 @@ import com.example.SkuciSe.model.oglas.Oglas;
import com.example.SkuciSe.model.zahtev.StanjeZahteva; import com.example.SkuciSe.model.zahtev.StanjeZahteva;
import com.example.SkuciSe.model.zahtev.Zahtev; import com.example.SkuciSe.model.zahtev.Zahtev;
import com.example.SkuciSe.repository.OglasRepository; import com.example.SkuciSe.repository.OglasRepository;
import com.example.SkuciSe.repository.SlikeRepository;
import com.example.SkuciSe.repository.ZahtevRepository; import com.example.SkuciSe.repository.ZahtevRepository;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.security.core.annotation.AuthenticationPrincipal;
...@@ -28,6 +29,9 @@ public class ZahtevController { ...@@ -28,6 +29,9 @@ public class ZahtevController {
ZahtevRepository zRepo; ZahtevRepository zRepo;
@Autowired @Autowired
OglasRepository oRepo; OglasRepository oRepo;
@Autowired
SlikeRepository sRepo;
@GetMapping("/profile/moji-zahtevi") @GetMapping("/profile/moji-zahtevi")
public String getMojiZahtevi(Model model, @AuthenticationPrincipal KorisnikDetails loggedUser) public String getMojiZahtevi(Model model, @AuthenticationPrincipal KorisnikDetails loggedUser)
{ {
...@@ -40,7 +44,7 @@ public class ZahtevController { ...@@ -40,7 +44,7 @@ public class ZahtevController {
model.addAttribute("loggedUser", loggedUser); model.addAttribute("loggedUser", loggedUser);
model.addAttribute("zahtevi", mojiZahtevi); model.addAttribute("zahtevi", mojiZahtevi);
model.addAttribute("oglasi", mojiOglasi); model.addAttribute("oglasi", mojiOglasi);
model.addAttribute("slike",sRepo.findAllFirstPics(mojiOglasi));
return "moji-zahtevi"; return "moji-zahtevi";
} }
......
...@@ -279,3 +279,47 @@ h3{ ...@@ -279,3 +279,47 @@ h3{
.carousel-control-prev { .carousel-control-prev {
filter: invert(100%); filter: invert(100%);
} }
@media (min-width: 0) {
.g-mr-15 {
margin-right: 1.07143rem !important;
}
}
@media (min-width: 0){
.g-mt-3 {
margin-top: 0.21429rem !important;
}
}
.g-height-50 {
height: 50px;
}
.g-width-50 {
width: 50px !important;
}
@media (min-width: 0){
.g-pa-30 {
padding: 2.14286rem !important;
}
}
.g-bg-secondary {
background-color: #fafafa !important;
}
.u-shadow-v18 {
box-shadow: 0 5px 10px -6px rgba(0, 0, 0, 0.15);
}
.g-color-gray-dark-v4 {
color: #777 !important;
}
.g-font-size-12 {
font-size: 0.85714rem !important;
}
.media-comment {
margin-top:20px
}
\ No newline at end of file
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
<!-- Team item--> <!-- Team item-->
<div class="col-xl-3 col-sm-6 mb-5"> <div class="col-xl-3 col-sm-6 mb-5">
<div class="bg-white rounded shadow-sm py-5 px-4"><img src="images/naocale.jpg" alt="" width="100" class="img-fluid rounded-circle mb-3 img-thumbnail shadow-sm"> <div class="bg-white rounded shadow-sm py-5 px-4"><img src="https://cdn.discordapp.com/attachments/534446980194107395/1020436174436835459/22d0118fab8c343a3e0af4061314f96ce7f4820088857fcf37ed42c2c5a67adc.0.png" alt="" width="100" class="img-fluid rounded-circle mb-3 img-thumbnail shadow-sm">
<h5 class="mb-0">Mihailo Šebek</h5><span class="small text-uppercase text-muted">Back-End Developer</span> <h5 class="mb-0">Mihailo Šebek</h5><span class="small text-uppercase text-muted">Back-End Developer</span>
<ul class="social mb-0 list-inline mt-3"> <ul class="social mb-0 list-inline mt-3">
<li class="list-inline-item"><a href="#" class="social-link"><i class="fa fa-facebook-f"></i></a></li> <li class="list-inline-item"><a href="#" class="social-link"><i class="fa fa-facebook-f"></i></a></li>
......
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