Skip to content

A
awesomelands
Commit 0f9867f3 by Pavle Opric
Options

Merge remote-tracking branch 'origin/master'

parents bf73423d 3cc9590f
Showing with 238 additions and 67 deletions
.idea/workspace.xml
......@@ -4,31 +4,9 @@
<option name="autoReloadType" value="ALL" />
</component>
<component name="ChangeListManager">
<list default="true" id="6e82c7f1-3949-40e2-bc26-7eb50b36f993" name="Default Changelist" comment="UPLOAD sada radi">
<change afterPath="$PROJECT_DIR$/src/main/java/app/rep/DodajRep.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/app/usluga/DodajUsluga.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/app/usluga/ImplementacijaDodaj.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/app/usluga/web/DodajKontrol.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/app/vuk.jpg.lnk" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/static/images/20554052.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/static/images/2446195060_e0018b9214_m.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/static/images/4.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/static/images/81355b64-5a23-4e90-a98e-25db5dfe414f.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/static/images/big-112921447_60589928c5c824-51097158big-112681991_6.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/static/images/download.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/static/images/macka.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_18_9_2022__18_26__Default_Changelist_.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_18_9_2022__18_26__Default_Changelist_.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_18_9_2022__20_08__Default_Changelist_.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_18_9_2022__20_08__Default_Changelist_.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_19_9_2022__15_07__Default_Changelist_.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_19_9_2022__15_07__Default_Changelist_.xml" afterDir="false" />
<list default="true" id="6e82c7f1-3949-40e2-bc26-7eb50b36f993" name="Default Changelist" comment="header i footer register">
<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/usluga/Implementacija.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/app/usluga/Implementacija.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/OglasController.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/app/usluga/web/RegKontroler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/app/usluga/web/RegKontroler.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/templates/dodaj.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/dodaj.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/property.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/property.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unknown.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/templates/login.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/login.html" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -227,6 +205,8 @@
<workItem from="1663598082766" duration="1751000" />
<workItem from="1663600055785" duration="984000" />
<workItem from="1663675731268" duration="8728000" />
<workItem from="1663703824680" duration="5427000" />
<workItem from="1663780970951" duration="541000" />
</task>
<task id="LOCAL-00001" summary="dodata ulogovana verzija">
<created>1663501497955</created>
......@@ -249,7 +229,14 @@
<option name="project" value="LOCAL" />
<updated>1663599823537</updated>
</task>
<option name="localTasksCounter" value="4" />
<task id="LOCAL-00004" summary="header i footer register">
<created>1663781295222</created>
<option name="number" value="00004" />
<option name="presentableId" value="LOCAL-00004" />
<option name="project" value="LOCAL" />
<updated>1663781295222</updated>
</task>
<option name="localTasksCounter" value="5" />
<servers />
</component>
<component name="TimeTrackingManager">
......@@ -312,7 +299,8 @@
<MESSAGE value="dodata ulogovana verzija" />
<MESSAGE value="login/logout/anonymous user..." />
<MESSAGE value="UPLOAD sada radi" />
<option name="LAST_COMMIT_MESSAGE" value="UPLOAD sada radi" />
<MESSAGE value="header i footer register" />
<option name="LAST_COMMIT_MESSAGE" value="header i footer register" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/app/model/Korisnik.java">
......
src/main/resources/templates/login.html
<!DOCTYPE html>
<html>
<html xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="ISO-8859-1">
<title>Login</title>
<title>Royal Estate - Free Bootstrap 4 Template by TIM</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="stylesheet"
href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"
integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u"
crossorigin="anonymous">
<link href="https://fonts.googleapis.com/css?family=Poppins:300,400,500,600,700" rel="stylesheet">
<style>
<link rel="stylesheet" href="css/open-iconic-bootstrap.min.css">
<link rel="stylesheet" href="css/animate.css">
<link rel="stylesheet" href="css/owl.carousel.min.css">
<link rel="stylesheet" href="css/owl.theme.default.min.css">
<link rel="stylesheet" href="css/magnific-popup.css">
</style>
<link rel="stylesheet" href="css/aos.css">
<link rel="stylesheet" href="css/ionicons.min.css">
<link rel="stylesheet" href="css/bootstrap-datepicker.css">
<link rel="stylesheet" href="css/jquery.timepicker.css">
<link rel="stylesheet" href="css/flaticon.css">
<link rel="stylesheet" href="css/icomoon.css">
<link rel="stylesheet" href="css/style.css">
</head>
<body>
<div class="top">
<div class="container">
<div class="row d-flex align-items-center">
<div class="col">
<p class="social d-flex">
<a href="#"><span class="icon-facebook"></span></a>
<a href="#"><span class="icon-twitter"></span></a>
<a href="#"><span class="icon-google"></span></a>
<a href="#"><span class="icon-pinterest"></span></a>
</p>
</div>
<div class="col d-flex justify-content-end">
<div th:text="${#authentication.name}">
The value of the "name" property of the authentication object should appear here.
</div>
</div>
</div>
</div>
</div>
<nav class="navbar navbar-expand-lg navbar-dark ftco_navbar bg-dark ftco-navbar-light" id="ftco-navbar">
<div class="container">
<a class="navbar-brand" href="/">AWESOME<span>lands</span></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#ftco-nav" aria-controls="ftco-nav" aria-expanded="false" aria-label="Toggle navigation">
<span class="oi oi-menu"></span> Menu
</button>
<div class="collapse navbar-collapse" id="ftco-nav">
<ul class="navbar-nav ml-auto">
<li class="nav-item active"><a href="/" class="nav-link">Pocetna strana</a></li>
<li class="nav-item"><a href="oglasi" class="nav-link">Oglasi</a></li>
<li class="nav-item"><a href="maintance" class="nav-link">Agenti</a></li>
<li class="nav-item"><a href="maintance" class="nav-link">O nama</a></li>
<li class="nav-item"><a href="maintance" class="nav-link">Kontakt</a></li>
<li sec:authorize="isAnonymous()" class="nav-item cta"><a href="login" class="nav-link ml-lg-2"><span class="icon-user"></span> Prijava</a></li>
<li sec:authorize="isAnonymous()" class="nav-item cta cta-colored"><a href="registration" class="nav-link" ><span class="icon-pencil"></span> Registracija</a></li>
<li sec:authorize="isAuthenticated()" class="nav-item cta"><a href="dodaj" class="nav-link ml-lg-2"><span class="icon-user"></span> Dodaj Oglas</a></li>
<li sec:authorize="isAuthenticated()" class="nav-item cta"><a href="/logout" class="nav-link ml-lg-2"><span class="icon-user"></span> Log Out</a></li>
<!--sec:authorize="isAuthenticated()-->
</ul>
</div>
</div>
</nav>
<!-- END nav -->
<!-- create navigation bar ( header) -->
<!-- create navigation bar ( header) -->
<nav class="navbar navbar-inverse navbar-fixed-top">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed"
data-toggle="collapse" data-target="#navbar" aria-expanded="false"
aria-controls="navbar">
<span class="sr-only">Toggle navigation</span> <span
class="icon-bar"></span> <span class="icon-bar"></span> <span
class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#" th:href="@{/}">Login</a>
</div>
</div>
</nav>
......@@ -80,5 +133,44 @@
</div>
</div>
</div>
<footer class="ftco-footer ftco-bg-dark ftco-section">
<div class="container">
<div class="row">
<div class="col-md-12 text-center">
<p><!-- Link back to Colorlib can't be removed. Template is licensed under CC BY 3.0. -->
Copyright &copy;<script>document.write(new Date().getFullYear());</script> Sva prava zadržana | </i> by <a target="_blank">TIM 10</a>
<!-- Link back to Colorlib can't be removed. Template is licensed under CC BY 3.0. --></p>
</div>
</div>
</div>
</footer>
<!-- 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>
<script src="js/jquery.min.js"></script>
<script src="js/jquery-migrate-3.0.1.min.js"></script>
<script src="js/popper.min.js"></script>
<script src="js/bootstrap.min.js"></script>
<script src="js/jquery.easing.1.3.js"></script>
<script src="js/jquery.waypoints.min.js"></script>
<script src="js/jquery.stellar.min.js"></script>
<script src="js/owl.carousel.min.js"></script>
<script src="js/jquery.magnific-popup.min.js"></script>
<script src="js/aos.js"></script>
<script src="js/jquery.animateNumber.min.js"></script>
<script src="js/bootstrap-datepicker.js"></script>
<script src="js/jquery.timepicker.min.js"></script>
<script src="js/scrollax.min.js"></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/main.js"></script>
</body>
</html>
\ No newline at end of file
src/main/resources/templates/registration.html
<!DOCTYPE html>
<html>
<html xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="ISO-8859-1">
<title>Registration</title>
<link rel="stylesheet"
href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"
integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u"
crossorigin="anonymous">
<title>Royal Estate - Free Bootstrap 4 Template by TIM</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link href="https://fonts.googleapis.com/css?family=Poppins:300,400,500,600,700" rel="stylesheet">
<link rel="stylesheet" href="css/open-iconic-bootstrap.min.css">
<link rel="stylesheet" href="css/animate.css">
<link rel="stylesheet" href="css/owl.carousel.min.css">
<link rel="stylesheet" href="css/owl.theme.default.min.css">
<link rel="stylesheet" href="css/magnific-popup.css">
<link rel="stylesheet" href="css/aos.css">
<link rel="stylesheet" href="css/ionicons.min.css">
<link rel="stylesheet" href="css/bootstrap-datepicker.css">
<link rel="stylesheet" href="css/jquery.timepicker.css">
<link rel="stylesheet" href="css/flaticon.css">
<link rel="stylesheet" href="css/icomoon.css">
<link rel="stylesheet" href="css/style.css">
</head>
<body>
<!-- create navigation bar ( header) -->
<nav class="navbar navbar-inverse navbar-fixed-top">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed"
data-toggle="collapse" data-target="#navbar" aria-expanded="false"
aria-controls="navbar">
<span class="sr-only">Toggle navigation</span> <span
class="icon-bar"></span> <span class="icon-bar"></span> <span
class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#" th:href="@{/}">Registracija</a>
<div class="top">
<div class="container">
<div class="row d-flex align-items-center">
<div class="col">
<p class="social d-flex">
<a href="#"><span class="icon-facebook"></span></a>
<a href="#"><span class="icon-twitter"></span></a>
<a href="#"><span class="icon-google"></span></a>
<a href="#"><span class="icon-pinterest"></span></a>
</p>
</div>
<div class="col d-flex justify-content-end">
<div th:text="${#authentication.name}">
The value of the "name" property of the authentication object should appear here.
</div>
</div>
</div>
</nav>
</div>
</div>
<nav class="navbar navbar-expand-lg navbar-dark ftco_navbar bg-dark ftco-navbar-light" id="ftco-navbar">
<div class="container">
<a class="navbar-brand" href="/">AWESOME<span>lands</span></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#ftco-nav" aria-controls="ftco-nav" aria-expanded="false" aria-label="Toggle navigation">
<span class="oi oi-menu"></span> Menu
</button>
<br>
<br>
<div class="collapse navbar-collapse" id="ftco-nav">
<ul class="navbar-nav ml-auto">
<li class="nav-item active"><a href="/" class="nav-link">Pocetna strana</a></li>
<li class="nav-item"><a href="oglasi" class="nav-link">Oglasi</a></li>
<li class="nav-item"><a href="maintance" class="nav-link">Agenti</a></li>
<li class="nav-item"><a href="maintance" class="nav-link">O nama</a></li>
<li class="nav-item"><a href="maintance" class="nav-link">Kontakt</a></li>
<li sec:authorize="isAnonymous()" class="nav-item cta"><a href="login" class="nav-link ml-lg-2"><span class="icon-user"></span> Prijava</a></li>
<li sec:authorize="isAnonymous()" class="nav-item cta cta-colored"><a href="registration" class="nav-link" ><span class="icon-pencil"></span> Registracija</a></li>
<li sec:authorize="isAuthenticated()" class="nav-item cta"><a href="dodaj" class="nav-link ml-lg-2"><span class="icon-user"></span> Dodaj Oglas</a></li>
<li sec:authorize="isAuthenticated()" class="nav-item cta"><a href="/logout" class="nav-link ml-lg-2"><span class="icon-user"></span> Log Out</a></li>
<!--sec:authorize="isAuthenticated()-->
</ul>
</div>
</div>
</nav>
<!-- Create HTML registration form -->
<div class="container">
<div class="row">
......@@ -73,5 +123,44 @@
</div>
</div>
</div>
<footer class="ftco-footer ftco-bg-dark ftco-section">
<div class="container">
<div class="row">
<div class="col-md-12 text-center">
<p><!-- Link back to Colorlib can't be removed. Template is licensed under CC BY 3.0. -->
Copyright &copy;<script>document.write(new Date().getFullYear());</script> Sva prava zadržana | </i> by <a target="_blank">TIM 10</a>
<!-- Link back to Colorlib can't be removed. Template is licensed under CC BY 3.0. --></p>
</div>
</div>
</div>
</footer>
<!-- 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>
<script src="js/jquery.min.js"></script>
<script src="js/jquery-migrate-3.0.1.min.js"></script>
<script src="js/popper.min.js"></script>
<script src="js/bootstrap.min.js"></script>
<script src="js/jquery.easing.1.3.js"></script>
<script src="js/jquery.waypoints.min.js"></script>
<script src="js/jquery.stellar.min.js"></script>
<script src="js/owl.carousel.min.js"></script>
<script src="js/jquery.magnific-popup.min.js"></script>
<script src="js/aos.js"></script>
<script src="js/jquery.animateNumber.min.js"></script>
<script src="js/bootstrap-datepicker.js"></script>
<script src="js/jquery.timepicker.min.js"></script>
<script src="js/scrollax.min.js"></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/main.js"></script>
</body>
</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