Changeset e5de1b0 for src/main/resources


Ignore:
Timestamp:
09/22/22 15:35:07 (2 years ago)
Author:
Leona <leona@…>
Branches:
master
Children:
3692f0d
Parents:
5506b50
Message:

changes in models & services - 1

Location:
src/main/resources
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • src/main/resources/application.properties

    r5506b50 re5de1b0  
    1 server.port=8081
    2 
    3 spring.profiles.active=prod
    4 
    5 #spring.datasource.hikari.connection-timeout=20000
    6 #spring.datasource.hikari.maximum-pool-size=5
    7 
    8 #spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.PostgreSQL95Dialect
    9 #spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
    10 #
    11 #spring.jpa.hibernate.ddl-auto=update
    12 #spring.jpa.show-sql=true
    13 #
    14 #spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyComponentPathImpl
    15 #
    16 #
    17 #spring.jpa.open-in-view=false
     1server.port=9091
    182
    193# Datasource configuration
    20 #spring.datasource.url=jdbc:postgresql://localhost:5432/libraryDB
    21 #spring.datasource.username=vintageLibrary
    22 #spring.datasource.password=baza123
     4spring.datasource.url=jdbc:postgresql://localhost:5432/parkingDB
     5spring.datasource.username=parkDB
     6spring.datasource.password=parkdb123
     7
     8# Default connection pool
     9spring.datasource.hikari.connection-timeout=20000
     10spring.datasource.hikari.maximum-pool-size=5
     11
     12spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.PostgreSQL95Dialect
     13spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
     14
     15spring.jpa.hibernate.ddl-auto=update
     16spring.jpa.show-sql=true
     17
     18
     19spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyComponentPathImpl
     20
     21spring.jpa.open-in-view=false

  • src/main/resources/templates/book.html

    r5506b50 re5de1b0  
    11<!DOCTYPE html>
    2 <html lang="en">
     2<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org">
    33<head>
    4   <meta charset="UTF-8">
    5   <title>$Title$</title>
     4  <meta charset="UTF-8"/>
     5  <title>Books</title>
     6  <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">
     7  <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
     8  <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
     9  <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
    610</head>
    711<body>
    8 $END$
     12<!--Header-->
     13<nav class="navbar navbar-expand-md navbar-dark bg-dark">
     14  <div class="container">
     15    <a class="navbar-brand" href="/home">ONLINE  LIBRARY</a>
     16    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
     17            aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
     18      <span class="navbar-toggler-icon"></span>
     19    </button>
     20
     21    <div class="collapse navbar-collapse justify-content-end" id="navbarsExampleDefault">
     22      <ul class="navbar-nav m-auto">
     23        <li class="nav-item m-auto">
     24          <a class="nav-link active" href="/home">ПОЧЕТНА</a>
     25        </li>
     26        <li class="nav-item m-auto">
     27          <a class="nav-link active" href="/info">ИНФОРМАЦИИ</a>
     28        </li>
     29        <li class="nav-item m-auto">
     30          <a class="nav-link active" href="/guide">УПАТСТВО</a>
     31        </li>
     32        <li class="nav-item m-auto">
     33          <a class="nav-link active" href="/book">КНИГИ</a>
     34        </li>
     35      </ul>
     36
     37      <form class="form-inline my-2 my-lg-0">
     38        <a class="btn btn-primary btn-sm ml-3" href="/logout">
     39          <i class="fa fa-shopping-cart"></i> ОДЈАВИ СЕ
     40        </a>
     41      </form>
     42    </div>
     43  </div>
     44</nav>
     45
     46<!--Main-->
     47<div class="container">
     48  <section class="jumbotron text-center">
     49    <h2 class="jumbotron-heading">Достапни книги</h2>
     50  </section>
     51
     52  <div th:if="${hasError}">
     53    <h5 class="text-center text-danger" th:text="${error}"></h5>
     54  </div>
     55
     56  <div class="container mb-4">
     57    <div class="row">
     58      <div class="col-12" >
     59        <div class="table-responsive">
     60          <table class="table table-striped">
     61            <thead>
     62            <th scope="col">Book Name</th>
     63            <th scope="col">Price</th>
     64            <th scope="col">Price Late</th>
     65            <th scope="col">Genre</th>
     66            <th scope="col">Library</th>
     67            </thead>
     68            <tbody>
     69            <tr>
     70              <td></td>
     71            </tr>
     72            </tbody>
     73
     74          </table>
     75        </div>
     76      </div>
     77    </div>
     78  </div>
     79
     80  <div>
     81    <table>
     82
     83      <!-- For each news you should have one <tr> like below -->
     84      <tr class="item" th:each="book:${book}">
     85        <td th:text="${book.bookName}">[book.bookName]</td>
     86        <td th:text="${book.bookPrice}">[book.bookPrice]</td>
     87        <td th:text="${book.bookPriceLate}">[book.bookPriceLate]</td>
     88        <td th:text="${book.getGenreOfBook()}">[book.genreOfBook]</td>
     89        <td th:text="${book.getLibraryOfBook()}">[book.libraryOfBook]</td>\
     90
     91      </tr>
     92    </table>
     93  </div>
     94
     95</div>
     96
     97
     98
     99<!-- Footer -->
     100<footer class="text-black-50 mt-xl-5">
     101  <div class="container">
     102    <div class="row">
     103      <div class="col-md-3 col-lg-1 col-xl-5">
     104        <h5>Contact</h5>
     105        <hr class="bg-white mb-2 mt-0 d-inline-block mx-auto w-25">
     106        <ul class="list-unstyled">
     107          <li><i class="fa fa-envelope mr-2"></i>onlinelibrary@library.com</li>
     108          <li><i class="fa fa-phone mr-2"></i> + 33 12 14 15 16</li>
     109          <li><i class="fa fa-print mr-2"></i> + 33 12 14 15 16</li>
     110        </ul>
     111      </div>
     112    </div>
     113  </div>
     114</footer>
    9115</body>
    10116</html>

  • src/main/resources/templates/guide.html

    r5506b50 re5de1b0  
    3030                </li>
    3131                <li class="nav-item m-auto">
    32                     <a class="nav-link active" href="/listBooks">ЛИСТА НА КНИГИ</a>
     32                    <a class="nav-link active" href="/book">ЛИСТА НА КНИГИ</a>
    3333                </li>
    3434            </ul>

  • src/main/resources/templates/home.html

    r5506b50 re5de1b0  
    2828                <li class="nav-item m-auto">
    2929                    <a class="nav-link active" href="/guide">УПАТСТВО</a>
    30                 </li>
    31                 <li class="nav-item m-auto">
    32                     <a class="nav-link active" href="/listBooks">ЛИСТА НА КНИГИ</a>
    3330                </li>
    3431            </ul>

  • src/main/resources/templates/info.html

    r5506b50 re5de1b0  
    2828        <li class="nav-item m-auto">
    2929          <a class="nav-link active" href="/guide">УПАТСТВО</a>
    30         </li>
    31         <li class="nav-item m-auto">
    32           <a class="nav-link active" href="/listBooks">ЛИСТА НА КНИГИ</a>
    3330        </li>
    3431      </ul>

  • src/main/resources/templates/library.html

    r5506b50 re5de1b0  
    2424        </li>
    2525        <li class="nav-item m-auto">
    26           <a class="nav-link active" href="info.html">ИНФОРМАЦИИ</a>
     26          <a class="nav-link active" href="/info">ИНФОРМАЦИИ</a>
    2727        </li>
    2828        <li class="nav-item m-auto">
    29           <a class="nav-link active" href="guide.html">УПАТСТВО</a>
    30         </li>
    31         <li class="nav-item m-auto">
    32           <a class="nav-link active" href="/listBooks">ЛИСТА НА КНИГИ</a>
     29          <a class="nav-link active" href="/guide">УПАТСТВО</a>
    3330        </li>
    3431      </ul>

  • src/main/resources/templates/login.html

    r5506b50 re5de1b0  
    3030                <li class="nav-item m-auto">
    3131                    <a class="nav-link active" href="/guide">УПАТСТВО</a>
    32                 <li class="nav-item m-auto">
    33                     <a class="nav-link active" href="/listBooks">ЛИСТА НА КНИГИ</a>
    34                 </li>
    3532                </li>
    3633            </ul>

  • src/main/resources/templates/onlinePayment.html

    r5506b50 re5de1b0  
    2121        </li>
    2222        <li class="nav-item m-auto">
    23           <a class="nav-link active" href="info.html">ИНФОРМАЦИИ</a>
     23          <a class="nav-link active" href="/info">ИНФОРМАЦИИ</a>
    2424        </li>
    2525        <li class="nav-item m-auto">
    26           <a class="nav-link active" href="guide.html">УПАТСТВО</a>
     26          <a class="nav-link active" href="/guide">УПАТСТВО</a>
    2727        </li>
    2828        <li class="nav-item m-auto">
    29           <a class="nav-link active" href="listBooks.html">ЛИСТА НА КНИГИ</a>
     29          <a class="nav-link active" href="/book">ЛИСТА НА КНИГИ</a>
    3030        </li>
    3131      </ul>

  • src/main/resources/templates/register.html

    r5506b50 re5de1b0  
    1313<nav class="navbar navbar-expand-md navbar-dark bg-dark">
    1414    <div class="container">
    15         <a class="navbar-brand" href="/home">ONLINE LIBRARY</a>
     15        <a class="navbar-brand" href="/home">VINTAGE LIBRARY</a>
    1616        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
    1717                aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
    … …  
    2525                </li>
    2626                <li class="nav-item m-auto">
    27                     <a class="nav-link active" href="/info">ИНФОРМАЦИИ</a>
     27                    <a class="nav-link active" href="info.html">ИНФОРМАЦИИ</a>
    2828                </li>
    2929                <li class="nav-item m-auto">
    30                     <a class="nav-link active" href="/guide">УПАТСТВО</a>
    31                 </li>
    32                 <li class="nav-item m-auto">
    33                     <a class="nav-link active" href="/listBooks">ЛИСТА НА КНИГИ</a>
     30                    <a class="nav-link active" href="guide.html">УПАТСТВО</a>
    3431                </li>
    3532            </ul>
    … …  
    4441    </div>
    4542
    46 <div class="container">
     43    <div class="container">
    4744
    48     <form class="form-signin mt-xl-2 col-md-8" method="post" action="/register">
    49         <h2 class="form-signin-heading">Регистрација</h2>
    50         <br>
    51         <p>
    52             <label for="name" class="sr-only">Име</label>
    53             <input type="text" id="name" name="name" class="form-control" placeholder="Name" required="" autofocus="">
    54         </p>
    55         <p>
    56             <label for="surname" class="sr-only">Презиме</label>
    57             <input type="text" id="surname" name="surname" class="form-control" placeholder="Surname" required="" autofocus="">
    58         </p>
    59         <p>
    60             <label for="birth" class="sr-only">Датум на раѓање</label>
    61             <input type="date" id="birth" name="birth" class="form-control" placeholder="Birth" required="" autofocus="">
    62         </p>
    63         <p>
    64             <label for="town" class="sr-only">Град</label>
    65             <input type="text" id="town" name="town" class="form-control" placeholder="Town" required="" autofocus="">
    66         </p>
    67         <p>
    68             <label for="address" class="sr-only">Адреса</label>
    69             <input type="text" id="address" name="address" class="form-control" placeholder="Address" required="" autofocus="">
    70         </p>
    71         <p>
    72             <label for="phonenumber" class="sr-only">Телефонски број</label>
    73             <input type="text" id="phonenumber" name="phonenumber" class="form-control" placeholder="Phonenumber" required="" autofocus="">
    74         </p>
    75         <p>
    76             <label for="schoolType" class="sr-only">Тип на школо</label>
    77             <input type="text" id="schoolType" name="schoolType" class="form-control" placeholder="SchoolType" required="" autofocus="">
    78         </p>
    79         <p>
    80             <label for="membershipType" class="sr-only">Тип на чланарина</label>
    81             <input type="text" id="membershipType" name="membershipType" class="form-control" placeholder="MembershipType" required="" autofocus="">
    82         </p>
    83         <p>
    84             <label for="email" class="sr-only">Корисничко име</label>
    85             <input type="text" id="email" name="email" class="form-control" placeholder="Username" required="" autofocus="">
    86         </p>
    87         <p>
    88             <label for="password" class="sr-only">Лозинка</label>
    89             <input type="password" id="password" name="password" class="form-control" placeholder="Password" required="">
    90         </p>
    91         <p>
    92             <label for="paymentMethod" class="sr-only">Изберете начин на плаќање</label>
    93             <input type="radio" id="paymentMethod" name="paymentMethod" class="form-control" placeholder="IsPayedBook" required="">
    94         </p>
     45        <form class="form-signin mt-xl-2 col-md-8" method="post" action="/register">
     46            <h2 class="form-signin-heading">Регистрација</h2>
     47            <br>
     48            <p>
     49                <label for="name" class="sr-only">Име</label>
     50                <input type="text" id="name" name="name" class="form-control" placeholder="Name" required="" autofocus="">
     51            </p>
     52            <p>
     53                <label for="surname" class="sr-only">Презиме</label>
     54                <input type="text" id="surname" name="surname" class="form-control" placeholder="Surname" required="" autofocus="">
     55            </p>
     56            <!-- <p>
     57                <label for="birthDate" class="sr-only">Датум на раѓање</label>
     58                <input type="date" id="birthDate" name="birthDate" class="form-control" placeholder="Birth" required="" autofocus="">
     59            </p> -->
     60            <p>
     61                <label for="town" class="sr-only">Град</label>
     62                <input type="text" id="town" name="town" class="form-control" placeholder="Town" required="" autofocus="">
     63            </p>
     64            <p>
     65                <label for="address" class="sr-only">Адреса</label>
     66                <input type="text" id="address" name="address" class="form-control" placeholder="Address" required="" autofocus="">
     67            </p>
     68            <p>
     69                <label for="phoneNumber" class="sr-only">Телефонски број</label>
     70                <input type="text" id="phoneNumber" name="phoneNumber" class="form-control" placeholder="Phonenumber" required="" autofocus="">
     71            </p>
     72            <!-- <p>
     73                 <label for="schoolType" class="sr-only">Тип на школо</label>
     74                 <input type="text" id="schoolType" name="schoolType" class="form-control" placeholder="SchoolType" required="" autofocus="">
     75             </p>
     76             <p>
     77                 <label for="membershipType" class="sr-only">Тип на чланарина</label>
     78                 <input type="text" id="membershipType" name="membershipType" class="form-control" placeholder="MembershipType" required="" autofocus="">
     79             </p> -->
     80            <p>
     81                <label for="email" class="sr-only">Корисничко име</label>
     82                <input type="text" id="email" name="email" class="form-control" placeholder="Username" required="" autofocus="">
     83            </p>
     84            <p>
     85                <label for="password" class="sr-only">Лозинка</label>
     86                <input type="password" id="password" name="password" class="form-control" placeholder="Password" required="">
     87            </p>
    9588
    96         <button class="btn btn-lg btn-primary btn-block" type="submit">Регистрирај се</button>
    97         <br>
    98         <a href="/login" class="btn btn-block btn-light">Веќе имате профил? Најавете се тука!!</a>
    99     </form>
    10089
    101 </div>
     90            <button class="btn btn-lg btn-primary btn-block" type="submit">Регистрирај се</button>
     91            <br>
     92            <a href="/login" class="btn btn-block btn-light">Веќе имате профил? Најавете се тука!!</a>
     93        </form>
     94
     95    </div>
    10296</section>
    10397
    … …  
    110104                <hr class="bg-white mb-2 mt-0 d-inline-block mx-auto w-25">
    111105                <ul class="list-unstyled">
    112                     <li><i class="fa fa-envelope mr-2"></i>onlinelibrary@library.com</li>
     106                    <li><i class="fa fa-envelope mr-2"></i>vintagelibrary@library.com</li>
    113107                    <li><i class="fa fa-phone mr-2"></i> + 33 12 14 15 16</li>
    114108                    <li><i class="fa fa-print mr-2"></i> + 33 12 14 15 16</li>
Note: See TracChangeset for help on using the changeset viewer.