From 4c01e68264180e892c845c161510a327d975381d Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Fri, 30 Jul 2021 11:00:02 +0200
Subject: [PATCH 1/2] Make a box that the study is finished

---
 backend/Dockerfile                        |  3 ++-
 frontend/src/App.css                      | 10 ++++++++++
 frontend/src/components/HeroSection.jsx   |  2 ++
 frontend/src/components/StudyFinished.jsx | 11 +++++++++++
 frontend/src/components/pages/Privacy.jsx |  2 ++
 frontend/src/components/pages/Study.jsx   |  2 ++
 6 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 frontend/src/components/StudyFinished.jsx

diff --git a/backend/Dockerfile b/backend/Dockerfile
index 8c2b849..b06cd7d 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -4,7 +4,8 @@ WORKDIR /app
 
 COPY requirements.txt .
 
-RUN apk install sqlite3
+RUN apt-get -y update
+RUN apt-get -y install sqlite3
 
 RUN pip install -r requirements.txt
 
diff --git a/frontend/src/App.css b/frontend/src/App.css
index 85703b2..2a480cd 100644
--- a/frontend/src/App.css
+++ b/frontend/src/App.css
@@ -97,3 +97,13 @@ h1 {
   font-weight: bold;
   user-select: none;
 }
+
+.study-finished {
+  background-color: var(--primary);
+  padding: 0.5em;
+}
+
+.study-finished > p {
+  color: var(--error);
+  font-size: 2em;
+}
diff --git a/frontend/src/components/HeroSection.jsx b/frontend/src/components/HeroSection.jsx
index 2613f3d..33e3968 100644
--- a/frontend/src/components/HeroSection.jsx
+++ b/frontend/src/components/HeroSection.jsx
@@ -3,6 +3,7 @@ import "../App.css";
 import { Button } from "./Button";
 import "./HeroSection.css";
 import { useAuth } from "../auth/AuthProvider";
+import StudyFinished from "./StudyFinished";
 
 export default function HeroSection() {
   const [isLoggedIn] = useAuth();
@@ -10,6 +11,7 @@ export default function HeroSection() {
   return (
     <div className="hero-container">
       <h1>Herzlich Willkommen</h1>
+      <StudyFinished />
       <div className="hero-btns">
         {isLoggedIn ? (
           <Button
diff --git a/frontend/src/components/StudyFinished.jsx b/frontend/src/components/StudyFinished.jsx
new file mode 100644
index 0000000..0c2da0c
--- /dev/null
+++ b/frontend/src/components/StudyFinished.jsx
@@ -0,0 +1,11 @@
+import React from "react";
+import "../App.css"
+
+export default function StudyFinished() {
+  return (
+    <div className="study-finished">
+      <p>Die Studie wurde beendet.</p>
+      <p>Vielen Dank für die Teilnahme an der Studie</p>
+    </div>
+  );
+}
diff --git a/frontend/src/components/pages/Privacy.jsx b/frontend/src/components/pages/Privacy.jsx
index 4afd173..9b3bbc2 100644
--- a/frontend/src/components/pages/Privacy.jsx
+++ b/frontend/src/components/pages/Privacy.jsx
@@ -72,8 +72,10 @@ export default function Privacy() {
           angegeben haben, verwendet werden.
         </p>
         <h2>Weitergabe der Daten</h2>
+        <p>
         Grundsätzlich werden die Daten nicht an Dritte weitergegeben. Folgende
         Ausnahmen gibt es:
+        </p>
         <ul>
           <li>
             Der Fernfachhochschule Schweiz werden die Daten falls notwendig
diff --git a/frontend/src/components/pages/Study.jsx b/frontend/src/components/pages/Study.jsx
index cb1c9a9..915b054 100644
--- a/frontend/src/components/pages/Study.jsx
+++ b/frontend/src/components/pages/Study.jsx
@@ -12,6 +12,7 @@ import BehaviorPhone from "../BehaviorPhone";
 import BehaviorStanding from "../BehaviorStanding";
 import BehaviorStudyEnd from "../BehaviorStudyEnd";
 import { authFetch } from "../../auth/AuthProvider";
+import StudyFinished from "../StudyFinished";
 
 export default function Study() {
   const _logger = useRef(0);
@@ -270,6 +271,7 @@ export default function Study() {
     <>
       <div className="sitePage">
         <h1>Studie</h1>
+        <StudyFinished />
         {state === STATES.START ? study_start : null}
         {state === STATES.NORMAL ? study_normal : null}
         {state === STATES.PHONE ? study_phone : null}
-- 
2.43.0


From a626e32cbe5892c772f4942b40a9531c2846cfe4 Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Fri, 30 Jul 2021 11:01:19 +0200
Subject: [PATCH 2/2] Remove apiurl so that no longer the data will get logged

---
 frontend/src/components/pages/Study.jsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/components/pages/Study.jsx b/frontend/src/components/pages/Study.jsx
index 915b054..e19bc40 100644
--- a/frontend/src/components/pages/Study.jsx
+++ b/frontend/src/components/pages/Study.jsx
@@ -34,7 +34,6 @@ export default function Study() {
   useEffect(() => {
     _logger.current = new Logger({
       inputs: ["keyboard", "wheel", "cursor", "custom"],
-      apiUrl: "https://behavior.marcocamenzind.ch",
     });
     _logger.current.init();
     authFetch("/api/username", {
-- 
2.43.0