Skip to content

A
awesomelands
Commit 3507edf5 by Vuk Lazovic
Options

blabla

parent adf7f2dc
Showing with 42 additions and 16 deletions
.idea/workspace.xml
...@@ -4,15 +4,12 @@ ...@@ -4,15 +4,12 @@
<option name="autoReloadType" value="ALL" /> <option name="autoReloadType" value="ALL" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="6e82c7f1-3949-40e2-bc26-7eb50b36f993" name="Default Changelist" comment=""> <list default="true" id="6e82c7f1-3949-40e2-bc26-7eb50b36f993" name="Default Changelist" comment="dodata ulogovana verzija">
<change afterPath="$PROJECT_DIR$/.idea/jpa-buddy.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/templates/dodaj.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/templates/loggedin.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/app/config/Bezbednost.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/app/config/Bezbednost.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/app/usluga/web/MainKontroler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/app/usluga/web/MainKontroler.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/app/usluga/web/MainKontroler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/app/usluga/web/MainKontroler.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/templates/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/index.html" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/resources/templates/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/templates/loggedin.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/loggedin.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/templates/property.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/property.html" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
...@@ -193,8 +190,16 @@ ...@@ -193,8 +190,16 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1663427032475</updated> <updated>1663427032475</updated>
<workItem from="1663427050863" duration="1923000" /> <workItem from="1663427050863" duration="1923000" />
<workItem from="1663500169914" duration="1149000" /> <workItem from="1663500169914" duration="6177000" />
</task> </task>
<task id="LOCAL-00001" summary="dodata ulogovana verzija">
<created>1663501497955</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1663501497955</updated>
</task>
<option name="localTasksCounter" value="2" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
...@@ -254,6 +259,8 @@ ...@@ -254,6 +259,8 @@
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" /> <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
<MESSAGE value="dodata ulogovana verzija" />
<option name="LAST_COMMIT_MESSAGE" value="dodata ulogovana verzija" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/app/model/Korisnik.java"> <entry file="file://$PROJECT_DIR$/src/main/java/app/model/Korisnik.java">
......
src/main/java/app/usluga/web/MainKontroler.java
package app.usluga.web; package app.usluga.web;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.ui.Model;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import java.util.List;
@Controller @Controller
public class MainKontroler { public class MainKontroler {
...@@ -25,4 +31,13 @@ public class MainKontroler { ...@@ -25,4 +31,13 @@ public class MainKontroler {
public String prikazidodaj() { public String prikazidodaj() {
return "dodaj"; return "dodaj";
} }
@GetMapping("/oglasi")
public String prikaziOglase(Model model)
{
//OVDE TREBA IZVUCI PODATKE SA SQLA
model.addAttribute("A","B");
return "property";
}
} }
src/main/resources/templates/index.html
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<div class="collapse navbar-collapse" id="ftco-nav"> <div class="collapse navbar-collapse" id="ftco-nav">
<ul class="navbar-nav ml-auto"> <ul class="navbar-nav ml-auto">
<li class="nav-item active"><a href="index.html" class="nav-link">Pocetna strana</a></li> <li class="nav-item active"><a href="index.html" class="nav-link">Pocetna strana</a></li>
<li class="nav-item"><a href="property.html" class="nav-link">Oglasi</a></li> <li class="nav-item"><a href="oglasi" class="nav-link">Oglasi</a></li>
<li class="nav-item"><a href="agents.html" class="nav-link">Agenti</a></li> <li class="nav-item"><a href="agents.html" class="nav-link">Agenti</a></li>
<li class="nav-item"><a href="about.html" class="nav-link">O nama</a></li> <li class="nav-item"><a href="about.html" class="nav-link">O nama</a></li>
<li class="nav-item"><a href="contact.html" class="nav-link">Kontakt</a></li> <li class="nav-item"><a href="contact.html" class="nav-link">Kontakt</a></li>
......
src/main/resources/templates/loggedin.html
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<div class="collapse navbar-collapse" id="ftco-nav"> <div class="collapse navbar-collapse" id="ftco-nav">
<ul class="navbar-nav ml-auto"> <ul class="navbar-nav ml-auto">
<li class="nav-item active"><a href="index.html" class="nav-link">Pocetna strana</a></li> <li class="nav-item active"><a href="index.html" class="nav-link">Pocetna strana</a></li>
<li class="nav-item"><a href="property.html" class="nav-link">Oglasi</a></li> <li class="nav-item"><a href="oglasi" class="nav-link">Oglasi</a></li>
<li class="nav-item"><a href="agents.html" class="nav-link">Agenti</a></li> <li class="nav-item"><a href="agents.html" class="nav-link">Agenti</a></li>
<li class="nav-item"><a href="about.html" class="nav-link">O nama</a></li> <li class="nav-item"><a href="about.html" class="nav-link">O nama</a></li>
<li class="nav-item"><a href="contact.html" class="nav-link">Kontakt</a></li> <li class="nav-item"><a href="contact.html" class="nav-link">Kontakt</a></li>
......
src/main/resources/templates/property.html
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html xmlns:th="https://www.thymeleaf.org">
<head> <head>
<title>Royal Estate - Free Bootstrap 4 Template by Colorlib</title> <title>Royal Estate - Free Bootstrap 4 Template by Colorlib</title>
<meta charset="utf-8"> <meta charset="utf-8">
...@@ -27,6 +27,8 @@ ...@@ -27,6 +27,8 @@
<link rel="stylesheet" href="css/style.css"> <link rel="stylesheet" href="css/style.css">
</head> </head>
<body> <body>
<div class="top"> <div class="top">
<div class="container"> <div class="container">
<div class="row d-flex align-items-center"> <div class="row d-flex align-items-center">
...@@ -279,7 +281,7 @@ ...@@ -279,7 +281,7 @@
</div> </div>
</div> </div>
</section> </section>
<section class="ftco-section bg-light"> <section class="ftco-section bg-light">
<div class="container"> <div class="container">
...@@ -295,7 +297,8 @@ ...@@ -295,7 +297,8 @@
<span class="status sale">Sale</span> <span class="status sale">Sale</span>
<div class="d-flex"> <div class="d-flex">
<div class="one"> <div class="one">
<h3><a href="property-single.html">North Parchmore Street</a></h3>
<h3 th:text="${A}"><a href="property-single.html"></a> </h3>
<p>Apartment</p> <p>Apartment</p>
</div> </div>
<div class="two"> <div class="two">
...@@ -554,7 +557,7 @@ ...@@ -554,7 +557,7 @@
</div> </div>
</div> </div>
</section> </section>
<section class="ftco-section-parallax"> <section class="ftco-section-parallax">
<div class="parallax-img d-flex align-items-center"> <div class="parallax-img d-flex align-items-center">
<div class="container"> <div class="container">
...@@ -639,8 +642,8 @@ ...@@ -639,8 +642,8 @@
</div> </div>
</div> </div>
</footer> </footer>
<!-- loader --> <!-- loader -->
<div id="ftco-loader" class="show fullscreen"><svg class="circular" width="48px" height="48px"><circle class="path-bg" cx="24" cy="24" r="22" fill="none" stroke-width="4" stroke="#eeeeee"/><circle class="path" cx="24" cy="24" r="22" fill="none" stroke-width="4" stroke-miterlimit="10" stroke="#F96D00"/></svg></div> <div id="ftco-loader" class="show fullscreen"><svg class="circular" width="48px" height="48px"><circle class="path-bg" cx="24" cy="24" r="22" fill="none" stroke-width="4" stroke="#eeeeee"/><circle class="path" cx="24" cy="24" r="22" fill="none" stroke-width="4" stroke-miterlimit="10" stroke="#F96D00"/></svg></div>
...@@ -663,6 +666,6 @@ ...@@ -663,6 +666,6 @@
<script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyBVWaKrjvy3MaE7SQ74_uJiULgl1JY0H2s&sensor=false"></script> <script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyBVWaKrjvy3MaE7SQ74_uJiULgl1JY0H2s&sensor=false"></script>
<script src="js/google-map.js"></script> <script src="js/google-map.js"></script>
<script src="js/main.js"></script> <script src="js/main.js"></script>
</body> </body>
</html> </html>
\ No newline at end of file
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