frontend/src/components/Button.css

@@ -31,12 +31,6 @@
   font-size: 1.3em;
 }
 
-.btn--full{
-  padding: 12px 26px;
-  margin: 0 auto;
-  font-size: 1.5em;
-}
-
 .btn--large:hover,
 .btn--medium:hover {
   transition: all 0.3s ease-out;
@@ -44,4 +38,3 @@
   color: var(--secondary);
   transition: 250ms;
 }
-

frontend/src/components/Button.js

@@ -4,7 +4,7 @@ import { Link } from "react-router-dom";
 
 const STYLES = ["btn--primary", "btn--outline"];
 
-const SIZES = ["btn--medium", "btn--large", "btn--full"];
+const SIZES = ["btn--medium", "btn--large"];
 export const Button = ({
   children,
   type,

frontend/src/components/pages/Study.js

@@ -6,7 +6,6 @@ import SubmitField from "../SubmitField";
 import { Logger } from "@behametrics/logger-web";
 import BehaviorStudyInfo from "../BehaviorStudyInfo";
 import BehaviorNormal from "../BehaviorNormal";
-import { Button } from "../Button";
 
 export default function Study() {
   let username = "";
@@ -19,16 +18,6 @@ export default function Study() {
     password = tmp_password;
   };
 
-  let isStepStart = true;
-  const setIsStepStart = (tmp) => {
-    isStepStart = tmp;
-  };
-
-  let isStepNormal = false;
-  const setIsStepNormal = (tmp) => {
-    isStepNormal = tmp;
-  };
-
   let logger = new Logger({
     //inputs: ["cursor", "wheel", "keyboard", "touch"],
     inputs: ["keyboard"],
@@ -62,13 +51,6 @@ export default function Study() {
     return false;
   };
 
-  const handleIsStepStart = () => {
-    setIsStepStart(false);
-    console.log("isStepStar", isStepStart)
-    setIsStepNormal(true);
-    console.log("isStepStar", isStepNormal)
-  };
-
   const onSubmitClick = (e) => {
     e.preventDefault();
     let opts = {
@@ -93,40 +75,22 @@ export default function Study() {
     });
   };
 
-  /*
-  useEffect(() => {
-    if (isStepStart) {
-      handleIsStepStart();
-      console.log("useEffect; normal");
-    } else if (isStepNormal) {
-      console.log("useEffect; normal");
-    }
-  });
-  */
-
   return (
     <>
       <div className="sitePage">
         <h1>Studie</h1>
         <button onClick={handleLoggerOn}>LOGGER StaRTEN</button>
-        {isStepStart ? (
+        <BehaviorStudyInfo />{" "}
-          <>
+        <form id="behaviorNormal" action="#">
-            <BehaviorStudyInfo />
+          <SubmitField
-            <Button
+            LabelName="Starten mit der Studie"
-              className="btns"
+            InputValue="next-situation"
-              buttonStyle="btn--primary"
+            InputName="Weiter"
-              buttonSize="btn--full"
+            onClick={handleLoggerOn}
-              onClick={handleIsStepStart}
+          />
-              newTo="study"
+        </form>{" "}
-            >
-              Starten mit der Studie
-            </Button>
-          </>
-        ) : null}
-        {isStepNormal ? (
-          <>
         <BehaviorNormal />
-            <form id="behaviorNormal">
+        <form id="behaviorNormal" action="#">
           <InputField
             LabelName="Benutzername"
             onChange={handleUsernameChange}
@@ -144,14 +108,14 @@ export default function Study() {
             onPaste={handleOnPasteEvent}
           />
           <SubmitField
-                LabelName="Weiter zur nächsten Situation"
+            LabelNa
+            me="Weiter zur nächsten Situation"
             InputValue="next-situation"
             InputName="Weiter"
             onClick={onSubmitClick}
           />
         </form>
-          </>
+        <button onClick={handleLoggerOff}>STOP THAT FUCKING LOGGER</button>
-        ) : null}
       </div>
       <Footer />
     </>