Changeset 4ab3aae for Prototype Application
- Timestamp:
- 03/10/23 22:22:18 (20 months ago)
- Branches:
- main
- Children:
- 656be6e
- Parents:
- c3278ac (diff), 7aa3382 (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. - git-author:
- SazdovaEkaterina <74919977+SazdovaEkaterina@…> (03/10/23 22:22:18)
- git-committer:
- GitHub <noreply@…> (03/10/23 22:22:18)
- Location:
- Prototype Application/Paw5/src/main
- Files:
-
- 8 added
- 5 edited
-
java/finki/paw5/service/AdopterService.java (added)
-
java/finki/paw5/service/EmployeeService.java (added)
-
java/finki/paw5/service/UserService.java (added)
-
java/finki/paw5/service/implementation/AdopterServiceImplementation.java (added)
-
java/finki/paw5/service/implementation/EmployeeServiceImplementation.java (added)
-
java/finki/paw5/service/implementation/UserServiceImpl.java (added)
-
java/finki/paw5/web/controllers/EmployeeController.java (added)
-
java/finki/paw5/web/controllers/HomeController.java (modified) (1 diff)
-
resources/templates/aboutUs.html (modified) (2 diffs)
-
resources/templates/approve-adopters.html (added)
-
resources/templates/home.html (modified) (2 diffs)
-
resources/templates/login.html (modified) (1 diff)
-
resources/templates/register.html (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
Prototype Application/Paw5/src/main/java/finki/paw5/web/controllers/HomeController.java
rc3278ac r4ab3aae 19 19 20 20 @GetMapping("/aboutUs") 21 public String get SuccessPage(){21 public String getAboutUsPage(){ 22 22 return "/aboutUs"; 23 23 } -
Prototype Application/Paw5/src/main/resources/templates/aboutUs.html
rc3278ac r4ab3aae 25 25 <a class="nav-link active" href="/home/aboutUs">About us</a> 26 26 </li> 27 <li class="nav-item m-auto" >28 <a class="nav-link active" href="/login" >Login</a>27 <li class="nav-item m-auto" th:if="${session.user == null}"> 28 <a class="nav-link active" href="/login" >Login</a> 29 29 </li> 30 <li class="nav-item m-auto" >30 <li class="nav-item m-auto" th:if="${session.user == null}"> 31 31 <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> 32 38 </li> 33 39 </ul> … … 38 44 <h1>About Us</h1> 39 45 <div> 40 <h5 class="text-center text-danger" >46 <h5 class="text-center text-danger" th:if="${session.user != null}"> 41 47 You successfully logged in 42 48 <th:block th:text="${session.user?.getId()}"></th:block> -
Prototype Application/Paw5/src/main/resources/templates/home.html
rc3278ac r4ab3aae 24 24 <a class="nav-link active" href="/home/aboutUs">About us</a> 25 25 </li> 26 <li class="nav-item m-auto"> 27 <a class="nav-link active" href="/login">Login</a> 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> 28 34 </li> 29 35 <li class="nav-item m-auto"> 30 <a class="nav-link active" href="/ register">Register</a>36 <a class="nav-link active" href="/approve-adopters">Approve adopters</a> 31 37 </li> 32 38 </ul> … … 37 43 <div> 38 44 <h1>Welcome to Paw 5</h1> 39 <h3 >Let's get started40 <th:block th:text="${session.user ?.getName()}"></th:block>45 <h3 th:if="${session.user != null}">Let's get started 46 <th:block th:text="${session.user.getName()}"></th:block> 41 47 </h3> 42 48 </div> -
Prototype Application/Paw5/src/main/resources/templates/login.html
rc3278ac r4ab3aae 25 25 <a class="nav-link active" href="/home/aboutUs">About us</a> 26 26 </li> 27 <li class="nav-item m-auto" >28 <a class="nav-link active" href="/login" >Login</a>27 <li class="nav-item m-auto" th:if="${session.user == null}"> 28 <a class="nav-link active" href="/login" >Login</a> 29 29 </li> 30 <li class="nav-item m-auto" >30 <li class="nav-item m-auto" th:if="${session.user == null}"> 31 31 <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> 32 38 </li> 33 39 </ul> -
Prototype Application/Paw5/src/main/resources/templates/register.html
rc3278ac r4ab3aae 32 32 <a class="nav-link active" href="/home/aboutUs">About us</a> 33 33 </li> 34 <li class="nav-item m-auto" >35 <a class="nav-link active" href="/login" >Login</a>36 </li> 37 <li class="nav-item m-auto" >34 <li class="nav-item m-auto" th:if="${session.user == null}"> 35 <a class="nav-link active" href="/login" >Login</a> 36 </li> 37 <li class="nav-item m-auto" th:if="${session.user == null}"> 38 38 <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> 39 45 </li> 40 46 </ul>
Note:
See TracChangeset
for help on using the changeset viewer.
