From 1751a375111792848ce5b27b17cb7dc0fffad0b8 Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Wed, 21 Jul 2021 04:26:23 +0200
Subject: [PATCH 01/47] Updated and removed some npm packages

---
 frontend/package-lock.json | 2068 ------------------------------------
 frontend/package.json      |    9 +-
 2 files changed, 1 insertion(+), 2076 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 3518599..0efc28f 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1878,41 +1878,6 @@
         }
       }
     },
-    "@react-hook/event": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@react-hook/event/-/event-1.2.3.tgz",
-      "integrity": "sha512-WMBwLnYY2rubLeecsi4skl1imfx0oiXTgazV/1ByPT6WkmLvxUao3hC+mxps5D/+JK4Fq3uG9OWU/dn5jMtXyg==",
-      "requires": {
-        "@react-hook/passive-layout-effect": "^1.2.0"
-      }
-    },
-    "@react-hook/latest": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@react-hook/latest/-/latest-1.0.3.tgz",
-      "integrity": "sha512-dy6duzl+JnAZcDbNTfmaP3xHiKtbXYOaz3G51MGVljh548Y8MWzTr+PHLOfvpypEVW9zwvl+VyKjbWKEVbV1Rg=="
-    },
-    "@react-hook/mouse-position": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@react-hook/mouse-position/-/mouse-position-4.1.0.tgz",
-      "integrity": "sha512-FkP0YeRjrTy6FiRuiGUAOvAvZt7StLETdRD7mRmSPvWgXZDGmAJR6Ksw8VxLKKa46o/ihzgVIb8deoMBFR/Qow==",
-      "requires": {
-        "@react-hook/event": "^1.2.1",
-        "@react-hook/throttle": "^2.2.0"
-      }
-    },
-    "@react-hook/passive-layout-effect": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@react-hook/passive-layout-effect/-/passive-layout-effect-1.2.1.tgz",
-      "integrity": "sha512-IwEphTD75liO8g+6taS+4oqz+nnroocNfWVHWz7j+N+ZO2vYrc6PV1q7GQhuahL0IOR7JccFTsFKQ/mb6iZWAg=="
-    },
-    "@react-hook/throttle": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@react-hook/throttle/-/throttle-2.2.0.tgz",
-      "integrity": "sha512-LJ5eg+yMV8lXtqK3lR+OtOZ2WH/EfWvuiEEu0M3bhR7dZRfTyEJKxH1oK9uyBxiXPtWXiQggWbZirMCXam51tg==",
-      "requires": {
-        "@react-hook/latest": "^1.0.2"
-      }
-    },
     "@rollup/plugin-node-resolve": {
       "version": "7.1.3",
       "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-7.1.3.tgz",
@@ -2085,178 +2050,11 @@
         "loader-utils": "^2.0.0"
       }
     },
-    "@testing-library/dom": {
-      "version": "7.31.2",
-      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-7.31.2.tgz",
-      "integrity": "sha512-3UqjCpey6HiTZT92vODYLPxTBWlM8ZOOjr3LX5F37/VRipW2M1kX6I/Cm4VXzteZqfGfagg8yXywpcOgQBlNsQ==",
-      "requires": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/runtime": "^7.12.5",
-        "@types/aria-query": "^4.2.0",
-        "aria-query": "^4.2.2",
-        "chalk": "^4.1.0",
-        "dom-accessibility-api": "^0.5.6",
-        "lz-string": "^1.4.4",
-        "pretty-format": "^26.6.2"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "@testing-library/jest-dom": {
-      "version": "5.14.1",
-      "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.14.1.tgz",
-      "integrity": "sha512-dfB7HVIgTNCxH22M1+KU6viG5of2ldoA5ly8Ar8xkezKHKXjRvznCdbMbqjYGgO2xjRbwnR+rR8MLUIqF3kKbQ==",
-      "requires": {
-        "@babel/runtime": "^7.9.2",
-        "@types/testing-library__jest-dom": "^5.9.1",
-        "aria-query": "^4.2.2",
-        "chalk": "^3.0.0",
-        "css": "^3.0.0",
-        "css.escape": "^1.5.1",
-        "dom-accessibility-api": "^0.5.6",
-        "lodash": "^4.17.15",
-        "redent": "^3.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "css": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/css/-/css-3.0.0.tgz",
-          "integrity": "sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==",
-          "requires": {
-            "inherits": "^2.0.4",
-            "source-map": "^0.6.1",
-            "source-map-resolve": "^0.6.0"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        },
-        "source-map-resolve": {
-          "version": "0.6.0",
-          "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz",
-          "integrity": "sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==",
-          "requires": {
-            "atob": "^2.1.2",
-            "decode-uri-component": "^0.2.0"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "@testing-library/react": {
-      "version": "11.2.7",
-      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-11.2.7.tgz",
-      "integrity": "sha512-tzRNp7pzd5QmbtXNG/mhdcl7Awfu/Iz1RaVHY75zTdOkmHCuzMhRL83gWHSgOAcjS3CCbyfwUHMZgRJb4kAfpA==",
-      "requires": {
-        "@babel/runtime": "^7.12.5",
-        "@testing-library/dom": "^7.28.1"
-      }
-    },
-    "@testing-library/user-event": {
-      "version": "12.8.3",
-      "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-12.8.3.tgz",
-      "integrity": "sha512-IR0iWbFkgd56Bu5ZI/ej8yQwrkCv8Qydx6RzwbKz9faXazR/+5tvYKsZQgyXJiwgpcva127YO6JcWy7YlCfofQ==",
-      "requires": {
-        "@babel/runtime": "^7.12.5"
-      }
-    },
     "@types/anymatch": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.1.tgz",
       "integrity": "sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA=="
     },
-    "@types/aria-query": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.1.tgz",
-      "integrity": "sha512-S6oPal772qJZHoRZLFc/XoZW2gFvwXusYUmXPXkgxJLuEk2vOt7jc4Yo6z/vtI0EBkbPBVrJJ0B+prLIKiWqHg=="
-    },
     "@types/babel__core": {
       "version": "7.1.14",
       "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.14.tgz",
@@ -2351,15 +2149,6 @@
         "@types/istanbul-lib-report": "*"
       }
     },
-    "@types/jest": {
-      "version": "26.0.23",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.23.tgz",
-      "integrity": "sha512-ZHLmWMJ9jJ9PTiT58juykZpL7KjwJywFN3Rr2pTSkyQfydf/rk22yS7W8p5DaVUMQ2BQC7oYiU3FjbTM/mYrOA==",
-      "requires": {
-        "jest-diff": "^26.0.0",
-        "pretty-format": "^26.0.0"
-      }
-    },
     "@types/json-schema": {
       "version": "7.0.7",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz",
@@ -2423,14 +2212,6 @@
       "resolved": "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.7.tgz",
       "integrity": "sha512-0VBprVqfgFD7Ehb2vd8Lh9TG3jP98gvr8rgehQqzztZNI7o8zS8Ad4jyZneKELphpuE212D8J70LnSNQSyO6bQ=="
     },
-    "@types/testing-library__jest-dom": {
-      "version": "5.14.0",
-      "resolved": "https://registry.npmjs.org/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.0.tgz",
-      "integrity": "sha512-l2P2GO+hFF4Liye+fAajT1qBqvZOiL79YMpEvgGs1xTK7hECxBI8Wz4J7ntACJNiJ9r0vXQqYovroXRLPDja6A==",
-      "requires": {
-        "@types/jest": "*"
-      }
-    },
     "@types/uglify-js": {
       "version": "3.13.0",
       "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.13.0.tgz",
@@ -4674,11 +4455,6 @@
       "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz",
       "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ=="
     },
-    "css.escape": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz",
-      "integrity": "sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s="
-    },
     "cssdb": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-4.4.0.tgz",
@@ -5161,11 +4937,6 @@
         "esutils": "^2.0.2"
       }
     },
-    "dom-accessibility-api": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.6.tgz",
-      "integrity": "sha512-DplGLZd8L1lN64jlT27N9TVSESFR5STaEJvX+thCby7fuCHonfPpAlodYc3vuUYbDuDec5w8AMP7oCM5TWFsqw=="
-    },
     "dom-converter": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
@@ -9933,11 +9704,6 @@
         "yallist": "^4.0.0"
       }
     },
-    "lz-string": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.4.4.tgz",
-      "integrity": "sha1-wNjq82BZ9wV5bh40SBHPTEmNOiY="
-    },
     "magic-string": {
       "version": "0.25.7",
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
@@ -10109,11 +9875,6 @@
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
       "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
     },
-    "min-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
-      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg=="
-    },
     "mini-create-react-context": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/mini-create-react-context/-/mini-create-react-context-0.4.1.tgz",
@@ -10537,1805 +10298,6 @@
         "sort-keys": "^1.0.0"
       }
     },
