Index: src/main/resources/application.properties
===================================================================
--- src/main/resources/application.properties	(revision a226bc376d8feeec1829bfe9374cdf27b2cf935b)
+++ src/main/resources/application.properties	(revision 3e572eb5078b74bc9c8fc83edc749c611308dd26)
@@ -1,6 +1,1 @@
 
-spring.datasource.url=jdbc:postgresql://localhost:9999/db_202324z_va_prj_cbdb
-spring.datasource.username=db_202324z_va_prj_cbdb_owner
-spring.datasource.password=d922daf2bfec
-
-
Index: src/main/resources/templates/error-page.html
===================================================================
--- src/main/resources/templates/error-page.html	(revision a226bc376d8feeec1829bfe9374cdf27b2cf935b)
+++ src/main/resources/templates/error-page.html	(revision 3e572eb5078b74bc9c8fc83edc749c611308dd26)
@@ -1,50 +1,10 @@
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:th="http://www.thymeleaf.org">
+<html lang="en">
 <head>
-    <meta charset="UTF-8">
-    <title>Home page</title>
-    <!-- Add Bootstrap CSS link -->
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css">
+  <meta charset="UTF-8">
+  <title>$Title$</title>
 </head>
 <body>
-<!-- Bootstrap Navbar -->
-<nav class="navbar navbar-expand-lg navbar-dark bg-dark">
-    <a class="navbar-brand" th:href="@{/}">
-        CookBook
-    </a>
-    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-    </button>
-    <div class="collapse navbar-collapse" id="navbarNav">
-        <ul class="navbar-nav ml-auto">
-            <li class="nav-item active">
-                <a class="nav-link" th:href="@{/}">Home <span class="sr-only">(current)</span></a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" th:href="@{/naracki}">Naracki</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="#">Contact</a>
-            </li>
-        </ul>
-    </div>
-</nav>
-
-<div class="container mt-5">
-    <h1>This is an error page</h1>
-    <div th:if="${error != null}">
-        <h5 th:text="${error}"></h5>
-    </div>
-
-    <h3>Something went wrong!</h3>
-
-
-</div>
-
-<!-- Add Bootstrap JS and Popper.js scripts (required for Bootstrap components) -->
-<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js"></script>
-<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"></script>
+$END$
 </body>
 </html>
Index: src/main/resources/templates/home.html
===================================================================
--- src/main/resources/templates/home.html	(revision a226bc376d8feeec1829bfe9374cdf27b2cf935b)
+++ src/main/resources/templates/home.html	(revision 3e572eb5078b74bc9c8fc83edc749c611308dd26)
@@ -1,63 +1,10 @@
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:th="http://www.thymeleaf.org">
+<html lang="en">
 <head>
-    <meta charset="UTF-8">
-    <title>Home page</title>
-    <!-- Add Bootstrap CSS link -->
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css">
+  <meta charset="UTF-8">
+  <title>$Title$</title>
 </head>
 <body>
-<!-- Bootstrap Navbar -->
-<nav class="navbar navbar-expand-lg navbar-dark bg-dark">
-    <a class="navbar-brand" th:href="@{/}">
-        CookBook
-    </a>
-    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-    </button>
-    <div class="collapse navbar-collapse" id="navbarNav">
-        <ul class="navbar-nav ml-auto">
-            <li class="nav-item active">
-                <a class="nav-link" th:href="@{/}">Home <span class="sr-only">(current)</span></a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" th:href="@{/naracki}">Naracki</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="#">Contact</a>
-            </li>
-        </ul>
-    </div>
-</nav>
-
-<div class="container mt-5">
-    <h1>This is home page</h1>
-
-    <table class="table">
-        <thead>
-        <tr>
-            <th>Ime</th>
-            <th>Ocena</th>
-            <th>Action</th>
-        </tr>
-        </thead>
-        <tbody>
-        <tr th:each="recept : ${recepti}">
-            <td><a th:href="@{'/recept/{id}' (id=${recept.recId})}" th:text="${recept.recIme}"></a></td>
-            <td th:text="${recept.srednaOcena}"></td>
-            <td>
-                <button class="btn btn-primary">Edit</button>
-                <button class="btn btn-danger">Delete</button>
-            </td>
-        </tr>
-        </tbody>
-    </table>
-</div>
-
-<!-- Add Bootstrap JS and Popper.js scripts (required for Bootstrap components) -->
-<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js"></script>
-<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"></script>
+$END$
 </body>
 </html>
