From 15b2697622cdb4b26d100fbb768d4551ef77042c Mon Sep 17 00:00:00 2001 From: cami Date: Fri, 9 Jul 2021 01:01:17 +0200 Subject: [PATCH] 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() { + 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 ( + <> +
+

Studie Verhaltensmerkmale

+
+