Merge pull request 'Feature für die Umfrage' (#58) from feature/umfrage into main

Reviewed-on: #58

backend/src/app.py

@@ -150,6 +150,17 @@ def register():
     )}
     return ret, 200
 
+
+@app.route('/umfrage', methods=['POST'])
+@flask_praetorian.auth_required
+def survey():
+    req = flask.request.get_json(force=True)
+    gender = req.get('gender', None)
+    print(req)
+    ret = {'message': 'Umfrage freigestellt'}
+    return ret, 200
+
+
 @app.route('/time')
 def get_current_time():
     return {'time': time.time()}

frontend/src/components/pages/Umfrage.js

@@ -5,6 +5,7 @@ import "../Input.css";
 import Footer from "../../Footer";
 import InputField from "../InputField";
 import SubmitField from "../SubmitField";
+import { authFetch } from "../../auth/AuthProvider";
 
 export default function Umfrage() {
   const [age, setAge] = useState("");
@@ -12,6 +13,8 @@ export default function Umfrage() {
   const [education, setEducation] = useState("");
   const [skills, setSkills] = useState("");
 
+  let surveyIsValid = true;
+
   const onSubmitClick = (e) => {
     e.preventDefault();
     let opts = {
@@ -20,20 +23,32 @@ export default function Umfrage() {
       education: education,
       skills: skills,
     };
-    console.log(opts);
-    /*fetch("/api/login", {
+
+    if (!Number(age)) {
+      console.log("age is not a number");
+      surveyIsValid = false;
+    }
+    if (gender === "DEFAULT" || gender === "") {
+      console.log("choose gender");
+      surveyIsValid = false;
+    }
+    if (education === "DEFAULT" || education === "") {
+      console.log("choose edu");
+      surveyIsValid = false;
+    }
+    if (skills === "DEFAULT" || skills === "") {
+      console.log("choose skills");
+      surveyIsValid = false;
+    }
+
+    if (surveyIsValid === true) {
+      console.log(opts);
+    }
+
+    authFetch("/umfrage", {
       method: "post",
       body: JSON.stringify(opts),
-    })
-      .then((r) => r.json())
-      .then((token) => {
-        if (token.access_token) {
-          login(token);
-        } else {
-          console.log("Please type in the correct username / password");
-        }
-      });
-      */
+    });
   };
 
   const handleAgeChange = (e) => {
@@ -71,10 +86,11 @@ export default function Umfrage() {
           So kann es für mich beispielsweise relevant sein, wenn sämtliche
           Teilnehmenden ein sehr gutes Informatikverständnis haben.
         </p>
-        <form id="umfrage" onClick={onSubmitClick}>
+        <form id="umfrage">
           <InputField
             InputType="number"
             onChange={handleAgeChange}
+            className="input-field"
             LabelName="Wie alt bist du? (Alter in Jahren)"
           />
           <div className="input-field">
@@ -143,6 +159,7 @@ export default function Umfrage() {
             InputName="Umfrage abschicken"
             InputValue="Umfrage abschicken"
             LabelName="Umfrage abschicken"
+            onClick={onSubmitClick}
           />
         </form>
       </div>