Changeset 6791e89 for src/main/resources

Timestamp:

09/22/22 21:16:07 (2 years ago)

Author:

Leona <leona@…>

Branches:

master

Parents:

3692f0d

Message:

working on reservations part

Location:

src/main/resources

Files:

• application.properties (modified) (2 diffs)
• templates/book.html (modified) (2 diffs)
• templates/login.html (modified) (2 diffs)
• templates/register.html (modified) (2 diffs)
• templates/resBook.html (modified) (2 diffs)

src/main/resources/application.properties

@@ -1 @@
-server.port=9091
+server.port=9090
 
 # Datasource configuration
-spring.datasource.url=jdbc:postgresql://localhost:5432/parkingDB
-spring.datasource.username=parkDB
-spring.datasource.password=parkdb123
+spring.datasource.url=jdbc:postgresql://localhost:9999/db_202122z_va_prj_vintagelibrary
+spring.datasource.username=db_202122z_va_prj_vintagelibrary_owner
+spring.datasource.password=45dc6bb3181a
 
 # Default connection pool
@@ -16 +16 @@
 spring.jpa.show-sql=true
 
-
-spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyComponentPathImpl
+spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
+spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyJpaImpl
 
 spring.jpa.open-in-view=false

src/main/resources/templates/book.html

@@ -61 +61 @@
             <th scope="col">Цена</th>
             <th scope="col">Цена со задоцнување</th>
-            <th scope="col">Автор</th>
-            <th scope="col">Жанр</th>
+            <!-- <th scope="col">Автор</th>  -->
+           <!-- <th scope="col">Жанр</th> -->
+            <th scope="col"></th>
             <th scope="col"></th>
             </thead>
@@ -71 +72 @@
               <td th:text="${book.getBookPrice()}"></td>
               <td th:text="${book.getBookPriceLate()}"></td>
-              <td th:each="writer : ${writers}" th:if="${book.getWriters().contains(writer)}" th:text="${writer.getWriterName()}"></td>
-              <td th:each="genre : ${genres}" th:if="${book.getGenre().contains(genre)}" th:text="${genre.getGenreName()}"></td>
+              <!-- <td th:each="writer : ${writers}" th:if="${book.getWriters().contains(writer)}" th:text="${writer.getWriterName()}"></td>  -->
+              <!-- <td th:each="genre : ${genres}" th:if="${book.getGenre().contains(genre)}" th:text="${genre.getGenreName()}"></td> -->
               <td><a class="btn btn-primary btn-sm ml-3" href="/resBook">Резервација</a>
                 <a class="btn btn-primary btn-sm ml-3" href="/online">Симнување</a></td>

src/main/resources/templates/login.html

@@ -36 +36 @@
 </nav>
 
+<section class="jumbotron text-center">
 <div class="container">
     <form class="form-signin mt-xl-5" method="post" action="/login">
-        <h2 class="form-signin-heading">Најава</h2>
+        <h2 class="form-signin-heading"><b>Најава</b></h2>
         <p>
             <label for="username" class="sr-only">Корисничко име:</label>
@@ -53 +54 @@
         <button class="btn btn-lg btn-primary btn-block" type="submit">Најави се</button>
     </form>
+    <br>
     <a href="/register" class="btn btn-block btn-light">Регистрирај се тука</a>
 </div>
+</section>
 
 <!-- Footer -->

src/main/resources/templates/register.html

@@ -43 +43 @@
     <div class="container">
 
-        <form class="form-signin mt-xl-2 col-md-8" method="post" action="/register">
-            <h2 class="form-signin-heading">Регистрација</h2>
+        <form class="form-signin mt-xl-5" method="post" action="/register">
+            <h2 class="form-signin-heading"><b>Регистрација</b></h2>
             <br>
             <p>
@@ -94 +94 @@
 
     </div>
-</section>
+
 
 <!-- Footer -->

src/main/resources/templates/resBook.html

@@ -42 +42 @@
 
 <!--Main-->
-<div class="container">
-  <section class="jumbotron text-center">
-    <h2 class="jumbotron-heading"><b>Резервација на книга</b></h2>
-  </section>
+<section class="jumbotron text-center">
+
 
   <div th:if="${hasError}">
@@ -51 +49 @@
   </div>
 
-  <div class="container mb-4">
-    <div class="row">
+  <div class="container">
+    <form class="form-signin mt-xl-5" method="post" action="/resBook">
 
-    </div>
+      <h2 class="jumbotron-heading"><b>Резервација на книга</b></h2>
+
+      <div class="container mb-4">
+        <div class="row">
+          <p>
+            <label for="bookName" class="sr-only" th:text="${book.getId()}"></label>
+            <input type="text" id="bookName" name="bookName" class="form-control" th:placeholder="${book.getBookName()}" required="" disabled >
+          </p>
+        </div>
+      </div>
+
+      <div class="container mb-4">
+        <div class="row">
+          <p>Датум земање книга
+            <label for="takeDate" class="sr-only">Датум земање книга</label>
+            <input type="date" id="takeDate" name="takeDate" class="form-control" placeholder="Take Date" required="" autofocus="">
+          </p>
+          <br>
+          <p>Датум враќање книга
+            <label for="returnDate" class="sr-only">Датум враќање книга</label>
+            <input type="date" id="returnDate" name="returnDate" class="form-control" placeholder="Return Date" required="" autofocus="">
+          </p>
+        </div>
+      </div>
+    </form>
+    <button class="btn btn-lg btn-primary btn-block" type="submit">ПОТВРДИ РЕЗЕРВАЦИЈА</button>
+    <br>
+    <a href="/book" class="btn btn-block btn-light">ОТКАЖИ РЕЗЕРВАЦИЈА</a>
   </div>
 
-</div>
+</section>
 
 <!-- Footer -->