Index: src/main/resources/templates/naracki.html
===================================================================
--- src/main/resources/templates/naracki.html	(revision a226bc376d8feeec1829bfe9374cdf27b2cf935b)
+++ 	(revision )
@@ -1,68 +1,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:th="http://www.thymeleaf.org">
-<head>
-    <meta charset="UTF-8">
-    <title>Home page</title>
-    <!-- Add Bootstrap CSS link -->
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css">
-</head>
-<body>
-<!-- Bootstrap Navbar -->
-<nav class="navbar navbar-expand-lg navbar-dark bg-dark">
-    <a class="navbar-brand" href="#">
-        CookBook
-    </a>
-    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-    </button>
-    <div class="collapse navbar-collapse" id="navbarNav">
-        <ul class="navbar-nav ml-auto">
-            <li class="nav-item active">
-                <a class="nav-link" th:href="@{/}">Home <span class="sr-only">(current)</span></a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" th:href="@{/naracki}">Naracki</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="#">Contact</a>
-            </li>
-        </ul>
-    </div>
-</nav>
-
-<div class="container mt-5">
-    <h1>This orders page</h1>
-
-    <table class="table">
-        <thead>
-        <tr>
-            <th>Vreme na narckata</th>
-            <th>Kontakt</th>
-            <th>Action</th>
-        </tr>
-        </thead>
-        <tbody>
-        <tr th:each="naracka: ${naracki}">
-            <td th:text="${naracka.getDataFormatirana()}"></td>
-            <td th:text="${naracka.telefon}"></td>
-            <td>
-                <form th:method="GET" th:action="@{/naracki/naracka}">
-                    <input type="datetime-local" hidden th:value="${naracka.vreme}" th:name="vreme">
-                    <input type="text" hidden th:value="${naracka.telefon}" th:name="telefon">
-                    <button class="btn btn-primary">View</button>
-                </form>
-
-                <button class="btn btn-danger">Delete</button>
-            </td>
-        </tr>
-        </tbody>
-    </table>
-</div>
-
-<!-- Add Bootstrap JS and Popper.js scripts (required for Bootstrap components) -->
-<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js"></script>
-<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"></script>
-</body>
-</html>
Index: src/main/resources/templates/recept.html
===================================================================
--- src/main/resources/templates/recept.html	(revision a226bc376d8feeec1829bfe9374cdf27b2cf935b)
+++ src/main/resources/templates/recept.html	(revision 3e572eb5078b74bc9c8fc83edc749c611308dd26)
@@ -7,17 +7,8 @@
     <!-- Add Bootstrap CSS link -->
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css">
-    <style>
-        img{
-            margin: 16px;
-            border-style: groove;
-        }
-        textarea{
-            width: 70%;
-        }
-    </style>
 </head>
 <body>
     <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
-    <a class="navbar-brand" th:href="@{/}">
+    <a class="navbar-brand" href="#">
         CookBook
     </a>
@@ -28,8 +19,8 @@
         <ul class="navbar-nav ml-auto">
             <li class="nav-item active">
-                <a class="nav-link" th:href="@{/}">Home <span class="sr-only">(current)</span></a>
+                <a class="nav-link" href="#">Home <span class="sr-only">(current)</span></a>
             </li>
             <li class="nav-item">
-                <a class="nav-link" th:href="@{/naracki}">Naracki</a>
+                <a class="nav-link" href="#">About</a>
             </li>
             <li class="nav-item">
@@ -40,66 +31,12 @@
 </nav>
 
