From 54d50286936802f2b6447951ead8dfe59bf52ed5 Mon Sep 17 00:00:00 2001
From: kasch309 <fr3sh3rpi55a@gmail.com>
Date: Mon, 16 Mar 2020 13:31:51 +0100
Subject: [PATCH 1/2] Add template for detailsNoMember.html, that displays the
 details when you search a page. Add connection to the controller

---
 .../controller/Gruppen2Controller.java        | 12 +++++++++
 .../resources/templates/detailsNoMember.html  | 21 ++++++++++++++-
 src/main/resources/templates/search.html      | 26 ++++++++++---------
 3 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
index c71ae8d..a5116d6 100644
--- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
+++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
@@ -112,4 +112,16 @@ public class Gruppen2Controller {
         throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Group not found");
     }
 
+    @RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator)"})
+    @GetMapping("/detailsSearch")
+    public String showGroupDetailsNoMember (KeycloakAuthenticationToken token, Model model, @RequestParam (value="id") Long id) throws EventException {
+        model.addAttribute("account", keyCloakService.createAccountFromPrincipal(token));
+        Group group = userService.getGroupById(id);
+        if (group!=null) {
+            model.addAttribute("group", group);
+            return "detailsNoMember";
+        }
+        throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Group not found");
+    }
+
 }
diff --git a/src/main/resources/templates/detailsNoMember.html b/src/main/resources/templates/detailsNoMember.html
index f351207..e12d035 100644
--- a/src/main/resources/templates/detailsNoMember.html
+++ b/src/main/resources/templates/detailsNoMember.html
@@ -25,7 +25,26 @@
     </nav>
 </header>
 <main th:fragment="bodycontent">
-
+    <div class="container-fluid">
+        <div class="row">
+            <div class="col-9" style="border: 10px solid aliceblue; background: aliceblue">
+                <form action="/" method="get">
+                    <h1 style="color: dodgerblue; font-weight: bold" th:text="${group.getTitle()}"></h1>
+                    <p style="font-weight: bold">
+                        <span class="badge badge-pill badge-dark" style="background: darkslategray" th:if="${group.getVisibility() == group.getVisibility().PRIVATE }">Private Gruppe</span>
+                        <span class="badge badge-pill badge-primary" th:if="${group.getVisibility() == group.getVisibility().PUBLIC}">Öffentliche Gruppe</span>
+                        <span class="badge badge-pill badge-success" style="background: lightseagreen" th:if="${group.getType() == group.getType().LECTURE}"> Veranstaltung</span>
+                    </p>
+                    <p th:text="${group.getDescription()}"></p>
+                    <div class="form-group">
+                        <div class="text-right">
+                            <button class="btn btn-primary" style="border-style: none;">Gruppe beitreten</button>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
 </main>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/search.html b/src/main/resources/templates/search.html
index 0a6e616..a3f6cbb 100644
--- a/src/main/resources/templates/search.html
+++ b/src/main/resources/templates/search.html
@@ -42,20 +42,22 @@
                     <table class="table">
                         <!-- Erscheint dann, wenn man "Suchen" Button klickt und Ergebnisse angezeigt werden, aber so solls aussehen -->
                         <thead th:if="${!gruppen.isEmpty()}">
-                        <tr>
-                            <th scope="col">Gruppenname</th>
-                            <th scope="col">Beschreibung</th>
-                            <th scope="col">Öffentlich/Privat</th>
-                            <th scope="col">Mitgliederanzahl</th>
-                        </tr>
+                            <tr>
+                                <th scope="col">Gruppenname</th>
+                                <th scope="col">Beschreibung</th>
+                                <th scope="col">Öffentlich/Privat</th>
+                                <th scope="col">Mitgliederanzahl</th>
+                            </tr>
                         </thead>
                         <tbody th:each="gruppe : ${gruppen}">
-                        <tr>
-                            <th scope="row" th:text="${gruppe.title}">Gruppenname</th>
-                            <td th:text="${gruppe.getDescription()}">Beschreibung</td>
-                            <td th:text="${gruppe.getVisibility()}">Öffentlich</td>
-                            <td th:text="${gruppe.getMembers().size()}">Mitgliederanzahl</td>
-                        </tr>
+                            <tr>
+                                <th scope="row">
+                                    <a th:href="@{/gruppen2/detailsSearch(id=${gruppe.getId()})}"  th:text="${gruppe.title}">Gruppenname</a>
+                                </th>
+                                <td th:text="${gruppe.getDescription()}">Beschreibung</td>
+                                <td th:text="${gruppe.getVisibility()}">Öffentlich</td>
+                                <td th:text="${gruppe.getMembers().size()}">Mitgliederanzahl</td>
+                            </tr>
                         </tbody>
                     </table>
                 </div>

From f4cee7ee822617572a0e7d0873d5d7333d57ab5f Mon Sep 17 00:00:00 2001
From: kasch309 <fr3sh3rpi55a@gmail.com>
Date: Mon, 16 Mar 2020 14:51:13 +0100
Subject: [PATCH 2/2] Add template for error page, that redirects the user to
 the previous page (rename later)

---
 .../resources/templates/errorRenameLater.html | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 src/main/resources/templates/errorRenameLater.html

diff --git a/src/main/resources/templates/errorRenameLater.html b/src/main/resources/templates/errorRenameLater.html
new file mode 100644
index 0000000..01fbadc
--- /dev/null
+++ b/src/main/resources/templates/errorRenameLater.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
+    <meta charset="UTF-8">
+    <title>Error</title>
+</head>
+<body>
+<div class="mx-auto" style="vertical-align: center; horiz-align: center; top: 50%; left: 50%; margin-top: 200px">
+    <div class="text-center" style="background: aliceblue; align-items: center; margin: auto; width: 1000px; vertical-align: center; padding: 50px; display: block">
+        <h1 style="text-align: center">Da ist etwas schiefgelaufen!</h1>
+        <h2 style="text-align: center">Die Seite, nach der du suchst, scheint nicht zu existieren.</h2>
+        <br>
+        <div>
+            <button type="button" class="btn btn-primary" style="margin: auto">
+                <a style="color: white" href="#" onclick="javascript:window.history.back(-1);return false;">Zurück zur letzten Seite</a>
+            </button>
+        </div>
+        <br>
+    </div>
+</div>
+</body>
+</html>
\ No newline at end of file