Changeset 8b875e6 for src/main/resources

Timestamp:

05/05/24 01:27:16 (2 months ago)

Author:

ppaunovski <paunovskipavel@…>

Branches:

master

Parents:

4d026a5

Message:

Added roles to Users and some minor changes

Location:

src/main/resources

Files:

• application.properties (modified) (2 diffs)
• templates/fragments/header.html (modified) (1 diff)
• templates/register.html (modified) (1 diff)

src/main/resources/application.properties

@@ -1 +1 @@
 #
-spring.datasource.url=jdbc:postgresql://localhost:8089/db_202324z_va_prj_busngo
+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
@@ -11 +11 @@
 #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_new
 
 spring.jpa.hibernate.ddl-auto=validate

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

@@ -10 +10 @@
       <div class="collapse navbar-collapse justify-content-end" id="navbarsExampleDefault">
         <ul class="navbar-nav m-auto">
-          <li sec:hasRole class="nav-item m-auto">
+          <li sec:authorize="hasRole('ROLE_PASSENGER')" class="nav-item m-auto">
             <a class="nav-link active" href="/bilet">Bileti</a>
           </li>
-          <li class="nav-item m-auto">
+          <li sec:authorize="hasAnyRole('ROLE_PASSENGER')" class="nav-item m-auto">
             <a class="nav-link active" href="/vozenje">Vozenja</a>
           </li>
-          <li class="nav-item m-auto">
+          <li sec:authorize="hasRole('ROLE_PASSENGER')" class="nav-item m-auto">
             <a class="nav-link active" href="/kazna">Kazni</a>
           </li>
-          <li class="nav-item m-auto">
+          <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>

src/main/resources/templates/register.html

@@ -29 +29 @@
       </p>
 
-      <p sec:authorize="hasRole('ROLE_ADMIN')">
-        <label for="vrabotenType" class="sr-only">Vraboten Type</label>
-        <select name="vrabotenType" id="vrabotenType">
-          <option th:each="type : ${types}"
-                  th:text="${type.name()}"
-                  th:value="${type}" ></option>
+<!--      <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>-->
 
       <p sec:authorize="hasRole('ROLE_ADMIN')">