diff --git a/gemeinsamforschen/src/main/webapp/pages/givefeedback.jsp b/gemeinsamforschen/src/main/webapp/pages/givefeedback.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..b3de7db23a3229facfd70cba8b9fa3f5dc9c81b9
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/givefeedback.jsp
@@ -0,0 +1,190 @@
+
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
+
+<!DOCTYPE html>
+<html>
+
+<head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>muster-gemeinsam-forschen</title>
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+ <link rel="stylesheet" href="../assets/css/styles.css">
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+ <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+ <link rel="stylesheet" href="../assets/fonts/font-awesome.min.css">
+ <link rel="stylesheet" href="../assets/css/Community-ChatComments.css">
+ <link rel="stylesheet" href="../assets/css/Sidebar-Menu-1.css">
+ <link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
+ <script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
+ <script src="https://cdn.rawgit.com/showdownjs/showdown/1.8.5/dist/showdown.min.js"></script>
+ <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css">
+</head>
+
+<body>
+<div id="wrapper">
+ <menu:menu></menu:menu>
+
+ <div class="page-content-wrapper">
+ <div class="container-fluid">
+ <h1 id="projectId"> PeerFeedback</h1>
+ </div>
+ <div align="right" class="dropdown" >
+ <button style= "position: absolute; right: 50px;" class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">
+
+ <i class="glyphicon glyphicon-envelope"></i>
+ </button>
+
+ <ul class="dropdown-menu">
+ <li><a href="viewfeedback.jsp">Feedback A</a></li>
+ <li><a href="viewfeedback.jsp">Feedback B</a></li>
+ <li><a href="viewfeedback.jsp">Feedback C</a></li>
+ </ul>
+
+ <a href="#">
+ <span class="glyphicon glyphicon-cog" style="font-size:29px;margin-right:30px;margin-top:3px;"></span>
+ </a>
+
+ </div>
+
+ <div>
+
+ </div>
+ <div>
+ <table>
+ <tr>
+ <h2> Gib dein Feedback ein!</h2>
+ <div class="line-spacer"></div>
+ <p><span> Datei zum Feedback: SelectedFile.pdf </span></p>
+ <p class="text-primary"><span> Kategorie: Untersuchungskonzept </span></p>
+ <hr />
+ <div class="form-check">
+ <input class="form-check-input" type="checkbox" value="" id="defaultCheck1">
+ <label class="form-check-label" for="defaultCheck1">
+ Das fand ich gut
+ </label>
+ </div>
+ <div class="form-check">
+ <input class="form-check-input" type="checkbox" value="" id="defaultCheck2">
+ <label class="form-check-label" for="defaultCheck1">
+ Ich habe noch eine Frage
+ </label>
+ </div>
+ <div class="form-check">
+ <input class="form-check-input" type="checkbox" value="" id="defaultCheck3">
+ <label class="form-check-label" for="defaultCheck1">
+ Das wuerde ich anders machen
+ </label>
+ </div>
+ <div class="form-check">
+ <input class="form-check-input" type="checkbox" value="" id="defaultCheck4">
+ <label class="form-check-label" for="defaultCheck1">
+ Ich habe eine Idee
+ </label>
+ </div>
+ <hr />
+ <div class="line-spacer"></div>
+ <td id="Peerfeedback" valign="top">
+
+
+ <div style="height:100px;padding-bottom:100px;">
+ <textarea id="demo1">
+ Das ist ein Test!
+ </textarea>
+ </div>
+
+ <button onclick="save()">Speichern</button>
+
+ <p id = "output"> Output... </p>
+ <script>
+ var editor = new InscrybMDE({
+ element: document.getElementById("demo1"),
+ spellChecker: false,
+ //toolbar: ["bold", "italic", "heading", "|", "quote", "table", "code", "|" , "side-by-side", "fullscreen"],
+ });
+
+
+ function save() {
+ console.log("save");
+ console.log(editor.value());
+
+ var converter = new showdown.Converter(),
+ text = editor.value(),
+ html = converter.makeHtml(text);
+
+ document.getElementById('output').innerHTML = html;11
+ }
+
+ </script>
+ </td>
+
+ <td id="chat">
+ <div class="card">
+ <div class="card-header">
+ <h6 class="mb-0">Gruppen+Projekt Chat</h6>
+ </div>
+ <div class="card-body">
+ <ul class="list-group">
+ <li class="list-group-item">
+ <div class="media">
+ <div></div>
+ <div class="media-body">
+ <div class="media" style="overflow:visible;">
+ <div><img src="../assets/img/1.jpg" class="mr-3"
+ style="width: 25px; height:25px;"></div>
+ <div class="media-body" style="overflow:visible;">
+ <div class="row">
+ <div class="col-md-12">
+ <p><a href="#">Sara Doe:</a> This guy has been going
+ 100+ MPH on side streets. <br>
+ <small class="text-muted">August 6, 2016 @ 10:35am
+ </small>
+ </p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </li>
+ <li class="list-group-item">
+ <div class="media">
+ <div></div>
+ <div class="media-body">
+ <div class="media" style="overflow:visible;">
+ <div><img src="../assets/img/2.jpg" class="mr-3"
+ style="width: 25px; height:25px;"></div>
+ <div class="media-body" style="overflow:visible;">
+ <div class="row">
+ <div class="col-md-12">
+ <p><a href="#">Brennan Prill:</a> This guy has been
+ going 100+ MPH on side streets. <br>
+ <small class="text-muted">August 6, 2016 @ 10:35am
+ </small>
+ </p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </li>
+ </ul>
+ <button class="btn btn-light">
+ Add Comment
+ </button>
+ </div>
+ </div>
+ </td>
+</tr>
+</table>
+</div>
+</div>
+</div>
+
+<script src="../assets/js/jquery.min.js"></script>
+<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
+<script src="../assets/js/Sidebar-Menu.js"></script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/project-student.jsp b/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
index 56d203004a59c56540948d5011d9f3089cd8908b..2f934ded25756ed2faa2d5c7df93b584d9de5b35 100644
--- a/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
@@ -15,6 +15,7 @@
<link rel="stylesheet" href="../assets/css/Community-ChatComments.css">
<link rel="stylesheet" href="../assets/css/Sidebar-Menu-1.css">
<link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
+ <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.1.0/css/all.css" integrity="sha384-lKuwvrZot6UHsBSfcMvOkWwlCMgc0TaWr+30HWe3a4ltaBwTZhyTEggF5tJv8tbt" crossorigin="anonymous">
</head>
<body>
@@ -23,14 +24,24 @@
<div class="page-content-wrapper">
<div class="container-fluid">
- <h1 id="projectId">project1
+ <h1 id="projectId">project1</h1>
+ </div>
+ <div align="right" class="dropdown" >
+ <button style= "position: absolute; right: 50px;" class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">
+
+ <i class="glyphicon glyphicon-envelope"></i>
+ </button>
+
+ <ul class="dropdown-menu">
+ <li><a href="viewfeedback.jsp">Feedback A</a></li>
+ <li><a href="viewfeedback.jsp">Feedback B</a></li>
+ <li><a href="viewfeedback.jsp">Feedback C</a></li>
+ </ul>
+
<a href="#">
- <span class="glyphicon glyphicon-envelope"
- style="font-size:27px;margin-top:-17px;margin-left:600px;"></span>
+ <span class="glyphicon glyphicon-cog" style="font-size:29px;margin-right:30px;margin-top:3px;"></span>
</a>
- <a href="#">
- <span class="glyphicon glyphicon-cog" style="font-size:29px;margin-left:5px;margin-top:-25px;"></span>
- </a></h1>
+
</div>
<div>
<table>
@@ -40,38 +51,63 @@
<!-- here will be all the content -->
<table>
<tr>
- <td>
+
+ <td width="100px" valign="top">
<h3>student1</h3>
<img src="../assets/img/1.jpg">
<a href="#">student1@uni.de</a>
<hr>
<ul>
- <li>Projektübersicht hochgeladen</li>
- <li>Blumen ins Hausaufgabenheft geklebt</li>
+ <li>Projektübersicht hochgeladen
+ <a href="givefeedback.jsp">
+ <i class="far fa-comments"></i>
+ </a></li>
+ <li>Blumen ins Hausaufgabenheft geklebt
+ <a href="givefeedback.jsp">
+ <span class="glyphicon glyphicon-pencil"
+ style="font-size:18px;margin-left:5px;margin-top:-25px"></span>
+ </a></li>
</ul>
</td>
- <td> </td>
- <td>
+ <td></td>
+
+ <td width="100px" valign="top">
<h3>student2</h3>
<img src="../assets/img/2.jpg">
<a href="#">student2@uni.de</a>
<hr>
<ul>
- <li>feedback zu Herbarium im Hausaufgabenheft gegeben</li>
- <li>Blumen an Vegetarier verfüttert</li>
- <li>Die armen Vegetarier</li>
+ <li>feedback zu Herbarium im Hausaufgabenheft gegeben
+ <a href="givefeedback.jsp">
+ <span class="glyphicon glyphicon-comment"
+ style="font-size:18px;margin-left:5px;margin-top:-25px"></span>
+ </a></li>
+ <li>Blumen an Vegetarier verfüttert
+ <a href="givefeedback.jsp">
+ <span class="glyphicon glyphicon-comment"
+ style="font-size:18px;margin-left:5px;margin-top:-25px"></span>
+ </a></li>
+ <li>Die armen Vegetarier
+ <a href="givefeedback.jsp">
+ <span class="glyphicon glyphicon-comment"
+ style="font-size:18px;margin-left:5px;margin-top:-25px"></span>
+ </a></li>
</ul>
</td>
- <td> </td>
- <td>
+ <td></td>
+
+ <td width="100px" valign="top">
<h3>student3</h3>
<img src="../assets/img/3.jpg">
<a href="#">student3@uni.de</a>
<hr>
<ul>
- <li>Viva la Floristika</li>
+ <li>Viva la Floristika <a href="givefeedback.jsp"> <span class="glyphicon glyphicon-pencil"
+ style="font-size:18px;margin-left:5px;margin-top:-25px"></span></a>
+ </li>
</ul>
</td>
+
</tr>
</table>
</td>
diff --git a/gemeinsamforschen/src/main/webapp/pages/viewfeedback.jsp b/gemeinsamforschen/src/main/webapp/pages/viewfeedback.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..fdaead1dfa94c20ee4b61f67667f32f9f7a21c4f
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/viewfeedback.jsp
@@ -0,0 +1,124 @@
+
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
+
+<!DOCTYPE html>
+<html>
+
+<head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>muster-gemeinsam-forschen</title>
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+ <link rel="stylesheet" href="../assets/css/styles.css">
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+ <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+ <link rel="stylesheet" href="../assets/fonts/font-awesome.min.css">
+ <link rel="stylesheet" href="../assets/css/Community-ChatComments.css">
+ <link rel="stylesheet" href="../assets/css/Sidebar-Menu-1.css">
+ <link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
+</head>
+
+<body>
+<div id="wrapper">
+ <menu:menu></menu:menu>
+
+ <div class="page-content-wrapper">
+ <div class="container-fluid">
+ <h1 id="projectId"> PeerFeedback</h1>
+ </div>
+ <div align="right" class="dropdown" >
+ <button style= "position: absolute; right: 50px;" class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">
+
+ <i class="glyphicon glyphicon-envelope"></i>
+ </button>
+
+ <ul class="dropdown-menu">
+ <li><a href="viewfeedback.jsp">Feedback A</a></li>
+ <li><a href="viewfeedback.jsp">Feedback B</a></li>
+ <li><a href="viewfeedback.jsp">Feedback C</a></li>
+ </ul>
+
+ <a href="#">
+ <span class="glyphicon glyphicon-cog" style="font-size:29px;margin-right:30px;margin-top:3px;"></span>
+ </a>
+
+ </div>
+ <div>
+ <table>
+ <tr>
+ <td id="Peerfeedback">
+ <h2>Feedback Nachrichten von Student X</h2>
+
+ <iframe width="90%" height="200%" src="http://rocketchat.westeurope.cloudapp.azure.com/channel/general?layout=embedded"></iframe>
+ </td>
+
+ <td id="chat">
+ <div class="card">
+ <div class="card-header">
+ <h6 class="mb-0">Gruppen+Projekt Chat</h6>
+ </div>
+ <div class="card-body">
+ <ul class="list-group">
+ <li class="list-group-item">
+ <div class="media">
+ <div></div>
+ <div class="media-body">
+ <div class="media" style="overflow:visible;">
+ <div><img src="../assets/img/1.jpg" class="mr-3"
+ style="width: 25px; height:25px;"></div>
+ <div class="media-body" style="overflow:visible;">
+ <div class="row">
+ <div class="col-md-12">
+ <p><a href="#">Sara Doe:</a> This guy has been going
+ 100+ MPH on side streets. <br>
+ <small class="text-muted">August 6, 2016 @ 10:35am
+ </small>
+ </p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </li>
+ <li class="list-group-item">
+ <div class="media">
+ <div></div>
+ <div class="media-body">
+ <div class="media" style="overflow:visible;">
+ <div><img src="../assets/img/2.jpg" class="mr-3"
+ style="width: 25px; height:25px;"></div>
+ <div class="media-body" style="overflow:visible;">
+ <div class="row">
+ <div class="col-md-12">
+ <p><a href="#">Brennan Prill:</a> This guy has been
+ going 100+ MPH on side streets. <br>
+ <small class="text-muted">August 6, 2016 @ 10:35am
+ </small>
+ </p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </li>
+ </ul>
+ <button class="btn btn-light">
+ Add Comment
+ </button>
+ </div>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </div>
+</div>
+
+<script src="../assets/js/jquery.min.js"></script>
+<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
+<script src="../assets/js/Sidebar-Menu.js"></script>
+</body>
+
+</html>