Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
SkuciSe
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Tim 2 - 2022
SkuciSe
Commits
806c145d
Commit
806c145d
authored
Sep 19, 2022
by
Nikola Markovic
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
korisnik - oglasi/ocene front
parent
6e31cddb
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
37 additions
and
10 deletions
+37
-10
SkuciSe/src/main/resources/static/js/main.js
+15
-0
SkuciSe/src/main/resources/templates/korisnik.html
+18
-6
SkuciSe/src/main/resources/templates/oglas.html
+1
-1
SkuciSe/src/main/resources/templates/onama.html
+1
-1
SkuciSe/src/main/resources/templates/portfolio.html
+2
-2
No files found.
SkuciSe/src/main/resources/static/js/main.js
View file @
806c145d
...
...
@@ -110,3 +110,17 @@ function promenaProdaja(radio){
$
(
document
).
ready
(
function
()
{
$
(
'#rateMe1'
).
mdbRate
();
});
function
prikaziOglase
(){
document
.
getElementById
(
"div-oglasi"
).
style
.
display
=
"block"
;
document
.
getElementById
(
"div-ocene"
).
style
.
display
=
"none"
;
document
.
getElementById
(
"dugme-oglasi"
).
style
=
"text-decoration:none; border-bottom: 3px solid grey; width:100px; text-align:center;padding-bottom:5px;"
;
document
.
getElementById
(
"dugme-ocene"
).
style
=
""
;
}
function
prikaziOcene
(){
document
.
getElementById
(
"div-oglasi"
).
style
.
display
=
"none"
;
document
.
getElementById
(
"div-ocene"
).
style
.
display
=
"block"
;
document
.
getElementById
(
"dugme-ocene"
).
style
=
"text-decoration:none; border-bottom: 3px solid grey; width:100px; text-align:center;padding-bottom:5px;"
;
document
.
getElementById
(
"dugme-oglasi"
).
style
=
""
;
}
\ No newline at end of file
SkuciSe/src/main/resources/templates/korisnik.html
View file @
806c145d
...
...
@@ -103,6 +103,7 @@
<article
class=
"card-group-item"
>
<div
class=
"profilepic"
>
<img
class=
"photo profilepic__image"
id=
"slikaProfil"
style=
"width: 100px;height:100px;border-radius:50%"
th:src=
"@{'data:image/png;charset=utf-8;base64,'+${korisnik.getSlika()}}"
alt=
"slika korisnika"
>
</div>
...
...
@@ -114,6 +115,15 @@
</div>
<div
class=
"col-9"
th:object=
"${slikeOglasa}"
>
<h1
th:if=
"${oglasi.size() == 0}"
class=
"text-center"
>
Nema oglasa!
</h1>
<div
class=
"row w-100 box "
style=
"/*! border: 1px solid red; */"
>
<div
class=
"col d-flex justify-content-center"
>
<h4
id=
"dugme-oglasi"
class=
"link-secondary"
style=
"text-decoration:none; border-bottom: 3px solid grey; width:100px; text-align:center;padding-bottom:5px;"
onclick=
"prikaziOglase()"
>
Oglasi
</h4>
</div>
<div
class=
"col d-flex justify-content-center"
>
<h4
id=
"dugme-ocene"
class=
"link-secondary"
style=
"text-decoration: none"
onclick=
"prikaziOcene()"
>
Ocene
</h4>
</div>
</div>
<div
id=
"div-oglasi"
>
<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=
"section border bg-white rounded p-2"
>
...
...
@@ -231,12 +241,10 @@
</div>
</div>
</div>
</div>
</form>
<div
class=
"col-5"
>
<div
id=
"div-ocene"
style=
"display: none"
class=
"row w-100"
>
<div
class=
"container"
>
<div
class=
"row
"
th:object=
"${korisniciKomentari}"
>
<div
class=
"col-md-8
"
th:each=
"komentar:${komentari}"
>
<div
class=
"row w-100
"
th:object=
"${korisniciKomentari}"
>
<div
class=
"row
"
th:each=
"komentar:${komentari}"
>
<div
class=
"media g-mb-30 media-comment"
>
<div
class=
"media-body u-shadow-v18 g-bg-secondary g-pa-30"
>
<img
class=
"d-flex g-width-50 g-height-50 rounded-circle g-mt-3 g-mr-15"
...
...
@@ -266,7 +274,11 @@
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</form>
<div
class=
"container-fluid pb-0 mb-0 justify-content-center text-light "
>
<footer>
<div
class=
"row my-5 justify-content-center py-5"
>
...
...
SkuciSe/src/main/resources/templates/oglas.html
View file @
806c145d
...
...
@@ -226,7 +226,7 @@
<img
class=
"d-flex rounded-circle"
style=
"width: 30%;"
th:src=
"@{'data:image/png;charset=utf-8;base64,'+${korisniciKomentari[komentarStat.index].slika}}"
alt=
"Image Description"
>
<div
class=
"g-mb-15"
>
<a
th:href=
"@{/korisnik/{korisnikId}(korisnikId=${
vlasnik
.korisnikId})}"
th:text=
"${korisniciKomentari[komentarStat.index].ime + ' '+ korisniciKomentari[komentarStat.index].prezime}"
class=
"text-right w-50"
style=
"color:#495056;text-decoration: none"
></a>
<a
th:href=
"@{/korisnik/{korisnikId}(korisnikId=${
korisniciKomentari[komentarStat.index]
.korisnikId})}"
th:text=
"${korisniciKomentari[komentarStat.index].ime + ' '+ korisniciKomentari[komentarStat.index].prezime}"
class=
"text-right w-50"
style=
"color:#495056;text-decoration: none"
></a>
<br>
<span
class=
"g-color-gray-dark-v4 g-font-size-12"
th:text=
"${komentar.vreme + ' ' + komentar.datum}"
></span>
</div>
...
...
SkuciSe/src/main/resources/templates/onama.html
View file @
806c145d
...
...
@@ -98,7 +98,7 @@
</div>
</nav>
<div
class=
"bg-image"
style=
"background-image: url('/images/ehl-real-estate-building.jpg');
height: 70vh;background-size: cover"
>
min-
height: 70vh;background-size: cover"
>
<div
class=
"w-100"
>
<div
class=
"row h-100 justify-content-end align-items-left px-5"
>
<div
class=
"col-lg-5 my-10"
>
...
...
SkuciSe/src/main/resources/templates/portfolio.html
View file @
806c145d
...
...
@@ -111,7 +111,7 @@
<div
class=
"row text-center"
>
<!-- Team item-->
<div
class=
"col-xl-3 col-sm-6 mb-5"
>
<div
class=
"bg-white rounded shadow-sm py-5 px-
4
h-100"
><img
src=
"/images/milovan.png"
alt=
""
width=
"100"
class=
"img-fluid rounded-circle mb-3 img-thumbnail shadow-sm"
>
<div
class=
"bg-white rounded shadow-sm py-5 px-
3
h-100"
><img
src=
"/images/milovan.png"
alt=
""
width=
"100"
class=
"img-fluid rounded-circle mb-3 img-thumbnail shadow-sm"
>
<h5
class=
"mb-0"
>
Milovan Samardzić
</h5><span
class=
"small text-uppercase text-muted row pt-2 justify-content-center mb-3"
>
Front-End Developer
</span>
<ul
class=
"social mb-0 list-inline pt-3"
>
<li
class=
"list-inline-item"
><a
href=
"https://facebook.com"
class=
"social-link"
><i
class=
"fa fa-facebook-f"
></i></a></li>
...
...
@@ -139,7 +139,7 @@
<!-- Team item-->
<div
class=
"col-xl-3 col-sm-6 mb-5"
>
<div
class=
"bg-white rounded shadow-sm py-5 px-
4
h-100"
><img
src=
"/images/nikola.png"
alt=
""
width=
"100"
class=
"img-fluid rounded-circle mb-3 img-thumbnail shadow-sm"
>
<div
class=
"bg-white rounded shadow-sm py-5 px-
3
h-100"
><img
src=
"/images/nikola.png"
alt=
""
width=
"100"
class=
"img-fluid rounded-circle mb-3 img-thumbnail shadow-sm"
>
<h5
class=
"mb-0"
>
Nikola Marković
</h5><span
class=
"small text-uppercase text-muted row pt-2 justify-content-center mb-3"
>
Front-End Developer
</span>
<ul
class=
"social mb-0 list-inline pt-3"
>
<li
class=
"list-inline-item"
><a
href=
"https://facebook.com"
class=
"social-link"
><i
class=
"fa fa-facebook-f"
></i></a></li>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment