Compare commits
No commits in common. "aa26855b43a12f2cbdf0a029b1a9263a7b35727d" and "92dfa044073a3dd6dfb2dd68a7f134b9d5c6caf9" have entirely different histories.
aa26855b43
...
92dfa04407
8 changed files with 50 additions and 136 deletions
|
@ -223,16 +223,9 @@ def survey():
|
||||||
return ret, 400
|
return ret, 400
|
||||||
|
|
||||||
|
|
||||||
@app.route('/api/protected/behavior', methods=['GET'])
|
@app.route('/time')
|
||||||
@flask_praetorian.auth_required
|
def get_current_time():
|
||||||
def get_randompassword():
|
return {'time': time.time()}
|
||||||
print("Hallo")
|
|
||||||
|
|
||||||
|
|
||||||
@app.route('/api/protected/behavior', methods=['POST'])
|
|
||||||
@flask_praetorian.auth_required
|
|
||||||
def check_password_username():
|
|
||||||
print("hallooo POST")
|
|
||||||
|
|
||||||
|
|
||||||
# Run the example
|
# Run the example
|
||||||
|
|
|
@ -12,8 +12,8 @@ import Manual from "./components/pages/Manual";
|
||||||
import Secret from "./components/pages/Secret";
|
import Secret from "./components/pages/Secret";
|
||||||
import Umfrage from "./components/pages/Umfrage";
|
import Umfrage from "./components/pages/Umfrage";
|
||||||
import PrivateRoute from "./auth/PrivateRoute";
|
import PrivateRoute from "./auth/PrivateRoute";
|
||||||
|
import Behavior from "./components/pages/Behavior";
|
||||||
import { useAuth } from "./auth/AuthProvider";
|
import { useAuth } from "./auth/AuthProvider";
|
||||||
import BehaviorNormal from "./components/pages/BehaviorNormal";
|
|
||||||
|
|
||||||
function App() {
|
function App() {
|
||||||
const [isLoggedIn] = useAuth();
|
const [isLoggedIn] = useAuth();
|
||||||
|
@ -31,7 +31,7 @@ function App() {
|
||||||
<Route path="/register" component={Register} />
|
<Route path="/register" component={Register} />
|
||||||
<Route path="/manual" component={Manual} />
|
<Route path="/manual" component={Manual} />
|
||||||
<Route path="/ueber" component={Ueber} />
|
<Route path="/ueber" component={Ueber} />
|
||||||
<PrivateRoute path="/behavior" component={BehaviorNormal} />
|
<PrivateRoute path="/behavior" component={Behavior} />
|
||||||
<PrivateRoute path="/secret" component={Secret} />
|
<PrivateRoute path="/secret" component={Secret} />
|
||||||
<PrivateRoute path="/umfrage" component={Umfrage} />
|
<PrivateRoute path="/umfrage" component={Umfrage} />
|
||||||
</Switch>
|
</Switch>
|
||||||
|
|
|
@ -10,8 +10,6 @@ function InputField(props) {
|
||||||
onChange={props.onChange}
|
onChange={props.onChange}
|
||||||
type={props.InputType}
|
type={props.InputType}
|
||||||
placeholder={props.InputPlaceHolder}
|
placeholder={props.InputPlaceHolder}
|
||||||
onCopy={props.onCopy}
|
|
||||||
onPaste={props.onPaste}
|
|
||||||
/>
|
/>
|
||||||
</label>
|
</label>
|
||||||
);
|
);
|
||||||
|
|
36
frontend/src/components/pages/Behavior.js
Normal file
36
frontend/src/components/pages/Behavior.js
Normal file
|
@ -0,0 +1,36 @@
|
||||||
|
import React, { useEffect } from "react";
|
||||||
|
import "../../App.css";
|
||||||
|
import Footer from "../../Footer";
|
||||||
|
import { Logger } from "@behametrics/logger-web";
|
||||||
|
import { useAuth } from "../../auth/AuthProvider";
|
||||||
|
|
||||||
|
export default function Behavior() {
|
||||||
|
let logger = new Logger({
|
||||||
|
//inputs: ["cursor", "wheel", "keyboard", "touch"],
|
||||||
|
inputs: ["keyboard"],
|
||||||
|
// logToConsole: true,
|
||||||
|
});
|
||||||
|
logger.init();
|
||||||
|
|
||||||
|
let [isLoggedIn] = useAuth();
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
document.title = `${isLoggedIn}`;
|
||||||
|
console.log(isLoggedIn);
|
||||||
|
if (isLoggedIn === false) {
|
||||||
|
logger.stop();
|
||||||
|
//console.log("stopped logger");
|
||||||
|
} else {
|
||||||
|
logger.start();
|
||||||
|
// console.log("start logger");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<div className="sitePage">
|
||||||
|
<h1>Studie Verhaltensmerkmale</h1>
|
||||||
|
</div>
|
||||||
|
<Footer />
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
|
@ -1,121 +0,0 @@
|
||||||
import React, { useEffect } from "react";
|
|
||||||
import "../../App.css";
|
|
||||||
import Footer from "../../Footer";
|
|
||||||
import { Logger } from "@behametrics/logger-web";
|
|
||||||
import { useAuth } from "../../auth/AuthProvider";
|
|
||||||
import InputField from "../InputField";
|
|
||||||
import { useState } from "react/cjs/react.development";
|
|
||||||
import SubmitField from "../SubmitField";
|
|
||||||
|
|
||||||
export default function BehaviorNormal() {
|
|
||||||
const [username, setUsername] = useState("");
|
|
||||||
const [password, setPassword] = useState("");
|
|
||||||
|
|
||||||
const handleUsernameChange = (e) => {
|
|
||||||
setUsername(e.target.value);
|
|
||||||
};
|
|
||||||
const handlePasswordChange = (e) => {
|
|
||||||
setPassword(e.target.value);
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleOnCopyEvent = (e) => {
|
|
||||||
e.preventDefault();
|
|
||||||
console.log("copy not allowed");
|
|
||||||
return false;
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleOnPasteEvent = (e) => {
|
|
||||||
e.preventDefault();
|
|
||||||
console.log("paste not allowed");
|
|
||||||
return false;
|
|
||||||
};
|
|
||||||
|
|
||||||
const onSubmitClick = (e) => {
|
|
||||||
e.preventDefault();
|
|
||||||
let opts = {
|
|
||||||
username: username,
|
|
||||||
password: password,
|
|
||||||
};
|
|
||||||
fetch("/api/protected/behavior", {
|
|
||||||
method: "post",
|
|
||||||
body: JSON.stringify(opts),
|
|
||||||
}).then((response) => {
|
|
||||||
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 :-)");
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
let logger = new Logger({
|
|
||||||
//inputs: ["cursor", "wheel", "keyboard", "touch"],
|
|
||||||
inputs: ["keyboard"],
|
|
||||||
// logToConsole: true,
|
|
||||||
});
|
|
||||||
logger.init();
|
|
||||||
|
|
||||||
let [isLoggedIn] = useAuth();
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
document.title = `${isLoggedIn}`;
|
|
||||||
if (isLoggedIn === false) {
|
|
||||||
logger.stop();
|
|
||||||
} else {
|
|
||||||
logger.start();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
return (
|
|
||||||
<>
|
|
||||||
<div className="sitePage">
|
|
||||||
<h1>Studie</h1>
|
|
||||||
<p>
|
|
||||||
Nachfolgend werden Sie einige Schritte durchlaufen, um ihre
|
|
||||||
Nutzerinteraktion messen zu können. Verwenden Sie hierbei jeweils
|
|
||||||
ihren Benutzernamen, welchen Sie bereits zuvor genutzt haben. Das
|
|
||||||
Passwort wird jeweils generiert.
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
Zu Beginn geht es darum, dass Sie ganz normal den Benutzernamen und
|
|
||||||
das Passwort eingeben. Verhalten Sie sich einfach so, als ob Sie sich
|
|
||||||
normalerweise anmelden.
|
|
||||||
</p>
|
|
||||||
<p onCopy={handleOnCopyEvent}>
|
|
||||||
Das Passwort für diese Situation lautet: abcdefgeh
|
|
||||||
</p>
|
|
||||||
<form action="#">
|
|
||||||
<InputField
|
|
||||||
LabelName="Benutzername"
|
|
||||||
onChange={handleUsernameChange}
|
|
||||||
InputType="text"
|
|
||||||
InputName="Benutzername"
|
|
||||||
InputPlaceHolder="Benutzername"
|
|
||||||
onCopy={handleOnCopyEvent}
|
|
||||||
onPaste={handleOnPasteEvent}
|
|
||||||
/>
|
|
||||||
<InputField
|
|
||||||
LabelName="Passwort"
|
|
||||||
onChange={handlePasswordChange}
|
|
||||||
InputType="password"
|
|
||||||
InputName="Passwort"
|
|
||||||
InputPlaceHolder="Benutzername"
|
|
||||||
onCopy={handleOnCopyEvent}
|
|
||||||
onPaste={handleOnPasteEvent}
|
|
||||||
/>
|
|
||||||
<SubmitField
|
|
||||||
LabelName="Weiter zur nächsten Situation"
|
|
||||||
InputValue="next-situation"
|
|
||||||
InputName="Weiter"
|
|
||||||
onClick={onSubmitClick}
|
|
||||||
/>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
<Footer />
|
|
||||||
</>
|
|
||||||
);
|
|
||||||
}
|
|
|
@ -13,6 +13,7 @@ export default function Login() {
|
||||||
const [username, setUsername] = useState("");
|
const [username, setUsername] = useState("");
|
||||||
const [password, setPassword] = useState("");
|
const [password, setPassword] = useState("");
|
||||||
|
|
||||||
|
const [message, setMessage] = useState("");
|
||||||
const [errorMessage, setErrorMessage] = useState("");
|
const [errorMessage, setErrorMessage] = useState("");
|
||||||
|
|
||||||
const [isStatusOk, setIsStatusOk] = useState("");
|
const [isStatusOk, setIsStatusOk] = useState("");
|
||||||
|
@ -39,6 +40,7 @@ export default function Login() {
|
||||||
});
|
});
|
||||||
} else if (response.status === 200) {
|
} else if (response.status === 200) {
|
||||||
response.json().then((resp) => {
|
response.json().then((resp) => {
|
||||||
|
setMessage(resp.message);
|
||||||
fetch("/api/login", {
|
fetch("/api/login", {
|
||||||
method: "post",
|
method: "post",
|
||||||
body: JSON.stringify(opts),
|
body: JSON.stringify(opts),
|
||||||
|
|
|
@ -24,6 +24,7 @@ export default function Umfrage() {
|
||||||
const [skillsErrorMessage, setSkillsErrorMessage] = useState("");
|
const [skillsErrorMessage, setSkillsErrorMessage] = useState("");
|
||||||
|
|
||||||
const [backendErrorMessage, setBackendErrorMessage] = useState("");
|
const [backendErrorMessage, setBackendErrorMessage] = useState("");
|
||||||
|
const [backendSuccessMessage, setBackendSuccessMessage] = useState("");
|
||||||
const [isSurveyValidBackend, setIsSurveyValidBackend] = useState("");
|
const [isSurveyValidBackend, setIsSurveyValidBackend] = useState("");
|
||||||
|
|
||||||
/* boolean if the values are ok */
|
/* boolean if the values are ok */
|
||||||
|
@ -49,6 +50,8 @@ export default function Umfrage() {
|
||||||
setIsEducationOk(true);
|
setIsEducationOk(true);
|
||||||
setIsSkillsOk(true);
|
setIsSkillsOk(true);
|
||||||
setIsSurveyValid(true);
|
setIsSurveyValid(true);
|
||||||
|
console.log("before valid");
|
||||||
|
console.log(isSurveyValid);
|
||||||
|
|
||||||
if (!Number(age)) {
|
if (!Number(age)) {
|
||||||
setAgeErrorMessage("Das Alter muss als Zahl angegeben werden.");
|
setAgeErrorMessage("Das Alter muss als Zahl angegeben werden.");
|
||||||
|
@ -77,6 +80,8 @@ export default function Umfrage() {
|
||||||
setIsSkillsOk(false);
|
setIsSkillsOk(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
console.log("after valid");
|
||||||
|
console.log(isSurveyValid);
|
||||||
if (isSurveyValid === true) {
|
if (isSurveyValid === true) {
|
||||||
authFetch("/api/protected/umfrage", {
|
authFetch("/api/protected/umfrage", {
|
||||||
method: "post",
|
method: "post",
|
||||||
|
@ -84,6 +89,7 @@ export default function Umfrage() {
|
||||||
}).then((response) => {
|
}).then((response) => {
|
||||||
if (response.status === 200) {
|
if (response.status === 200) {
|
||||||
response.json().then((r) => {
|
response.json().then((r) => {
|
||||||
|
setBackendSuccessMessage(r.message);
|
||||||
setIsSurveyValidBackend(true);
|
setIsSurveyValidBackend(true);
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in a new issue