Changeset f8ef9bd


Ignore:
Timestamp:
02/06/23 04:03:40 (23 months ago)
Author:
DenicaKj <dkorvezir@…>
Branches:
master
Children:
43a1688
Parents:
eb5426c (diff), 608fefef (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of ​https://github.com/DenicaKj/MovieZone

Location:
src/main/resources/templates
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • src/main/resources/templates/fragments/footer.html

    reb5426c rf8ef9bd  
    1 <!DOCTYPE html>
    2 <html lang="en">
    3 <head>
    4     <meta charset="UTF-8">
    5     <title>Title</title>
    6 </head>
    7 <body>
     1<footer class="text-black-50 mt-xl-5" xmlns:th="http://www.thymeleaf.org">
     2    <div class="container">
     3        <div class="row">
     4            <div class="col-md-3 col-lg-4 col-xl-3">
     5                <h5>About</h5>
     6                <hr class="bg-white mb-2 mt-0 d-inline-block mx-auto w-25">
     7                <p class="mb-0">
     8                   MovieZone
     9                </p>
     10            </div>
    811
    9 </body>
    10 </html>
     12            <div class="col-md-2 col-lg-2 col-xl-2 mx-auto">
     13                <h5>Informations</h5>
     14                <hr class="bg-white mb-2 mt-0 d-inline-block mx-auto w-25">
     15                <ul class="list-unstyled">
     16                    <li><a href="">Link 1</a></li>
     17                    <li><a href="">Link 2</a></li>
     18                    <li><a href="">Link 3</a></li>
     19                    <li><a href="">Link 4</a></li>
     20                </ul>
     21            </div>
     22
     23            <div class="col-md-3 col-lg-2 col-xl-2 mx-auto">
     24                <h5>Others links</h5>
     25                <hr class="bg-white mb-2 mt-0 d-inline-block mx-auto w-25">
     26                <ul class="list-unstyled">
     27                    <li><a href="">Link 1</a></li>
     28                    <li><a href="">Link 2</a></li>
     29                    <li><a href="">Link 3</a></li>
     30                    <li><a href="">Link 4</a></li>
     31                </ul>
     32            </div>
     33
     34            <div class="col-md-4 col-lg-3 col-xl-3">
     35                <h5>Contact</h5>
     36                <hr class="bg-white mb-2 mt-0 d-inline-block mx-auto w-25">
     37                <ul class="list-unstyled">
     38                    <li><i class="fa fa-home mr-2"></i> MovieZone</li>
     39                    <li><i class="fa fa-envelope mr-2"></i> moviezone@yahoo.com</li>
     40                    <li><i class="fa fa-phone mr-2"></i> + 33 12 14 15 16</li>
     41                    <li><i class="fa fa-print mr-2"></i> + 33 12 14 15 16</li>
     42                </ul>
     43            </div>
     44        </div>
     45    </div>
     46</footer>

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

    reb5426c rf8ef9bd  
    1 <!DOCTYPE html>
    2 <html lang="en">
    3 <head>
    4     <meta charset="UTF-8">
    5     <title>Title</title>
    6 </head>
    7 <body>
    81
    9 </body>
    10 </html>
     2<div>
     3    <form th:method="POST" th:action="@{/login}">
     4        <div class="container">
     5            <form class="form-signin mt-xl-5" method="post" action="/login">
     6                <h2 class="form-signin-heading">SIGN IN</h2>
     7                <p>
     8                    <label for="username" class="sr-only">Username</label>
     9                    <input type="text" id="username" name="username" class="form-control" placeholder="Username" required="" autofocus=""/>
     10                </p>
     11                <p>
     12                    <label for="password" class="sr-only">Password</label>
     13                    <input type="password" id="password" name="password" class="form-control" placeholder="Password" required=""/>
     14                </p>
     15            </form>
     16            <button id="submit" class="btn btn-lg btn-primary btn-block" type="submit">Sign in</button>
     17        </div>
     18    </form>
     19    <a href="/register" class="btn btn-block btn-light">Register Here!</a>
     20</div>

  • src/main/resources/templates/master-template.html

    reb5426c rf8ef9bd  
    33<head>
    44    <meta charset="UTF-8"/>
     5
    56    <title>MovieZone</title>
     7
    68    <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">
    79    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
    … …  
    1517
    1618</section>
    17 <!-- Footer -->
     19
     20<footer th:replace="fragments/footer"/>
     21
    1822</body>
    1923</html>

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

    reb5426c rf8ef9bd  
    1 <!DOCTYPE html>
    2 <html lang="en">
    3 <head>
    4     <meta charset="UTF-8">
    5     <title>Title</title>
    6 </head>
    7 <body>
    8 
    9 </body>
    10 </html>
     1<div class="container">
     2    <h1 th:if="${hasError}" th:text="${error}"></h1>
     3</div>
     4<div class="container">
     5    <form class="form-signin mt-xl-5" method="post" action="/register">
     6        <h2 class="form-signin-heading">Register</h2>
     7        <p>
     8            <label for="username" class="sr-only">Username</label>
     9            <input type="text" id="username" name="username" class="form-control" placeholder="Username" required=""
     10                   autofocus="">
     11        </p>
     12        <p>
     13            <label for="password" class="sr-only">Password</label>
     14            <input type="password" id="password" name="password" class="form-control" placeholder="Password"
     15                   required="">
     16        </p>
     17        <p>
     18            <label for="repeatedPassword" class="sr-only">Repeat Password</label>
     19            <input type="password" id="repeatedPassword" name="repeatedPassword" class="form-control"
     20                   placeholder="Repeat Password" required="">
     21        </p>
     22        <p>
     23            <label for="first_name" class="sr-only">First Name</label>
     24            <input type="text" id="first_name" name="first_name" class="form-control" placeholder="First Name" required="" autofocus="">
     25        </p>
     26        <p>
     27            <label for="last_name" class="sr-only">Last Name</label>
     28            <input type="text" id="last_name" name="last_name" class="form-control" placeholder="Last Name" required=""
     29                   autofocus="">
     30        </p>
     31        <p>
     32        <div class="form-check form-check-inline">
     33            <input class="form-check-input" name="role" type="radio" id="ROLE_ADMIN" value="ROLE_ADMIN">
     34            <label class="form-check-label" for="ROLE_ADMIN">ROLE_ADMIN</label>
     35        </div>
     36        <div class="form-check form-check-inline">
     37            <input class="form-check-input" name="role"  type="radio" id="ROLE_USER" value="ROLE_USER">
     38            <label class="form-check-label" for="ROLE_USER">ROLE_USER</label>
     39        </div>
     40        </p>
     41        <button class="btn btn-lg btn-primary btn-block" type="submit">Sign up</button>
     42    </form>
     43    <a href="/login" class="btn btn-block btn-light">Already have an account? Login here!</a>
     44</div>
Note: See TracChangeset for help on using the changeset viewer.