Changeset bde8b13 for src/main/resources

Timestamp:

01/09/24 01:26:08 (11 months ago)

Author:

ppaunovski <paunovskipavel@…>

Branches:

master

Children:

e272096

Parents:

b101b69

Message:

All 3 main use cases implemented.

1. Starting a commute
2. Writing a ticket
3. Starting an instance of a Bus Line

Location:

src/main/resources

Files:

• application.properties (modified) (2 diffs)
• templates/choosePostojka.html (added)
• templates/endVozenje.html (added)
• templates/fragments/header.html (modified) (2 diffs)
• templates/inlShow.html (added)
• templates/kontrola.html (added)
• templates/listInstanci.html (added)
• templates/listKazni.html (added)
• templates/listVozenja.html (added)
• templates/startInstanca.html (added)
• templates/startVozenje.html (added)

src/main/resources/application.properties

@@ -1 +1 @@
 #
-spring.datasource.url=jdbc:postgresql://localhost:9090/db_202324z_va_prj_busngo
+spring.datasource.url=jdbc:postgresql://localhost:8089/db_202324z_va_prj_busngo
 spring.datasource.username=db_202324z_va_prj_busngo_owner
 spring.datasource.password=d9f924580e7
@@ -7 +7 @@
 
 spring.datasource.hikari.connection-timeout=20000
-spring.datasource.hikari.maximum-pool-size=25
+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 
+spring.jpa.properties.hibernate.default_schema=project
 
 spring.jpa.hibernate.ddl-auto=validate
 spring.jpa.show-sql=true
+

src/main/resources/templates/fragments/header.html

@@ -14 +14 @@
           </li>
           <li class="nav-item m-auto">
-            <a class="nav-link active" href="/categories">Categories</a>
+            <a class="nav-link active" href="/vozenje">Vozenja</a>
           </li>
           <li class="nav-item m-auto">
-            <a class="nav-link active" href="/manufacturers">Manufacturers</a>
+            <a class="nav-link active" href="/kazna">Kazni</a>
+          </li>
+          <li class="nav-item m-auto">
+            <a class="nav-link active" href="/instanca-na-linija">Instanci</a>
           </li>
         </ul>
@@ -58 +61 @@
             </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>