-    "npm": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/npm/-/npm-7.19.1.tgz",
-      "integrity": "sha512-aN3hZzGkPzKOyhjXtOhnQTGumorFhgpOU6xfuQsF1nJKh4DhsgfOMG4s/SNx56r4xHPvM5m/sk914wzDgKba3A==",
-      "requires": {
-        "@npmcli/arborist": "^2.6.4",
-        "@npmcli/ci-detect": "^1.2.0",
-        "@npmcli/config": "^2.2.0",
-        "@npmcli/package-json": "^1.0.1",
-        "@npmcli/run-script": "^1.8.5",
-        "abbrev": "~1.1.1",
-        "ansicolors": "~0.3.2",
-        "ansistyles": "~0.1.3",
-        "archy": "~1.0.0",
-        "byte-size": "^7.0.1",
-        "cacache": "^15.2.0",
-        "chalk": "^4.1.0",
-        "chownr": "^2.0.0",
-        "cli-columns": "^3.1.2",
-        "cli-table3": "^0.6.0",
-        "columnify": "~1.5.4",
-        "glob": "^7.1.7",
-        "graceful-fs": "^4.2.6",
-        "hosted-git-info": "^4.0.2",
-        "ini": "^2.0.0",
-        "init-package-json": "^2.0.3",
-        "is-cidr": "^4.0.2",
-        "json-parse-even-better-errors": "^2.3.1",
-        "leven": "^3.1.0",
-        "libnpmaccess": "^4.0.2",
-        "libnpmdiff": "^2.0.4",
-        "libnpmexec": "^2.0.0",
-        "libnpmfund": "^1.1.0",
-        "libnpmhook": "^6.0.2",
-        "libnpmorg": "^2.0.2",
-        "libnpmpack": "^2.0.1",
-        "libnpmpublish": "^4.0.1",
-        "libnpmsearch": "^3.1.1",
-        "libnpmteam": "^2.0.3",
-        "libnpmversion": "^1.2.1",
-        "make-fetch-happen": "^9.0.3",
-        "minipass": "^3.1.3",
-        "minipass-pipeline": "^1.2.4",
-        "mkdirp": "^1.0.4",
-        "mkdirp-infer-owner": "^2.0.0",
-        "ms": "^2.1.2",
-        "node-gyp": "^7.1.2",
-        "nopt": "^5.0.0",
-        "npm-audit-report": "^2.1.5",
-        "npm-package-arg": "^8.1.5",
-        "npm-pick-manifest": "^6.1.1",
-        "npm-profile": "^5.0.3",
-        "npm-registry-fetch": "^11.0.0",
-        "npm-user-validate": "^1.0.1",
-        "npmlog": "~4.1.2",
-        "opener": "^1.5.2",
-        "pacote": "^11.3.3",
-        "parse-conflict-json": "^1.1.1",
-        "qrcode-terminal": "^0.12.0",
-        "read": "~1.0.7",
-        "read-package-json": "^3.0.1",
-        "read-package-json-fast": "^2.0.2",
-        "readdir-scoped-modules": "^1.1.0",
-        "rimraf": "^3.0.2",
-        "semver": "^7.3.5",
-        "ssri": "^8.0.1",
-        "tar": "^6.1.0",
-        "text-table": "~0.2.0",
-        "tiny-relative-date": "^1.3.0",
-        "treeverse": "^1.0.4",
-        "validate-npm-package-name": "~3.0.0",
-        "which": "^2.0.2",
-        "write-file-atomic": "^3.0.3"
-      },
-      "dependencies": {
-        "@npmcli/arborist": {
-          "version": "2.6.4",
-          "bundled": true,
-          "requires": {
-            "@npmcli/installed-package-contents": "^1.0.7",
-            "@npmcli/map-workspaces": "^1.0.2",
-            "@npmcli/metavuln-calculator": "^1.1.0",
-            "@npmcli/move-file": "^1.1.0",
-            "@npmcli/name-from-folder": "^1.0.1",
-            "@npmcli/node-gyp": "^1.0.1",
-            "@npmcli/package-json": "^1.0.1",
-            "@npmcli/run-script": "^1.8.2",
-            "bin-links": "^2.2.1",
-            "cacache": "^15.0.3",
-            "common-ancestor-path": "^1.0.1",
-            "json-parse-even-better-errors": "^2.3.1",
-            "json-stringify-nice": "^1.1.4",
-            "mkdirp-infer-owner": "^2.0.0",
-            "npm-install-checks": "^4.0.0",
-            "npm-package-arg": "^8.1.0",
-            "npm-pick-manifest": "^6.1.0",
-            "npm-registry-fetch": "^11.0.0",
-            "pacote": "^11.2.6",
-            "parse-conflict-json": "^1.1.1",
-            "proc-log": "^1.0.0",
-            "promise-all-reject-late": "^1.0.0",
-            "promise-call-limit": "^1.0.1",
-            "read-package-json-fast": "^2.0.2",
-            "readdir-scoped-modules": "^1.1.0",
-            "semver": "^7.3.5",
-            "tar": "^6.1.0",
-            "treeverse": "^1.0.4",
-            "walk-up-path": "^1.0.0"
-          }
-        },
-        "@npmcli/ci-detect": {
-          "version": "1.3.0",
-          "bundled": true
-        },
-        "@npmcli/config": {
-          "version": "2.2.0",
-          "bundled": true,
-          "requires": {
-            "ini": "^2.0.0",
-            "mkdirp-infer-owner": "^2.0.0",
-            "nopt": "^5.0.0",
-            "semver": "^7.3.4",
-            "walk-up-path": "^1.0.0"
-          }
-        },
-        "@npmcli/disparity-colors": {
-          "version": "1.0.1",
-          "bundled": true,
-          "requires": {
-            "ansi-styles": "^4.3.0"
-          }
-        },
-        "@npmcli/git": {
-          "version": "2.0.9",
-          "bundled": true,
-          "requires": {
-            "@npmcli/promise-spawn": "^1.3.2",
-            "lru-cache": "^6.0.0",
-            "mkdirp": "^1.0.4",
-            "npm-pick-manifest": "^6.1.1",
-            "promise-inflight": "^1.0.1",
-            "promise-retry": "^2.0.1",
-            "semver": "^7.3.5",
-            "which": "^2.0.2"
-          }
-        },
-        "@npmcli/installed-package-contents": {
-          "version": "1.0.7",
-          "bundled": true,
-          "requires": {
-            "npm-bundled": "^1.1.1",
-            "npm-normalize-package-bin": "^1.0.1"
-          }
-        },
-        "@npmcli/map-workspaces": {
-          "version": "1.0.3",
-          "bundled": true,
-          "requires": {
-            "@npmcli/name-from-folder": "^1.0.1",
-            "glob": "^7.1.6",
-            "minimatch": "^3.0.4",
-            "read-package-json-fast": "^2.0.1"
-          }
-        },
-        "@npmcli/metavuln-calculator": {
-          "version": "1.1.1",
-          "bundled": true,
-          "requires": {
-            "cacache": "^15.0.5",
-            "pacote": "^11.1.11",
-            "semver": "^7.3.2"
-          }
-        },
-        "@npmcli/move-file": {
-          "version": "1.1.2",
-          "bundled": true,
-          "requires": {
-            "mkdirp": "^1.0.4",
-            "rimraf": "^3.0.2"
-          }
-        },
-        "@npmcli/name-from-folder": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "@npmcli/node-gyp": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "@npmcli/package-json": {
-          "version": "1.0.1",
-          "bundled": true,
-          "requires": {
-            "json-parse-even-better-errors": "^2.3.1"
-          }
-        },
-        "@npmcli/promise-spawn": {
-          "version": "1.3.2",
-          "bundled": true,
-          "requires": {
-            "infer-owner": "^1.0.4"
-          }
-        },
-        "@npmcli/run-script": {
-          "version": "1.8.5",
-          "bundled": true,
-          "requires": {
-            "@npmcli/node-gyp": "^1.0.2",
-            "@npmcli/promise-spawn": "^1.3.2",
-            "infer-owner": "^1.0.4",
-            "node-gyp": "^7.1.0",
-            "read-package-json-fast": "^2.0.1"
-          }
-        },
-        "@tootallnate/once": {
-          "version": "1.1.2",
-          "bundled": true
-        },
-        "abbrev": {
-          "version": "1.1.1",
-          "bundled": true
-        },
-        "agent-base": {
-          "version": "6.0.2",
-          "bundled": true,
-          "requires": {
-            "debug": "4"
-          }
-        },
-        "agentkeepalive": {
-          "version": "4.1.4",
-          "bundled": true,
-          "requires": {
-            "debug": "^4.1.0",
-            "depd": "^1.1.2",
-            "humanize-ms": "^1.2.1"
-          }
-        },
-        "aggregate-error": {
-          "version": "3.1.0",
-          "bundled": true,
-          "requires": {
-            "clean-stack": "^2.0.0",
-            "indent-string": "^4.0.0"
-          }
-        },
-        "ajv": {
-          "version": "6.12.6",
-          "bundled": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "ansi-regex": {
-          "version": "2.1.1",
-          "bundled": true
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "bundled": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "ansicolors": {
-          "version": "0.3.2",
-          "bundled": true
-        },
-        "ansistyles": {
-          "version": "0.1.3",
-          "bundled": true
-        },
-        "aproba": {
-          "version": "2.0.0",
-          "bundled": true
-        },
-        "archy": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "are-we-there-yet": {
-          "version": "1.1.5",
-          "bundled": true,
-          "requires": {
-            "delegates": "^1.0.0",
-            "readable-stream": "^2.0.6"
-          }
-        },
-        "asap": {
-          "version": "2.0.6",
-          "bundled": true
-        },
-        "asn1": {
-          "version": "0.2.4",
-          "bundled": true,
-          "requires": {
-            "safer-buffer": "~2.1.0"
-          }
-        },
-        "assert-plus": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "asynckit": {
-          "version": "0.4.0",
-          "bundled": true
-        },
-        "aws-sign2": {
-          "version": "0.7.0",
-          "bundled": true
-        },
-        "aws4": {
-          "version": "1.11.0",
-          "bundled": true
-        },
-        "balanced-match": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "bcrypt-pbkdf": {
-          "version": "1.0.2",
-          "bundled": true,
-          "requires": {
-            "tweetnacl": "^0.14.3"
-          }
-        },
-        "bin-links": {
-          "version": "2.2.1",
-          "bundled": true,
-          "requires": {
-            "cmd-shim": "^4.0.1",
-            "mkdirp": "^1.0.3",
-            "npm-normalize-package-bin": "^1.0.0",
-            "read-cmd-shim": "^2.0.0",
-            "rimraf": "^3.0.0",
-            "write-file-atomic": "^3.0.3"
-          }
-        },
-        "binary-extensions": {
-          "version": "2.2.0",
-          "bundled": true
-        },
-        "brace-expansion": {
-          "version": "1.1.11",
-          "bundled": true,
-          "requires": {
-            "balanced-match": "^1.0.0",
-            "concat-map": "0.0.1"
-          }
-        },
-        "builtins": {
-          "version": "1.0.3",
-          "bundled": true
-        },
-        "byte-size": {
-          "version": "7.0.1",
-          "bundled": true
-        },
-        "cacache": {
-          "version": "15.2.0",
-          "bundled": true,
-          "requires": {
-            "@npmcli/move-file": "^1.0.1",
-            "chownr": "^2.0.0",
-            "fs-minipass": "^2.0.0",
-            "glob": "^7.1.4",
-            "infer-owner": "^1.0.4",
-            "lru-cache": "^6.0.0",
-            "minipass": "^3.1.1",
-            "minipass-collect": "^1.0.2",
-            "minipass-flush": "^1.0.5",
-            "minipass-pipeline": "^1.2.2",
-            "mkdirp": "^1.0.3",
-            "p-map": "^4.0.0",
-            "promise-inflight": "^1.0.1",
-            "rimraf": "^3.0.2",
-            "ssri": "^8.0.1",
-            "tar": "^6.0.2",
-            "unique-filename": "^1.1.1"
-          }
-        },
-        "caseless": {
-          "version": "0.12.0",
-          "bundled": true
-        },
-        "chalk": {
-          "version": "4.1.1",
-          "bundled": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "chownr": {
-          "version": "2.0.0",
-          "bundled": true
-        },
-        "cidr-regex": {
-          "version": "3.1.1",
-          "bundled": true,
-          "requires": {
-            "ip-regex": "^4.1.0"
-          }
-        },
-        "clean-stack": {
-          "version": "2.2.0",
-          "bundled": true
-        },
-        "cli-columns": {
-          "version": "3.1.2",
-          "bundled": true,
-          "requires": {
-            "string-width": "^2.0.0",
-            "strip-ansi": "^3.0.1"
-          }
-        },
-        "cli-table3": {
-          "version": "0.6.0",
-          "bundled": true,
-          "requires": {
-            "colors": "^1.1.2",
-            "object-assign": "^4.1.0",
-            "string-width": "^4.2.0"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "5.0.0",
-              "bundled": true
-            },
-            "is-fullwidth-code-point": {
-              "version": "3.0.0",
-              "bundled": true
-            },
-            "string-width": {
-              "version": "4.2.2",
-              "bundled": true,
-              "requires": {
-                "emoji-regex": "^8.0.0",
-                "is-fullwidth-code-point": "^3.0.0",
-                "strip-ansi": "^6.0.0"
-              }
-            },
-            "strip-ansi": {
-              "version": "6.0.0",
-              "bundled": true,
-              "requires": {
-                "ansi-regex": "^5.0.0"
-              }
-            }
-          }
-        },
-        "clone": {
-          "version": "1.0.4",
-          "bundled": true
-        },
-        "cmd-shim": {
-          "version": "4.1.0",
-          "bundled": true,
-          "requires": {
-            "mkdirp-infer-owner": "^2.0.0"
-          }
-        },
-        "code-point-at": {
-          "version": "1.1.0",
-          "bundled": true
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "bundled": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "bundled": true
-        },
-        "colors": {
-          "version": "1.4.0",
-          "bundled": true,
-          "optional": true
-        },
-        "columnify": {
-          "version": "1.5.4",
-          "bundled": true,
-          "requires": {
-            "strip-ansi": "^3.0.0",
-            "wcwidth": "^1.0.0"
-          }
-        },
-        "combined-stream": {
-          "version": "1.0.8",
-          "bundled": true,
-          "requires": {
-            "delayed-stream": "~1.0.0"
-          }
-        },
-        "common-ancestor-path": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "concat-map": {
-          "version": "0.0.1",
-          "bundled": true
-        },
-        "console-control-strings": {
-          "version": "1.1.0",
-          "bundled": true
-        },
-        "core-util-is": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "dashdash": {
-          "version": "1.14.1",
-          "bundled": true,
-          "requires": {
-            "assert-plus": "^1.0.0"
-          }
-        },
-        "debug": {
-          "version": "4.3.1",
-          "bundled": true,
-          "requires": {
-            "ms": "2.1.2"
-          },
-          "dependencies": {
-            "ms": {
-              "version": "2.1.2",
-              "bundled": true
-            }
-          }
-        },
-        "debuglog": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "defaults": {
-          "version": "1.0.3",
-          "bundled": true,
-          "requires": {
-            "clone": "^1.0.2"
-          }
-        },
-        "delayed-stream": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "delegates": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "depd": {
-          "version": "1.1.2",
-          "bundled": true
-        },
-        "dezalgo": {
-          "version": "1.0.3",
-          "bundled": true,
-          "requires": {
-            "asap": "^2.0.0",
-            "wrappy": "1"
-          }
-        },
-        "diff": {
-          "version": "5.0.0",
-          "bundled": true
-        },
-        "ecc-jsbn": {
-          "version": "0.1.2",
-          "bundled": true,
-          "requires": {
-            "jsbn": "~0.1.0",
-            "safer-buffer": "^2.1.0"
-          }
-        },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "bundled": true
-        },
-        "encoding": {
-          "version": "0.1.13",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "iconv-lite": "^0.6.2"
-          }
-        },
-        "env-paths": {
-          "version": "2.2.1",
-          "bundled": true
-        },
-        "err-code": {
-          "version": "2.0.3",
-          "bundled": true
-        },
-        "extend": {
-          "version": "3.0.2",
-          "bundled": true
-        },
-        "extsprintf": {
-          "version": "1.3.0",
-          "bundled": true
-        },
-        "fast-deep-equal": {
-          "version": "3.1.3",
-          "bundled": true
-        },
-        "fast-json-stable-stringify": {
-          "version": "2.1.0",
-          "bundled": true
-        },
-        "forever-agent": {
-          "version": "0.6.1",
-          "bundled": true
-        },
-        "fs-minipass": {
-          "version": "2.1.0",
-          "bundled": true,
-          "requires": {
-            "minipass": "^3.0.0"
-          }
-        },
-        "fs.realpath": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "function-bind": {
-          "version": "1.1.1",
-          "bundled": true
-        },
-        "gauge": {
-          "version": "2.7.4",
-          "bundled": true,
-          "requires": {
-            "aproba": "^1.0.3",
-            "console-control-strings": "^1.0.0",
-            "has-unicode": "^2.0.0",
-            "object-assign": "^4.1.0",
-            "signal-exit": "^3.0.0",
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wide-align": "^1.1.0"
-          },
-          "dependencies": {
-            "aproba": {
-              "version": "1.2.0",
-              "bundled": true
-            },
-            "is-fullwidth-code-point": {
-              "version": "1.0.0",
-              "bundled": true,
-              "requires": {
-                "number-is-nan": "^1.0.0"
-              }
-            },
-            "string-width": {
-              "version": "1.0.2",
-              "bundled": true,
-              "requires": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
-              }
-            }
-          }
-        },
-        "getpass": {
-          "version": "0.1.7",
-          "bundled": true,
-          "requires": {
-            "assert-plus": "^1.0.0"
-          }
-        },
-        "glob": {
-          "version": "7.1.7",
-          "bundled": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "graceful-fs": {
-          "version": "4.2.6",
-          "bundled": true
-        },
-        "har-schema": {
-          "version": "2.0.0",
-          "bundled": true
-        },
-        "har-validator": {
-          "version": "5.1.5",
-          "bundled": true,
-          "requires": {
-            "ajv": "^6.12.3",
-            "har-schema": "^2.0.0"
-          }
-        },
-        "has": {
-          "version": "1.0.3",
-          "bundled": true,
-          "requires": {
-            "function-bind": "^1.1.1"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "bundled": true
-        },
-        "has-unicode": {
-          "version": "2.0.1",
-          "bundled": true
-        },
-        "hosted-git-info": {
-          "version": "4.0.2",
-          "bundled": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
-        "http-cache-semantics": {
-          "version": "4.1.0",
-          "bundled": true
-        },
-        "http-proxy-agent": {
-          "version": "4.0.1",
-          "bundled": true,
-          "requires": {
-            "@tootallnate/once": "1",
-            "agent-base": "6",
-            "debug": "4"
-          }
-        },
-        "http-signature": {
-          "version": "1.2.0",
-          "bundled": true,
-          "requires": {
-            "assert-plus": "^1.0.0",
-            "jsprim": "^1.2.2",
-            "sshpk": "^1.7.0"
-          }
-        },
-        "https-proxy-agent": {
-          "version": "5.0.0",
-          "bundled": true,
-          "requires": {
-            "agent-base": "6",
-            "debug": "4"
-          }
-        },
-        "humanize-ms": {
-          "version": "1.2.1",
-          "bundled": true,
-          "requires": {
-            "ms": "^2.0.0"
-          }
-        },
-        "iconv-lite": {
-          "version": "0.6.3",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3.0.0"
-          }
-        },
-        "ignore-walk": {
-          "version": "3.0.4",
-          "bundled": true,
-          "requires": {
-            "minimatch": "^3.0.4"
-          }
-        },
-        "imurmurhash": {
-          "version": "0.1.4",
-          "bundled": true
-        },
-        "indent-string": {
-          "version": "4.0.0",
-          "bundled": true
-        },
-        "infer-owner": {
-          "version": "1.0.4",
-          "bundled": true
-        },
-        "inflight": {
-          "version": "1.0.6",
-          "bundled": true,
-          "requires": {
-            "once": "^1.3.0",
-            "wrappy": "1"
-          }
-        },
-        "inherits": {
-          "version": "2.0.4",
-          "bundled": true
-        },
-        "ini": {
-          "version": "2.0.0",
-          "bundled": true
-        },
-        "init-package-json": {
-          "version": "2.0.3",
-          "bundled": true,
-          "requires": {
-            "glob": "^7.1.1",
-            "npm-package-arg": "^8.1.2",
-            "promzard": "^0.3.0",
-            "read": "~1.0.1",
-            "read-package-json": "^3.0.1",
-            "semver": "^7.3.5",
-            "validate-npm-package-license": "^3.0.4",
-            "validate-npm-package-name": "^3.0.0"
-          }
-        },
-        "ip": {
-          "version": "1.1.5",
-          "bundled": true
-        },
-        "ip-regex": {
-          "version": "4.3.0",
-          "bundled": true
-        },
-        "is-cidr": {
-          "version": "4.0.2",
-          "bundled": true,
-          "requires": {
-            "cidr-regex": "^3.1.1"
-          }
-        },
-        "is-core-module": {
-          "version": "2.4.0",
-          "bundled": true,
-          "requires": {
-            "has": "^1.0.3"
-          }
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "bundled": true
-        },
-        "is-lambda": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "is-typedarray": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "isexe": {
-          "version": "2.0.0",
-          "bundled": true
-        },
-        "isstream": {
-          "version": "0.1.2",
-          "bundled": true
-        },
-        "jsbn": {
-          "version": "0.1.1",
-          "bundled": true
-        },
-        "json-parse-even-better-errors": {
-          "version": "2.3.1",
-          "bundled": true
-        },
-        "json-schema": {
-          "version": "0.2.3",
-          "bundled": true
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "bundled": true
-        },
-        "json-stringify-nice": {
-          "version": "1.1.4",
-          "bundled": true
-        },
-        "json-stringify-safe": {
-          "version": "5.0.1",
-          "bundled": true
-        },
-        "jsonparse": {
-          "version": "1.3.1",
-          "bundled": true
-        },
-        "jsprim": {
-          "version": "1.4.1",
-          "bundled": true,
-          "requires": {
-            "assert-plus": "1.0.0",
-            "extsprintf": "1.3.0",
-            "json-schema": "0.2.3",
-            "verror": "1.10.0"
-          }
-        },
-        "just-diff": {
-          "version": "3.1.1",
-          "bundled": true
-        },
-        "just-diff-apply": {
-          "version": "3.0.0",
-          "bundled": true
-        },
-        "leven": {
-          "version": "3.1.0",
-          "bundled": true
-        },
-        "libnpmaccess": {
-          "version": "4.0.3",
-          "bundled": true,
-          "requires": {
-            "aproba": "^2.0.0",
-            "minipass": "^3.1.1",
-            "npm-package-arg": "^8.1.2",
-            "npm-registry-fetch": "^11.0.0"
-          }
-        },
-        "libnpmdiff": {
-          "version": "2.0.4",
-          "bundled": true,
-          "requires": {
-            "@npmcli/disparity-colors": "^1.0.1",
-            "@npmcli/installed-package-contents": "^1.0.7",
-            "binary-extensions": "^2.2.0",
-            "diff": "^5.0.0",
-            "minimatch": "^3.0.4",
-            "npm-package-arg": "^8.1.4",
-            "pacote": "^11.3.4",
-            "tar": "^6.1.0"
-          }
-        },
-        "libnpmexec": {
-          "version": "2.0.0",
-          "bundled": true,
-          "requires": {
-            "@npmcli/arborist": "^2.3.0",
-            "@npmcli/ci-detect": "^1.3.0",
-            "@npmcli/run-script": "^1.8.4",
-            "chalk": "^4.1.0",
-            "mkdirp-infer-owner": "^2.0.0",
-            "npm-package-arg": "^8.1.2",
-            "pacote": "^11.3.1",
-            "proc-log": "^1.0.0",
-            "read": "^1.0.7",
-            "read-package-json-fast": "^2.0.2",
-            "walk-up-path": "^1.0.0"
-          }
-        },
-        "libnpmfund": {
-          "version": "1.1.0",
-          "bundled": true,
-          "requires": {
-            "@npmcli/arborist": "^2.5.0"
-          }
-        },
-        "libnpmhook": {
-          "version": "6.0.3",
-          "bundled": true,
-          "requires": {
-            "aproba": "^2.0.0",
-            "npm-registry-fetch": "^11.0.0"
-          }
-        },
-        "libnpmorg": {
-          "version": "2.0.3",
-          "bundled": true,
-          "requires": {
-            "aproba": "^2.0.0",
-            "npm-registry-fetch": "^11.0.0"
-          }
-        },
-        "libnpmpack": {
-          "version": "2.0.1",
-          "bundled": true,
-          "requires": {
-            "@npmcli/run-script": "^1.8.3",
-            "npm-package-arg": "^8.1.0",
-            "pacote": "^11.2.6"
-          }
-        },
-        "libnpmpublish": {
-          "version": "4.0.2",
-          "bundled": true,
-          "requires": {
-            "normalize-package-data": "^3.0.2",
-            "npm-package-arg": "^8.1.2",
-            "npm-registry-fetch": "^11.0.0",
-            "semver": "^7.1.3",
-            "ssri": "^8.0.1"
-          }
-        },
-        "libnpmsearch": {
-          "version": "3.1.2",
-          "bundled": true,
-          "requires": {
-            "npm-registry-fetch": "^11.0.0"
-          }
-        },
-        "libnpmteam": {
-          "version": "2.0.4",
-          "bundled": true,
-          "requires": {
-            "aproba": "^2.0.0",
-            "npm-registry-fetch": "^11.0.0"
-          }
-        },
-        "libnpmversion": {
-          "version": "1.2.1",
-          "bundled": true,
-          "requires": {
-            "@npmcli/git": "^2.0.7",
-            "@npmcli/run-script": "^1.8.4",
-            "json-parse-even-better-errors": "^2.3.1",
-            "semver": "^7.3.5",
-            "stringify-package": "^1.0.1"
-          }
-        },
-        "lru-cache": {
-          "version": "6.0.0",
-          "bundled": true,
-          "requires": {
-            "yallist": "^4.0.0"
-          }
-        },
-        "make-fetch-happen": {
-          "version": "9.0.3",
-          "bundled": true,
-          "requires": {
-            "agentkeepalive": "^4.1.3",
-            "cacache": "^15.2.0",
-            "http-cache-semantics": "^4.1.0",
-            "http-proxy-agent": "^4.0.1",
-            "https-proxy-agent": "^5.0.0",
-            "is-lambda": "^1.0.1",
-            "lru-cache": "^6.0.0",
-            "minipass": "^3.1.3",
-            "minipass-collect": "^1.0.2",
-            "minipass-fetch": "^1.3.2",
-            "minipass-flush": "^1.0.5",
-            "minipass-pipeline": "^1.2.4",
-            "negotiator": "^0.6.2",
-            "promise-retry": "^2.0.1",
-            "socks-proxy-agent": "^5.0.0",
-            "ssri": "^8.0.0"
-          }
-        },
-        "mime-db": {
-          "version": "1.48.0",
-          "bundled": true
-        },
-        "mime-types": {
-          "version": "2.1.31",
-          "bundled": true,
-          "requires": {
-            "mime-db": "1.48.0"
-          }
-        },
-        "minimatch": {
-          "version": "3.0.4",
-          "bundled": true,
-          "requires": {
-            "brace-expansion": "^1.1.7"
-          }
-        },
-        "minipass": {
-          "version": "3.1.3",
-          "bundled": true,
-          "requires": {
-            "yallist": "^4.0.0"
-          }
-        },
-        "minipass-collect": {
-          "version": "1.0.2",
-          "bundled": true,
-          "requires": {
-            "minipass": "^3.0.0"
-          }
-        },
-        "minipass-fetch": {
-          "version": "1.3.3",
-          "bundled": true,
-          "requires": {
-            "encoding": "^0.1.12",
-            "minipass": "^3.1.0",
-            "minipass-sized": "^1.0.3",
-            "minizlib": "^2.0.0"
-          }
-        },
-        "minipass-flush": {
-          "version": "1.0.5",
-          "bundled": true,
-          "requires": {
-            "minipass": "^3.0.0"
-          }
-        },
-        "minipass-json-stream": {
-          "version": "1.0.1",
-          "bundled": true,
-          "requires": {
-            "jsonparse": "^1.3.1",
-            "minipass": "^3.0.0"
-          }
-        },
-        "minipass-pipeline": {
-          "version": "1.2.4",
-          "bundled": true,
-          "requires": {
-            "minipass": "^3.0.0"
-          }
-        },
-        "minipass-sized": {
-          "version": "1.0.3",
-          "bundled": true,
-          "requires": {
-            "minipass": "^3.0.0"
-          }
-        },
-        "minizlib": {
-          "version": "2.1.2",
-          "bundled": true,
-          "requires": {
-            "minipass": "^3.0.0",
-            "yallist": "^4.0.0"
-          }
-        },
-        "mkdirp": {
-          "version": "1.0.4",
-          "bundled": true
-        },
-        "mkdirp-infer-owner": {
-          "version": "2.0.0",
-          "bundled": true,
-          "requires": {
-            "chownr": "^2.0.0",
-            "infer-owner": "^1.0.4",
-            "mkdirp": "^1.0.3"
-          }
-        },
-        "ms": {
-          "version": "2.1.3",
-          "bundled": true
-        },
-        "mute-stream": {
-          "version": "0.0.8",
-          "bundled": true
-        },
-        "negotiator": {
-          "version": "0.6.2",
-          "bundled": true
-        },
-        "node-gyp": {
-          "version": "7.1.2",
-          "bundled": true,
-          "requires": {
-            "env-paths": "^2.2.0",
-            "glob": "^7.1.4",
-            "graceful-fs": "^4.2.3",
-            "nopt": "^5.0.0",
-            "npmlog": "^4.1.2",
-            "request": "^2.88.2",
-            "rimraf": "^3.0.2",
-            "semver": "^7.3.2",
-            "tar": "^6.0.2",
-            "which": "^2.0.2"
-          }
-        },
-        "nopt": {
-          "version": "5.0.0",
-          "bundled": true,
-          "requires": {
-            "abbrev": "1"
-          }
-        },
-        "normalize-package-data": {
-          "version": "3.0.2",
-          "bundled": true,
-          "requires": {
-            "hosted-git-info": "^4.0.1",
-            "resolve": "^1.20.0",
-            "semver": "^7.3.4",
-            "validate-npm-package-license": "^3.0.1"
-          }
-        },
-        "npm-audit-report": {
-          "version": "2.1.5",
-          "bundled": true,
-          "requires": {
-            "chalk": "^4.0.0"
-          }
-        },
-        "npm-bundled": {
-          "version": "1.1.2",
-          "bundled": true,
-          "requires": {
-            "npm-normalize-package-bin": "^1.0.1"
-          }
-        },
-        "npm-install-checks": {
-          "version": "4.0.0",
-          "bundled": true,
-          "requires": {
-            "semver": "^7.1.1"
-          }
-        },
-        "npm-normalize-package-bin": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "npm-package-arg": {
-          "version": "8.1.5",
-          "bundled": true,
-          "requires": {
-            "hosted-git-info": "^4.0.1",
-            "semver": "^7.3.4",
-            "validate-npm-package-name": "^3.0.0"
-          }
-        },
-        "npm-packlist": {
-          "version": "2.2.2",
-          "bundled": true,
-          "requires": {
-            "glob": "^7.1.6",
-            "ignore-walk": "^3.0.3",
-            "npm-bundled": "^1.1.1",
-            "npm-normalize-package-bin": "^1.0.1"
-          }
-        },
-        "npm-pick-manifest": {
-          "version": "6.1.1",
-          "bundled": true,
-          "requires": {
-            "npm-install-checks": "^4.0.0",
-            "npm-normalize-package-bin": "^1.0.1",
-            "npm-package-arg": "^8.1.2",
-            "semver": "^7.3.4"
-          }
-        },
-        "npm-profile": {
-          "version": "5.0.4",
-          "bundled": true,
-          "requires": {
-            "npm-registry-fetch": "^11.0.0"
-          }
-        },
-        "npm-registry-fetch": {
-          "version": "11.0.0",
-          "bundled": true,
-          "requires": {
-            "make-fetch-happen": "^9.0.1",
-            "minipass": "^3.1.3",
-            "minipass-fetch": "^1.3.0",
-            "minipass-json-stream": "^1.0.1",
-            "minizlib": "^2.0.0",
-            "npm-package-arg": "^8.0.0"
-          }
-        },
-        "npm-user-validate": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "npmlog": {
-          "version": "4.1.2",
-          "bundled": true,
-          "requires": {
-            "are-we-there-yet": "~1.1.2",
-            "console-control-strings": "~1.1.0",
-            "gauge": "~2.7.3",
-            "set-blocking": "~2.0.0"
-          }
-        },
-        "number-is-nan": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "oauth-sign": {
-          "version": "0.9.0",
-          "bundled": true
-        },
-        "object-assign": {
-          "version": "4.1.1",
-          "bundled": true
-        },
-        "once": {
-          "version": "1.4.0",
-          "bundled": true,
-          "requires": {
-            "wrappy": "1"
-          }
-        },
-        "opener": {
-          "version": "1.5.2",
-          "bundled": true
-        },
-        "p-map": {
-          "version": "4.0.0",
-          "bundled": true,
-          "requires": {
-            "aggregate-error": "^3.0.0"
-          }
-        },
-        "pacote": {
-          "version": "11.3.4",
-          "bundled": true,
-          "requires": {
-            "@npmcli/git": "^2.0.1",
-            "@npmcli/installed-package-contents": "^1.0.6",
-            "@npmcli/promise-spawn": "^1.2.0",
-            "@npmcli/run-script": "^1.8.2",
-            "cacache": "^15.0.5",
-            "chownr": "^2.0.0",
-            "fs-minipass": "^2.1.0",
-            "infer-owner": "^1.0.4",
-            "minipass": "^3.1.3",
-            "mkdirp": "^1.0.3",
-            "npm-package-arg": "^8.0.1",
-            "npm-packlist": "^2.1.4",
-            "npm-pick-manifest": "^6.0.0",
-            "npm-registry-fetch": "^11.0.0",
-            "promise-retry": "^2.0.1",
-            "read-package-json-fast": "^2.0.1",
-            "rimraf": "^3.0.2",
-            "ssri": "^8.0.1",
-            "tar": "^6.1.0"
-          }
-        },
-        "parse-conflict-json": {
-          "version": "1.1.1",
-          "bundled": true,
-          "requires": {
-            "json-parse-even-better-errors": "^2.3.0",
-            "just-diff": "^3.0.1",
-            "just-diff-apply": "^3.0.0"
-          }
-        },
-        "path-is-absolute": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "path-parse": {
-          "version": "1.0.7",
-          "bundled": true
-        },
-        "performance-now": {
-          "version": "2.1.0",
-          "bundled": true
-        },
-        "proc-log": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "process-nextick-args": {
-          "version": "2.0.1",
-          "bundled": true
-        },
-        "promise-all-reject-late": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "promise-call-limit": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "promise-inflight": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "promise-retry": {
-          "version": "2.0.1",
-          "bundled": true,
-          "requires": {
-            "err-code": "^2.0.2",
-            "retry": "^0.12.0"
-          }
-        },
-        "promzard": {
-          "version": "0.3.0",
-          "bundled": true,
-          "requires": {
-            "read": "1"
-          }
-        },
-        "psl": {
-          "version": "1.8.0",
-          "bundled": true
-        },
-        "punycode": {
-          "version": "2.1.1",
-          "bundled": true
-        },
-        "qrcode-terminal": {
-          "version": "0.12.0",
-          "bundled": true
-        },
-        "qs": {
-          "version": "6.5.2",
-          "bundled": true
-        },
-        "read": {
-          "version": "1.0.7",
-          "bundled": true,
-          "requires": {
-            "mute-stream": "~0.0.4"
-          }
-        },
-        "read-cmd-shim": {
-          "version": "2.0.0",
-          "bundled": true
-        },
-        "read-package-json": {
-          "version": "3.0.1",
-          "bundled": true,
-          "requires": {
-            "glob": "^7.1.1",
-            "json-parse-even-better-errors": "^2.3.0",
-            "normalize-package-data": "^3.0.0",
-            "npm-normalize-package-bin": "^1.0.0"
-          }
-        },
-        "read-package-json-fast": {
-          "version": "2.0.2",
-          "bundled": true,
-          "requires": {
-            "json-parse-even-better-errors": "^2.3.0",
-            "npm-normalize-package-bin": "^1.0.1"
-          }
-        },
-        "readable-stream": {
-          "version": "2.3.7",
-          "bundled": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "readdir-scoped-modules": {
-          "version": "1.1.0",
-          "bundled": true,
-          "requires": {
-            "debuglog": "^1.0.1",
-            "dezalgo": "^1.0.0",
-            "graceful-fs": "^4.1.2",
-            "once": "^1.3.0"
-          }
-        },
-        "request": {
-          "version": "2.88.2",
-          "bundled": true,
-          "requires": {
-            "aws-sign2": "~0.7.0",
-            "aws4": "^1.8.0",
-            "caseless": "~0.12.0",
-            "combined-stream": "~1.0.6",
-            "extend": "~3.0.2",
-            "forever-agent": "~0.6.1",
-            "form-data": "~2.3.2",
-            "har-validator": "~5.1.3",
-            "http-signature": "~1.2.0",
-            "is-typedarray": "~1.0.0",
-            "isstream": "~0.1.2",
-            "json-stringify-safe": "~5.0.1",
-            "mime-types": "~2.1.19",
-            "oauth-sign": "~0.9.0",
-            "performance-now": "^2.1.0",
-            "qs": "~6.5.2",
-            "safe-buffer": "^5.1.2",
-            "tough-cookie": "~2.5.0",
-            "tunnel-agent": "^0.6.0",
-            "uuid": "^3.3.2"
-          },
-          "dependencies": {
-            "form-data": {
-              "version": "2.3.3",
-              "bundled": true,
-              "requires": {
-                "asynckit": "^0.4.0",
-                "combined-stream": "^1.0.6",
-                "mime-types": "^2.1.12"
-              }
-            },
-            "tough-cookie": {
-              "version": "2.5.0",
-              "bundled": true,
-              "requires": {
-                "psl": "^1.1.28",
-                "punycode": "^2.1.1"
-              }
-            }
-          }
-        },
-        "resolve": {
-          "version": "1.20.0",
-          "bundled": true,
-          "requires": {
-            "is-core-module": "^2.2.0",
-            "path-parse": "^1.0.6"
-          }
-        },
-        "retry": {
-          "version": "0.12.0",
-          "bundled": true
-        },
-        "rimraf": {
-          "version": "3.0.2",
-          "bundled": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "bundled": true
-        },
-        "safer-buffer": {
-          "version": "2.1.2",
-          "bundled": true
-        },
-        "semver": {
-          "version": "7.3.5",
-          "bundled": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
-        "set-blocking": {
-          "version": "2.0.0",
-          "bundled": true
-        },
-        "signal-exit": {
-          "version": "3.0.3",
-          "bundled": true
-        },
-        "smart-buffer": {
-          "version": "4.1.0",
-          "bundled": true
-        },
-        "socks": {
-          "version": "2.6.1",
-          "bundled": true,
-          "requires": {
-            "ip": "^1.1.5",
-            "smart-buffer": "^4.1.0"
-          }
-        },
-        "socks-proxy-agent": {
-          "version": "5.0.0",
-          "bundled": true,
-          "requires": {
-            "agent-base": "6",
-            "debug": "4",
-            "socks": "^2.3.3"
-          }
-        },
-        "spdx-correct": {
-          "version": "3.1.1",
-          "bundled": true,
-          "requires": {
-            "spdx-expression-parse": "^3.0.0",
-            "spdx-license-ids": "^3.0.0"
-          }
-        },
-        "spdx-exceptions": {
-          "version": "2.3.0",
-          "bundled": true
-        },
-        "spdx-expression-parse": {
-          "version": "3.0.1",
-          "bundled": true,
-          "requires": {
-            "spdx-exceptions": "^2.1.0",
-            "spdx-license-ids": "^3.0.0"
-          }
-        },
-        "spdx-license-ids": {
-          "version": "3.0.9",
-          "bundled": true
-        },
-        "sshpk": {
-          "version": "1.16.1",
-          "bundled": true,
-          "requires": {
-            "asn1": "~0.2.3",
-            "assert-plus": "^1.0.0",
-            "bcrypt-pbkdf": "^1.0.0",
-            "dashdash": "^1.12.0",
-            "ecc-jsbn": "~0.1.1",
-            "getpass": "^0.1.1",
-            "jsbn": "~0.1.0",
-            "safer-buffer": "^2.0.2",
-            "tweetnacl": "~0.14.0"
-          }
-        },
-        "ssri": {
-          "version": "8.0.1",
-          "bundled": true,
-          "requires": {
-            "minipass": "^3.1.1"
-          }
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "bundled": true,
-          "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "3.0.0",
-              "bundled": true
-            },
-            "strip-ansi": {
-              "version": "4.0.0",
-              "bundled": true,
-              "requires": {
-                "ansi-regex": "^3.0.0"
-              }
-            }
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "bundled": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        },
-        "stringify-package": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "bundled": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "bundled": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "tar": {
-          "version": "6.1.0",
-          "bundled": true,
-          "requires": {
-            "chownr": "^2.0.0",
-            "fs-minipass": "^2.0.0",
-            "minipass": "^3.0.0",
-            "minizlib": "^2.1.1",
-            "mkdirp": "^1.0.3",
-            "yallist": "^4.0.0"
-          }
-        },
-        "text-table": {
-          "version": "0.2.0",
-          "bundled": true
-        },
-        "tiny-relative-date": {
-          "version": "1.3.0",
-          "bundled": true
-        },
-        "treeverse": {
-          "version": "1.0.4",
-          "bundled": true
-        },
-        "tunnel-agent": {
-          "version": "0.6.0",
-          "bundled": true,
-          "requires": {
-            "safe-buffer": "^5.0.1"
-          }
-        },
-        "tweetnacl": {
-          "version": "0.14.5",
-          "bundled": true
-        },
-        "typedarray-to-buffer": {
-          "version": "3.1.5",
-          "bundled": true,
-          "requires": {
-            "is-typedarray": "^1.0.0"
-          }
-        },
-        "unique-filename": {
-          "version": "1.1.1",
-          "bundled": true,
-          "requires": {
-            "unique-slug": "^2.0.0"
-          }
-        },
-        "unique-slug": {
-          "version": "2.0.2",
-          "bundled": true,
-          "requires": {
-            "imurmurhash": "^0.1.4"
-          }
-        },
-        "uri-js": {
-          "version": "4.4.1",
-          "bundled": true,
-          "requires": {
-            "punycode": "^2.1.0"
-          }
-        },
-        "util-deprecate": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "uuid": {
-          "version": "3.4.0",
-          "bundled": true
-        },
-        "validate-npm-package-license": {
-          "version": "3.0.4",
-          "bundled": true,
-          "requires": {
-            "spdx-correct": "^3.0.0",
-            "spdx-expression-parse": "^3.0.0"
-          }
-        },
-        "validate-npm-package-name": {
-          "version": "3.0.0",
-          "bundled": true,
-          "requires": {
-            "builtins": "^1.0.3"
-          }
-        },
-        "verror": {
-          "version": "1.10.0",
-          "bundled": true,
-          "requires": {
-            "assert-plus": "^1.0.0",
-            "core-util-is": "1.0.2",
-            "extsprintf": "^1.2.0"
-          }
-        },
-        "walk-up-path": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "wcwidth": {
-          "version": "1.0.1",
-          "bundled": true,
-          "requires": {
-            "defaults": "^1.0.3"
-          }
-        },
-        "which": {
-          "version": "2.0.2",
-          "bundled": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        },
-        "wide-align": {
-          "version": "1.1.3",
-          "bundled": true,
-          "requires": {
-            "string-width": "^1.0.2 || 2"
-          }
-        },
-        "wrappy": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "write-file-atomic": {
-          "version": "3.0.3",
-          "bundled": true,
-          "requires": {
-            "imurmurhash": "^0.1.4",
-            "is-typedarray": "^1.0.0",
-            "signal-exit": "^3.0.2",
-            "typedarray-to-buffer": "^3.1.5"
-          }
-        },
-        "yallist": {
-          "version": "4.0.0",
-          "bundled": true
-        }
-      }
-    },
     "npm-run-path": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
@@ -14359,14 +12321,6 @@
       "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.9.tgz",
       "integrity": "sha512-nQTTcUu+ATDbrSD1BZHr5kgSD4oF8OFjxun8uAaL8RwPBacGBNPf/yAuVVdx17N8XNzRDMrZ9XcKZHCjPW+9ew=="
     },
