From c5b595ad400ba9eeb6782712af516c5b1ac99863 Mon Sep 17 00:00:00 2001 From: cami Date: Sun, 25 Jul 2021 00:05:11 +0200 Subject: [PATCH 1/7] 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 Date: Sun, 25 Jul 2021 00:15:05 +0200 Subject: [PATCH 2/7] 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 Date: Sun, 25 Jul 2021 00:19:26 +0200 Subject: [PATCH 3/7] 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 Date: Sun, 25 Jul 2021 23:27:49 +0200 Subject: [PATCH 4/7] 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 Date: Sun, 25 Jul 2021 23:36:05 +0200 Subject: [PATCH 5/7] 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() {
  • - Behametrics Serverimplementierung (MIT-Lizenz) + Behametrics Serverimplementierung (MIT-Lizenz):{" "} https://gitlab.com/behametrics/server 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.

    +

    Weitergabe der Daten

    + Grundsätzlich werden die Daten nicht an Dritte weitergegeben. Folgende + Ausnahmen gibt es: +
      +
    • + Der Fernfachhochschule Schweiz werden die Daten falls notwendig + weitergegeben. +
      • +
    • + Sofern es eine gesetzliche Grundlage gibt, werden die Daten auch + weitergegeben. +
      • +
    • + Wie bereits oben erwähnt, läuft die Webanwendung auf einem + virtuellen Server bei netcup. Hierbei gelten die Datenschutzbestimmungen von netcup, welche hier eingesehen werden können. +
      • +