Merge pull request 'survey-end' (#211) from survey-end into main

Reviewed-on: #211

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
 

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;
+}

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

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>
+  );
+}

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

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);
@@ -33,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", {
@@ -270,6 +270,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}