-    "react-form-with-constraints": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/react-form-with-constraints/-/react-form-with-constraints-0.18.0.tgz",
-      "integrity": "sha512-JPbechD+g500rhe2ixNGM2+Lez9YgAmVj+D+H1IUyXY2qCUqohMx48QlZEO1fZXJyl9Fkx/ibpzE4C0xZqYjQw==",
-      "requires": {
-        "prop-types": ">=15.7.2"
-      }
-    },
     "react-is": {
       "version": "16.13.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
@@ -14600,15 +12554,6 @@
         "minimatch": "3.0.4"
       }
     },
-    "redent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
-      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
-      "requires": {
-        "indent-string": "^4.0.0",
-        "strip-indent": "^3.0.0"
-      }
-    },
     "regenerate": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
@@ -16179,14 +14124,6 @@
       "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
       "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="
     },
-    "strip-indent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
-      "requires": {
-        "min-indent": "^1.0.0"
-      }
-    },
     "strip-json-comments": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -17352,11 +15289,6 @@
         "minimalistic-assert": "^1.0.0"
       }
     },
-    "web-vitals": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/web-vitals/-/web-vitals-1.1.2.tgz",
-      "integrity": "sha512-PFMKIY+bRSXlMxVAQ+m2aw9c/ioUYfDgrYot0YUa+/xa0sakubWhSDyxAKwzymvXVdF4CZI71g06W+mqhzu6ig=="
-    },
     "webidl-conversions": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index 4a7d640..e8ad209 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -5,18 +5,11 @@
   "dependencies": {
     "@behametrics/logger-web": "^3.1.1",
     "@fortawesome/fontawesome-free": "^5.15.3",
-    "@react-hook/mouse-position": "^4.1.0",
-    "@testing-library/jest-dom": "^5.14.1",
-    "@testing-library/react": "^11.2.7",
-    "@testing-library/user-event": "^12.8.3",
-    "npm": "^7.19.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-form-with-constraints": "^0.18.0",
     "react-router-dom": "^5.2.0",
     "react-scripts": "4.0.3",
-    "react-token-auth": "^1.1.8",
-    "web-vitals": "^1.1.2"
+    "react-token-auth": "^1.1.8"
   },
   "scripts": {
     "start": "react-scripts start",

From d055e693aa29a86bbf555d984bd1a92c499f92c8 Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Wed, 21 Jul 2021 04:33:52 +0200
Subject: [PATCH 02/47] Refactored some things in the frontend

- use button insted of inputfield
- make use of conditional rendering
---
 frontend/src/components/Button.css     |   7 ++
 frontend/src/components/Button.js      |   2 +-
 frontend/src/components/pages/Study.js | 108 ++++++++++++++++---------
 3 files changed, 80 insertions(+), 37 deletions(-)

diff --git a/frontend/src/components/Button.css b/frontend/src/components/Button.css
index cbd63e3..19143fe 100644
--- a/frontend/src/components/Button.css
+++ b/frontend/src/components/Button.css
@@ -31,6 +31,12 @@
   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;
@@ -38,3 +44,4 @@
   color: var(--secondary);
   transition: 250ms;
 }
