Index: bus-n-go-do-5ta-faza/src/main/resources/application.properties
===================================================================
--- bus-n-go-do-5ta-faza/src/main/resources/application.properties	(revision baf4cc4b66f1d62e9dc9c2e71bcc078c9c3956a3)
+++ bus-n-go-do-5ta-faza/src/main/resources/application.properties	(revision baf4cc4b66f1d62e9dc9c2e71bcc078c9c3956a3)
@@ -0,0 +1,17 @@
+#
+spring.datasource.url=jdbc:postgresql://localhost:8081/db_202324z_va_prj_busngo
+spring.datasource.username=db_202324z_va_prj_busngo_owner
+spring.datasource.password=d9f924580e7
+spring.datasource.driver-class-name=org.postgresql.Driver
+
+
+spring.datasource.hikari.connection-timeout=20000
+spring.datasource.hikari.maximum-pool-size=5
+
+#spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
+spring.jpa.properties.hibernate.jdbc.non_contextual_creation=true
+spring.jpa.properties.hibernate.default_schema=project_new
+
+spring.jpa.hibernate.ddl-auto=validate
+spring.jpa.show-sql=true
+
Index: bus-n-go-do-5ta-faza/src/main/resources/templates/choosePostojka.html
===================================================================
--- bus-n-go-do-5ta-faza/src/main/resources/templates/choosePostojka.html	(revision baf4cc4b66f1d62e9dc9c2e71bcc078c9c3956a3)
+++ bus-n-go-do-5ta-faza/src/main/resources/templates/choosePostojka.html	(revision baf4cc4b66f1d62e9dc9c2e71bcc078c9c3956a3)
@@ -0,0 +1,17 @@
+<div class="container" xmlns:th="http://www.thymeleaf.org">
+    <form class="form-signin mt-xl-5" method="get" action="/vozenje/choose-postojka">
+        <h2 class="form-signin-heading">Odberete postojka na koja se naogjate</h2>
+        <p>
+            <label for="pnlId" class="sr-only">Postojka</label>
+            <select class="form-control" name="pnlId" id="pnlId">
+                <option class="form-control" th:each="postojka : ${postojki}" th:text="${postojka.postojkaByPId.pIme}" th:value="${postojka.pnlId}" ></option>
+            </select>
+
+
+        </p>
+        <div class="col-md-3">
+            <button id="submit" class="btn btn-lg btn-primary btn-block" type="submit">Odberi</button>
+        </div>
+    </form>
+</div>
+
Index: bus-n-go-do-5ta-faza/src/main/resources/templates/endVozenje.html
===================================================================
--- bus-n-go-do-5ta-faza/src/main/resources/templates/endVozenje.html	(revision baf4cc4b66f1d62e9dc9c2e71bcc078c9c3956a3)
+++ bus-n-go-do-5ta-faza/src/main/resources/templates/endVozenje.html	(revision baf4cc4b66f1d62e9dc9c2e71bcc078c9c3956a3)
@@ -0,0 +1,62 @@
+<div class="container" xmlns:th="http://www.thymeleaf.org">
+    <form class="form-signin mt-xl-5" method="post" th:action="@{'/vozenje/{id}/end'(id=${vozenje.vozenjeId})}">
+        <h2 class="form-signin-heading">Start vozenje</h2>
+
+        <p>
+            <label for="pnlId" class="sr-only">Postojka</label>
+            <select   class="form-control" name="pnlId" id="pnlId">
+                <option class="form-control"
+                        th:text="${vozenje.postojkanalinijaByKacuvaPnlId.postojkaByPId.pIme}"
+                        selected
+                        disabled
+                        th:value="${vozenje.postojkanalinijaByKacuvaPnlId.pnlId} "  ></option>
+<!--                        th:selected="${postojka!= null && postojka.pnlId == pos.pnlId} ? 'true' : 'false' " -->
+<!--                        th:disabled="${postojka!= null && postojka.pnlId != pos.pnlId} ? 'true' : 'false' "  -->
+
+            </select>
+        </p>
+
+        <p >
+            <label for="instanca" class="sr-only">Instanca</label>
+            <select id="instanca" name="inlId" class="form-control">
+                <option
+                        selected
+                        disabled
+                        th:value="${vozenje.instancanalinijaByInlId.inlId}"
+                        th:text="${vozenje.instancanalinijaByInlId.linijaByLiId.liIme} + ' - ' + ${vozenje.instancanalinijaByInlId.linijaByLiId.liPravec}"></option>
+            </select>
+        </p>
+
+        <p >
+            <label for="bilet" class="sr-only">Bilet</label>
+            <select id="bilet" name="bId" class="form-control">
+                <option
+                        selected
+                        disabled
+                        th:value="${vozenje.biletByBId.bId}"
+                        th:text="${vozenje.biletByBId.tipbiletByTbId.tbIme} + ' - ' + ${vozenje.biletByBId.bStatus.name()}"></option>
+            </select>
+        </p>
+
+        <p>
+            <label for="pnlEndId" class="sr-only">Postojka Simnuvanje</label>
+            <select   class="form-control" name="pnlEndId" id="pnlEndId">
+                <option class="form-control"
+                        th:each="pos : ${pnls}"
+                        th:text="${pos.postojkaByPId.pIme}"
+                        th:value="${pos.pnlId} "  ></option>
+
+
+            </select>
+        </p>
+
+        <div th:if="${param.error}" th:text="${param.error}" class="text-danger"></div>
+
+        <div class="row">
+            <div class="col-md-3">
+                <button id="submit" class="btn btn-lg btn-primary btn-block" type="submit">End</button>
+            </div>
+        </div>
+    </form>
+</div>
+
Index: bus-n-go-do-5ta-faza/src/main/resources/templates/fragments/footer.html
===================================================================
--- bus-n-go-do-5ta-faza/src/main/resources/templates/fragments/footer.html	(revision baf4cc4b66f1d62e9dc9c2e71bcc078c9c3956a3)
+++ bus-n-go-do-5ta-faza/src/main/resources/templates/fragments/footer.html	(revision baf4cc4b66f1d62e9dc9c2e71bcc078c9c3956a3)
@@ -0,0 +1,48 @@
+<footer class="text-black-50 mt-xl-5" xmlns:th="http://www.thymeleaf.org">
+    <div class="container">
+        <div class="row">
+            <div class="col-md-3 col-lg-4 col-xl-3">
+                <h5>About</h5>
+                <hr class="bg-white mb-2 mt-0 d-inline-block mx-auto w-25">
+                <p class="mb-0">
+                    Le Lorem Ipsum est simplement du faux texte employé dans la composition et la mise en page avant
+                    impression.
+                </p>
+            </div>
+
+            <div class="col-md-2 col-lg-2 col-xl-2 mx-auto">
+                <h5>Informations</h5>
+                <hr class="bg-white mb-2 mt-0 d-inline-block mx-auto w-25">
+                <ul class="list-unstyled">
+                    <li><a href="">Link 1</a></li>
+                    <li><a href="">Link 2</a></li>
+                    <li><a href="">Link 3</a></li>
+                    <li><a href="">Link 4</a></li>
+                </ul>
+            </div>
+
+            <div class="col-md-3 col-lg-2 col-xl-2 mx-auto">
+                <h5>Others links</h5>
+                <hr class="bg-white mb-2 mt-0 d-inline-block mx-auto w-25">
+                <ul class="list-unstyled">
+                    <li><a href="">Link 1</a></li>
+                    <li><a href="">Link 2</a></li>
+                    <li><a href="">Link 3</a></li>
+                    <li><a href="">Link 4</a></li>
+                </ul>
+            </div>
+
+            <div class="col-md-4 col-lg-3 col-xl-3">
+                <h5>Contact</h5>
+                <hr class="bg-white mb-2 mt-0 d-inline-block mx-auto w-25">
+                <ul class="list-unstyled">
+                    <li><i class="fa fa-home mr-2"></i> My company</li>
+                    <li><i class="fa fa-envelope mr-2"></i> email@example.com</li>
+                    <li><i class="fa fa-phone mr-2"></i> + 33 12 14 15 16</li>
+                    <li><i class="fa fa-print mr-2"></i> + 33 12 14 15 16</li>
+                </ul>
+            </div>
+        </div>
+    </div>
+</footer>
+
Index: bus-n-go-do-5ta-faza/src/main/resources/templates/fragments/header.html
===================================================================
--- bus-n-go-do-5ta-faza/src/main/resources/templates/fragments/header.html	(revision baf4cc4b66f1d62e9dc9c2e71bcc078c9c3956a3)
+++ bus-n-go-do-5ta-faza/src/main/resources/templates/fragments/header.html	(revision baf4cc4b66f1d62e9dc9c2e71bcc078c9c3956a3)
@@ -0,0 +1,68 @@
+<header xmlns:th="http://www.thymeleaf.org">
+  <nav class="navbar navbar-expand-md navbar-dark bg-dark">
+    <div class="container">
+      <a class="navbar-brand" href="/">Bus & GO</a>
+      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
+              aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
+        <span class="navbar-toggler-icon"></span>
+      </button>
+
+      <div class="collapse navbar-collapse justify-content-end" id="navbarsExampleDefault">
+        <ul class="navbar-nav m-auto">
+          <li sec:authorize="hasRole('ROLE_PASSENGER')" class="nav-item m-auto">
+            <a class="nav-link active" href="/bilet">Bileti</a>
+          </li>
+          <li sec:authorize="hasAnyRole('ROLE_PASSENGER')" class="nav-item m-auto">
+            <a class="nav-link active" href="/vozenje">Vozenja</a>
+          </li>
+          <li sec:authorize="hasRole('ROLE_PASSENGER')" class="nav-item m-auto">
+            <a class="nav-link active" href="/kazna">Kazni</a>
+          </li>
+          <li sec:authorize="hasAnyRole('ROLE_CONDUCTOR', 'ROLE_DRIVER')" class="nav-item m-auto">
+            <a class="nav-link active" href="/instanca-na-linija">Instanci</a>
+          </li>
+        </ul>
+
+
+        <form class="form-inline my-2 my-lg-0">
+          <div class="input-group input-group-sm">
+            <input type="text" class="form-control" aria-label="Small"
+                   aria-describedby="inputGroup-sizing-sm"
+                   placeholder="Search...">
+            <div class="input-group-append">
+              <button type="button" class="btn btn-secondary btn-number">
+                <i class="fa fa-search"></i>
+              </button>
+            </div>
+          </div>
+        </form>
+        <ul class="nav navbar-nav navbar-right">
+
+          <li class="nav-item">
+            <a class="nav-link" href="#"></a>
+          </li>
+
+          <li class="nav-item" sec:authorize="isAuthenticated()">
+            <a href="#" class="btn btn-light btn-sm ml-3" sec:authentication="name">
+            </a>
+          </li>
+          <li class="nav-item" sec:authorize="isAuthenticated()">
+            <a class="btn btn-light btn-sm ml-3" href="/logout">
+              <i class="fa-solid fa-right-from-bracket"></i> Logout
+            </a>
+          </li>
+          <li class="nav-item" sec:authorize="isAnonymous()">
+            <a class="btn btn-light btn-sm ml-3" href="/login">
+              <i class="fa-solid fa-right-to-bracket"></i> Login
+            </a>
+          </li>
+          <li class="nav-item" sec:authorize="hasRole('ROLE_ADMIN')">
+            <a class="btn btn-light btn-sm ml-3" href="/admin">
+               Admin Menu
+            </a>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </nav>
+</header>
Index: bus-n-go-do-5ta-faza/src/main/resources/templates/inlShow.html
===================================================================
--- bus-n-go-do-5ta-faza/src/main/resources/templates/inlShow.html	(revision baf4cc4b66f1d62e9dc9c2e71bcc078c9c3956a3)
+++ bus-n-go-do-5ta-faza/src/main/resources/templates/inlShow.html	(revision baf4cc4b66f1d62e9dc9c2e71bcc078c9c3956a3)
@@ -0,0 +1,115 @@
+<div class="container" xmlns:th="http://www.thymeleaf.org">
+    <form class="form-signin mt-xl-5" method="post" th:action="@{'/instanca-na-linija/{id}/end'(id=${inl.inlId})}">
+        <h2 class="form-signin-heading">Instanca na linija</h2>
+
+        <p>
+            <label for="aRegistracija" class="sr-only">Avtobus</label>
+            <input type="text"
+                   class="form-controll"
+                   th:value="${inl.avtobusByARegistracija.aRegistracija} "
+                   disabled
+                   name="aRegistracija"
+                   id="aRegistracija"
+            >
+        </p>
+
+        <p>
+            <label for="liId" class="sr-only">Linija</label>
+            <select id="liId" name="liId" class="form-control">
+                <option th:value="${inl.linijaByLiId.liId}"
+                        th:text="${inl.linijaByLiId.liIme} + ' - ' + ${inl.linijaByLiId.liPravec}"
+                        selected
+                        disabled></option>
+            </select>
+
+
+        </p>
+
+
+        <div th:if="${param.error}" th:text="${param.error}" class="text-danger"></div>
+
+        <div class="row">
+            <div class="col-md-3">
+                <button th:disabled="${inl.inlDatumEnd != null} ? 'true' : 'false'"
+                        id="submit"
+                        class="btn btn-lg btn-primary btn-block"
+                        type="submit"
+                        th:text="${inl.inlDatumEnd != null} ? 'Already ended' : 'End'"></button>
+            </div>
+        </div>
+    </form>
+
+    <div xmlns:th="http://www.thymeleaf.org">
+
+        <div class="container mb-4">
+            <div class="row">
+                <div class="col-12" >
+                    <div class="table-responsive">
+                        <table class="table table-striped">
+                            <thead>
+                            <tr>
+                                <th scope="col">#</th>
+                                <th scope="col">Timestamp</th>
+                                <th scope="col">Kondukter</th>
+                                <th scope="col"></th>
+                                <th scope="col"></th>
+                                <th scope="col"></th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            <tr th:each="kontrola : ${kontroli}" class="product">
+                                <td >
+                                    <a th:text="${kontrola.kontrolaId}" th:href="@{'/kontrola/{id}'(id= ${kontrola.kontrolaId})}"></a>
+                                </td>
+                                <td th:text="${kontrola.kontrolaDatum}"></td>
+                                <td th:text="${kontrola.korisnikByKondukterKId.kIme}"></td>
+
+                                <td class="text-right">
+                                    <!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
+                                    <!--                                    <form th:action="@{'/products/delete/{id}' (id=${vozenje.vozenjeId})}"-->
+                                    <!--                                          th:method="DELETE">-->
+                                    <!--                                        <button type="submit"-->
+                                    <!--                                                class="btn btn-sm btn-danger delete-product">-->
+                                    <!--                                            <i class="fas fa-trash-alt"></i> Delete-->
+                                    <!--                                        </button>-->
+                                    <!--                                    </form>-->
+                                    <!--                                </th:block>-->
+                                </td>
+                                <td>
+                                    <!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
+                                    <!--                                    <a th:href="@{'/products/edit-form/{id}' (id=${vozenje.vozenjeId})}"-->
+                                    <!--                                       class="btn btn-sm btn-info edit-product">-->
+                                    <!--                                        <i class="fas fa-edit"></i> Edit-->
+                                    <!--                                    </a>-->
+                                    <!--                                </th:block>-->
+                                </td>
+                                <td>
+<!--                                    <form th:action="@{'/kontrola/start-for/{id}'(id=${inl.inlId})}"-->
+<!--                                          th:method="GET">-->
+<!--                                        <button type="submit" class="btn btn-sm btn-success add-to-cart">-->
+<!--                                            <i class="fas fa-shopping-cart"></i> Kontrola-->
+<!--                                        </button>-->
+<!--                                    </form>-->
+                                </td>
+                            </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+                <div class="col mb-3">
+                    <div class="row">
+                        <div class="col-sm-12 col-md-12">
+                            <a href="/instanca-na-linija/start" class="btn btn-block btn-dark add-product-btn">
+                                Start instanca
+                            </a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+
+
+</div>
+
Index: bus-n-go-do-5ta-faza/src/main/resources/templates/kontrola.html
===================================================================
--- bus-n-go-do-5ta-faza/src/main/resources/templates/kontrola.html	(revision baf4cc4b66f1d62e9dc9c2e71bcc078c9c3956a3)
+++ bus-n-go-do-5ta-faza/src/main/resources/templates/kontrola.html	(revision baf4cc4b66f1d62e9dc9c2e71bcc078c9c3956a3)
@@ -0,0 +1,150 @@
+<div xmlns:th="http://www.thymeleaf.org">
+
+    <div class="container mb-4">
+        <div class="row">
+            <div class="col-12" >
+
+    <form class="form-signin mt-xl-5" method="post" th:action="@{'/kontrola/{id}/kazni-neregistriran'(id=${kontrola.kontrolaId})}">
+        <h2 class="form-signin-heading">Kazna za neregirstiran</h2>
+
+        <p>
+            <label for="dokument" >Dokument</label>
+            <input class="form-control" name="dokument" id="dokument" type="text">
+        </p>
+
+
+        <p>
+            <label for="telefon" >Telefon</label>
+            <input class="form-control" name="telefon" id="telefon" type="text">
+        </p>
+
+        <p>
+            <label for="ime" >Ime</label>
+            <input class="form-control" name="ime" id="ime" type="text">
+        </p>
+
+        <p>
+            <label for="adresa" >Adresa</label>
+            <input class="form-control" name="adresa" id="adresa" type="text">
+        </p>
+
+
+        <p>
+            <label for="iznos" >Iznos</label>
+            <input class="form-control" name="iznos" id="iznos" type="number">
+        </p>
+
+
+        <div th:if="${param.error}" th:text="${param.error}" class="text-danger"></div>
+
+        <div class="row">
+            <div class="col-md-3">
+                <button id="submit" class="btn btn-lg btn-primary btn-block" type="submit">Kazni</button>
+            </div>
+        </div>
+    </form>
+
+
+
+    <form class="form-signin mt-xl-5" method="post" th:action="@{'/kontrola/{id}/kazni-registriran'(id=${kontrola.kontrolaId})}">
+        <h2 class="form-signin-heading">Kazna za regirstiran</h2>
+
+        <p>
+            <label for="dk" >Dokument</label>
+            <input class="form-control" name="dokument" id="dk" type="text">
+        </p>
+
+        <p>
+            <label for="iz" >Iznos</label>
+            <input class="form-control" name="iznos" id="iz" type="number">
+        </p>
+
+        <p>
+            <label for="patnik" >Patnik</label>
+            <select id="patnik" name="patnik" class="form-control">
+                <option th:each="patnik : ${patnici}"
+                        th:value="${patnik.kId}"
+                        th:text="${patnik.kIme} + ' - ' + ${patnik.kEmail}">
+
+                </option>
+            </select>
+        </p>
+
+
+        <div th:if="${param.error}" th:text="${param.error}" class="text-danger"></div>
+
+        <div class="row">
+            <div class="col-md-3">
+                <button id="sub" class="btn btn-lg btn-primary btn-block" type="submit">Kazni</button>
+            </div>
+        </div>
+    </form>
+
+            </div>
+        </div>
+    </div>
+
+
+
+
+
+
+
+
+
+    <div class="container mb-4">
+        <div class="row">
+            <div class="col-12" >
+                <div class="table-responsive">
+                    <table class="table table-striped">
+                        <thead>
+                        <tr>
+                            <th scope="col">#</th>
+                            <th scope="col">Iznos</th>
+                            <th scope="col">Plateno</th>
+                            <th scope="col">Dokument</th>
+                            <th scope="col"></th>
+                            <th scope="col"></th>
+                            <th scope="col"></th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr th:each="kazna : ${kazni}" class="product">
+                            <td th:text="${kazna.kzId}"></td>
+                            <td th:text="${kazna.kzIznos}"></td>
+                            <td th:text="${kazna.kzPlateno}"></td>
+                            <td th:text="${kazna.kzDokument}"></td>
+
+                            <td class="text-right">
+<!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
+<!--                                    <form th:action="@{'/products/delete/{id}' (id=${kazna.kzId})}"-->
+<!--                                          th:method="DELETE">-->
+<!--                                        <button type="submit"-->
+<!--                                                class="btn btn-sm btn-danger delete-product">-->
+<!--                                            <i class="fas fa-trash-alt"></i> Delete-->
+<!--                                        </button>-->
+<!--                                    </form>-->
+<!--                                </th:block>-->
+                            </td>
+                            <td>
+<!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
+<!--                                    <a th:href="@{'/products/edit-form/{id}' (id=${kazna.kzId})}"-->
+<!--                                       class="btn btn-sm btn-info edit-product">-->
+<!--                                        <i class="fas fa-edit"></i> Edit-->
+<!--                                    </a>-->
+<!--                                </th:block>-->
+                            </td>
+                            <td>
+
+                            </td>
+                        </tr>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>
+
+
Index: bus-n-go-do-5ta-faza/src/main/resources/templates/kupiBilet.html
===================================================================
--- bus-n-go-do-5ta-faza/src/main/resources/templates/kupiBilet.html	(revision baf4cc4b66f1d62e9dc9c2e71bcc078c9c3956a3)
+++ bus-n-go-do-5ta-faza/src/main/resources/templates/kupiBilet.html	(revision baf4cc4b66f1d62e9dc9c2e71bcc078c9c3956a3)
@@ -0,0 +1,20 @@
+<div xmlns:th="http://www.thymeleaf.org">
+
+
+    <div style="width: 500px">
+        <form method="post" action="/bilet/kupi">
+
+            <p>
+                <label for="tipbilet" class="sr-only">Tip Bilet</label>
+                <select id="tipbilet" name="tipbilet" class="form-control">
+                    <option class="form-control" th:each="tip : ${tipbileti}" th:value="${tip.tbId}" th:text="${tip.tbIme}"></option>
+                </select>
+            </p>
+
+            <input type="submit" value="Kupi" class="btn btn-success">
+        </form>
+
+    </div>
+</div>
+
+
Index: bus-n-go-do-5ta-faza/src/main/resources/templates/listBileti.html
===================================================================
--- bus-n-go-do-5ta-faza/src/main/resources/templates/listBileti.html	(revision baf4cc4b66f1d62e9dc9c2e71bcc078c9c3956a3)
+++ bus-n-go-do-5ta-faza/src/main/resources/templates/listBileti.html	(revision baf4cc4b66f1d62e9dc9c2e71bcc078c9c3956a3)
@@ -0,0 +1,67 @@
+<div xmlns:th="http://www.thymeleaf.org">
+
+
+    <div class="container mb-4">
+        <div class="row">
+            <div class="col-12" >
+                <div class="table-responsive">
+                    <table class="table table-striped">
+                        <thead>
+                        <tr>
+                            <th scope="col">#</th>
+                            <th scope="col">Status</th>
+                            <th scope="col">Korisnik Ime</th>
+                            <th scope="col">Tip Bilet</th>
+                            <th scope="col"></th>
+                            <th scope="col"></th>
+                            <th scope="col"></th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr th:each="bilet : ${bileti}" class="product">
+                            <td th:text="${bilet.bId}"></td>
+                            <td th:text="${bilet.bStatus.name()}"></td>
+                            <td th:text="${bilet.korisnikByPatnikKId.kIme}"></td>
+                            <td th:text="${bilet.tipbiletByTbId.tbIme}"></td>
+
+                            <td class="text-right">
+<!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
+<!--                                    <form th:action="@{'/products/delete/{id}' (id=${bilet.bId})}"-->
+<!--                                          th:method="DELETE">-->
+<!--                                        <button type="submit"-->
+<!--                                                class="btn btn-sm btn-danger delete-product">-->
+<!--                                            <i class="fas fa-trash-alt"></i> Delete-->
+<!--                                        </button>-->
+<!--                                    </form>-->
+<!--                                </th:block>-->
+                            </td>
+                            <td>
+<!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
+<!--                                    <a th:href="@{'/products/edit-form/{id}' (id=${bilet.bId})}"-->
+<!--                                       class="btn btn-sm btn-info edit-product">-->
+<!--                                        <i class="fas fa-edit"></i> Edit-->
+<!--                                    </a>-->
+<!--                                </th:block>-->
+                            </td>
+                            <td>
+
+                            </td>
+                        </tr>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+            <div class="col mb-3">
+                <div class="row">
+                    <div class="col-sm-12 col-md-12">
+                        <a href="/bilet/kupi" class="btn btn-block btn-dark add-product-btn">
+                            Kupi bilet
+                        </a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+
Index: bus-n-go-do-5ta-faza/src/main/resources/templates/listInstanci.html
===================================================================
--- bus-n-go-do-5ta-faza/src/main/resources/templates/listInstanci.html	(revision baf4cc4b66f1d62e9dc9c2e71bcc078c9c3956a3)
+++ bus-n-go-do-5ta-faza/src/main/resources/templates/listInstanci.html	(revision baf4cc4b66f1d62e9dc9c2e71bcc078c9c3956a3)
@@ -0,0 +1,80 @@
+<div xmlns:th="http://www.thymeleaf.org">
+
+
+    <div class="container mb-4">
+        <div class="row">
+            <div class="col-12" >
+                <div class="table-responsive">
+                    <table class="table table-striped">
+                        <thead>
+                        <tr>
+                            <th scope="col">#</th>
+                            <th scope="col">Vozac</th>
+                            <th scope="col">Avtobus</th>
+                            <th scope="col">Linija</th>
+                            <th scope="col">Pravec</th>
+                            <th scope="col">Start date</th>
+                            <th scope="col">End date</th>
+                            <th scope="col"></th>
+                            <th scope="col"></th>
+                            <th scope="col"></th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr th:each="inl : ${inls}" class="product">
+                            <td >
+                                <a th:text="${inl.inlId}" th:href="@{'/instanca-na-linija/{id}'(id= ${inl.inlId})}"></a>
+                            </td>
+                            <td th:text="${inl.korisnikByVozacKId.kIme}"></td>
+                            <td th:text="${inl.avtobusByARegistracija.aRegistracija}"></td>
+                            <td th:text="${inl.linijaByLiId.liIme}"></td>
+                            <td th:text="${inl.linijaByLiId.liPravec}"></td>
+                            <td th:text="${inl.inlDatumStart.toString()}"></td>
+                            <td th:text="${inl.inlDatumEnd != null} ? ${inl.inlDatumEnd.toString()} : 'Still active'"></td>
+
+                            <td class="text-right">
+<!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
+<!--                                    <form th:action="@{'/products/delete/{id}' (id=${vozenje.vozenjeId})}"-->
+<!--                                          th:method="DELETE">-->
+<!--                                        <button type="submit"-->
+<!--                                                class="btn btn-sm btn-danger delete-product">-->
+<!--                                            <i class="fas fa-trash-alt"></i> Delete-->
+<!--                                        </button>-->
+<!--                                    </form>-->
+<!--                                </th:block>-->
+                            </td>
+                            <td>
+<!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
+<!--                                    <a th:href="@{'/products/edit-form/{id}' (id=${vozenje.vozenjeId})}"-->
+<!--                                       class="btn btn-sm btn-info edit-product">-->
+<!--                                        <i class="fas fa-edit"></i> Edit-->
+<!--                                    </a>-->
+<!--                                </th:block>-->
+                            </td>
+                            <td>
+                                <form th:action="@{'/kontrola/start-for/{id}'(id=${inl.inlId})}"
+                                      th:method="GET">
+                                    <button type="submit" class="btn btn-sm btn-success add-to-cart">
+                                         Kontrola
+                                    </button>
+                                </form>
+                            </td>
+                        </tr>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+            <div class="col mb-3">
+                <div class="row">
+                    <div class="col-sm-12 col-md-12">
+                        <a href="/instanca-na-linija/start" class="btn btn-block btn-dark add-product-btn">
+                            Start instanca
+                        </a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+
Index: bus-n-go-do-5ta-faza/src/main/resources/templates/listKazni.html
===================================================================
--- bus-n-go-do-5ta-faza/src/main/resources/templates/listKazni.html	(revision baf4cc4b66f1d62e9dc9c2e71bcc078c9c3956a3)
+++ bus-n-go-do-5ta-faza/src/main/resources/templates/listKazni.html	(revision baf4cc4b66f1d62e9dc9c2e71bcc078c9c3956a3)
@@ -0,0 +1,76 @@
+<div xmlns:th="http://www.thymeleaf.org">
+
+
+    <div class="container mb-4">
+        <div class="row">
+            <div class="col-12" >
+                <div class="table-responsive">
+                    <table class="table table-striped">
+                        <thead>
+                        <tr>
+                            <th scope="col">#</th>
+                            <th scope="col">Iznos</th>
+                            <th scope="col">Datum</th>
+                            <th scope="col">Plateno</th>
+                            <th scope="col">Datum plateno</th>
+                            <th scope="col">Dokument</th>
+                            <th scope="col"></th>
+                            <th scope="col"></th>
+                            <th scope="col"></th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr th:each="kazna : ${kazni}" class="product">
+                            <td th:text="${kazna.kzId}"></td>
+                            <td th:text="${kazna.kzIznos}"></td>
+                            <td th:text="${kazna.kzDatum}"></td>
+                            <td th:text="${kazna.kzPlateno}"></td>
+                            <td th:text="${kazna.kzDatumPlateno}"></td>
+                            <td th:text="${kazna.kzDokument}"></td>
+
+                            <td class="text-right">
+<!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
+<!--                                    <form th:action="@{'/products/delete/{id}' (id=${kazna.kzId})}"-->
+<!--                                          th:method="DELETE">-->
+<!--                                        <button type="submit"-->
+<!--                                                class="btn btn-sm btn-danger delete-product">-->
+<!--                                            <i class="fas fa-trash-alt"></i> Delete-->
+<!--                                        </button>-->
+<!--                                    </form>-->
+<!--                                </th:block>-->
+                            </td>
+                            <td>
+<!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
+<!--                                    <a th:href="@{'/products/edit-form/{id}' (id=${kazna.kzId})}"-->
+<!--                                       class="btn btn-sm btn-info edit-product">-->
+<!--                                        <i class="fas fa-edit"></i> Edit-->
+<!--                                    </a>-->
+<!--                                </th:block>-->
+                            </td>
+                            <td>
+                                <form th:action="@{'/kazna/{id}/pay' (id=${kazna.kzId})}"
+                                      th:method="POST">
+                                    <button type="submit" class="btn btn-sm btn-success add-to-cart">
+                                         Pay
+                                    </button>
+                                </form>
+                            </td>
+                        </tr>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+            <div class="col mb-3">
+                <div class="row">
+                    <div class="col-sm-12 col-md-12">
+                        <a href="/bilet/kupi" class="btn btn-block btn-dark add-product-btn">
+                            Kupi bilet
+                        </a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+
Index: bus-n-go-do-5ta-faza/src/main/resources/templates/listVozenja.html
===================================================================
--- bus-n-go-do-5ta-faza/src/main/resources/templates/listVozenja.html	(revision baf4cc4b66f1d62e9dc9c2e71bcc078c9c3956a3)
+++ bus-n-go-do-5ta-faza/src/main/resources/templates/listVozenja.html	(revision baf4cc4b66f1d62e9dc9c2e71bcc078c9c3956a3)
@@ -0,0 +1,83 @@
+<div xmlns:th="http://www.thymeleaf.org">
+    <section class="jumbotron text-center">
+        <div class="container">
+            <h1 class="jumbotron-heading">WEB PROGRAMMING SHOP</h1>
+            <h3 class="jumbotron-heading">All products</h3>
+        </div>
+    </section>
+
+    <form method="get" action="/vozenje">
+        <select name="status">
+            <option th:each="status : ${vozStatus}" th:value="${status}" th:text="${status.name()}"></option>
+        </select>
+
+        <input type="submit" value="Search">
+    </form>
+
+    <div class="container mb-4">
+        <div class="row">
+            <div class="col-12" >
+                <div class="table-responsive">
+                    <table class="table table-striped">
+                        <thead>
+                        <tr>
+                            <th scope="col">#</th>
+                            <th scope="col">Status</th>
+                            <th scope="col">Korisnik Ime</th>
+                            <th scope="col">Bilet Id</th>
+                            <th scope="col">Tip Bilet</th>
+                            <th scope="col"></th>
+                            <th scope="col"></th>
+                            <th scope="col"></th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr th:each="vozenje : ${vozenja}" class="product">
+                            <td th:text="${vozenje.vozenjeId}"></td>
+                            <td th:text="${vozenje.vozenjeStatus.name()}"></td>
+                            <td th:text="${vozenje.korisnikByPatnikKId.kIme}"></td>
+                            <td th:text="${vozenje.biletByBId.bId}"></td>
+                            <td th:text="${vozenje.biletByBId.tipbiletByTbId.tbIme}"></td>
+
+                            <td class="text-right">
+                                <th:block  >
+                                    <form th:action="@{'/vozenje/{id}/end' (id=${vozenje.vozenjeId})}"
+                                          th:hidden="${vozenje.vozenjeStatus.name().equals('FINISHED')} ? 'true' : 'false'"
+                                          th:method="GET">
+                                        <button type="submit"
+                                                class="btn btn-sm btn-danger delete-product">
+                                            <i class="fas fa-trash-alt"></i> End
+                                        </button>
+                                    </form>
+                                </th:block>
+                            </td>
+                            <td>
+<!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
+<!--                                    <a th:href="@{'/products/edit-form/{id}' (id=${vozenje.vozenjeId})}"-->
+<!--                                       class="btn btn-sm btn-info edit-product">-->
+<!--                                        <i class="fas fa-edit"></i> Edit-->
+<!--                                    </a>-->
+<!--                                </th:block>-->
+                            </td>
+                            <td>
+
+                            </td>
+                        </tr>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+            <div class="col mb-3">
+                <div class="row">
+                    <div class="col-sm-12 col-md-12">
+                        <a href="/vozenje/start" class="btn btn-block btn-dark add-product-btn">
+                            Start vozenje
+                        </a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+
Index: bus-n-go-do-5ta-faza/src/main/resources/templates/login.html
===================================================================
--- bus-n-go-do-5ta-faza/src/main/resources/templates/login.html	(revision baf4cc4b66f1d62e9dc9c2e71bcc078c9c3956a3)
+++ bus-n-go-do-5ta-faza/src/main/resources/templates/login.html	(revision baf4cc4b66f1d62e9dc9c2e71bcc078c9c3956a3)
@@ -0,0 +1,27 @@
+<div class="container" xmlns:th="http://www.thymeleaf.org">
+    <form class="form-signin mt-xl-5" method="post" action="/login">
+        <h2 class="form-signin-heading">Sign in</h2>
+        <p>
+            <label for="username" class="sr-only">Username</label>
+            <input type="text" id="username" name="username" class="form-control" placeholder="Username" required=""
+                   autofocus="">
+        </p>
+        <p>
+            <label for="password" class="sr-only">Password</label>
+            <input type="password" id="password" name="password" class="form-control" placeholder="Password"
+                   required="">
+        </p>
+
+        <div th:if="${param.error}" th:text="${param.error}" class="text-danger"></div>
+
+        <div class="row">
+            <div class="col-md-3">
+                <button id="submit" class="btn btn-lg btn-primary btn-block" type="submit">Sign in</button>
+            </div>
+            <div class="col-md-3">
+                <a href="/register" class="btn btn-lg btn-block btn-light">Register here</a>
+            </div>
+        </div>
+    </form>
+</div>
+
Index: bus-n-go-do-5ta-faza/src/main/resources/templates/master-template.html
===================================================================
--- bus-n-go-do-5ta-faza/src/main/resources/templates/master-template.html	(revision baf4cc4b66f1d62e9dc9c2e71bcc078c9c3956a3)
+++ bus-n-go-do-5ta-faza/src/main/resources/templates/master-template.html	(revision baf4cc4b66f1d62e9dc9c2e71bcc078c9c3956a3)
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8"/>
+    <title>Products</title>
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"
+          integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
+            integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
+            crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"
+            integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1"
+            crossorigin="anonymous"></script>
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"
+            integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM"
+            crossorigin="anonymous"></script>
+    <script src="https://kit.fontawesome.com/e59232f0a1.js" crossorigin="anonymous"></script>
+</head>
+<body>
+<header th:replace="fragments/header"/>
+
+<div th:text="${error}"></div>
+
+<section th:include="${bodyContent}">
+
+</section>
+<footer th:replace="fragments/footer"/>
+</body>
+</html>
+
Index: bus-n-go-do-5ta-faza/src/main/resources/templates/register.html
===================================================================
--- bus-n-go-do-5ta-faza/src/main/resources/templates/register.html	(revision baf4cc4b66f1d62e9dc9c2e71bcc078c9c3956a3)
+++ bus-n-go-do-5ta-faza/src/main/resources/templates/register.html	(revision baf4cc4b66f1d62e9dc9c2e71bcc078c9c3956a3)
@@ -0,0 +1,57 @@
+<div xmlns:th="http://www.thymeleaf.org">
+
+  <div class="container mb-4">
+    <form class="form-signin mt-xl-5" method="post" action="/register">
+      <h2 class="form-signin-heading">Register</h2>
+      <p>
+        <label for="username" class="sr-only">Email</label>
+        <input type="text" id="username" name="email" class="form-control" placeholder="Email" required="" autofocus="">
+      </p>
+      <p>
+        <label for="password" class="sr-only">Password</label>
+        <input type="password" id="password" name="password" class="form-control" placeholder="Password" required="">
+      </p>
+      <p>
+        <label for="repeatedPassword" class="sr-only">Repeat Password</label>
+        <input type="password" id="repeatedPassword" name="confirmPassword" class="form-control" placeholder="Repeat Password" required="">
+      </p>
+      <p>
+        <label for="name" class="sr-only">Name</label>
+        <input type="text" id="name" name="name" class="form-control" placeholder="Name" required="" autofocus="">
+      </p>
+      <p>
+        <label for="surname" class="sr-only">Address</label>
+        <input type="text" id="surname" name="address" class="form-control" placeholder="Address" required="" autofocus="">
+      </p>
+      <p>
+        <label for="phone" class="sr-only">Phone</label>
+        <input type="text" id="phone" name="phone" class="form-control" placeholder="Phone" required="" autofocus="">
+      </p>
+
+<!--      <p sec:authorize="hasRole('ROLE_ADMIN')">-->
+        <label for="role" class="sr-only">Role</label>
+        <select name="role" id="role">
+          <option th:each="role : ${roles}"
+                  th:text="${role.name()}"
+                  th:value="${role}" ></option>
+        </select>
+<!--      </p>-->
+
+      <p sec:authorize="hasRole('ROLE_ADMIN')">
+        <label for="salary" class="sr-only">Salary</label>
+        <input type="number" id="salary" name="salary">
+      </p>
+
+
+
+
+      <th:block th:if="${hasError}">
+        <div th:text="${error}" class="text-danger"></div>
+      </th:block>
+
+      <button class="btn btn-lg btn-primary btn-block" type="submit">Sign up</button>
+    </form>
+    <a href="/login" class="btn btn-block btn-light">Already have an account? Login here!</a>
+  </div>
+
+</div>
Index: bus-n-go-do-5ta-faza/src/main/resources/templates/startInstanca.html
===================================================================
--- bus-n-go-do-5ta-faza/src/main/resources/templates/startInstanca.html	(revision baf4cc4b66f1d62e9dc9c2e71bcc078c9c3956a3)
+++ bus-n-go-do-5ta-faza/src/main/resources/templates/startInstanca.html	(revision baf4cc4b66f1d62e9dc9c2e71bcc078c9c3956a3)
@@ -0,0 +1,29 @@
+<div class="container" xmlns:th="http://www.thymeleaf.org">
+    <form class="form-signin mt-xl-5" method="post" action="/instanca-na-linija/start">
+        <h2 class="form-signin-heading">Start instanca na linija</h2>
+
+        <p>
+            <label for="aRegistracija" class="sr-only">Avtobus</label>
+            <select   class="form-control" name="aRegistracija" id="aRegistracija">
+                <option class="form-control" th:each="avtobus : ${avtobusi}" th:text="${avtobus.aRegistracija}"  th:value="${avtobus.aRegistracija} "  ></option>
+            </select>
+        </p>
+
+        <p>
+            <label for="liId" class="sr-only">Password</label>
+            <select id="liId" name="liId" class="form-control">
+                <option th:each="linija : ${linii}" th:value="${linija.liId}" th:text="${linija.liIme} + ' - ' + ${linija.liPravec}"></option>
+            </select>
+        </p>
+
+
+        <div th:if="${param.error}" th:text="${param.error}" class="text-danger"></div>
+
+        <div class="row">
+            <div class="col-md-3">
+                <button id="submit" class="btn btn-lg btn-primary btn-block" type="submit">Start</button>
+            </div>
+        </div>
+    </form>
+</div>
+
Index: bus-n-go-do-5ta-faza/src/main/resources/templates/startVozenje.html
===================================================================
--- bus-n-go-do-5ta-faza/src/main/resources/templates/startVozenje.html	(revision baf4cc4b66f1d62e9dc9c2e71bcc078c9c3956a3)
+++ bus-n-go-do-5ta-faza/src/main/resources/templates/startVozenje.html	(revision baf4cc4b66f1d62e9dc9c2e71bcc078c9c3956a3)
@@ -0,0 +1,35 @@
+<div class="container" xmlns:th="http://www.thymeleaf.org">
+    <form class="form-signin mt-xl-5" th:method="${postojka} != null ? 'post' : 'get'" action="/vozenje/start">
+        <h2 class="form-signin-heading">Start vozenje</h2>
+
+        <p>
+            <label for="pnlId" class="sr-only">Postojka</label>
+            <select   class="form-control" name="pnlId" id="pnlId">
+                <option class="form-control" th:each="pos : ${postojki}" th:text="${pos.postojkaByPId.pIme}" th:selected="${postojka!= null && postojka.pnlId == pos.pnlId} ? 'true' : 'false' " th:disabled="${postojka!= null && postojka.pnlId != pos.pnlId} ? 'true' : 'false' "  th:value="${pos.pnlId} "  ></option>
+            </select>
+        </p>
+
+        <p th:hidden="${instanci} == null">
+            <label for="instanca" class="sr-only">Password</label>
+            <select id="instanca" name="inlId" class="form-control">
+                <option th:each="instanca : ${instanci}" th:value="${instanca.inlId}" th:text="${instanca.linijaByLiId.liIme} + ' - ' + ${instanca.linijaByLiId.liPravec}"></option>
+            </select>
+        </p>
+
+        <p th:hidden="${instanci} == null">
+            <label for="bilet" class="sr-only">Password</label>
+            <select id="bilet" name="bId" class="form-control">
+                <option th:each="bilet : ${bileti}" th:value="${bilet.bId}" th:text="${bilet.tipbiletByTbId.tbIme} + ' - ' + ${bilet.bStatus.name()}"></option>
+            </select>
+        </p>
+
+        <div th:if="${param.error}" th:text="${param.error}" class="text-danger"></div>
+
+        <div class="row">
+            <div class="col-md-3">
+                <button id="submit" class="btn btn-lg btn-primary btn-block" type="submit">Start</button>
+            </div>
+        </div>
+    </form>
+</div>
+