+    <h1 th:text="${recept.recIme}"></h1>
+
+    <h4 th:text="${recept.srednaOcena}"></h4>
+
+    <div th:text="${recept.postapka}"></div>
 
 
-    <div class="container mt-4">
-        <h1 th:text="${recept.recIme}"></h1>
-
-        <h4 th:text="${recept.srednaOcena}"></h4>
-
-        <div class="row">
-            <div class="col-12">
-                <h6>Pictures</h6>
-            </div>
-            <div class="col-12">
-                <img th:each="slika : ${sliki}" th:src="${slika.pic}" class="img-fluid" alt="Recipe Image" width="200px" height="200px">
-            </div>
-        </div>
-
-        <div>
-            <h5>Состојки</h5>
-            <div th:if="${sostojki.size() == 0}">Состојките не се додадени!</div>
-            <ul>
-                <li th:each="sostojka : ${sostojki}" th:text="${sostojka.sNaziv}"></li>
-            </ul>
-        </div>
-
-
-        <div>
-            <h5>Постапка</h5>
-            <p class="mt-4" th:text="${recept.postapka}"></p>
-        </div>
-
-        <form class="p-4 border" th:method="POST" th:action="@{'/komentar/{id}' (id=${recept.recId})}">
-            <div class="pt-3">
-                <label for="kom-ocena">Внеси оцена</label>
-                <input id="kom-ocena" name="ocena" type="number" min="1" max="10" step="1" required>
-            </div>
-
-            <div class="pt-3">
-                <textarea name="komentar">Внеси коментар..</textarea>
-            </div>
-            <div class="pt-3">
-                <label for="telefon">Избери телефон</label>
-                <select id="telefon" name="telefon" required>
-                    <option selected></option>
-                    <option th:each="posetitel : ${posetiteli}"
-                            th:text="${posetitel.telefon}"
-                            th:value="${posetitel.telefon}"></option>
-                </select>
-            </div>
-            <div class="pt-3">
-                <button>Submit</button>
-            </div>
-        </form>
-
-        <div class="mt-4">
-            <div th:each="komentar : ${komentari}" class="border p-4">
-                <p th:text="${komentar.imePrezime}">Ime Prezime</p>
-                <p th:text="${komentar.getDataFormatirana()}">2022-12-09 18:25:58</p>
-                <p th:text="${komentar.ocena}">8</p>
-                <p th:text="${komentar.text}" class="border">text</p>
-            </div>
-        </div>
-    </div>
+    <div>KOMENTARI TO DO</div>
 
 <!-- Add Bootstrap JS and Popper.js scripts (required for Bootstrap components) -->
Index: src/main/resources/templates/stavka.html
===================================================================
--- src/main/resources/templates/stavka.html	(revision a226bc376d8feeec1829bfe9374cdf27b2cf935b)
+++ 	(revision )
@@ -1,89 +1,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:th="http://www.thymeleaf.org">
-<head>
-  <meta charset="UTF-8">
-  <title>Home page</title>
-  <!-- Add Bootstrap CSS link -->
-  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css">
-</head>
-<body>
-<!-- Bootstrap Navbar -->
-<nav class="navbar navbar-expand-lg navbar-dark bg-dark">
-  <a class="navbar-brand" href="#">
-    CookBook
-  </a>
-  <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
-    <span class="navbar-toggler-icon"></span>
-  </button>
-  <div class="collapse navbar-collapse" id="navbarNav">
-    <ul class="navbar-nav ml-auto">
-      <li class="nav-item active">
-        <a class="nav-link" th:href="@{/}">Home <span class="sr-only">(current)</span></a>
-      </li>
-      <li class="nav-item">
-        <a class="nav-link" th:href="@{/naracki}">Naracki</a>
-      </li>
-      <li class="nav-item">
-        <a class="nav-link" href="#">Contact</a>
-      </li>
-    </ul>
-  </div>
-</nav>
-
-<div class="container mt-5">
-  <h1>This is items of the order</h1>
-
-  <table class="table">
-    <thead>
-    <tr>
-      <th>Vreme na narckata</th>
-      <th>Kontakt</th>
-      <th>Ime recept</th>
-      <th>Nacin</th>
-      <th>Action</th>
-    </tr>
-    </thead>
-    <tbody>
-    <tr th:each="stavka: ${stavki}">
-      <td th:text="${stavka.getDataFormatirana()}"></td>
-      <td th:text="${stavka.telefon}"></td>
-      <td th:text="${stavka.recIme}"></td>
-      <td th:text="${stavka.nacin}"></td>
-      <td>
-        <button class="btn btn-primary" disabled>View</button>
-        <button class="btn btn-danger" disabled>Delete</button>
-      </td>
-    </tr>
-    </tbody>
-  </table>
-
-  <h3>Information for the items of the order</h3>
-  <table class="table">
-    <thead>
-      <tr>
-        <th>Ime recept</th>
-        <th>Adresa</th>
-        <th>Sostojka</th>
-        <th>Action</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr th:each="dostava: ${podatoci}">
-        <td th:text="${dostava.recIme()}"></td>
-        <td th:text="${dostava.adresa()}"></td>
-        <td th:text="${dostava.sostojka()}"></td>
-        <td>
-          <button class="btn btn-primary">Select</button>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-</div>
-
-<!-- Add Bootstrap JS and Popper.js scripts (required for Bootstrap components) -->
-<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js"></script>
-<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"></script>
-</body>
-</html>
