Changeset 4ab3aae

Timestamp:

03/10/23 22:22:18 (16 months ago)

Author:

GitHub <noreply@…>

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)

Message:

Merge pull request #10 from SazdovaEkaterina/approve-adopter

Approve Adopters

Location:

Prototype Application/Paw5/src/main

Files:

• 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)

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

@@ -19 +19 @@
 
     @GetMapping("/aboutUs")
-    public String getSuccessPage() {
+    public String getAboutUsPage(){
         return "/aboutUs";
     }

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

@@ -25 +25 @@
                         <a class="nav-link active" href="/home/aboutUs">About us</a>
                     </li>
-                    <li class="nav-item m-auto">
-                        <a class="nav-link active" href="/login">Login</a>
+                    <li class="nav-item m-auto" th:if="${session.user == null}">
+                        <a class="nav-link active" href="/login" >Login</a>
                     </li>
-                    <li class="nav-item m-auto">
+                    <li class="nav-item m-auto" th:if="${session.user == null}">
                         <a class="nav-link active" href="/register">Register</a>
+                    </li>
+                    <li class="nav-item m-auto" th:if="${session.user != null}">
+                        <a class="nav-link active">Log out</a>
+                    </li>
+                    <li class="nav-item m-auto" th:if="${session.user != null}">
+                        <a class="nav-link active" href="/approve-adopters">Approve adopters</a>
                     </li>
                 </ul>
@@ -38 +44 @@
 <h1>About Us</h1>
 <div>
-    <h5 class="text-center text-danger">
+    <h5 class="text-center text-danger" th:if="${session.user != null}">
         You successfully logged in
         <th:block  th:text="${session.user?.getId()}"></th:block>

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

@@ -24 +24 @@
             <a class="nav-link active" href="/home/aboutUs">About us</a>
           </li>
-          <li class="nav-item m-auto">
-            <a class="nav-link active" href="/login">Login</a>
+          <li class="nav-item m-auto" th:if="${session.user == null}">
+            <a class="nav-link active" href="/login" >Login</a>
+          </li>
+          <li class="nav-item m-auto" th:if="${session.user == null}">
+            <a class="nav-link active" href="/register">Register</a>
+          </li>
+          <li class="nav-item m-auto" th:if="${session.user != null}">
+            <a class="nav-link active">Log out</a>
           </li>
           <li class="nav-item m-auto">
-            <a class="nav-link active" href="/register">Register</a>
+            <a class="nav-link active" href="/approve-adopters">Approve adopters</a>
           </li>
         </ul>
@@ -37 +43 @@
 <div>
   <h1>Welcome to Paw 5</h1>
-  <h3>Let's get started
-    <th:block  th:text="${session.user?.getName()}"></th:block>
+  <h3 th:if="${session.user != null}">Let's get started
+    <th:block  th:text="${session.user.getName()}"></th:block>
   </h3>
 </div>

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

@@ -25 +25 @@
             <a class="nav-link active" href="/home/aboutUs">About us</a>
           </li>
-          <li class="nav-item m-auto">
-            <a class="nav-link active" href="/login">Login</a>
+          <li class="nav-item m-auto" th:if="${session.user == null}">
+            <a class="nav-link active" href="/login" >Login</a>
           </li>
-          <li class="nav-item m-auto">
+          <li class="nav-item m-auto" th:if="${session.user == null}">
             <a class="nav-link active" href="/register">Register</a>
+          </li>
+          <li class="nav-item m-auto" th:if="${session.user != null}">
+            <a class="nav-link active">Log out</a>
+          </li>
+          <li class="nav-item m-auto" th:if="${session.user != null}">
+            <a class="nav-link active" href="/approve-adopters">Approve adopters</a>
           </li>
         </ul>

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

@@ -32 +32 @@
                         <a class="nav-link active" href="/home/aboutUs">About us</a>
                     </li>
-                    <li class="nav-item m-auto">
-                        <a class="nav-link active" href="/login">Login</a>
-                    </li>
-                    <li class="nav-item m-auto">
+                    <li class="nav-item m-auto" th:if="${session.user == null}">
+                        <a class="nav-link active" href="/login" >Login</a>
+                    </li>
+                    <li class="nav-item m-auto" th:if="${session.user == null}">
                         <a class="nav-link active" href="/register">Register</a>
+                    </li>
+                    <li class="nav-item m-auto" th:if="${session.user != null}">
+                        <a class="nav-link active">Log out</a>
+                    </li>
+                    <li class="nav-item m-auto" th:if="${session.user != null}">
+                        <a class="nav-link active" href="/approve-adopters">Approve adopters</a>
                     </li>
                 </ul>