+
diff --git a/frontend/src/components/Button.js b/frontend/src/components/Button.js
index 2353f06..a43e24c 100644
--- a/frontend/src/components/Button.js
+++ b/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"];
+const SIZES = ["btn--medium", "btn--large", "btn--full"];
 export const Button = ({
   children,
   type,
diff --git a/frontend/src/components/pages/Study.js b/frontend/src/components/pages/Study.js
index a6bbeab..94d825d 100644
--- a/frontend/src/components/pages/Study.js
+++ b/frontend/src/components/pages/Study.js
@@ -6,6 +6,7 @@ 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 = "";
@@ -18,6 +19,16 @@ 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"],
@@ -51,6 +62,13 @@ 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 = {
@@ -75,47 +93,65 @@ 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>
-        <BehaviorStudyInfo />{" "}
-        <form id="behaviorNormal" action="#">
-          <SubmitField
-            LabelName="Starten mit der Studie"
-            InputValue="next-situation"
-            InputName="Weiter"
-            onClick={handleLoggerOn}
-          />
-        </form>{" "}
-        <BehaviorNormal />
-        <form id="behaviorNormal" action="#">
-          <InputField
-            LabelName="Benutzername"
-            onChange={handleUsernameChange}
-            InputType="text"
-            InputName="Benutzername"
-            InputPlaceHolder="Benutzername"
-            onPaste={handleOnPasteEvent}
-          />
-          <InputField
-            LabelName="Passwort"
-            onChange={handlePasswordChange}
-            InputType="password"
-            InputName="Passwort"
-            InputPlaceHolder="Benutzername"
-            onPaste={handleOnPasteEvent}
-          />
-          <SubmitField
-            LabelNa
-            me="Weiter zur nächsten Situation"
-            InputValue="next-situation"
-            InputName="Weiter"
-            onClick={onSubmitClick}
-          />
-        </form>
-        <button onClick={handleLoggerOff}>STOP THAT FUCKING LOGGER</button>
+        {isStepStart ? (
+          <>
+            <BehaviorStudyInfo />
+            <Button
+              className="btns"
+              buttonStyle="btn--primary"
+              buttonSize="btn--full"
+              onClick={handleIsStepStart}
+              newTo="study"
+            >
+              Starten mit der Studie
+            </Button>
+          </>
+        ) : null}
+        {isStepNormal ? (
+          <>
+            <BehaviorNormal />
+            <form id="behaviorNormal">
+              <InputField
+                LabelName="Benutzername"
+                onChange={handleUsernameChange}
+                InputType="text"
+                InputName="Benutzername"
+                InputPlaceHolder="Benutzername"
+                onPaste={handleOnPasteEvent}
+              />
+              <InputField
+                LabelName="Passwort"
+                onChange={handlePasswordChange}
+                InputType="password"
+                InputName="Passwort"
+                InputPlaceHolder="Benutzername"
+                onPaste={handleOnPasteEvent}
+              />
+              <SubmitField
+                LabelName="Weiter zur nächsten Situation"
+                InputValue="next-situation"
+                InputName="Weiter"
+                onClick={onSubmitClick}
+              />
+            </form>
+          </>
+        ) : null}
       </div>
       <Footer />
     </>

From c5788a00d20bb8f319d6925a83ca5524e808f56e Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Wed, 21 Jul 2021 21:33:16 +0200
Subject: [PATCH 03/47] Forceupdate things

---
 frontend/src/components/pages/Study.js | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/pages/Study.js b/frontend/src/components/pages/Study.js
index 94d825d..7e860bb 100644
--- a/frontend/src/components/pages/Study.js
+++ b/frontend/src/components/pages/Study.js
@@ -1,4 +1,4 @@
-import React, { useEffect } from "react";
+import React, { useEffect, useState } from "react";
 import "../../App.css";
 import Footer from "../../Footer";
 import InputField from "../InputField";
@@ -8,6 +8,12 @@ import BehaviorStudyInfo from "../BehaviorStudyInfo";
 import BehaviorNormal from "../BehaviorNormal";
 import { Button } from "../Button";
 
+//create your forceUpdate hook
+function useForceUpdate() {
+  const [value, setValue] = useState(0)
+  return () => setValue(value => value  +1)
+}
+
 export default function Study() {
   let username = "";
   const setUsername = (tmp_username) => {
@@ -29,6 +35,8 @@ export default function Study() {
     isStepNormal = tmp;
   };
 
+  const forceUpdate = useForceUpdate();
+
   let logger = new Logger({
     //inputs: ["cursor", "wheel", "keyboard", "touch"],
     inputs: ["keyboard"],
@@ -64,11 +72,13 @@ export default function Study() {
 
   const handleIsStepStart = () => {
     setIsStepStart(false);
-    console.log("isStepStar", isStepStart)
+    console.log("isStepStar", isStepStart);
     setIsStepNormal(true);
-    console.log("isStepStar", isStepNormal)
+    console.log("isStepNormal", isStepNormal);
+    forceUpdate();
   };
 
+
   const onSubmitClick = (e) => {
     e.preventDefault();
     let opts = {
@@ -152,6 +162,7 @@ export default function Study() {
             </form>
           </>
         ) : null}
+        <button onClick={handleLoggerOff}>LOGGER STOPPEN</button>
       </div>
       <Footer />
     </>

From cf481d42e162617dcd21cf548e2952f28a02115a Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Wed, 21 Jul 2021 21:53:57 +0200
Subject: [PATCH 04/47] Refactoring..

---
 frontend/src/components/pages/Study.js | 48 ++++++++++----------------
 1 file changed, 19 insertions(+), 29 deletions(-)

diff --git a/frontend/src/components/pages/Study.js b/frontend/src/components/pages/Study.js
index 7e860bb..43831e4 100644
--- a/frontend/src/components/pages/Study.js
+++ b/frontend/src/components/pages/Study.js
@@ -8,13 +8,21 @@ import BehaviorStudyInfo from "../BehaviorStudyInfo";
 import BehaviorNormal from "../BehaviorNormal";
 import { Button } from "../Button";
 
-//create your forceUpdate hook
-function useForceUpdate() {
-  const [value, setValue] = useState(0)
-  return () => setValue(value => value  +1)
-}
-
 export default function Study() {
+
+  var [logger, setLogger] = useState();
+
+  useEffect(() => {
+    logger = new Logger({
+      //inputs: ["cursor", "wheel", "keyboard", "touch"],
+      inputs: ["keyboard"],
+      // apiUrl: "https://behavior.marcocamenzind.ch",
+      apiUrl: "http://localhost:5000",
+      logToConsole: true,
+    });
+    logger.init();
+  }, []);
+
   let username = "";
   const setUsername = (tmp_username) => {
     username = tmp_username;
@@ -25,6 +33,7 @@ export default function Study() {
     password = tmp_password;
   };
 
+  /*
   let isStepStart = true;
   const setIsStepStart = (tmp) => {
     isStepStart = tmp;
@@ -34,18 +43,11 @@ export default function Study() {
   const setIsStepNormal = (tmp) => {
     isStepNormal = tmp;
   };
+  */
 
-  const forceUpdate = useForceUpdate();
+  const [isStepStart, setIsStepStart] = useState(true);
+  const [isStepNormal, setIsStepNormal] = useState(false);
 
-  let logger = new Logger({
-    //inputs: ["cursor", "wheel", "keyboard", "touch"],
-    inputs: ["keyboard"],
-    // apiUrl: "https://behavior.marcocamenzind.ch",
-    apiUrl: "http://localhost:5000",
-    logToConsole: true,
-  });
-
-  logger.init();
 
   const handleLoggerOff = () => {
     logger.stop();
@@ -75,10 +77,9 @@ export default function Study() {
     console.log("isStepStar", isStepStart);
     setIsStepNormal(true);
     console.log("isStepNormal", isStepNormal);
-    forceUpdate();
+    // forceUpdate();
   };
 
-
   const onSubmitClick = (e) => {
     e.preventDefault();
     let opts = {
@@ -103,17 +104,6 @@ export default function Study() {
     });
   };
 
-  /*
-  useEffect(() => {
-    if (isStepStart) {
-      handleIsStepStart();
-      console.log("useEffect; normal");
-    } else if (isStepNormal) {
-      console.log("useEffect; normal");
-    }
-  });
-  */
-
   return (
     <>
       <div className="sitePage">

From 65fcf8e4ab81be56e3a1add339790430a5f39cf0 Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Wed, 21 Jul 2021 22:04:23 +0200
Subject: [PATCH 05/47] Working things

---
 frontend/src/components/pages/Study.js | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/frontend/src/components/pages/Study.js b/frontend/src/components/pages/Study.js
index 43831e4..981495f 100644
--- a/frontend/src/components/pages/Study.js
+++ b/frontend/src/components/pages/Study.js
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useRef, useState } from "react";
 import "../../App.css";
 import Footer from "../../Footer";
 import InputField from "../InputField";
@@ -9,18 +9,17 @@ import BehaviorNormal from "../BehaviorNormal";
 import { Button } from "../Button";
 
 export default function Study() {
-
-  var [logger, setLogger] = useState();
+  const _logger = useRef(0);
 
   useEffect(() => {
-    logger = new Logger({
+    _logger.current = new Logger({
       //inputs: ["cursor", "wheel", "keyboard", "touch"],
       inputs: ["keyboard"],
       // apiUrl: "https://behavior.marcocamenzind.ch",
       apiUrl: "http://localhost:5000",
       logToConsole: true,
     });
-    logger.init();
+    _logger.current.init();
   }, []);
 
   let username = "";
@@ -33,29 +32,16 @@ export default function Study() {
     password = tmp_password;
   };
 
-  /*
-  let isStepStart = true;
-  const setIsStepStart = (tmp) => {
-    isStepStart = tmp;
-  };
-
-  let isStepNormal = false;
-  const setIsStepNormal = (tmp) => {
-    isStepNormal = tmp;
-  };
-  */
-
   const [isStepStart, setIsStepStart] = useState(true);
   const [isStepNormal, setIsStepNormal] = useState(false);
 
-
   const handleLoggerOff = () => {
-    logger.stop();
+    _logger.current.stop();
     console.log("Logger ausgeschaltet");
   };
 
   const handleLoggerOn = () => {
-    logger.start();
+    _logger.current.start();
     console.log("start logging ");
   };
 

From 146b018ad1f08b451d4c2b8729ee2676e94e5776 Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Wed, 21 Jul 2021 22:38:31 +0200
Subject: [PATCH 06/47] Start logger when starting survey

---
 frontend/src/components/pages/Study.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/components/pages/Study.js b/frontend/src/components/pages/Study.js
index 981495f..f7b75d5 100644
--- a/frontend/src/components/pages/Study.js
+++ b/frontend/src/components/pages/Study.js
@@ -63,6 +63,7 @@ export default function Study() {
     console.log("isStepStar", isStepStart);
     setIsStepNormal(true);
     console.log("isStepNormal", isStepNormal);
+    handleLoggerOn();
     // forceUpdate();
   };
 

From 1553f92adf9cf167286b7d6b7ea162c448500f1e Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Wed, 21 Jul 2021 23:41:10 +0200
Subject: [PATCH 07/47] Added multiple situations so the survey is more
 complete

---
 frontend/src/components/BehaviorPhone.js    |  17 ++
 frontend/src/components/BehaviorStanding.js |  14 ++
 frontend/src/components/pages/Study.js      | 182 ++++++++++++++------
 3 files changed, 165 insertions(+), 48 deletions(-)
 create mode 100644 frontend/src/components/BehaviorPhone.js
 create mode 100644 frontend/src/components/BehaviorStanding.js

diff --git a/frontend/src/components/BehaviorPhone.js b/frontend/src/components/BehaviorPhone.js
new file mode 100644
index 0000000..9a6787e
--- /dev/null
+++ b/frontend/src/components/BehaviorPhone.js
@@ -0,0 +1,17 @@
+import React from "react";
+import "../App.css";
+import GeneratedPassword from "./GeneratedPassword";
+
+export default function BehaviorPhone() {
+  return (
+    <>
+      <p>
+        Im nächsten Schritt geht es darum, dass Sie während der Passworteingabe
+        telefonieren. Nehmen Sie hierzu Ihr Smartphone oder Telefon und stellen
+        Sie sich vor, dass Sie gerade am Telefonieren sind. Verwenden Sie bitte
+        kein Headset oder Ähnliches.
+      </p>
+      <GeneratedPassword />
+    </>
+  );
+}
diff --git a/frontend/src/components/BehaviorStanding.js b/frontend/src/components/BehaviorStanding.js
new file mode 100644
index 0000000..479b59b
--- /dev/null
+++ b/frontend/src/components/BehaviorStanding.js
@@ -0,0 +1,14 @@
+import React from "react";
+import "../App.css";
+import GeneratedPassword from "./GeneratedPassword"
+
+export default function BehaviorStanding() {
+  return (
+    <>
+      <p>
+        In dieser Situation geht es darum, dass Sie das Passwort im Stehen eingeben. Stehen Sie also vor den Computer und geben Sie den Benutzernamen und das Passwort wie gewohnt ein.
+      </p>
+      <GeneratedPassword />
+    </>
+  );
+}
diff --git a/frontend/src/components/pages/Study.js b/frontend/src/components/pages/Study.js
index f7b75d5..9378c54 100644
--- a/frontend/src/components/pages/Study.js
+++ b/frontend/src/components/pages/Study.js
@@ -7,6 +7,8 @@ import { Logger } from "@behametrics/logger-web";
 import BehaviorStudyInfo from "../BehaviorStudyInfo";
 import BehaviorNormal from "../BehaviorNormal";
 import { Button } from "../Button";
+import BehaviorPhone from "../BehaviorPhone";
+import BehaviorStanding from "../BehaviorStanding";
 
 export default function Study() {
   const _logger = useRef(0);
@@ -34,6 +36,9 @@ export default function Study() {
 
   const [isStepStart, setIsStepStart] = useState(true);
   const [isStepNormal, setIsStepNormal] = useState(false);
+  const [isStepPhone, setIsStepPhone] = useState(false);
+  const [isStepStanding, setIsStepStanding] = useState(false);
+  const [isStepEnd, setIsStepEnd] = useState(false);
 
   const handleLoggerOff = () => {
     _logger.current.stop();
@@ -58,15 +63,29 @@ export default function Study() {
     return false;
   };
 
-  const handleIsStepStart = () => {
+  const handleClickAtStepStart = () => {
     setIsStepStart(false);
-    console.log("isStepStar", isStepStart);
     setIsStepNormal(true);
-    console.log("isStepNormal", isStepNormal);
     handleLoggerOn();
     // forceUpdate();
   };
 
+  const handleClickAtStepNormal = () => {
+    setIsStepNormal(false);
+    setIsStepPhone(true);
+  };
+
+  const handleClickAtStepPhone = () => {
+    setIsStepPhone(false);
+    setIsStepStanding(true);
+  };
+
+  const handleClickAtStepStanding = () => {
+    setIsStepStanding(false);
+    setIsStepEnd(true);
+    handleLoggerOff();
+  };
+
   const onSubmitClick = (e) => {
     e.preventDefault();
     let opts = {
@@ -91,55 +110,122 @@ export default function Study() {
     });
   };
 
+  const study_start = (
+    <>
+      <BehaviorStudyInfo />
+      <Button
+        className="btns"
+        buttonStyle="btn--primary"
+        buttonSize="btn--full"
+        onClick={handleClickAtStepStart}
+        newTo="study"
+      >
+        Starten mit der Studie
+      </Button>
+    </>
+  );
+
+  const study_normal = (
+    <>
+      <BehaviorNormal />
+      <form id="behaviorNormal">
+        <InputField
+          LabelName="Benutzername"
+          onChange={handleUsernameChange}
+          InputType="text"
+          InputName="Benutzername"
+          InputPlaceHolder="Benutzername"
+          onPaste={handleOnPasteEvent}
+        />
+        <InputField
+          LabelName="Passwort"
+          onChange={handlePasswordChange}
+          InputType="password"
+          InputName="Passwort"
+          InputPlaceHolder="Benutzername"
+          onPaste={handleOnPasteEvent}
+        />
+        <SubmitField
+          LabelName="Weiter zur nächsten Situation"
+          InputValue="next-situation"
+          InputName="Weiter"
+          onClick={handleClickAtStepNormal}
+        />
+      </form>
+    </>
+  );
+
+  const study_phone = (
+    <>
+      <BehaviorPhone />
+      <form id="behaviorPhone">
+        <InputField
+          LabelName="Benutzername"
+          onChange={handleUsernameChange}
+          InputType="text"
+          InputName="Benutzername"
+          InputPlaceHolder="Benutzername"
+          onPaste={handleOnPasteEvent}
+        />
+        <InputField
+          LabelName="Passwort"
+          onChange={handlePasswordChange}
+          InputType="password"
+          InputName="Passwort"
+          InputPlaceHolder="Benutzername"
+          onPaste={handleOnPasteEvent}
+        />
+        <SubmitField
+          LabelName="Weiter zur nächsten Situation"
+          InputValue="next-situation"
+          InputName="Weiter"
+          onClick={handleClickAtStepPhone}
+        />
+      </form>
+    </>
+  );
+
+  const study_standing = (
+    <>
+      <BehaviorStanding />
+      <form id="behaviorPhone">
+        <InputField
+          LabelName="Benutzername"
+          onChange={handleUsernameChange}
+          InputType="text"
+          InputName="Benutzername"
+          InputPlaceHolder="Benutzername"
+          onPaste={handleOnPasteEvent}
+        />
+        <InputField
+          LabelName="Passwort"
+          onChange={handlePasswordChange}
+          InputType="password"
+          InputName="Passwort"
+          InputPlaceHolder="Benutzername"
+          onPaste={handleOnPasteEvent}
+        />
+        <SubmitField
+          LabelName="Studie beenden"
+          InputValue="stopStudy"
+          InputName="quit"
+          onClick={handleClickAtStepStanding}
+        />
+      </form>
+    </>
+  );
+
+  const study_end = <p>Merci :-)</p>;
+
   return (
     <>
       <div className="sitePage">
         <h1>Studie</h1>
-        <button onClick={handleLoggerOn}>LOGGER StaRTEN</button>
-        {isStepStart ? (
-          <>
-            <BehaviorStudyInfo />
-            <Button
-              className="btns"
-              buttonStyle="btn--primary"
-              buttonSize="btn--full"
-              onClick={handleIsStepStart}
-              newTo="study"
-            >
-              Starten mit der Studie
-            </Button>
-          </>
-        ) : null}
-        {isStepNormal ? (
-          <>
-            <BehaviorNormal />
-            <form id="behaviorNormal">
-              <InputField
-                LabelName="Benutzername"
-                onChange={handleUsernameChange}
-                InputType="text"
-                InputName="Benutzername"
-                InputPlaceHolder="Benutzername"
-                onPaste={handleOnPasteEvent}
-              />
-              <InputField
-                LabelName="Passwort"
-                onChange={handlePasswordChange}
-                InputType="password"
-                InputName="Passwort"
-                InputPlaceHolder="Benutzername"
-                onPaste={handleOnPasteEvent}
-              />
-              <SubmitField
-                LabelName="Weiter zur nächsten Situation"
-                InputValue="next-situation"
-                InputName="Weiter"
-                onClick={onSubmitClick}
-              />
-            </form>
-          </>
-        ) : null}
-        <button onClick={handleLoggerOff}>LOGGER STOPPEN</button>
+        {isStepStart ? study_start : null}
+        {isStepNormal ? study_normal : null}
+        {isStepPhone ? study_phone : null}
+        {isStepStanding ? study_standing : null}
+        {isStepEnd ? study_end : null}
       </div>
       <Footer />
     </>

From f00bc1999459e021ea265a32a353e647af7040a7 Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Thu, 22 Jul 2021 00:02:57 +0200
Subject: [PATCH 08/47] Add special character and numbers inside the password

---
 backend/src/password_util.py | 89 +++++++++++++++++++++++++++++-------
 1 file changed, 73 insertions(+), 16 deletions(-)

diff --git a/backend/src/password_util.py b/backend/src/password_util.py
index 189488c..8146a93 100644
--- a/backend/src/password_util.py
+++ b/backend/src/password_util.py
@@ -23,6 +23,15 @@ def get_random_password():
     ]
 
     second_part = [
+        "%",
+        "(",
+        ")",
+        "$",
+        "+",
+        "!",
+    ]
+
+    third_part = [
         "frisst",
         "küsst",
         "begrüsst",
@@ -33,28 +42,76 @@ def get_random_password():
         "vergisst",
     ]
 
-    third_part = [
-        "den Vogel",
-        "die Mücke",
-        "den Adler",
-        "den Apfel",
-        "die Birne",
-        "die Biene",
-        "eine Gurke",
-    ]
-
     forth_part = [
-        "auf der Terasse.",
-        "auf der Wiese.",
-        "im Garten.",
-        "in der Kühltruhe.",
-        "auf dem Balkon.",
+        "1 Vogel!",
+        "2 Vögel!",
+        "3 Vögel!",
+        "4 Vögel!",
+        "5 Vögel!",
+        "6 Vögel!",
+        "7 Vögel!",
+        "8 Vögel!",
+        "9 Vögel!",
+        "1 Mücke",
+        "2 Mücken!",
+        "3 Mücken!",
+        "4 Mücken!",
+        "5 Mücken!",
+        "6 Mücken!",
+        "7 Mücken!",
+        "8 Mücken!",
+        "9 Mücken!",
+        "1 Adler",
+        "2 Adler!",
+        "3 Adler!",
+        "4 Adler!",
+        "5 Adler!",
+        "6 Adler!",
+        "7 Adler!",
+        "8 Adler!",
+        "9 Adler!",
+        "1 Apfel",
+        "2 Äpfel!",
+        "3 Äpfel!",
+        "4 Äpfel!",
+        "5 Äpfel!",
+        "6 Äpfel!",
+        "7 Äpfel!",
+        "8 Äpfel!",
+        "9 Äpfel!",
+        "1 Birne",
+        "2 Birnen!",
+        "3 Birnen!",
+        "4 Birnen!",
+        "5 Birnen!",
+        "6 Birnen!",
+        "7 Birnen!",
+        "8 Birnen!",
+        "9 Birnen!",
+        "1 Biene",
+        "2 Bienen!",
+        "3 Bienen!",
+        "4 Bienen!",
+        "5 Bienen!",
+        "6 Bienen!",
+        "7 Bienen!",
+        "8 Bienen!",
+        "9 Bienen!",
+        "1 Gurke",
+        "2 Gurken!",
+        "3 Gurken!",
+        "4 Gurken!",
+        "5 Gurken!",
+        "6 Gurken!",
+        "7 Gurken!",
+        "8 Gurken!",
+        "9 Gurken!",
     ]
 
     password = ""
     password += str(first_part[get_random_value(len(first_part)-1)])
     password += " " + str(second_part[get_random_value(len(second_part)-1)])
     password += " " + str(third_part[get_random_value(len(third_part)-1)])
-    # password += " " + str(forth_part[get_random_value(len(forth_part)-1)])
+    password += " " + str(forth_part[get_random_value(len(forth_part)-1)])
 
     return password

From 117e63e189115191b3e80824e59b3f14a19d85c3 Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Thu, 22 Jul 2021 02:26:06 +0200
Subject: [PATCH 09/47] Added requests script to not enter all the things
 always

---
 requests.sh | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 requests.sh

diff --git a/requests.sh b/requests.sh
new file mode 100644
index 0000000..7836c04
--- /dev/null
+++ b/requests.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+ARG=$1
+ACTIONS=(login register rcvpw username)
+
+print_help(){
+   echo "usage: $0 [action]"
+   echo "available actions:"
+   for el in ${ACTIONS[@]}; do
+       echo - $el
+   done
+   exit 1
+}
+
+if [[ -z $1 ]]; then
+    print_help
+fi
+
+
+case $ARG in 
+    "${ACTIONS[0]}")
+        echo "login action"
+        curl localhost:5050/api/login -X POST -d '{"username":"test","password":"test"}'
+        ;;
+    "${ACTIONS[1]}")
+        echo "register action"
+        curl localhost:5050/api/register -X POST -d '{"username":"test","password":"test"}'
+        ;;
+    "${ACTIONS[2]}")
+        echo "rcv_pw action"
+        ;;
+    *)
+        echo "Action not available"
+        print_help
+        ;;
+esac

From fbbdbd43326925e69445080e82f38c8edc6e8dbf Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Thu, 22 Jul 2021 02:37:04 +0200
Subject: [PATCH 10/47] Updated requests script

---
 requests.sh | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/requests.sh b/requests.sh
index 7836c04..ee90262 100644
--- a/requests.sh
+++ b/requests.sh
@@ -1,15 +1,17 @@
 #!/bin/bash
 
-ARG=$1
+ACTION=$1
+TOKEN=$2
 ACTIONS=(login register rcvpw username)
 
 print_help(){
-   echo "usage: $0 [action]"
-   echo "available actions:"
-   for el in ${ACTIONS[@]}; do
-       echo - $el
-   done
-   exit 1
+    echo "Usage: $0 ACTION [TOKEN]"
+    echo
+    echo "available actions:"
+    for el in "${ACTIONS[@]}"; do
+       echo - "$el"
+    done
+    exit 1
 }
 
 if [[ -z $1 ]]; then
@@ -17,20 +19,26 @@ if [[ -z $1 ]]; then
 fi
 
 
-case $ARG in 
-    "${ACTIONS[0]}")
+case $ACTION in 
+    "${ACTIONS[0]}") # login
         echo "login action"
         curl localhost:5050/api/login -X POST -d '{"username":"test","password":"test"}'
         ;;
-    "${ACTIONS[1]}")
+    "${ACTIONS[1]}") # register
         echo "register action"
         curl localhost:5050/api/register -X POST -d '{"username":"test","password":"test"}'
         ;;
-    "${ACTIONS[2]}")
+    "${ACTIONS[2]}") # reveice password
         echo "rcv_pw action"
+        curl localhost:5050/api/protected/rcv_pw
+        ;;
+    "${ACTIONS[3]}") # get current username
+        echo "get username action"
+        curl localhost:5050/api/username -X GET -H "Authorization: Bearer $TOKEN"
         ;;
     *)
-        echo "Action not available"
+        echo "Error: Action not available"
+        echo 
         print_help
         ;;
 esac

From 959912bd9b0eaac3b59d75a1024766be5aff4aca Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Thu, 22 Jul 2021 02:40:17 +0200
Subject: [PATCH 11/47] Refactored so that the studyEnd also has its own
 component

---
 frontend/src/components/BehaviorStudyEnd.js | 12 ++++++++++++
 frontend/src/components/pages/Study.js      |  3 ++-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 frontend/src/components/BehaviorStudyEnd.js

diff --git a/frontend/src/components/BehaviorStudyEnd.js b/frontend/src/components/BehaviorStudyEnd.js
new file mode 100644
index 0000000..e19c613
--- /dev/null
+++ b/frontend/src/components/BehaviorStudyEnd.js
@@ -0,0 +1,12 @@
+import React from "react";
+import "../App.css";
+
+export default function BehaviorStudyEnd() {
+  return (
+    <>
+      <p>
+        Merci :-)
+      </p>
+    </>
+  );
+}
diff --git a/frontend/src/components/pages/Study.js b/frontend/src/components/pages/Study.js
index 9378c54..4d73609 100644
--- a/frontend/src/components/pages/Study.js
+++ b/frontend/src/components/pages/Study.js
@@ -9,6 +9,7 @@ import BehaviorNormal from "../BehaviorNormal";
 import { Button } from "../Button";
 import BehaviorPhone from "../BehaviorPhone";
 import BehaviorStanding from "../BehaviorStanding";
+import BehaviorStudyEnd from "../BehaviorStudyEnd";
 
 export default function Study() {
   const _logger = useRef(0);
@@ -215,7 +216,7 @@ export default function Study() {
     </>
   );
 
-  const study_end = <p>Merci :-)</p>;
+  const study_end = <BehaviorStudyEnd />;
 
   return (
     <>

From e7407fd40b6ba754a84d53958c2957d5927a7012 Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Thu, 22 Jul 2021 02:40:58 +0200
Subject: [PATCH 12/47] Refactoring and removing unused things

---
 backend/src/app.py                     |  1 -
 frontend/src/components/pages/Study.js | 27 +-------------------------
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/backend/src/app.py b/backend/src/app.py
index 6d9b201..62be6d7 100644
--- a/backend/src/app.py
+++ b/backend/src/app.py
@@ -134,7 +134,6 @@ def protected():
 
 
 @app.route('/api/protected/rcv_pw', methods=['GET'])
-# @flask_praetorian.auth_required
 def get_password():
     pw = get_random_password()
     ret = {'password': pw}
diff --git a/frontend/src/components/pages/Study.js b/frontend/src/components/pages/Study.js
index 4d73609..c5247c9 100644
--- a/frontend/src/components/pages/Study.js
+++ b/frontend/src/components/pages/Study.js
@@ -68,7 +68,6 @@ export default function Study() {
     setIsStepStart(false);
     setIsStepNormal(true);
     handleLoggerOn();
-    // forceUpdate();
   };
 
   const handleClickAtStepNormal = () => {
@@ -87,30 +86,6 @@ export default function Study() {
     handleLoggerOff();
   };
 
-  const onSubmitClick = (e) => {
-    e.preventDefault();
-    let opts = {
-      username: username,
-      password: password,
-    };
-    fetch("/api/protected/behavior", {
-      method: "post",
-      body: JSON.stringify(opts),
-    }).then((response) => {
-      console.log(response.status);
-      if (response.status === 401) {
-        response.json().then((resp) => {
-          console.log("nicht so wirklich gut");
-          // setErrorMessage(resp.message);
-        });
-      } else {
-        response.json().then((token) => {
-          console.log("Alles gut :-)");
-        });
-      }
-    });
-  };
-
   const study_start = (
     <>
       <BehaviorStudyInfo />
@@ -189,7 +164,7 @@ export default function Study() {
   const study_standing = (
     <>
       <BehaviorStanding />
-      <form id="behaviorPhone">
+      <form id="behaviorStanding">
         <InputField
           LabelName="Benutzername"
           onChange={handleUsernameChange}

From 770e3e0285f5d6ccec7ea2eafd966511a7da3ed7 Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Thu, 22 Jul 2021 02:41:24 +0200
Subject: [PATCH 13/47] Started implementing username and password check

---
 backend/src/app.py                     |  8 ++++++++
 frontend/src/components/pages/Study.js | 13 +++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/backend/src/app.py b/backend/src/app.py
index 62be6d7..700dd2b 100644
--- a/backend/src/app.py
+++ b/backend/src/app.py
@@ -119,6 +119,14 @@ def refresh():
     return ret, 200
 
 
+@app.route('/api/username', methods=['GET'])
+@flask_praetorian.auth_required
+def get_username():
+    user = flask_praetorian.current_user().username
+    ret = {'username': user}
+    return user, 200
+
+
 @app.route('/api/protected')
 @flask_praetorian.auth_required
 def protected():
diff --git a/frontend/src/components/pages/Study.js b/frontend/src/components/pages/Study.js
index c5247c9..2f7b689 100644
--- a/frontend/src/components/pages/Study.js
+++ b/frontend/src/components/pages/Study.js
@@ -13,6 +13,7 @@ import BehaviorStudyEnd from "../BehaviorStudyEnd";
 
 export default function Study() {
   const _logger = useRef(0);
+  const [serverUsername, setServerUsername] = useState("");
 
   useEffect(() => {
     _logger.current = new Logger({
@@ -23,6 +24,13 @@ export default function Study() {
       logToConsole: true,
     });
     _logger.current.init();
+    fetch("/api/username", {
+      method: "get",
+    }).then((response) => {
+      response.json().then((resp) => {
+        setServerUsername(username);
+      });
+    });
   }, []);
 
   let username = "";
@@ -64,6 +72,10 @@ export default function Study() {
     return false;
   };
 
+  const checkValuesStudy = () => {
+    console.log(serverUsername);
+  };
+
   const handleClickAtStepStart = () => {
     setIsStepStart(false);
     setIsStepNormal(true);
@@ -71,6 +83,7 @@ export default function Study() {
   };
 
   const handleClickAtStepNormal = () => {
+    checkValuesStudy();
     setIsStepNormal(false);
     setIsStepPhone(true);
   };

From 130088756d9921bce04028136d46fdacbdca273b Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Thu, 22 Jul 2021 03:11:28 +0200
Subject: [PATCH 14/47] Check if username is the same as in the current session

---
 backend/src/app.py                     |  6 +++---
 frontend/src/components/pages/Study.js | 26 ++++++++++++++++++++------
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/backend/src/app.py b/backend/src/app.py
index 700dd2b..8f49861 100644
--- a/backend/src/app.py
+++ b/backend/src/app.py
@@ -122,9 +122,9 @@ def refresh():
 @app.route('/api/username', methods=['GET'])
 @flask_praetorian.auth_required
 def get_username():
-    user = flask_praetorian.current_user().username
-    ret = {'username': user}
-    return user, 200
+    username = flask_praetorian.current_user().username
+    ret = {'username': username}
+    return ret, 200
 
 
 @app.route('/api/protected')
diff --git a/frontend/src/components/pages/Study.js b/frontend/src/components/pages/Study.js
index 2f7b689..7e849d1 100644
--- a/frontend/src/components/pages/Study.js
+++ b/frontend/src/components/pages/Study.js
@@ -4,12 +4,13 @@ import Footer from "../../Footer";
 import InputField from "../InputField";
 import SubmitField from "../SubmitField";
 import { Logger } from "@behametrics/logger-web";
+import { Button } from "../Button";
 import BehaviorStudyInfo from "../BehaviorStudyInfo";
 import BehaviorNormal from "../BehaviorNormal";
-import { Button } from "../Button";
 import BehaviorPhone from "../BehaviorPhone";
 import BehaviorStanding from "../BehaviorStanding";
 import BehaviorStudyEnd from "../BehaviorStudyEnd";
+import { authFetch } from "../../auth/AuthProvider";
 
 export default function Study() {
   const _logger = useRef(0);
@@ -24,11 +25,11 @@ export default function Study() {
       logToConsole: true,
     });
     _logger.current.init();
-    fetch("/api/username", {
+    authFetch("/api/username", {
       method: "get",
     }).then((response) => {
       response.json().then((resp) => {
-        setServerUsername(username);
+        setServerUsername(resp.username);
       });
     });
   }, []);
@@ -72,8 +73,21 @@ export default function Study() {
     return false;
   };
 
-  const checkValuesStudy = () => {
-    console.log(serverUsername);
+  const checkIfUsernameIsCorrect = () => {
+    console.log("serverUsername", serverUsername);
+    console.log("username", username);
+    if (serverUsername === username) {
+      console.log("Passt soweit");
+      return true;
+    } else {
+      console.log("Passt gar nicht");
+      return false;
+    }
+  };
+
+
+  const checkIfValuesAreCorrect = () => {
+    checkIfUsernameIsCorrect();
   };
 
   const handleClickAtStepStart = () => {
@@ -83,7 +97,7 @@ export default function Study() {
   };
 
   const handleClickAtStepNormal = () => {
-    checkValuesStudy();
+    checkIfValuesAreCorrect();
     setIsStepNormal(false);
     setIsStepPhone(true);
   };

From 7a930c20b625611acd22f79110bb4fbf4ab2ed6c Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Thu, 22 Jul 2021 03:11:50 +0200
Subject: [PATCH 15/47] Permissions for requests.sh

---
 requests.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 requests.sh

diff --git a/requests.sh b/requests.sh
old mode 100644
new mode 100755

From c1fce5bf4a2f782a1bb6f00fcf45196ede9dcf1c Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Thu, 22 Jul 2021 03:24:31 +0200
Subject: [PATCH 16/47] Change api for random password

---
 backend/src/app.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/app.py b/backend/src/app.py
index 8f49861..7f66284 100644
--- a/backend/src/app.py
+++ b/backend/src/app.py
@@ -141,10 +141,10 @@ def protected():
     return {'message': f'protected endpoint (allowed user {flask_praetorian.current_user().username})'}
 
 
-@app.route('/api/protected/rcv_pw', methods=['GET'])
+@app.route('/api/rcv_pw', methods=['GET'])
 def get_password():
     pw = get_random_password()
-    ret = {'password': pw}
+    ret = {'random_password': pw}
     return ret, 200
 
 

From a6346d749652420d7c9b76b4977830bc0652334d Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Thu, 22 Jul 2021 04:44:31 +0200
Subject: [PATCH 17/47] Password validation works but password is not shown in
 generated password thing

---
 frontend/src/components/GeneratedPassword.js | 13 +-----
 frontend/src/components/pages/Study.js       | 42 ++++++++++++++++----
 2 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/frontend/src/components/GeneratedPassword.js b/frontend/src/components/GeneratedPassword.js
index c963b5c..af03882 100644
--- a/frontend/src/components/GeneratedPassword.js
+++ b/frontend/src/components/GeneratedPassword.js
@@ -1,23 +1,14 @@
-import React, { useEffect, useState } from "react";
+import React from "react";
 import "../App.css";
 
 export default function GeneratedPassword() {
-  const [genPassword, setGenPassword] = useState("");
 
+  const genPassword = "PASSWORT_MANUELL"
   const handleOnCopyEvent = (e) => {
     e.preventDefault();
     return false;
   };
 
-  useEffect(() => {
-    fetch("/api/protected/rcv_pw", {
-      method: "get",
-    }).then((response) => {
-      response.json().then((resp) => {
-        setGenPassword(resp.password);
-      });
-    });
-  }, []);
   return (
     <>
       <p onCopy={handleOnCopyEvent}>
diff --git a/frontend/src/components/pages/Study.js b/frontend/src/components/pages/Study.js
index 7e849d1..094479f 100644
--- a/frontend/src/components/pages/Study.js
+++ b/frontend/src/components/pages/Study.js
@@ -70,36 +70,64 @@ export default function Study() {
 
   const handleOnPasteEvent = (e) => {
     e.preventDefault();
+    console.log("paste not allowed");
     return false;
   };
 
   const checkIfUsernameIsCorrect = () => {
-    console.log("serverUsername", serverUsername);
-    console.log("username", username);
     if (serverUsername === username) {
-      console.log("Passt soweit");
       return true;
     } else {
-      console.log("Passt gar nicht");
       return false;
     }
   };
 
+  const _genPassword = useRef(null);
+
+  const receiveRandomPassword = () => {
+    fetch("/api/rcv_pw", {
+      method: "get",
+    }).then((response) => {
+      response.json().then((resp) => {
+        _genPassword.current = resp.random_password;
+        console.log(_genPassword.current)
+      });
+    });
+  };
+
+  const checkIfPasswordIsCorrect = () => {
+    if (_genPassword.current === password) {
+      return true;
+    } else {
+      return false;
+    }
+  };
 
   const checkIfValuesAreCorrect = () => {
     checkIfUsernameIsCorrect();
+    checkIfPasswordIsCorrect();
+    console.log(checkIfPasswordIsCorrect());
+    if (checkIfPasswordIsCorrect() && checkIfUsernameIsCorrect) {
+      return true;
+    } else {
+      alert("Passt nicht")
+      return false;
+    }
   };
 
   const handleClickAtStepStart = () => {
     setIsStepStart(false);
     setIsStepNormal(true);
     handleLoggerOn();
+    receiveRandomPassword();
   };
 
   const handleClickAtStepNormal = () => {
-    checkIfValuesAreCorrect();
-    setIsStepNormal(false);
-    setIsStepPhone(true);
+    if (checkIfValuesAreCorrect()){
+      receiveRandomPassword();
+      setIsStepNormal(false);
+      setIsStepPhone(true);
+    }
   };
 
   const handleClickAtStepPhone = () => {

From 58bd327377e123a8564eafe787405b52c3aacbca Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Thu, 22 Jul 2021 05:20:37 +0200
Subject: [PATCH 18/47] Update some change password things..

---
 frontend/src/components/BehaviorNormal.js    |  7 ++++---
 frontend/src/components/GeneratedPassword.js |  5 +++--
 frontend/src/components/pages/Study.js       | 15 +++++++++++----
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/BehaviorNormal.js b/frontend/src/components/BehaviorNormal.js
index 9f64ef9..c427a02 100644
--- a/frontend/src/components/BehaviorNormal.js
+++ b/frontend/src/components/BehaviorNormal.js
@@ -1,8 +1,8 @@
 import React from "react";
 import "../App.css";
-import GeneratedPassword from "./GeneratedPassword"
+import GeneratedPassword from "./GeneratedPassword";
 
-export default function BehaviorNormal() {
+export default function BehaviorNormal(props) {
   return (
     <>
       <p>
@@ -10,7 +10,8 @@ export default function BehaviorNormal() {
         Passwort eingeben. Verhalten Sie sich einfach so, als ob Sie sich
         normalerweise anmelden.
       </p>
-      <GeneratedPassword />
+      {console.log("props", props)}
+      <GeneratedPassword genPassword={props.genPassword} />
     </>
   );
 }
diff --git a/frontend/src/components/GeneratedPassword.js b/frontend/src/components/GeneratedPassword.js
index af03882..722fc2a 100644
--- a/frontend/src/components/GeneratedPassword.js
+++ b/frontend/src/components/GeneratedPassword.js
@@ -1,7 +1,7 @@
 import React from "react";
 import "../App.css";
 
-export default function GeneratedPassword() {
+export default function GeneratedPassword(props) {
 
   const genPassword = "PASSWORT_MANUELL"
   const handleOnCopyEvent = (e) => {
@@ -13,7 +13,8 @@ export default function GeneratedPassword() {
     <>
       <p onCopy={handleOnCopyEvent}>
         Das Passwort für diese Situation lautet:{" "}
-        <span className="generated-password">{genPassword}</span>
+        {console.log("component genpw, genpassword", props.genPassword)}
+        <span className="generated-password">{props.genPassword}</span>
       </p>
     </>
   );
diff --git a/frontend/src/components/pages/Study.js b/frontend/src/components/pages/Study.js
index 094479f..e369065 100644
--- a/frontend/src/components/pages/Study.js
+++ b/frontend/src/components/pages/Study.js
@@ -83,6 +83,12 @@ export default function Study() {
   };
 
   const _genPassword = useRef(null);
+  let genPassword = "";
+
+  const setGenPassword = (tmp) => {
+    genPassword = tmp;
+    console.log("setGenPassword", genPassword, tmp);
+  };
 
   const receiveRandomPassword = () => {
     fetch("/api/rcv_pw", {
@@ -90,7 +96,8 @@ export default function Study() {
     }).then((response) => {
       response.json().then((resp) => {
         _genPassword.current = resp.random_password;
-        console.log(_genPassword.current)
+        console.log(_genPassword.current);
+        setGenPassword(_genPassword.current);
       });
     });
   };
@@ -110,7 +117,7 @@ export default function Study() {
     if (checkIfPasswordIsCorrect() && checkIfUsernameIsCorrect) {
       return true;
     } else {
-      alert("Passt nicht")
+      alert("Passt nicht");
       return false;
     }
   };
@@ -123,7 +130,7 @@ export default function Study() {
   };
 
   const handleClickAtStepNormal = () => {
-    if (checkIfValuesAreCorrect()){
+    if (checkIfValuesAreCorrect()) {
       receiveRandomPassword();
       setIsStepNormal(false);
       setIsStepPhone(true);
@@ -158,7 +165,7 @@ export default function Study() {
 
   const study_normal = (
     <>
-      <BehaviorNormal />
+      <BehaviorNormal genPassword={_genPassword.current} />
       <form id="behaviorNormal">
         <InputField
           LabelName="Benutzername"

From d1bc91bcb75d1c0c00d4039a3a1f495173998bf0 Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Thu, 22 Jul 2021 07:29:54 +0200
Subject: [PATCH 19/47] Added content

---
 frontend/src/App.css                    |  4 +--
 frontend/src/components/pages/Manual.js | 37 +++++++++++++++++++++++++
 frontend/src/components/pages/Study.js  |  2 +-
 frontend/src/components/pages/Ueber.js  |  4 +--
 4 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/frontend/src/App.css b/frontend/src/App.css
index c013d97..6bdd62c 100644
--- a/frontend/src/App.css
+++ b/frontend/src/App.css
@@ -51,12 +51,12 @@ a:hover:not(.navbar-logo) {
 }
 
 h1 {
-  font-size: 5em;
+  font-size: 4.5em;
   margin: 0.7em auto;
 }
 
 .sitePage h2 {
-  font-size: 3.75em;
+  font-size: 3.7em;
   margin: 0.7em auto;
 }
 
diff --git a/frontend/src/components/pages/Manual.js b/frontend/src/components/pages/Manual.js
index 46ae5ef..3cb29b0 100644
--- a/frontend/src/components/pages/Manual.js
+++ b/frontend/src/components/pages/Manual.js
@@ -1,4 +1,5 @@
 import React from "react";
+import { Link } from "react-router-dom";
 import "../../App.css";
 import Footer from "../../Footer";
 
@@ -7,6 +8,42 @@ export default function Manual() {
     <>
       <div className="sitePage">
         <h1> Anleitung / Bedienungshinweise</h1>
+        <p>
+          Vielen Dank für Ihr Interesse an meiner Bachelorthesis. Falls Sie noch
+          grundlegende Informationen benötigen, können Sie diese{" "}
+          <Link to="ueber">hier</Link> genauer anschauen. Hier geht es darum,
+          dass ich Ihnen eine kurze Anleitung zur Verfügung stelle und erkäre
+          wie das ganze funktioniert.
+        </p>
+        <h2>Neu hier</h2>
+        <p>
+          Bei Besuchern, die das erste Mal hier sind, geht es um zwei Dinge.
+          Erstens müssen sich diese registrieren und zweitens sollte eine
+          Umfrage durchgeführt werden. Diese Umfrage dient dazu, dass ich eine
+          grobe Übersicht habe, welche Personengruppen teilgenommen haben. Für
+          die Registrierung klicken Sie oben rechts einfach auf registieren. Sie
+          müssen dann einen Nutzernamen und ein Passwort eingeben. Schauen Sie
+          darauf, dass Sie sich den Benutzernamen und das Passwort merken
+          können. Es gibt keine Möglichkeit, das Passwort oder den Benutzernamen
+          zurückzusetzen. Nach der Registrierung landen Sie auf einer
+          Umfrageseite. Füllen Sie die Fragen wahrheitsgemäss aus und klicken
+          Sie danach auf "Umfrage abschicken". Nachdem die Umfrage durchgeführt
+          wurde, können Sie an der Studie teilnehmen, indem Sie auf den Button "Studie starten" klicken. Folgen Sie danach den Anweisungen gemäss der Studie.
+        </p>
+        <h2>War schon einmal hier</h2>
+        <p>
+        Wenn Sie schon einmal hier waren, gibt es zwei mögliche Zustände:
+        <ul>
+          <li>Sie sind noch eingeloggt</li>
+          <li>Sie sind nicht mehr eingeloggt</li>
+        </ul>
+        </p>
+        <p>
+        Sofern Sie noch nicht eingeloggt sind, können Sie sich anmelden mit ihrem gewählten Benutzernamen und dem Passwort. Sie landen dann direkt auf der Seite, welche ich für meine Studie benötige. Führen Sie dort die Studie die Studie wie gewohnt durch und beenden Sie diese am Schluss der Studie mit dem Button "Studie beenden".
+        </p>
+        <p>
+          Wenn Sie bereits eingeloggt sind, dann landen Sie auf der Startseite. Sie finden in der Mitte einen Button mit der Überschrift "Zur Studie". Klicken Sie bitte auf diesen Button und führen Sie dann die Studie durch.
+        </p>
       </div>
       <Footer />
     </>
diff --git a/frontend/src/components/pages/Study.js b/frontend/src/components/pages/Study.js
index 9378c54..37362b0 100644
--- a/frontend/src/components/pages/Study.js
+++ b/frontend/src/components/pages/Study.js
@@ -120,7 +120,7 @@ export default function Study() {
         onClick={handleClickAtStepStart}
         newTo="study"
       >
-        Starten mit der Studie
+        Studie starten
       </Button>
     </>
   );
diff --git a/frontend/src/components/pages/Ueber.js b/frontend/src/components/pages/Ueber.js
index d8bb19d..601ae8b 100644
--- a/frontend/src/components/pages/Ueber.js
+++ b/frontend/src/components/pages/Ueber.js
@@ -9,10 +9,10 @@ export default function Ueber() {
         <h1>Über das Projekt</h1>
         <p>
           Im Rahmen meiner Bachelorthesis an der Fernfachhochschule Schweiz
-          möchte ich der Frage nachgehen, wie sich die Verhaltensmerkmale in
+          möchte ich der Frage nachgehen, wie sich die Verhaltensmerkmale (also zum Beispiel Tastaturanschläge und Mausbewegungen) in
           unterschiedlichen Situationen unterscheiden. Hierfür habe ich eine
           Webanwendung entwickelt, welche die Nutzerinnen und Nutzer möglichst
-          einfach durch die Studie führt.
+          einfach durch die Studie führt. Damit ich ein paar Personen respektive deren Verhalten erfassen kann, ist es natürlich wichtig, dass mehrere Personen an der Studie teilnehmen. Ausserdem ist es wichtig, dass die teilnehmenden Personen mehrere Male teilnehmen, so dass ich mögliche Unterschiede während des Tagesverlauf bewerten kann.
         </p>
         <p>
           Falls Sie Fragen haben, können Sie diese jederzeit per Mail stellen.

From 2f7d733591c86af1aa905b782aba83cbbd4ecfe4 Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Thu, 22 Jul 2021 16:53:08 +0200
Subject: [PATCH 20/47] Receive password and check if it's the same

---
 frontend/src/components/pages/Study.js | 33 ++++++++++++++------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/frontend/src/components/pages/Study.js b/frontend/src/components/pages/Study.js
index 99fcff9..a0f9df1 100644
--- a/frontend/src/components/pages/Study.js
+++ b/frontend/src/components/pages/Study.js
@@ -82,28 +82,22 @@ export default function Study() {
     }
   };
 
-  const _genPassword = useRef(null);
-  let genPassword = "";
-
-  const setGenPassword = (tmp) => {
-    genPassword = tmp;
-    console.log("setGenPassword", genPassword, tmp);
-  };
+  const [genPassword, setGenPassword] = useState("");
 
   const receiveRandomPassword = () => {
     fetch("/api/rcv_pw", {
       method: "get",
     }).then((response) => {
       response.json().then((resp) => {
-        _genPassword.current = resp.random_password;
-        console.log(_genPassword.current);
-        setGenPassword(_genPassword.current);
+        console.log(resp.random_password);
+        setGenPassword(resp.random_password);
+        console.log("rcv pw; print genPassword", genPassword);
       });
     });
   };
 
   const checkIfPasswordIsCorrect = () => {
-    if (_genPassword.current === password) {
+    if (genPassword === password) {
       return true;
     } else {
       return false;
@@ -111,10 +105,8 @@ export default function Study() {
   };
 
   const checkIfValuesAreCorrect = () => {
-    checkIfUsernameIsCorrect();
-    checkIfPasswordIsCorrect();
     console.log(checkIfPasswordIsCorrect());
-    if (checkIfPasswordIsCorrect() && checkIfUsernameIsCorrect) {
+    if (checkIfPasswordIsCorrect() && checkIfUsernameIsCorrect()) {
       return true;
     } else {
       alert("Passt nicht");
@@ -123,10 +115,10 @@ export default function Study() {
   };
 
   const handleClickAtStepStart = () => {
+    receiveRandomPassword();
     setIsStepStart(false);
     setIsStepNormal(true);
     handleLoggerOn();
-    receiveRandomPassword();
   };
 
   const handleClickAtStepNormal = () => {
@@ -138,14 +130,25 @@ export default function Study() {
   };
 
   const handleClickAtStepPhone = () => {
+    if (checkIfValuesAreCorrect()){
+    receiveRandomPassword();
     setIsStepPhone(false);
     setIsStepStanding(true);
+    }
+    else {
+      console.log("Passwort und Benutzername stimmen nicht.")
+    }
   };
 
   const handleClickAtStepStanding = () => {
+    if (checkIfValuesAreCorrect()){
     setIsStepStanding(false);
     setIsStepEnd(true);
     handleLoggerOff();
+    }
+    else {
+      console.log("Passwort und Benutzername stimmen nicht.")
+    }
   };
 
   const study_start = (

From eaa4d8937aadeae1f2a2133eb1150295e7ee6db1 Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Thu, 22 Jul 2021 16:53:57 +0200
Subject: [PATCH 21/47] use property to show the value of the actual password

---
 frontend/src/components/BehaviorPhone.js    |  4 ++--
 frontend/src/components/BehaviorStanding.js |  4 ++--
 frontend/src/components/pages/Manual.js     | 25 ++++++++++++++-------
 frontend/src/components/pages/Study.js      |  6 ++---
 4 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/frontend/src/components/BehaviorPhone.js b/frontend/src/components/BehaviorPhone.js
index 9a6787e..92cc8f0 100644
--- a/frontend/src/components/BehaviorPhone.js
+++ b/frontend/src/components/BehaviorPhone.js
@@ -2,7 +2,7 @@ import React from "react";
 import "../App.css";
 import GeneratedPassword from "./GeneratedPassword";
 
-export default function BehaviorPhone() {
+export default function BehaviorPhone(props) {
   return (
     <>
       <p>
@@ -11,7 +11,7 @@ export default function BehaviorPhone() {
         Sie sich vor, dass Sie gerade am Telefonieren sind. Verwenden Sie bitte
         kein Headset oder Ähnliches.
       </p>
-      <GeneratedPassword />
+      <GeneratedPassword genPassword={props.genPassword}/>
     </>
   );
 }
diff --git a/frontend/src/components/BehaviorStanding.js b/frontend/src/components/BehaviorStanding.js
index 479b59b..e3c1486 100644
--- a/frontend/src/components/BehaviorStanding.js
+++ b/frontend/src/components/BehaviorStanding.js
@@ -2,13 +2,13 @@ import React from "react";
 import "../App.css";
 import GeneratedPassword from "./GeneratedPassword"
 
-export default function BehaviorStanding() {
+export default function BehaviorStanding(props) {
   return (
     <>
       <p>
         In dieser Situation geht es darum, dass Sie das Passwort im Stehen eingeben. Stehen Sie also vor den Computer und geben Sie den Benutzernamen und das Passwort wie gewohnt ein.
       </p>
-      <GeneratedPassword />
+      <GeneratedPassword genPassword={props.genPassword}/>
     </>
   );
 }
diff --git a/frontend/src/components/pages/Manual.js b/frontend/src/components/pages/Manual.js
index 3cb29b0..fb9557e 100644
--- a/frontend/src/components/pages/Manual.js
+++ b/frontend/src/components/pages/Manual.js
@@ -28,21 +28,30 @@ export default function Manual() {
           zurückzusetzen. Nach der Registrierung landen Sie auf einer
           Umfrageseite. Füllen Sie die Fragen wahrheitsgemäss aus und klicken
           Sie danach auf "Umfrage abschicken". Nachdem die Umfrage durchgeführt
-          wurde, können Sie an der Studie teilnehmen, indem Sie auf den Button "Studie starten" klicken. Folgen Sie danach den Anweisungen gemäss der Studie.
+          wurde, können Sie an der Studie teilnehmen, indem Sie auf den Button
+          "Studie starten" klicken. Folgen Sie danach den Anweisungen gemäss der
+          Studie.
         </p>
         <h2>War schon einmal hier</h2>
         <p>
-        Wenn Sie schon einmal hier waren, gibt es zwei mögliche Zustände:
-        <ul>
-          <li>Sie sind noch eingeloggt</li>
-          <li>Sie sind nicht mehr eingeloggt</li>
-        </ul>
+          Wenn Sie schon einmal hier waren, gibt es zwei mögliche Zustände:
+          <ul>
+            <li>Sie sind noch eingeloggt</li>
+            <li>Sie sind nicht mehr eingeloggt</li>
+          </ul>
         </p>
         <p>
-        Sofern Sie noch nicht eingeloggt sind, können Sie sich anmelden mit ihrem gewählten Benutzernamen und dem Passwort. Sie landen dann direkt auf der Seite, welche ich für meine Studie benötige. Führen Sie dort die Studie die Studie wie gewohnt durch und beenden Sie diese am Schluss der Studie mit dem Button "Studie beenden".
+          Sofern Sie noch nicht eingeloggt sind, können Sie sich anmelden mit
+          ihrem gewählten Benutzernamen und dem Passwort. Sie landen dann direkt
+          auf der Seite, welche ich für meine Studie benötige. Führen Sie dort
+          die Studie die Studie wie gewohnt durch und beenden Sie diese am
+          Schluss der Studie mit dem Button "Studie beenden".
         </p>
         <p>
-          Wenn Sie bereits eingeloggt sind, dann landen Sie auf der Startseite. Sie finden in der Mitte einen Button mit der Überschrift "Zur Studie". Klicken Sie bitte auf diesen Button und führen Sie dann die Studie durch.
+          Wenn Sie bereits eingeloggt sind, dann landen Sie auf der Startseite.
+          Sie finden in der Mitte einen Button mit der Überschrift "Zur Studie".
+          Klicken Sie bitte auf diesen Button und führen Sie dann die Studie
+          durch.
         </p>
       </div>
       <Footer />
diff --git a/frontend/src/components/pages/Study.js b/frontend/src/components/pages/Study.js
index a0f9df1..5df4c0d 100644
--- a/frontend/src/components/pages/Study.js
+++ b/frontend/src/components/pages/Study.js
@@ -168,7 +168,7 @@ export default function Study() {
 
   const study_normal = (
     <>
-      <BehaviorNormal genPassword={_genPassword.current} />
+      <BehaviorNormal genPassword={genPassword} />
       <form id="behaviorNormal">
         <InputField
           LabelName="Benutzername"
@@ -198,7 +198,7 @@ export default function Study() {
 
   const study_phone = (
     <>
-      <BehaviorPhone />
+      <BehaviorPhone genPassword={genPassword} />
       <form id="behaviorPhone">
         <InputField
           LabelName="Benutzername"
@@ -228,7 +228,7 @@ export default function Study() {
 
   const study_standing = (
     <>
-      <BehaviorStanding />
+      <BehaviorStanding genPassword={genPassword} />
       <form id="behaviorStanding">
         <InputField
           LabelName="Benutzername"

From 396b45df6737f7f9cf1baa7219379b0fdf4a56e5 Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Thu, 22 Jul 2021 16:54:24 +0200
Subject: [PATCH 22/47] Add text at the end of the study

---
 frontend/src/components/BehaviorStudyEnd.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/BehaviorStudyEnd.js b/frontend/src/components/BehaviorStudyEnd.js
index e19c613..432d206 100644
--- a/frontend/src/components/BehaviorStudyEnd.js
+++ b/frontend/src/components/BehaviorStudyEnd.js
@@ -5,7 +5,10 @@ export default function BehaviorStudyEnd() {
   return (
     <>
       <p>
-        Merci :-)
+        Vielen Dank, dass Sie an der Studie teilgenommen haben. Sie helfen mir mit Ihrer Teilnahme enorm für die Bachelorthesis weiter.
+      </p>
+      <p>
+        Damit ich möglichst aussagekräftige Ergebnisse erhalte, ist es für mich wichtig, dass Sie mehrmals an der Studie teilnehmen. Daher bitte ich Sie, dass Sie zu einem anderen Zeitpunkt die Studie wiederholen.
       </p>
     </>
   );

From 9cf2c50d017b6611119ce27c31e53afd0c2ccdcf Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Thu, 22 Jul 2021 17:10:35 +0200
Subject: [PATCH 23/47] Added study button

---
 frontend/src/components/Navbar.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/frontend/src/components/Navbar.js b/frontend/src/components/Navbar.js
index 7c542d9..a30ce29 100644
--- a/frontend/src/components/Navbar.js
+++ b/frontend/src/components/Navbar.js
@@ -44,6 +44,11 @@ function Navbar() {
                 Startseite
               </Link>
             </li>
+            <li className="nav-item">
+              <Link to="/study" className="nav-links" onClick={closeMobileMenu}>
+                Studie
+              </Link>
+            </li>
             <li className="nav-item">
               <Link to="/Ueber" className="nav-links" onClick={closeMobileMenu}>
                 Über

From fd205273fca7e5310b0ac33a5fccd3e7dabb815c Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Thu, 22 Jul 2021 19:01:40 +0200
Subject: [PATCH 24/47] Added content in license page

---
 frontend/src/App.css                      | 16 ++++++++++++++
 frontend/src/components/pages/Manual.js   |  2 +-
 frontend/src/components/pages/Privacy.js  |  1 -
 frontend/src/components/pages/Study.js    | 26 +++++++++++------------
 frontend/src/components/pages/lizenzen.js | 26 +++++++++++++++++++----
 5 files changed, 51 insertions(+), 20 deletions(-)

diff --git a/frontend/src/App.css b/frontend/src/App.css
index 6bdd62c..9b36b7b 100644
--- a/frontend/src/App.css
+++ b/frontend/src/App.css
@@ -40,6 +40,10 @@
   color: var(--primary);
 }
 
+a {
+  text-decoration: none;
+}
+
 a:hover:not(.navbar-logo) {
   border-bottom: 4px dotted var(--secondary);
 }
@@ -53,6 +57,7 @@ a:hover:not(.navbar-logo) {
 h1 {
   font-size: 4.5em;
   margin: 0.7em auto;
+  text-align: center;
 }
 
 .sitePage h2 {
@@ -60,12 +65,23 @@ h1 {
   margin: 0.7em auto;
 }
 
+.sitePage h3 {
+  font-size: 2em;
+  margin: 0.5em auto;
+}
+
 .sitePage p {
   font-size: 1.5em;
   max-width: 60%;
   margin-bottom: 4vh;
 }
 
+.sitePage ul li {
+  font-size: 1.5em;
+  margin-bottom: 0.7em;
+}
+
+
 .errorMessage {
   color: var(--error);
   max-width: 60%;
diff --git a/frontend/src/components/pages/Manual.js b/frontend/src/components/pages/Manual.js
index fb9557e..e5d9ac8 100644
--- a/frontend/src/components/pages/Manual.js
+++ b/frontend/src/components/pages/Manual.js
@@ -35,11 +35,11 @@ export default function Manual() {
         <h2>War schon einmal hier</h2>
         <p>
           Wenn Sie schon einmal hier waren, gibt es zwei mögliche Zustände:
+        </p>
           <ul>
             <li>Sie sind noch eingeloggt</li>
             <li>Sie sind nicht mehr eingeloggt</li>
           </ul>
-        </p>
         <p>
           Sofern Sie noch nicht eingeloggt sind, können Sie sich anmelden mit
           ihrem gewählten Benutzernamen und dem Passwort. Sie landen dann direkt
diff --git a/frontend/src/components/pages/Privacy.js b/frontend/src/components/pages/Privacy.js
index 4091220..4464714 100644
--- a/frontend/src/components/pages/Privacy.js
+++ b/frontend/src/components/pages/Privacy.js
@@ -8,7 +8,6 @@ export default function Privacy() {
       <div className="sitePage">
         <h1>Datenschutz</h1>
       </div>
-      "
       <Footer />
     </>
   );
diff --git a/frontend/src/components/pages/Study.js b/frontend/src/components/pages/Study.js
index 5df4c0d..071ebd8 100644
--- a/frontend/src/components/pages/Study.js
+++ b/frontend/src/components/pages/Study.js
@@ -130,24 +130,22 @@ export default function Study() {
   };
 
   const handleClickAtStepPhone = () => {
-    if (checkIfValuesAreCorrect()){
-    receiveRandomPassword();
-    setIsStepPhone(false);
-    setIsStepStanding(true);
-    }
-    else {
-      console.log("Passwort und Benutzername stimmen nicht.")
+    if (checkIfValuesAreCorrect()) {
+      receiveRandomPassword();
+      setIsStepPhone(false);
+      setIsStepStanding(true);
+    } else {
+      console.log("Passwort und Benutzername stimmen nicht.");
     }
   };
 
   const handleClickAtStepStanding = () => {
-    if (checkIfValuesAreCorrect()){
-    setIsStepStanding(false);
-    setIsStepEnd(true);
-    handleLoggerOff();
-    }
-    else {
-      console.log("Passwort und Benutzername stimmen nicht.")
+    if (checkIfValuesAreCorrect()) {
+      setIsStepStanding(false);
+      setIsStepEnd(true);
+      handleLoggerOff();
+    } else {
+      console.log("Passwort und Benutzername stimmen nicht.");
     }
   };
 
diff --git a/frontend/src/components/pages/lizenzen.js b/frontend/src/components/pages/lizenzen.js
index 1bb415c..959f660 100644
--- a/frontend/src/components/pages/lizenzen.js
+++ b/frontend/src/components/pages/lizenzen.js
@@ -5,7 +5,7 @@ import Footer from "../../Footer";
 export default function Lizenzen() {
   return (
     <>
-      <div className="sitePage">
+      <div className="sitePage license">
         <h1>Lizenzen und Bildnachweise</h1>
         <p>
           Nachfolgend sollen die verwendeten Bibliotheken inklusive der Lizenz
@@ -13,13 +13,31 @@ export default function Lizenzen() {
           Bildnachweise notiert werden.
         </p>
         <h2>Verwendete Bibliotheken</h2>
-        <h3>Backend</h3>
         <h3>Frontend</h3>
+        <ul>
+          <li>
+            ReactJS (MIT-Lizenz):{" "}
+            <a href="https://github.com/facebook/react">
+              https://github.com/facebook/react
+            </a>{" "}
+          </li>
+          <li>Behametrics Web-Logger (MIT-Lizenz): <a href="https://gitlab.com/behametrics/logger-web">https://gitlab.com/behametrics/logger-web</a></li>
+          <li>Fortawesome Icons (CC-BY-4.0): <a href="https://github.com/FortAwesome/Font-Awesome">https://github.com/FortAwesome/Font-Awesome</a></li>
+          <li>React-Token-Auth (ISC-Lizenz): <a href="https://github.com/obabichev/react-token-auth">https://github.com/obabichev/react-token-auth</a></li>
+          <li>react-router-dom (MIT-Lizenz)<a href="https://github.com/ReactTraining/react-router">https://github.com/ReactTraining/react-router</a></li>
+        </ul>
+        <h3>Backend</h3>
+        <ul>
+          <li>Flask (BSD-3-Lizenz): <a href="https://github.com/pallets/flask/">https://github.com/pallets/flask/</a></li>
+          <li>flask-sqlalchemy (BSD-3-Lizenz): <a href="https://github.com/pallets/flask-sqlalchemy">https://github.com/pallets/flask-sqlalchemy</a></li>
+          <li>flask-praetorian (MIT-Lizenz): <a href="https://github.com/dusktreader/flask-praetorian">https://github.com/dusktreader/flask-praetorian</a></li>
+          <li>Flask-CORS (MIT-Lizenz): <a href="https://github.com/corydolphin/flask-cors">https://github.com/corydolphin/flask-cors</a></li>
+          <li>Behametrics Serverimplementierung (MIT-Lizenz)<a href="https://gitlab.com/behametrics/server">https://gitlab.com/behametrics/server</a></li>
+        </ul>
         <h2>Bildnachweise</h2>
         <ul className="bildnachweise">
           <li>
-            Originalbild für die Startseite:
-            <a href="https://pixabay.com/illustrations/virtual-identity-digital-identity-69996/">
+            Originalbild für die Startseite: <a href="https://pixabay.com/illustrations/virtual-identity-digital-identity-69996/">
               https://pixabay.com/illustrations/virtual-identity-digital-identity-69996/
             </a>
           </li>

From 52131aa3dd339e153c96f38080565a0ca858f3b7 Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Thu, 22 Jul 2021 19:55:06 +0200
Subject: [PATCH 25/47] Refactoring..

- use STATES instead of multiple different variables
- add check if password is correct
-
---
 frontend/src/App.js                      |  2 +-
 frontend/src/components/Navbar.js        | 16 +++++--
 frontend/src/components/pages/Study.js   | 60 +++++++++---------------
 frontend/src/components/pages/Umfrage.js |  4 +-
 4 files changed, 36 insertions(+), 46 deletions(-)

diff --git a/frontend/src/App.js b/frontend/src/App.js
index 415c951..26c93dc 100644
--- a/frontend/src/App.js
+++ b/frontend/src/App.js
@@ -9,10 +9,10 @@ import Privacy from "./components/pages/Privacy";
 import Login from "./components/pages/Login";
 import Register from "./components/pages/Register";
 import Manual from "./components/pages/Manual";
-import Secret from "./components/pages/Secret";
 import Umfrage from "./components/pages/Umfrage";
 import PrivateRoute from "./auth/PrivateRoute";
 import Study from "./components/pages/Study";
+import Secret from "./components/pages/Secret"
 
 function App() {
   return (
diff --git a/frontend/src/components/Navbar.js b/frontend/src/components/Navbar.js
index a30ce29..5f8b68a 100644
--- a/frontend/src/components/Navbar.js
+++ b/frontend/src/components/Navbar.js
@@ -44,11 +44,17 @@ function Navbar() {
                 Startseite
               </Link>
             </li>
-            <li className="nav-item">
-              <Link to="/study" className="nav-links" onClick={closeMobileMenu}>
-                Studie
-              </Link>
-            </li>
+            {isLoggedIn && (
+              <li className="nav-item">
+                <Link
+                  to="/study"
+                  className="nav-links"
+                  onClick={closeMobileMenu}
+                >
+                  Studie
+                </Link>
+              </li>
+            )}
             <li className="nav-item">
               <Link to="/Ueber" className="nav-links" onClick={closeMobileMenu}>
                 Über
diff --git a/frontend/src/components/pages/Study.js b/frontend/src/components/pages/Study.js
index 071ebd8..54b8f8b 100644
--- a/frontend/src/components/pages/Study.js
+++ b/frontend/src/components/pages/Study.js
@@ -15,6 +15,15 @@ import { authFetch } from "../../auth/AuthProvider";
 export default function Study() {
   const _logger = useRef(0);
   const [serverUsername, setServerUsername] = useState("");
+  const [genPassword, setGenPassword] = useState("");
+  const STATES = {
+    START: "start",
+    NORMAL: "normal",
+    PHONE: "phone",
+    STANDING: "standing",
+    END: "end",
+  };
+  const [state, setState] = useState(STATES.START);
 
   useEffect(() => {
     _logger.current = new Logger({
@@ -44,12 +53,6 @@ export default function Study() {
     password = tmp_password;
   };
 
-  const [isStepStart, setIsStepStart] = useState(true);
-  const [isStepNormal, setIsStepNormal] = useState(false);
-  const [isStepPhone, setIsStepPhone] = useState(false);
-  const [isStepStanding, setIsStepStanding] = useState(false);
-  const [isStepEnd, setIsStepEnd] = useState(false);
-
   const handleLoggerOff = () => {
     _logger.current.stop();
     console.log("Logger ausgeschaltet");
@@ -75,15 +78,9 @@ export default function Study() {
   };
 
   const checkIfUsernameIsCorrect = () => {
-    if (serverUsername === username) {
-      return true;
-    } else {
-      return false;
-    }
+    return serverUsername === username;
   };
 
-  const [genPassword, setGenPassword] = useState("");
-
   const receiveRandomPassword = () => {
     fetch("/api/rcv_pw", {
       method: "get",
@@ -97,43 +94,31 @@ export default function Study() {
   };
 
   const checkIfPasswordIsCorrect = () => {
-    if (genPassword === password) {
-      return true;
-    } else {
-      return false;
-    }
+    return genPassword === password;
   };
 
   const checkIfValuesAreCorrect = () => {
     console.log(checkIfPasswordIsCorrect());
-    if (checkIfPasswordIsCorrect() && checkIfUsernameIsCorrect()) {
-      return true;
-    } else {
-      alert("Passt nicht");
-      return false;
-    }
+    return checkIfPasswordIsCorrect() && checkIfUsernameIsCorrect();
   };
 
   const handleClickAtStepStart = () => {
     receiveRandomPassword();
-    setIsStepStart(false);
-    setIsStepNormal(true);
+    setState(STATES.NORMAL);
     handleLoggerOn();
   };
 
   const handleClickAtStepNormal = () => {
     if (checkIfValuesAreCorrect()) {
       receiveRandomPassword();
-      setIsStepNormal(false);
-      setIsStepPhone(true);
+      setState(STATES.PHONE);
     }
   };
 
   const handleClickAtStepPhone = () => {
     if (checkIfValuesAreCorrect()) {
       receiveRandomPassword();
-      setIsStepPhone(false);
-      setIsStepStanding(true);
+      setState(STATES.STANDING);
     } else {
       console.log("Passwort und Benutzername stimmen nicht.");
     }
@@ -141,8 +126,7 @@ export default function Study() {
 
   const handleClickAtStepStanding = () => {
     if (checkIfValuesAreCorrect()) {
-      setIsStepStanding(false);
-      setIsStepEnd(true);
+      setState(STATES.END);
       handleLoggerOff();
     } else {
       console.log("Passwort und Benutzername stimmen nicht.");
@@ -241,7 +225,7 @@ export default function Study() {
           onChange={handlePasswordChange}
           InputType="password"
           InputName="Passwort"
-          InputPlaceHolder="Benutzername"
+          InputPlaceHolder="Passwort"
           onPaste={handleOnPasteEvent}
         />
         <SubmitField
@@ -260,11 +244,11 @@ export default function Study() {
     <>
       <div className="sitePage">
         <h1>Studie</h1>
-        {isStepStart ? study_start : null}
-        {isStepNormal ? study_normal : null}
-        {isStepPhone ? study_phone : null}
-        {isStepStanding ? study_standing : null}
-        {isStepEnd ? study_end : null}
+        {state === STATES.START ? study_start : null}
+        {state === STATES.NORMAL ? study_normal : null}
+        {state === STATES.PHONE ? study_phone : null}
+        {state === STATES.STANDING ? study_standing : null}
+        {state === STATES.END ? study_end : null}
       </div>
       <Footer />
     </>
diff --git a/frontend/src/components/pages/Umfrage.js b/frontend/src/components/pages/Umfrage.js
index 33bc203..a47ec6c 100644
--- a/frontend/src/components/pages/Umfrage.js
+++ b/frontend/src/components/pages/Umfrage.js
@@ -51,8 +51,8 @@ export default function Umfrage() {
 
     if (!Number(age)) {
       setAgeErrorMessage("Das Alter muss als Zahl angegeben werden.");
-      //setIsSurveyValid(false);
-      // setIsAgeOk(false);
+      setIsSurveyValid(false);
+      setIsAgeOk(false);
     }
     if (gender === "DEFAULT" || gender === "") {
       setGenderErrorMessage(

From dcd4215efa704259db3dc7c5c59ca2376731364b Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Thu, 22 Jul 2021 20:02:35 +0200
Subject: [PATCH 26/47] Renamed lizenzen.js to Lizenzen.js

---
 frontend/src/App.js                                        | 4 ++--
 frontend/src/components/pages/{lizenzen.js => Lizenzen.js} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename frontend/src/components/pages/{lizenzen.js => Lizenzen.js} (100%)

diff --git a/frontend/src/App.js b/frontend/src/App.js
index 26c93dc..9ba9375 100644
--- a/frontend/src/App.js
+++ b/frontend/src/App.js
@@ -4,7 +4,7 @@ import "./App.css";
 import { BrowserRouter as Router, Switch, Route } from "react-router-dom";
 import Home from "./components/pages/Home";
 import Ueber from "./components/pages/Ueber";
-import Lizenzen from "./components/pages/lizenzen";
+import Lizenzen from "./components/pages/Lizenzen";
 import Privacy from "./components/pages/Privacy";
 import Login from "./components/pages/Login";
 import Register from "./components/pages/Register";
@@ -12,7 +12,7 @@ import Manual from "./components/pages/Manual";
 import Umfrage from "./components/pages/Umfrage";
 import PrivateRoute from "./auth/PrivateRoute";
 import Study from "./components/pages/Study";
-import Secret from "./components/pages/Secret"
+import Secret from "./components/pages/Secret";
 
 function App() {
   return (
diff --git a/frontend/src/components/pages/lizenzen.js b/frontend/src/components/pages/Lizenzen.js
similarity index 100%
rename from frontend/src/components/pages/lizenzen.js
rename to frontend/src/components/pages/Lizenzen.js

From 85e484bf0b30668b8c58c6d4b12d97b5ee5ecf30 Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Thu, 22 Jul 2021 20:18:01 +0200
Subject: [PATCH 27/47] Renaming and autoformatting

- renamed the react files to jsx
- autoformat with vscode
---
 frontend/public/index.html                    |  5 +-
 frontend/src/App.css                          |  1 -
 frontend/src/{App.js => App.jsx}              |  0
 frontend/src/Footer.css                       | 42 --------
 frontend/src/{Footer.js => Footer.jsx}        |  0
 .../{PrivateRoute.js => PrivateRoute.jsx}     |  0
 frontend/src/components/Author.js             |  7 --
 .../{BehaviorNormal.js => BehaviorNormal.jsx} |  0
 .../{BehaviorPhone.js => BehaviorPhone.jsx}   |  2 +-
 frontend/src/components/BehaviorStanding.js   | 14 ---
 frontend/src/components/BehaviorStanding.jsx  | 16 ++++
 ...haviorStudyEnd.js => BehaviorStudyEnd.jsx} |  7 +-
 ...viorStudyInfo.js => BehaviorStudyInfo.jsx} |  1 -
 frontend/src/components/Button.css            |  3 +-
 .../src/components/{Button.js => Button.jsx}  |  0
 .../{ErrorMessage.js => ErrorMessage.jsx}     |  0
 ...ratedPassword.js => GeneratedPassword.jsx} |  2 -
 .../{HeroSection.js => HeroSection.jsx}       |  0
 .../{InputField.js => InputField.jsx}         |  0
 .../src/components/{Navbar.js => Navbar.jsx}  |  0
 .../{SubmitField.js => SubmitField.jsx}       |  0
 .../components/pages/{Home.js => Home.jsx}    |  0
 frontend/src/components/pages/Lizenzen.js     | 49 ----------
 frontend/src/components/pages/Lizenzen.jsx    | 95 +++++++++++++++++++
 .../components/pages/{Login.js => Login.jsx}  |  0
 .../pages/{Manual.js => Manual.jsx}           | 12 +--
 .../pages/{Privacy.js => Privacy.jsx}         |  0
 .../pages/{Register.js => Register.jsx}       |  0
 .../pages/{Secret.js => Secret.jsx}           |  0
 .../components/pages/{Study.js => Study.jsx}  |  0
 .../components/pages/{Ueber.js => Ueber.jsx}  |  0
 .../pages/{Umfrage.js => Umfrage.jsx}         |  0
 32 files changed, 127 insertions(+), 129 deletions(-)
 rename frontend/src/{App.js => App.jsx} (100%)
 rename frontend/src/{Footer.js => Footer.jsx} (100%)
 rename frontend/src/auth/{PrivateRoute.js => PrivateRoute.jsx} (100%)
 delete mode 100644 frontend/src/components/Author.js
 rename frontend/src/components/{BehaviorNormal.js => BehaviorNormal.jsx} (100%)
 rename frontend/src/components/{BehaviorPhone.js => BehaviorPhone.jsx} (88%)
 delete mode 100644 frontend/src/components/BehaviorStanding.js
 create mode 100644 frontend/src/components/BehaviorStanding.jsx
 rename frontend/src/components/{BehaviorStudyEnd.js => BehaviorStudyEnd.jsx} (54%)
 rename frontend/src/components/{BehaviorStudyInfo.js => BehaviorStudyInfo.jsx} (99%)
 rename frontend/src/components/{Button.js => Button.jsx} (100%)
 rename frontend/src/components/{ErrorMessage.js => ErrorMessage.jsx} (100%)
 rename frontend/src/components/{GeneratedPassword.js => GeneratedPassword.jsx} (91%)
 rename frontend/src/components/{HeroSection.js => HeroSection.jsx} (100%)
 rename frontend/src/components/{InputField.js => InputField.jsx} (100%)
 rename frontend/src/components/{Navbar.js => Navbar.jsx} (100%)
 rename frontend/src/components/{SubmitField.js => SubmitField.jsx} (100%)
 rename frontend/src/components/pages/{Home.js => Home.jsx} (100%)
 delete mode 100644 frontend/src/components/pages/Lizenzen.js
 create mode 100644 frontend/src/components/pages/Lizenzen.jsx
 rename frontend/src/components/pages/{Login.js => Login.jsx} (100%)
 rename frontend/src/components/pages/{Manual.js => Manual.jsx} (91%)
 rename frontend/src/components/pages/{Privacy.js => Privacy.jsx} (100%)
 rename frontend/src/components/pages/{Register.js => Register.jsx} (100%)
 rename frontend/src/components/pages/{Secret.js => Secret.jsx} (100%)
 rename frontend/src/components/pages/{Study.js => Study.jsx} (100%)
 rename frontend/src/components/pages/{Ueber.js => Ueber.jsx} (100%)
 rename frontend/src/components/pages/{Umfrage.js => Umfrage.jsx} (100%)

diff --git a/frontend/public/index.html b/frontend/public/index.html
index fa21ab4..8be889f 100644
--- a/frontend/public/index.html
+++ b/frontend/public/index.html
@@ -31,7 +31,10 @@
     <title>BA - Marco Camenzind</title>
   </head>
   <body>
-    <noscript>Diese Anwendung funktioniert leider nur mit JavaScript. Bitte aktivieren JavaScript in den Einstellungen</noscript>
+    <noscript
+      >Diese Anwendung funktioniert leider nur mit JavaScript. Bitte aktivieren
+      JavaScript in den Einstellungen</noscript
+    >
     <div id="root"></div>
     <!--
       This HTML file is a template.
diff --git a/frontend/src/App.css b/frontend/src/App.css
index 9b36b7b..b31da3c 100644
--- a/frontend/src/App.css
+++ b/frontend/src/App.css
@@ -81,7 +81,6 @@ h1 {
   margin-bottom: 0.7em;
 }
 
-
 .errorMessage {
   color: var(--error);
   max-width: 60%;
diff --git a/frontend/src/App.js b/frontend/src/App.jsx
similarity index 100%
rename from frontend/src/App.js
rename to frontend/src/App.jsx
diff --git a/frontend/src/Footer.css b/frontend/src/Footer.css
index 03f9900..d9e9235 100644
--- a/frontend/src/Footer.css
+++ b/frontend/src/Footer.css
@@ -92,45 +92,6 @@
   color: #b1b1b1;
 }
 
-/* Social Icons */
-.social-icon-link {
-  color: var(--forth);
-  font-size: 24px;
-}
-
-.social-media {
-  max-width: 1000px;
-  width: 100%;
-}
-
-.social-media-wrap {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  width: 99%;
-  max-width: 1000px;
-  margin: 40px auto 0 auto;
-}
-
-.social-icons {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  width: 240px;
-}
-
-.social-logo {
-  color: var(--forth);
-  justify-self: start;
-  margin-left: 20px;
-  cursor: pointer;
-  text-decoration: none;
-  font-size: 2rem;
-  display: flex;
-  align-self: center;
-  margin-bottom: 16px;
-}
-
 @media screen and (max-width: 820px) {
   .footer-links {
     padding-top: 2rem;
@@ -148,7 +109,4 @@
     flex-direction: column;
   }
 
-  .social-media-wrap {
-    flex-direction: column;
-  }
 }
diff --git a/frontend/src/Footer.js b/frontend/src/Footer.jsx
similarity index 100%
rename from frontend/src/Footer.js
rename to frontend/src/Footer.jsx
diff --git a/frontend/src/auth/PrivateRoute.js b/frontend/src/auth/PrivateRoute.jsx
similarity index 100%
rename from frontend/src/auth/PrivateRoute.js
rename to frontend/src/auth/PrivateRoute.jsx
diff --git a/frontend/src/components/Author.js b/frontend/src/components/Author.js
deleted file mode 100644
index 8ea89dd..0000000
--- a/frontend/src/components/Author.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import React from "react";
-
-function AuthorDate() {
-  return <div></div>;
-}
-
-export default AuthorDate;
diff --git a/frontend/src/components/BehaviorNormal.js b/frontend/src/components/BehaviorNormal.jsx
similarity index 100%
rename from frontend/src/components/BehaviorNormal.js
rename to frontend/src/components/BehaviorNormal.jsx
diff --git a/frontend/src/components/BehaviorPhone.js b/frontend/src/components/BehaviorPhone.jsx
similarity index 88%
rename from frontend/src/components/BehaviorPhone.js
rename to frontend/src/components/BehaviorPhone.jsx
index 92cc8f0..f0a23b8 100644
--- a/frontend/src/components/BehaviorPhone.js
+++ b/frontend/src/components/BehaviorPhone.jsx
@@ -11,7 +11,7 @@ export default function BehaviorPhone(props) {
         Sie sich vor, dass Sie gerade am Telefonieren sind. Verwenden Sie bitte
         kein Headset oder Ähnliches.
       </p>
-      <GeneratedPassword genPassword={props.genPassword}/>
+      <GeneratedPassword genPassword={props.genPassword} />
     </>
   );
 }
diff --git a/frontend/src/components/BehaviorStanding.js b/frontend/src/components/BehaviorStanding.js
deleted file mode 100644
index e3c1486..0000000
--- a/frontend/src/components/BehaviorStanding.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import React from "react";
-import "../App.css";
-import GeneratedPassword from "./GeneratedPassword"
-
-export default function BehaviorStanding(props) {
-  return (
-    <>
-      <p>
-        In dieser Situation geht es darum, dass Sie das Passwort im Stehen eingeben. Stehen Sie also vor den Computer und geben Sie den Benutzernamen und das Passwort wie gewohnt ein.
-      </p>
-      <GeneratedPassword genPassword={props.genPassword}/>
-    </>
-  );
-}
diff --git a/frontend/src/components/BehaviorStanding.jsx b/frontend/src/components/BehaviorStanding.jsx
new file mode 100644
index 0000000..8aa77d5
--- /dev/null
+++ b/frontend/src/components/BehaviorStanding.jsx
@@ -0,0 +1,16 @@
+import React from "react";
+import "../App.css";
+import GeneratedPassword from "./GeneratedPassword";
+
+export default function BehaviorStanding(props) {
+  return (
+    <>
+      <p>
+        In dieser Situation geht es darum, dass Sie das Passwort im Stehen
+        eingeben. Stehen Sie also vor den Computer und geben Sie den
+        Benutzernamen und das Passwort wie gewohnt ein.
+      </p>
+      <GeneratedPassword genPassword={props.genPassword} />
+    </>
+  );
+}
diff --git a/frontend/src/components/BehaviorStudyEnd.js b/frontend/src/components/BehaviorStudyEnd.jsx
similarity index 54%
rename from frontend/src/components/BehaviorStudyEnd.js
rename to frontend/src/components/BehaviorStudyEnd.jsx
index 432d206..a79f3c4 100644
--- a/frontend/src/components/BehaviorStudyEnd.js
+++ b/frontend/src/components/BehaviorStudyEnd.jsx
@@ -5,10 +5,13 @@ export default function BehaviorStudyEnd() {
   return (
     <>
       <p>
-        Vielen Dank, dass Sie an der Studie teilgenommen haben. Sie helfen mir mit Ihrer Teilnahme enorm für die Bachelorthesis weiter.
+        Vielen Dank, dass Sie an der Studie teilgenommen haben. Sie helfen mir
+        mit Ihrer Teilnahme enorm für die Bachelorthesis weiter.
       </p>
       <p>
-        Damit ich möglichst aussagekräftige Ergebnisse erhalte, ist es für mich wichtig, dass Sie mehrmals an der Studie teilnehmen. Daher bitte ich Sie, dass Sie zu einem anderen Zeitpunkt die Studie wiederholen.
+        Damit ich möglichst aussagekräftige Ergebnisse erhalte, ist es für mich
+        wichtig, dass Sie mehrmals an der Studie teilnehmen. Daher bitte ich
+        Sie, dass Sie zu einem anderen Zeitpunkt die Studie wiederholen.
       </p>
     </>
   );
diff --git a/frontend/src/components/BehaviorStudyInfo.js b/frontend/src/components/BehaviorStudyInfo.jsx
similarity index 99%
rename from frontend/src/components/BehaviorStudyInfo.js
rename to frontend/src/components/BehaviorStudyInfo.jsx
index eaea777..15d2324 100644
--- a/frontend/src/components/BehaviorStudyInfo.js
+++ b/frontend/src/components/BehaviorStudyInfo.jsx
@@ -14,7 +14,6 @@ export default function BehaviorStudyInfo() {
         Bitte klicken Sie auf weiter, um mit der Studie zu beginnen. Bitte lesen
         Sie die jeweilige Aufgabe jeweils genau.
       </p>
-
     </>
   );
 }
diff --git a/frontend/src/components/Button.css b/frontend/src/components/Button.css
index 19143fe..0319108 100644
--- a/frontend/src/components/Button.css
+++ b/frontend/src/components/Button.css
@@ -31,7 +31,7 @@
   font-size: 1.3em;
 }
 
-.btn--full{
+.btn--full {
   padding: 12px 26px;
   margin: 0 auto;
   font-size: 1.5em;
@@ -44,4 +44,3 @@
   color: var(--secondary);
   transition: 250ms;
 }
-
diff --git a/frontend/src/components/Button.js b/frontend/src/components/Button.jsx
similarity index 100%
rename from frontend/src/components/Button.js
rename to frontend/src/components/Button.jsx
diff --git a/frontend/src/components/ErrorMessage.js b/frontend/src/components/ErrorMessage.jsx
similarity index 100%
rename from frontend/src/components/ErrorMessage.js
rename to frontend/src/components/ErrorMessage.jsx
diff --git a/frontend/src/components/GeneratedPassword.js b/frontend/src/components/GeneratedPassword.jsx
similarity index 91%
rename from frontend/src/components/GeneratedPassword.js
rename to frontend/src/components/GeneratedPassword.jsx
index 722fc2a..f2b8ea9 100644
--- a/frontend/src/components/GeneratedPassword.js
+++ b/frontend/src/components/GeneratedPassword.jsx
@@ -2,8 +2,6 @@ import React from "react";
 import "../App.css";
 
 export default function GeneratedPassword(props) {
-
-  const genPassword = "PASSWORT_MANUELL"
   const handleOnCopyEvent = (e) => {
     e.preventDefault();
     return false;
diff --git a/frontend/src/components/HeroSection.js b/frontend/src/components/HeroSection.jsx
similarity index 100%
rename from frontend/src/components/HeroSection.js
rename to frontend/src/components/HeroSection.jsx
diff --git a/frontend/src/components/InputField.js b/frontend/src/components/InputField.jsx
similarity index 100%
rename from frontend/src/components/InputField.js
rename to frontend/src/components/InputField.jsx
diff --git a/frontend/src/components/Navbar.js b/frontend/src/components/Navbar.jsx
similarity index 100%
rename from frontend/src/components/Navbar.js
rename to frontend/src/components/Navbar.jsx
diff --git a/frontend/src/components/SubmitField.js b/frontend/src/components/SubmitField.jsx
similarity index 100%
rename from frontend/src/components/SubmitField.js
rename to frontend/src/components/SubmitField.jsx
diff --git a/frontend/src/components/pages/Home.js b/frontend/src/components/pages/Home.jsx
similarity index 100%
rename from frontend/src/components/pages/Home.js
rename to frontend/src/components/pages/Home.jsx
diff --git a/frontend/src/components/pages/Lizenzen.js b/frontend/src/components/pages/Lizenzen.js
deleted file mode 100644
index 959f660..0000000
--- a/frontend/src/components/pages/Lizenzen.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import React from "react";
-import "../../App.css";
-import Footer from "../../Footer";
-
-export default function Lizenzen() {
-  return (
-    <>
-      <div className="sitePage license">
-        <h1>Lizenzen und Bildnachweise</h1>
-        <p>
-          Nachfolgend sollen die verwendeten Bibliotheken inklusive der Lizenz
-          aufgeführt werden. Neben den Bibliotheken sollen vorallem auch
-          Bildnachweise notiert werden.
-        </p>
-        <h2>Verwendete Bibliotheken</h2>
-        <h3>Frontend</h3>
-        <ul>
-          <li>
-            ReactJS (MIT-Lizenz):{" "}
-            <a href="https://github.com/facebook/react">
-              https://github.com/facebook/react
-            </a>{" "}
-          </li>
-          <li>Behametrics Web-Logger (MIT-Lizenz): <a href="https://gitlab.com/behametrics/logger-web">https://gitlab.com/behametrics/logger-web</a></li>
-          <li>Fortawesome Icons (CC-BY-4.0): <a href="https://github.com/FortAwesome/Font-Awesome">https://github.com/FortAwesome/Font-Awesome</a></li>
-          <li>React-Token-Auth (ISC-Lizenz): <a href="https://github.com/obabichev/react-token-auth">https://github.com/obabichev/react-token-auth</a></li>
-          <li>react-router-dom (MIT-Lizenz)<a href="https://github.com/ReactTraining/react-router">https://github.com/ReactTraining/react-router</a></li>
-        </ul>
-        <h3>Backend</h3>
-        <ul>
-          <li>Flask (BSD-3-Lizenz): <a href="https://github.com/pallets/flask/">https://github.com/pallets/flask/</a></li>
-          <li>flask-sqlalchemy (BSD-3-Lizenz): <a href="https://github.com/pallets/flask-sqlalchemy">https://github.com/pallets/flask-sqlalchemy</a></li>
-          <li>flask-praetorian (MIT-Lizenz): <a href="https://github.com/dusktreader/flask-praetorian">https://github.com/dusktreader/flask-praetorian</a></li>
-          <li>Flask-CORS (MIT-Lizenz): <a href="https://github.com/corydolphin/flask-cors">https://github.com/corydolphin/flask-cors</a></li>
-          <li>Behametrics Serverimplementierung (MIT-Lizenz)<a href="https://gitlab.com/behametrics/server">https://gitlab.com/behametrics/server</a></li>
-        </ul>
-        <h2>Bildnachweise</h2>
-        <ul className="bildnachweise">
-          <li>
-            Originalbild für die Startseite: <a href="https://pixabay.com/illustrations/virtual-identity-digital-identity-69996/">
-              https://pixabay.com/illustrations/virtual-identity-digital-identity-69996/
-            </a>
-          </li>
-        </ul>
-      </div>
-      <Footer />
-    </>
-  );
-}
diff --git a/frontend/src/components/pages/Lizenzen.jsx b/frontend/src/components/pages/Lizenzen.jsx
new file mode 100644
index 0000000..dbd7b38
--- /dev/null
+++ b/frontend/src/components/pages/Lizenzen.jsx
@@ -0,0 +1,95 @@
+import React from "react";
+import "../../App.css";
+import Footer from "../../Footer";
+
+export default function Lizenzen() {
+  return (
+    <>
+      <div className="sitePage license">
+        <h1>Lizenzen und Bildnachweise</h1>
+        <p>
+          Nachfolgend sollen die verwendeten Bibliotheken inklusive der Lizenz
+          aufgeführt werden. Neben den Bibliotheken sollen vorallem auch
+          Bildnachweise notiert werden.
+        </p>
+        <h2>Verwendete Bibliotheken</h2>
+        <h3>Frontend</h3>
+        <ul>
+          <li>
+            ReactJS (MIT-Lizenz):{" "}
+            <a href="https://github.com/facebook/react">
+              https://github.com/facebook/react
+            </a>{" "}
+          </li>
+          <li>
+            Behametrics Web-Logger (MIT-Lizenz):{" "}
+            <a href="https://gitlab.com/behametrics/logger-web">
+              https://gitlab.com/behametrics/logger-web
+            </a>
+          </li>
+          <li>
+            Fortawesome Icons (CC-BY-4.0):{" "}
+            <a href="https://github.com/FortAwesome/Font-Awesome">
+              https://github.com/FortAwesome/Font-Awesome
+            </a>
+          </li>
+          <li>
+            React-Token-Auth (ISC-Lizenz):{" "}
+            <a href="https://github.com/obabichev/react-token-auth">
+              https://github.com/obabichev/react-token-auth
+            </a>
+          </li>
+          <li>
+            react-router-dom (MIT-Lizenz)
+            <a href="https://github.com/ReactTraining/react-router">
+              https://github.com/ReactTraining/react-router
+            </a>
+          </li>
+        </ul>
+        <h3>Backend</h3>
+        <ul>
+          <li>
+            Flask (BSD-3-Lizenz):{" "}
+            <a href="https://github.com/pallets/flask/">
+              https://github.com/pallets/flask/
+            </a>
+          </li>
+          <li>
+            flask-sqlalchemy (BSD-3-Lizenz):{" "}
+            <a href="https://github.com/pallets/flask-sqlalchemy">
+              https://github.com/pallets/flask-sqlalchemy
+            </a>
+          </li>
+          <li>
+            flask-praetorian (MIT-Lizenz):{" "}
+            <a href="https://github.com/dusktreader/flask-praetorian">
+              https://github.com/dusktreader/flask-praetorian
+            </a>
+          </li>
+          <li>
+            Flask-CORS (MIT-Lizenz):{" "}
+            <a href="https://github.com/corydolphin/flask-cors">
+              https://github.com/corydolphin/flask-cors
+            </a>
+          </li>
+          <li>
+            Behametrics Serverimplementierung (MIT-Lizenz)
+            <a href="https://gitlab.com/behametrics/server">
+              https://gitlab.com/behametrics/server
+            </a>
+          </li>
+        </ul>
+        <h2>Bildnachweise</h2>
+        <ul className="bildnachweise">
+          <li>
+            Originalbild für die Startseite:{" "}
+            <a href="https://pixabay.com/illustrations/virtual-identity-digital-identity-69996/">
+              https://pixabay.com/illustrations/virtual-identity-digital-identity-69996/
+            </a>
+          </li>
+        </ul>
+      </div>
+      <Footer />
+    </>
+  );
+}
diff --git a/frontend/src/components/pages/Login.js b/frontend/src/components/pages/Login.jsx
similarity index 100%
rename from frontend/src/components/pages/Login.js
rename to frontend/src/components/pages/Login.jsx
diff --git a/frontend/src/components/pages/Manual.js b/frontend/src/components/pages/Manual.jsx
similarity index 91%
rename from frontend/src/components/pages/Manual.js
rename to frontend/src/components/pages/Manual.jsx
index e5d9ac8..d86d436 100644
--- a/frontend/src/components/pages/Manual.js
+++ b/frontend/src/components/pages/Manual.jsx
@@ -33,13 +33,11 @@ export default function Manual() {
           Studie.
         </p>
         <h2>War schon einmal hier</h2>
-        <p>
-          Wenn Sie schon einmal hier waren, gibt es zwei mögliche Zustände:
-        </p>
-          <ul>
-            <li>Sie sind noch eingeloggt</li>
-            <li>Sie sind nicht mehr eingeloggt</li>
-          </ul>
+        <p>Wenn Sie schon einmal hier waren, gibt es zwei mögliche Zustände:</p>
+        <ul>
+          <li>Sie sind noch eingeloggt</li>
+          <li>Sie sind nicht mehr eingeloggt</li>
+        </ul>
         <p>
           Sofern Sie noch nicht eingeloggt sind, können Sie sich anmelden mit
           ihrem gewählten Benutzernamen und dem Passwort. Sie landen dann direkt
diff --git a/frontend/src/components/pages/Privacy.js b/frontend/src/components/pages/Privacy.jsx
similarity index 100%
rename from frontend/src/components/pages/Privacy.js
rename to frontend/src/components/pages/Privacy.jsx
diff --git a/frontend/src/components/pages/Register.js b/frontend/src/components/pages/Register.jsx
similarity index 100%
rename from frontend/src/components/pages/Register.js
rename to frontend/src/components/pages/Register.jsx
diff --git a/frontend/src/components/pages/Secret.js b/frontend/src/components/pages/Secret.jsx
similarity index 100%
rename from frontend/src/components/pages/Secret.js
rename to frontend/src/components/pages/Secret.jsx
diff --git a/frontend/src/components/pages/Study.js b/frontend/src/components/pages/Study.jsx
similarity index 100%
rename from frontend/src/components/pages/Study.js
rename to frontend/src/components/pages/Study.jsx
diff --git a/frontend/src/components/pages/Ueber.js b/frontend/src/components/pages/Ueber.jsx
similarity index 100%
rename from frontend/src/components/pages/Ueber.js
rename to frontend/src/components/pages/Ueber.jsx
diff --git a/frontend/src/components/pages/Umfrage.js b/frontend/src/components/pages/Umfrage.jsx
similarity index 100%
rename from frontend/src/components/pages/Umfrage.js
rename to frontend/src/components/pages/Umfrage.jsx

From a1a719088d2772b43c6174b1565807c18266b162 Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Fri, 23 Jul 2021 00:51:28 +0200
Subject: [PATCH 28/47] Added some more options to requests-script

---
 requests.sh | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/requests.sh b/requests.sh
index ee90262..6cfb89a 100755
--- a/requests.sh
+++ b/requests.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 
 ACTION=$1
-TOKEN=$2
-ACTIONS=(login register rcvpw username)
+VALUE=$2
+ACTIONS=(login register rcvpw username data csv)
 
 print_help(){
-    echo "Usage: $0 ACTION [TOKEN]"
+    echo "Usage: $0 ACTION [TOKEN|INPUT_TYPE]"
     echo
     echo "available actions:"
     for el in "${ACTIONS[@]}"; do
@@ -34,7 +34,15 @@ case $ACTION in
         ;;
     "${ACTIONS[3]}") # get current username
         echo "get username action"
-        curl localhost:5050/api/username -X GET -H "Authorization: Bearer $TOKEN"
+        curl localhost:5050/api/username -X GET -H "Authorization: Bearer $VALUE"
+        ;;
+    "${ACTIONS[4]}") # get all data from behametricsserver
+        echo "get data action"
+        curl localhost:5000/data
+        ;;
+    "${ACTIONS[5]}") # get all data from behametricsserver
+        echo "get data action"
+        curl localhost:5000/data/csv/"${VALUE}"
         ;;
     *)
         echo "Error: Action not available"

From 31513f4824e61dcd068b6d11ccdfaf287e231271 Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Fri, 23 Jul 2021 00:54:29 +0200
Subject: [PATCH 29/47] Make it not possible to copy the password with css

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

diff --git a/frontend/src/App.css b/frontend/src/App.css
index b31da3c..85703b2 100644
--- a/frontend/src/App.css
+++ b/frontend/src/App.css
@@ -95,4 +95,5 @@ h1 {
 
 .generated-password {
   font-weight: bold;
+  user-select: none;
 }

From 90e77bf4504cb82ea41cf9a94c90eecad3190a83 Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Fri, 23 Jul 2021 00:58:34 +0200
Subject: [PATCH 30/47] Clean up some things

---
 frontend/src/components/BehaviorNormal.jsx    | 1 -
 frontend/src/components/GeneratedPassword.jsx | 1 -
 frontend/src/components/pages/Study.jsx       | 6 ++----
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/BehaviorNormal.jsx b/frontend/src/components/BehaviorNormal.jsx
index c427a02..9a4e715 100644
--- a/frontend/src/components/BehaviorNormal.jsx
+++ b/frontend/src/components/BehaviorNormal.jsx
@@ -10,7 +10,6 @@ export default function BehaviorNormal(props) {
         Passwort eingeben. Verhalten Sie sich einfach so, als ob Sie sich
         normalerweise anmelden.
       </p>
-      {console.log("props", props)}
       <GeneratedPassword genPassword={props.genPassword} />
     </>
   );
diff --git a/frontend/src/components/GeneratedPassword.jsx b/frontend/src/components/GeneratedPassword.jsx
index f2b8ea9..b0920a1 100644
--- a/frontend/src/components/GeneratedPassword.jsx
+++ b/frontend/src/components/GeneratedPassword.jsx
@@ -11,7 +11,6 @@ export default function GeneratedPassword(props) {
     <>
       <p onCopy={handleOnCopyEvent}>
         Das Passwort für diese Situation lautet:{" "}
-        {console.log("component genpw, genpassword", props.genPassword)}
         <span className="generated-password">{props.genPassword}</span>
       </p>
     </>
diff --git a/frontend/src/components/pages/Study.jsx b/frontend/src/components/pages/Study.jsx
index 54b8f8b..e8588ab 100644
--- a/frontend/src/components/pages/Study.jsx
+++ b/frontend/src/components/pages/Study.jsx
@@ -73,7 +73,6 @@ export default function Study() {
 
   const handleOnPasteEvent = (e) => {
     e.preventDefault();
-    console.log("paste not allowed");
     return false;
   };
 
@@ -88,7 +87,6 @@ export default function Study() {
       response.json().then((resp) => {
         console.log(resp.random_password);
         setGenPassword(resp.random_password);
-        console.log("rcv pw; print genPassword", genPassword);
       });
     });
   };
@@ -165,7 +163,7 @@ export default function Study() {
           onChange={handlePasswordChange}
           InputType="password"
           InputName="Passwort"
-          InputPlaceHolder="Benutzername"
+          InputPlaceHolder="Passwort"
           onPaste={handleOnPasteEvent}
         />
         <SubmitField
@@ -195,7 +193,7 @@ export default function Study() {
           onChange={handlePasswordChange}
           InputType="password"
           InputName="Passwort"
-          InputPlaceHolder="Benutzername"
+          InputPlaceHolder="Passwort"
           onPaste={handleOnPasteEvent}
         />
         <SubmitField

From 1d0f898fc9b164e105e0cfd8f1c4000b67e80d5e Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Fri, 23 Jul 2021 00:59:39 +0200
Subject: [PATCH 31/47] Do not allow copy and paste in survey (fix #197)

---
 frontend/src/components/GeneratedPassword.jsx | 2 +-
 frontend/src/components/pages/Study.jsx       | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/GeneratedPassword.jsx b/frontend/src/components/GeneratedPassword.jsx
index b0920a1..1dfb3af 100644
--- a/frontend/src/components/GeneratedPassword.jsx
+++ b/frontend/src/components/GeneratedPassword.jsx
@@ -9,7 +9,7 @@ export default function GeneratedPassword(props) {
 
   return (
     <>
-      <p onCopy={handleOnCopyEvent}>
+      <p>
         Das Passwort für diese Situation lautet:{" "}
         <span className="generated-password">{props.genPassword}</span>
       </p>
diff --git a/frontend/src/components/pages/Study.jsx b/frontend/src/components/pages/Study.jsx
index e8588ab..dec7bc3 100644
--- a/frontend/src/components/pages/Study.jsx
+++ b/frontend/src/components/pages/Study.jsx
@@ -75,6 +75,10 @@ export default function Study() {
     e.preventDefault();
     return false;
   };
+  const handleOnCopyEvent = (e) => {
+    e.preventDefault();
+    return false;
+  };
 
   const checkIfUsernameIsCorrect = () => {
     return serverUsername === username;
@@ -96,7 +100,6 @@ export default function Study() {
   };
 
   const checkIfValuesAreCorrect = () => {
-    console.log(checkIfPasswordIsCorrect());
     return checkIfPasswordIsCorrect() && checkIfUsernameIsCorrect();
   };
 

From d168b0c87ea84adcb290a62b8a644f8bc24ce6f3 Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Fri, 23 Jul 2021 01:00:14 +0200
Subject: [PATCH 32/47] Add errormessage if username or password are not
 correct

---
 frontend/src/components/pages/Study.jsx | 42 +++++++++++++++++++------
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/pages/Study.jsx b/frontend/src/components/pages/Study.jsx
index dec7bc3..2694809 100644
--- a/frontend/src/components/pages/Study.jsx
+++ b/frontend/src/components/pages/Study.jsx
@@ -3,6 +3,7 @@ import "../../App.css";
 import Footer from "../../Footer";
 import InputField from "../InputField";
 import SubmitField from "../SubmitField";
+import ErrorMessage from "../ErrorMessage";
 import { Logger } from "@behametrics/logger-web";
 import { Button } from "../Button";
 import BehaviorStudyInfo from "../BehaviorStudyInfo";
@@ -24,6 +25,10 @@ export default function Study() {
     END: "end",
   };
   const [state, setState] = useState(STATES.START);
+  const [isInputCorrect, setIsInputCorrect] = useState(true);
+
+  const errorText =
+    "Das Passwort und der Benutzername stimmen nicht überein. Bitte prüfen Sie, dass Sie das Passwort richtig abgetippt und den Benutzernamen richtig eingegeben haben.";
 
   useEffect(() => {
     _logger.current = new Logger({
@@ -109,28 +114,44 @@ export default function Study() {
     handleLoggerOn();
   };
 
+  const resetInputValues = () => {
+    let inputElements = document.querySelectorAll('div input:not([type="submit"])');
+    for (let i=0; i < inputElements.length; i++){
+      inputElements[i].value = ""
+
+    }
+  };
+
   const handleClickAtStepNormal = () => {
     if (checkIfValuesAreCorrect()) {
       receiveRandomPassword();
+      setIsInputCorrect(true);
       setState(STATES.PHONE);
+    } else {
+      setIsInputCorrect(false);
+      resetInputValues();
     }
   };
 
   const handleClickAtStepPhone = () => {
     if (checkIfValuesAreCorrect()) {
       receiveRandomPassword();
+      setIsInputCorrect(true);
       setState(STATES.STANDING);
     } else {
-      console.log("Passwort und Benutzername stimmen nicht.");
+      setIsInputCorrect(false);
+      resetInputValues();
     }
   };
 
   const handleClickAtStepStanding = () => {
     if (checkIfValuesAreCorrect()) {
+      setIsInputCorrect(true);
       setState(STATES.END);
       handleLoggerOff();
     } else {
-      console.log("Passwort und Benutzername stimmen nicht.");
+      setIsInputCorrect(false);
+      resetInputValues();
     }
   };
 
@@ -151,8 +172,9 @@ export default function Study() {
 
   const study_normal = (
     <>
-      <BehaviorNormal genPassword={genPassword} />
-      <form id="behaviorNormal">
+      <BehaviorNormal onCopy={handleOnCopyEvent} genPassword={genPassword} />
+      {!isInputCorrect && <ErrorMessage message={errorText} />}
+      <div>
         <InputField
           LabelName="Benutzername"
           onChange={handleUsernameChange}
@@ -175,14 +197,15 @@ export default function Study() {
           InputName="Weiter"
           onClick={handleClickAtStepNormal}
         />
-      </form>
+      </div>
     </>
   );
 
   const study_phone = (
     <>
       <BehaviorPhone genPassword={genPassword} />
-      <form id="behaviorPhone">
+      {!isInputCorrect && <ErrorMessage message={errorText} />}
+      <div>
         <InputField
           LabelName="Benutzername"
           onChange={handleUsernameChange}
@@ -205,14 +228,15 @@ export default function Study() {
           InputName="Weiter"
           onClick={handleClickAtStepPhone}
         />
-      </form>
+      </div>
     </>
   );
 
   const study_standing = (
     <>
       <BehaviorStanding genPassword={genPassword} />
-      <form id="behaviorStanding">
+      {!isInputCorrect && <ErrorMessage message={errorText} />}
+      <div>
         <InputField
           LabelName="Benutzername"
           onChange={handleUsernameChange}
@@ -235,7 +259,7 @@ export default function Study() {
           InputName="quit"
           onClick={handleClickAtStepStanding}
         />
-      </form>
+      </div>
     </>
   );
 

From 8e6a74d30c50c6943679ba782bca187e570ecc0a Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Fri, 23 Jul 2021 00:52:36 +0200
Subject: [PATCH 33/47] Added a bugfix in the backend

---
 backend/src/app.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/app.py b/backend/src/app.py
index 7f66284..470e4cf 100644
--- a/backend/src/app.py
+++ b/backend/src/app.py
@@ -113,7 +113,7 @@ def refresh():
        $ curl http://localhost:5000/api/refresh -X GET \
          -H "Authorization: Bearer <your_token>"
     """
-    old_token = request.get_data()
+    old_token = flask.request.get_data()
     new_token = guard.refresh_jwt_token(old_token)
     ret = {'access_token': new_token}
     return ret, 200

From 617741218c5963e34cdc68117c74fa0a7d5a0acd Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Fri, 23 Jul 2021 03:35:09 +0200
Subject: [PATCH 34/47] Add things about privacy for the user

---
 frontend/src/components/pages/Privacy.jsx | 64 +++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/frontend/src/components/pages/Privacy.jsx b/frontend/src/components/pages/Privacy.jsx
index 4464714..a48b177 100644
--- a/frontend/src/components/pages/Privacy.jsx
+++ b/frontend/src/components/pages/Privacy.jsx
@@ -7,6 +7,70 @@ export default function Privacy() {
     <>
       <div className="sitePage">
         <h1>Datenschutz</h1>
+        <p>
+          Nachfolgend werden Sie informiert, welche Daten ich von Ihnen erfasse
+          und erhebe. Grundsätzlich gilt, dass ich sämtliche Daten nach der
+          Bachelorthesis wieder lösche. Ausserdem gebe ich keine
+          personenbezogenen Daten an Dritte weiter. Nachfolgend werden die Daten
+          in folgende drei Kategorien eingeteilt:
+        </p>
+        <ul>
+          <li>Daten des Webservers</li>
+          <li>Anmelde- und Umfragedaten</li>
+          <li>Daten zu biometrischen Verhaltensmerkmalen</li>
+        </ul>
+        <h2>Daten des Webservers</h2>
+        <p>
+          Diese Webanwendung wird auf einem virtuellen Server bei{" "}
+          <a href="https://netcup.de">netcup</a> betrieben. Um diese
+          Webanwendung grundsätzlich bereitzustellen, werden die folgenden Daten
+          erhoben:{" "}
+        </p>
+        <ul>
+          <li>IP-Adresse der Anfrage</li>
+          <li>URL der Anfrage</li>
+          <li>
+            User-Agent der Anfrage (also z.B. der verwendete Browser usw.)
+          </li>
+          <li>Status der Antwort</li>
+        </ul>
+        <p>
+          Diese Informationen werden verwendet, um den reibungslosen Betrieb der
+          Webseit zu gewährleisten.{" "}
+        </p>
+        <h2>Anmelde- und Umfragedaten</h2>
+        <p>
+          Im Rahmen der Bachelorthesis erfasse ich einige Merkmale über Sie.
+          Hierzu zählen einerseits die Logindaten, welche erfasst werden müssen,
+          damit Sie sich einloggen können. Ausserdem erfasse ich die folgenden
+          Daten mit einer Umfrage:{" "}
+        </p>
+        <ul>
+          <li>Alter </li>
+          <li>Geschlecht </li>
+          <li>Höchster Bildungsstand </li>
+          <li>Geschätzte Anwenderkenntnisse im Informatikbereich</li>
+        </ul>
+        <p>
+          Die Anmeldedaten werden verwendet, damit Sie sich auf der Webseite
+          einloggen können. Damit Sie sich nicht jedes Mal anmelden müssen,
+          verwende ich die Methode von LocalStorage. Im Localstorage wird der
+          Wert REACT_TOKEN_AUTH_KEY gespeichert, welcher einen Zugangscode
+          enthält. Die Umfragedaten werden ausgewertet, damit ich die
+          Teilnehmenden einordnen kann. Die Daten werst sonst nicht
+          weiterverwertet.
+        </p>
+        <h2>Daten zu biometrischen Verhaltensmerkmalen</h2>
+        <p>
+          Während der Studie werden biometirsche Daten gesammelt. Zu den
+          biometrischen Daten gehören Mausbewegungen und Tastaturanschläge.
+          Diese Daten werden lediglich im Rahmen der Bachelorthesis verwendet
+          und ausgewertet. Nachdem die Bachelorthesis beendet ist, werden
+          sämtliche Daten gelöscht. Es erfolgt keine Auswertung der
+          biometrischen Daten im Zusammenhang mit den Daten der Umfrage.
+          Allerdings kann der Benutzername, welchen Sie bei der Anmeldung
+          angegeben haben, verwendet werden.
+        </p>
       </div>
       <Footer />
     </>

From 5816d4f91405e2b1d1b078dee5ebe93243cbec1a Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Fri, 23 Jul 2021 03:46:43 +0200
Subject: [PATCH 35/47] Remove unused fontawesome usages

---
 frontend/src/Footer.jsx                 | 1 -
 frontend/src/components/HeroSection.jsx | 1 -
 2 files changed, 2 deletions(-)

diff --git a/frontend/src/Footer.jsx b/frontend/src/Footer.jsx
index 6c789d4..1e0fbfa 100644
--- a/frontend/src/Footer.jsx
+++ b/frontend/src/Footer.jsx
@@ -1,7 +1,6 @@
 import React from "react";
 import { Link } from "react-router-dom";
 import "./Footer.css";
-import "@fortawesome/fontawesome-free/css/all.css";
 
 function Footer() {
   return (
diff --git a/frontend/src/components/HeroSection.jsx b/frontend/src/components/HeroSection.jsx
index 93211d3..2613f3d 100644
--- a/frontend/src/components/HeroSection.jsx
+++ b/frontend/src/components/HeroSection.jsx
@@ -2,7 +2,6 @@ import React from "react";
 import "../App.css";
 import { Button } from "./Button";
 import "./HeroSection.css";
-import "@fortawesome/fontawesome-free/css/all.css";
 import { useAuth } from "../auth/AuthProvider";
 
 export default function HeroSection() {

From a97c95f762094e24d824a757f467f485db8b644b Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Sat, 24 Jul 2021 01:08:17 +0200
Subject: [PATCH 36/47] Bumped version of mongodb

---
 docker-compose.prod.yml | 2 +-
 docker-compose.yml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 10c3e2d..ec741e6 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -20,6 +20,6 @@ services:
     environment:
       - MONGO_URI=mongodb://mongodb:27017/behametrics
   mongodb:
-    image: mongo:4.0.1
+    image: mongo:4.0.25
     container_name: "behametrics-mongo"
     command: mongod --smallfiles
diff --git a/docker-compose.yml b/docker-compose.yml
index 46dafc3..deac250 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -35,6 +35,6 @@ services:
     environment:
       - MONGO_URI=mongodb://mongodb:27017/behametrics
   mongodb:
-    image: mongo:4.0.1
+    image: mongo:4.0.25
     container_name: "behametrics-mongo"
     command: mongod --smallfiles

From d220f86cb833f08cfa187865ef7adda70d0b72c4 Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Sat, 24 Jul 2021 01:10:40 +0200
Subject: [PATCH 37/47] Remove the input if someone typed the wrong password

---
 frontend/src/components/pages/Study.jsx | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/pages/Study.jsx b/frontend/src/components/pages/Study.jsx
index 2694809..a9e0ca1 100644
--- a/frontend/src/components/pages/Study.jsx
+++ b/frontend/src/components/pages/Study.jsx
@@ -115,10 +115,11 @@ export default function Study() {
   };
 
   const resetInputValues = () => {
-    let inputElements = document.querySelectorAll('div input:not([type="submit"])');
-    for (let i=0; i < inputElements.length; i++){
-      inputElements[i].value = ""
-
+    let inputElements = document.querySelectorAll(
+      'div input:not([type="submit"])'
+    );
+    for (let i = 0; i < inputElements.length; i++) {
+      inputElements[i].value = "";
     }
   };
 

From c52308e6231b3d2f28b9dcd877ff732ead28bdd9 Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Sat, 24 Jul 2021 01:14:25 +0200
Subject: [PATCH 38/47] Update logger config and create a session usermapping

---
 frontend/src/components/pages/Study.jsx | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/pages/Study.jsx b/frontend/src/components/pages/Study.jsx
index a9e0ca1..48e4718 100644
--- a/frontend/src/components/pages/Study.jsx
+++ b/frontend/src/components/pages/Study.jsx
@@ -32,11 +32,8 @@ export default function Study() {
 
   useEffect(() => {
     _logger.current = new Logger({
-      //inputs: ["cursor", "wheel", "keyboard", "touch"],
-      inputs: ["keyboard"],
-      // apiUrl: "https://behavior.marcocamenzind.ch",
-      apiUrl: "http://localhost:5000",
-      logToConsole: true,
+      inputs: ["keyboard", "wheel", "cursor", "custom"],
+      apiUrl: "https://behavior.marcocamenzind.ch",
     });
     _logger.current.init();
     authFetch("/api/username", {
@@ -112,6 +109,12 @@ export default function Study() {
     receiveRandomPassword();
     setState(STATES.NORMAL);
     handleLoggerOn();
+    // map username and session with the logs
+    _logger.current.logCustomEvent(
+      {
+        name: serverUsername,
+      },
+    );
   };
 
   const resetInputValues = () => {

From deecf9ccad49d758e7ec0c0fbfe5af9187812e4c Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Sat, 24 Jul 2021 01:16:39 +0200
Subject: [PATCH 39/47] Removed unused function

---
 frontend/src/components/GeneratedPassword.jsx | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/frontend/src/components/GeneratedPassword.jsx b/frontend/src/components/GeneratedPassword.jsx
index 1dfb3af..7536737 100644
--- a/frontend/src/components/GeneratedPassword.jsx
+++ b/frontend/src/components/GeneratedPassword.jsx
@@ -2,11 +2,6 @@ import React from "react";
 import "../App.css";
 
 export default function GeneratedPassword(props) {
-  const handleOnCopyEvent = (e) => {
-    e.preventDefault();
-    return false;
-  };
-
   return (
     <>
       <p>

From 8bb37bbc210afb8ae947f84e22f4b86524b80eab Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Sat, 24 Jul 2021 02:11:17 +0200
Subject: [PATCH 40/47] Updated to upstream

---
 docker-compose.prod.yml                 | 2 ++
 frontend/src/components/pages/Study.jsx | 8 +++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index ec741e6..9c7cbf9 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -8,6 +8,8 @@ services:
   backend-prod:
     image: caminsha/bt-backend
     container_name: backend-prod
+    volumes:
+      - "./database.db:/app/database.db:z"
     environment:
       DEBUG: "no"
       PORT: 5050
diff --git a/frontend/src/components/pages/Study.jsx b/frontend/src/components/pages/Study.jsx
index 48e4718..92de04d 100644
--- a/frontend/src/components/pages/Study.jsx
+++ b/frontend/src/components/pages/Study.jsx
@@ -110,11 +110,9 @@ export default function Study() {
     setState(STATES.NORMAL);
     handleLoggerOn();
     // map username and session with the logs
-    _logger.current.logCustomEvent(
-      {
-        name: serverUsername,
-      },
-    );
+    _logger.current.logCustomEvent({
+      name: serverUsername,
+    });
   };
 
   const resetInputValues = () => {

From c5b595ad400ba9eeb6782712af516c5b1ac99863 Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Sun, 25 Jul 2021 00:05:11 +0200
Subject: [PATCH 41/47] Updated some things for infrastructure

---
 backend/Dockerfile      |  2 ++
 backend/Dockerfile.prod |  2 ++
 requests.sh             | 12 ++++++++++--
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/backend/Dockerfile b/backend/Dockerfile
index 8eb7a25..8c2b849 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -4,6 +4,8 @@ WORKDIR /app
 
 COPY requirements.txt .
 
+RUN apk install sqlite3
+
 RUN pip install -r requirements.txt
 
 COPY /src .
diff --git a/backend/Dockerfile.prod b/backend/Dockerfile.prod
index 1bd4a72..3e3875f 100644
--- a/backend/Dockerfile.prod
+++ b/backend/Dockerfile.prod
@@ -6,6 +6,8 @@ RUN apt-get -y update && apt-get -y upgrade
 
 COPY requirements.txt .
 
+RUN apk install sqlite3
+
 RUN pip install -r requirements.txt
 
 COPY /src .
diff --git a/requests.sh b/requests.sh
index 6cfb89a..ff77321 100755
--- a/requests.sh
+++ b/requests.sh
@@ -2,7 +2,7 @@
 
 ACTION=$1
 VALUE=$2
-ACTIONS=(login register rcvpw username data csv)
+ACTIONS=(login register rcvpw username data csv prod_data prod_csv)
 
 print_help(){
     echo "Usage: $0 ACTION [TOKEN|INPUT_TYPE]"
@@ -41,9 +41,17 @@ case $ACTION in
         curl localhost:5000/data
         ;;
     "${ACTIONS[5]}") # get all data from behametricsserver
-        echo "get data action"
+        echo "get csv from input action"
         curl localhost:5000/data/csv/"${VALUE}"
         ;;
+    "${ACTIONS[6]}") # get all data from behametricsserver
+        echo "get prod data action"
+        curl behavior.marcocamenzind.ch:5000/data
+        ;;
+    "${ACTIONS[7]}") # get all data from behametricsserver
+        echo "get prod csv from input action"
+        curl behavior.marcocamenzind.ch:5000/data/csv/"${VALUE}"
+        ;;
     *)
         echo "Error: Action not available"
         echo 

From fe5b56313946652166da189a63c2fb0a452833eb Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Sun, 25 Jul 2021 00:15:05 +0200
Subject: [PATCH 42/47] Updated python requirements

---
 backend/requirements.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/backend/requirements.txt b/backend/requirements.txt
index 75a45e2..3458910 100644
--- a/backend/requirements.txt
+++ b/backend/requirements.txt
@@ -1,3 +1,4 @@
+autopep8==1.5.7
 blinker==1.4
 click==7.1.2
 Deprecated==1.2.12
@@ -16,11 +17,13 @@ MarkupSafe==1.1.1
 passlib==1.7.4
 pendulum==2.1.2
 py-buzz==1.0.3
+pycodestyle==2.7.0
 PyJWT==2.1.0
 python-dateutil==2.8.1
 python-dotenv==0.17.1
 pytzdata==2020.1
 six==1.16.0
 SQLAlchemy==1.4.15
+toml==0.10.2
 Werkzeug==1.0.1
 wrapt==1.12.1

From d5c6aad834d7ccab5c3d20ad529153211bf66f9c Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Sun, 25 Jul 2021 00:19:26 +0200
Subject: [PATCH 43/47] Updated dockerfile

---
 backend/Dockerfile.prod | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/Dockerfile.prod b/backend/Dockerfile.prod
index 3e3875f..61f536d 100644
--- a/backend/Dockerfile.prod
+++ b/backend/Dockerfile.prod
@@ -6,7 +6,7 @@ RUN apt-get -y update && apt-get -y upgrade
 
 COPY requirements.txt .
 
-RUN apk install sqlite3
+RUN apt-get -y install sqlite3
 
 RUN pip install -r requirements.txt
 

From 41143c361b90827f7fdfcb74271817ef0a3a75f4 Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Sun, 25 Jul 2021 23:27:49 +0200
Subject: [PATCH 44/47] Remove logging of password

---
 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 92de04d..cb1c9a9 100644
--- a/frontend/src/components/pages/Study.jsx
+++ b/frontend/src/components/pages/Study.jsx
@@ -91,7 +91,6 @@ export default function Study() {
       method: "get",
     }).then((response) => {
       response.json().then((resp) => {
-        console.log(resp.random_password);
         setGenPassword(resp.random_password);
       });
     });

From d01a70f9255dc80435cb57004d6fff5f72c4807e Mon Sep 17 00:00:00 2001
From: cami <cami+giteaspcodes@mailbox.org>
Date: Sun, 25 Jul 2021 23:36:05 +0200
Subject: [PATCH 45/47] Updated licenses and privacy

---
 frontend/src/components/pages/Lizenzen.jsx |  2 +-
 frontend/src/components/pages/Privacy.jsx  | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/pages/Lizenzen.jsx b/frontend/src/components/pages/Lizenzen.jsx
index dbd7b38..e47176c 100644
--- a/frontend/src/components/pages/Lizenzen.jsx
+++ b/frontend/src/components/pages/Lizenzen.jsx
@@ -73,7 +73,7 @@ export default function Lizenzen() {
             </a>
           </li>
           <li>
-            Behametrics Serverimplementierung (MIT-Lizenz)
+            Behametrics Serverimplementierung (MIT-Lizenz):{" "}
             <a href="https://gitlab.com/behametrics/server">
               https://gitlab.com/behametrics/server
             </a>
diff --git a/frontend/src/components/pages/Privacy.jsx b/frontend/src/components/pages/Privacy.jsx
index a48b177..4afd173 100644
--- a/frontend/src/components/pages/Privacy.jsx
+++ b/frontend/src/components/pages/Privacy.jsx
@@ -71,6 +71,23 @@ export default function Privacy() {
           Allerdings kann der Benutzername, welchen Sie bei der Anmeldung
           angegeben haben, verwendet werden.
         </p>
+        <h2>Weitergabe der Daten</h2>
+        Grundsätzlich werden die Daten nicht an Dritte weitergegeben. Folgende
+        Ausnahmen gibt es:
+        <ul>
+          <li>
+            Der Fernfachhochschule Schweiz werden die Daten falls notwendig
+            weitergegeben.
+          </li>
+          <li>
+            Sofern es eine gesetzliche Grundlage gibt, werden die Daten auch
+            weitergegeben.
+          </li>
+          <li>
+            Wie bereits oben erwähnt, läuft die Webanwendung auf einem
+            virtuellen Server bei <a href="https://netcup.de">netcup</a>. Hierbei gelten die Datenschutzbestimmungen von netcup, welche <a href="https://www.netcup.de/kontakt/datenschutzerklaerung.php">hier</a> eingesehen werden können.
+          </li>
+        </ul>
       </div>
       <Footer />
     </>

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 46/47] 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}

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 47/47] 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", {