From 15b2697622cdb4b26d100fbb768d4551ef77042c Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Fri, 9 Jul 2021 01:01:17 +0200
Subject: [PATCH 1/3] redirection and merge resolve (fix #113)

This commit will add
- redirections to behaviour page

- resolving a merge conflict
---
 frontend/src/App.js                       |  4 ++++
 frontend/src/components/pages/Behavior.js | 14 ++++++++++++++
 frontend/src/components/pages/Login.js    |  4 ++--
 frontend/src/components/pages/Umfrage.js  |  3 ++-
 4 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 frontend/src/components/pages/Behavior.js

diff --git a/frontend/src/App.js b/frontend/src/App.js
index 0cfe98a..3e20248 100644
--- a/frontend/src/App.js
+++ b/frontend/src/App.js
@@ -12,6 +12,9 @@ import Manual from "./components/pages/Manual";
 import Secret from "./components/pages/Secret";
 import Umfrage from "./components/pages/Umfrage";
 import PrivateRoute from "./auth/PrivateRoute";
+import Behavior from "./components/pages/Behavior";
+import { Logger } from "@behametrics/logger-web";
+import { useAuth } from "./auth/AuthProvider";
 
 function App() {
   return (
@@ -27,6 +30,7 @@ function App() {
           <Route path="/register" component={Register} />
           <Route path="/manual" component={Manual} />
           <Route path="/ueber" component={Ueber} />
+          <PrivateRoute path="/behavior" component={Behavior} />
           <PrivateRoute path="/secret" component={Secret} />
           <PrivateRoute path="/umfrage" component={Umfrage} />
         </Switch>
diff --git a/frontend/src/components/pages/Behavior.js b/frontend/src/components/pages/Behavior.js
new file mode 100644
index 0000000..3925394
--- /dev/null
+++ b/frontend/src/components/pages/Behavior.js
@@ -0,0 +1,14 @@
+import React from "react";
+import "../../App.css";
+import Footer from "../../Footer";
+
+export default function Behavior() {
+  return (
+    <>
+      <div className="sitePage">
+        <h1>Studie Verhaltensmerkmale</h1>
+      </div>
+      <Footer />
+    </>
+  );
+}
diff --git a/frontend/src/components/pages/Login.js b/frontend/src/components/pages/Login.js
index 69b3021..46dcba5 100644
--- a/frontend/src/components/pages/Login.js
+++ b/frontend/src/components/pages/Login.js
@@ -4,6 +4,7 @@ import "../../App.css";
 import Footer from "../../Footer";
 import InputField from "../InputField";
 import SubmitField from "../SubmitField";
+import { Redirect } from "react-router";
 import { login, useAuth, logout } from "../../auth/AuthProvider";
 import Secret from "./Secret";
 import ErrorMessage from "../ErrorMessage";
@@ -71,8 +72,7 @@ export default function Login() {
           </form>
         ) : (
           <>
-            <Secret />
-            <button onClick={() => logout()}>Logout</button>
+            <Redirect to="/behavior" />
           </>
         )}
       </div>
diff --git a/frontend/src/components/pages/Umfrage.js b/frontend/src/components/pages/Umfrage.js
index 12a00a1..44b6ee6 100644
--- a/frontend/src/components/pages/Umfrage.js
+++ b/frontend/src/components/pages/Umfrage.js
@@ -8,6 +8,7 @@ import SubmitField from "../SubmitField";
 import { authFetch } from "../../auth/AuthProvider";
 import ErrorMessage from "../ErrorMessage";
 import { Link } from "react-router-dom";
+import { Redirect } from "react-router";
 
 export default function Umfrage() {
   /* values from survey */
@@ -218,7 +219,7 @@ export default function Umfrage() {
         {!isSurveyValidBackend ? (
           <ErrorMessage message={backendErrorMessage} />
         ) : (
-          <p>{backendSuccessMessage}</p>
+          <Redirect to="/behavior" />
         )}
       </div>
       <Footer />

From 55a9eabc2498ba5b979296c28837d599dbf46e44 Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Fri, 9 Jul 2021 01:19:47 +0200
Subject: [PATCH 2/3] Added css option to hover all the links (fix #33)

---
 frontend/src/App.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/src/App.css b/frontend/src/App.css
index 73dac89..8ffc57a 100644
--- a/frontend/src/App.css
+++ b/frontend/src/App.css
@@ -40,6 +40,10 @@
   color: var(--primary);
 }
 
+a:hover {
+  border-bottom: 4px dotted var(--secondary);
+}
+
 h1 {
   font-size: 5em;
   margin: 0.7em auto;

From 904c9ae9a5f95172576d97ef882ecae8bbb030d4 Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Fri, 9 Jul 2021 01:25:45 +0200
Subject: [PATCH 3/3] Removed dotted line unter navbar logo when hovering (fix
 #33)

---
 frontend/src/App.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/App.css b/frontend/src/App.css
index 8ffc57a..5d1f792 100644
--- a/frontend/src/App.css
+++ b/frontend/src/App.css
@@ -40,7 +40,7 @@
   color: var(--primary);
 }
 
-a:hover {
+a:hover:not(.navbar-logo){
   border-bottom: 4px dotted var(--secondary);
 }