Changes in / [4ab3aae:c3278ac]


Ignore:
Location:
Prototype Application/Paw5/src/main
Files:
8 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • Prototype Application/Paw5/src/main/java/finki/paw5/web/controllers/HomeController.java

    r4ab3aae rc3278ac  
    1919
    2020    @GetMapping("/aboutUs")
    21     public String getAboutUsPage(){
     21    public String getSuccessPage() {
    2222        return "/aboutUs";
    2323    }

  • Prototype Application/Paw5/src/main/resources/templates/aboutUs.html

    r4ab3aae rc3278ac  
    2525                        <a class="nav-link active" href="/home/aboutUs">About us</a>
    2626                    </li>
    27                     <li class="nav-item m-auto" th:if="${session.user == null}">
    28                         <a class="nav-link active" href="/login" >Login</a>
     27                    <li class="nav-item m-auto">
     28                        <a class="nav-link active" href="/login">Login</a>
    2929                    </li>
    30                     <li class="nav-item m-auto" th:if="${session.user == null}">
     30                    <li class="nav-item m-auto">
    3131                        <a class="nav-link active" href="/register">Register</a>
    32                     </li>
    33                     <li class="nav-item m-auto" th:if="${session.user != null}">
    34                         <a class="nav-link active">Log out</a>
    35                     </li>
    36                     <li class="nav-item m-auto" th:if="${session.user != null}">
    37                         <a class="nav-link active" href="/approve-adopters">Approve adopters</a>
    3832                    </li>
    3933                </ul>
    … …  
    4438<h1>About Us</h1>
    4539<div>
    46     <h5 class="text-center text-danger" th:if="${session.user != null}">
     40    <h5 class="text-center text-danger">
    4741        You successfully logged in
    4842        <th:block  th:text="${session.user?.getId()}"></th:block>

  • Prototype Application/Paw5/src/main/resources/templates/home.html

    r4ab3aae rc3278ac  
    2424            <a class="nav-link active" href="/home/aboutUs">About us</a>
    2525          </li>
    26           <li class="nav-item m-auto" th:if="${session.user == null}">
    27             <a class="nav-link active" href="/login" >Login</a>
    28           </li>
    29           <li class="nav-item m-auto" th:if="${session.user == null}">
    30             <a class="nav-link active" href="/register">Register</a>
    31           </li>
    32           <li class="nav-item m-auto" th:if="${session.user != null}">
    33             <a class="nav-link active">Log out</a>
     26          <li class="nav-item m-auto">
     27            <a class="nav-link active" href="/login">Login</a>
    3428          </li>
    3529          <li class="nav-item m-auto">
    36             <a class="nav-link active" href="/approve-adopters">Approve adopters</a>
     30            <a class="nav-link active" href="/register">Register</a>
    3731          </li>
    3832        </ul>
    … …  
    4337<div>
    4438  <h1>Welcome to Paw 5</h1>
    45   <h3 th:if="${session.user != null}">Let's get started
    46     <th:block  th:text="${session.user.getName()}"></th:block>
     39  <h3>Let's get started
     40    <th:block  th:text="${session.user?.getName()}"></th:block>
    4741  </h3>
    4842</div>

  • Prototype Application/Paw5/src/main/resources/templates/login.html

    r4ab3aae rc3278ac  
    2525            <a class="nav-link active" href="/home/aboutUs">About us</a>
    2626          </li>
    27           <li class="nav-item m-auto" th:if="${session.user == null}">
    28             <a class="nav-link active" href="/login" >Login</a>
     27          <li class="nav-item m-auto">
     28            <a class="nav-link active" href="/login">Login</a>
    2929          </li>
    30           <li class="nav-item m-auto" th:if="${session.user == null}">
     30          <li class="nav-item m-auto">
    3131            <a class="nav-link active" href="/register">Register</a>
    32           </li>
    33           <li class="nav-item m-auto" th:if="${session.user != null}">
    34             <a class="nav-link active">Log out</a>
    35           </li>
    36           <li class="nav-item m-auto" th:if="${session.user != null}">
    37             <a class="nav-link active" href="/approve-adopters">Approve adopters</a>
    3832          </li>
    3933        </ul>

  • Prototype Application/Paw5/src/main/resources/templates/register.html

    r4ab3aae rc3278ac  
    3232                        <a class="nav-link active" href="/home/aboutUs">About us</a>
    3333                    </li>
    34                     <li class="nav-item m-auto" th:if="${session.user == null}">
    35                         <a class="nav-link active" href="/login" >Login</a>
     34                    <li class="nav-item m-auto">
     35                        <a class="nav-link active" href="/login">Login</a>
    3636                    </li>
    37                     <li class="nav-item m-auto" th:if="${session.user == null}">
     37                    <li class="nav-item m-auto">
    3838                        <a class="nav-link active" href="/register">Register</a>
    39                     </li>
    40                     <li class="nav-item m-auto" th:if="${session.user != null}">
    41                         <a class="nav-link active">Log out</a>
    42                     </li>
    43                     <li class="nav-item m-auto" th:if="${session.user != null}">
    44                         <a class="nav-link active" href="/approve-adopters">Approve adopters</a>
    4539                    </li>
    4640                </ul>
Note: See TracChangeset for help on using the changeset viewer.