Merge pull request 'Add Feedback at the registration process (fix #78)' (#79) from feature/registerFeedback into main
Reviewed-on: #79
This commit is contained in:
commit
93c098dd8e
5 changed files with 42 additions and 15 deletions
|
@ -138,16 +138,24 @@ def register():
|
||||||
req = flask.request.get_json(force=True)
|
req = flask.request.get_json(force=True)
|
||||||
username = req.get('username', None)
|
username = req.get('username', None)
|
||||||
password = req.get('password', None)
|
password = req.get('password', None)
|
||||||
new_user = User(
|
|
||||||
username=username,
|
get_list_by_username = User.query.filter_by(username=username).first()
|
||||||
password=guard.hash_password(password)
|
if get_list_by_username is None:
|
||||||
)
|
new_user = User(
|
||||||
db.session.add(new_user)
|
username=username,
|
||||||
db.session.commit()
|
password=guard.hash_password(password)
|
||||||
ret = {'message': 'Account erstellt für den Account {}'.format(
|
)
|
||||||
new_user.username
|
db.session.add(new_user)
|
||||||
)}
|
db.session.commit()
|
||||||
return ret, 200
|
ret = {'message': 'Account erstellt für den Account {}'.format(
|
||||||
|
new_user.username
|
||||||
|
)}
|
||||||
|
return ret, 200
|
||||||
|
else:
|
||||||
|
ret = {'message': 'Benutzername {} existiert bereits. Bitte wähle einen anderen '.format(
|
||||||
|
username
|
||||||
|
)}
|
||||||
|
return ret, 409
|
||||||
|
|
||||||
|
|
||||||
@app.route('/umfrage', methods=['POST'])
|
@app.route('/umfrage', methods=['POST'])
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
--secondary: rgb(218, 218, 218);
|
--secondary: rgb(218, 218, 218);
|
||||||
--third: rgb(171, 183, 183);
|
--third: rgb(171, 183, 183);
|
||||||
--forth: rgb(255, 255, 255);
|
--forth: rgb(255, 255, 255);
|
||||||
|
--error: rgb(221, 140, 18);
|
||||||
}
|
}
|
||||||
|
|
||||||
.home,
|
.home,
|
||||||
|
@ -54,3 +55,7 @@ h1 {
|
||||||
max-width: 60%;
|
max-width: 60%;
|
||||||
margin-bottom: 4vh;
|
margin-bottom: 4vh;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.errorMessage {
|
||||||
|
color: var(--error);
|
||||||
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
form {
|
form {
|
||||||
max-width: 60%;
|
width: 60%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.input-field {
|
.input-field {
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
import React from "react";
|
import React from "react";
|
||||||
import "./Input.css";
|
import "./Input.css";
|
||||||
import "./Button.css";
|
|
||||||
|
|
||||||
function SubmitField(props) {
|
function SubmitField(props) {
|
||||||
const InputValue = props.LabelName;
|
const InputValue = props.LabelName;
|
||||||
|
|
|
@ -4,21 +4,35 @@ import "../../App.css";
|
||||||
import Footer from "../../Footer";
|
import Footer from "../../Footer";
|
||||||
import InputField from "../InputField";
|
import InputField from "../InputField";
|
||||||
import SubmitField from "../SubmitField";
|
import SubmitField from "../SubmitField";
|
||||||
|
import "../Input.css";
|
||||||
|
|
||||||
export default function Login() {
|
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 onSubmitClick = (e) => {
|
const onSubmitClick = (e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
let opts = {
|
let opts = {
|
||||||
username: username,
|
username: username,
|
||||||
password: password,
|
password: password,
|
||||||
};
|
};
|
||||||
console.log(opts);
|
|
||||||
fetch("/api/register", {
|
fetch("/api/register", {
|
||||||
method: "post",
|
method: "post",
|
||||||
body: JSON.stringify(opts),
|
body: JSON.stringify(opts),
|
||||||
|
}).then((response) => {
|
||||||
|
console.log(response);
|
||||||
|
if (response.status === 409) {
|
||||||
|
/*
|
||||||
|
then is needed twice to get rid of the javascript Promise thing
|
||||||
|
*/
|
||||||
|
response.json().then((resp2) => {
|
||||||
|
setMessage(resp2.message);
|
||||||
|
});
|
||||||
|
} else if (response.status === 200) {
|
||||||
|
//TODO redirect to login #77 or #74
|
||||||
|
}
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -41,6 +55,7 @@ export default function Login() {
|
||||||
onChange={handleUsernameChange}
|
onChange={handleUsernameChange}
|
||||||
InputName="username"
|
InputName="username"
|
||||||
/>
|
/>
|
||||||
|
<p className="errorMessage">{message}</p>
|
||||||
<InputField
|
<InputField
|
||||||
LabelName="Passwort"
|
LabelName="Passwort"
|
||||||
InputType="password"
|
InputType="password"
|
||||||
|
@ -48,7 +63,7 @@ export default function Login() {
|
||||||
InputName="password"
|
InputName="password"
|
||||||
/>
|
/>
|
||||||
<br />
|
<br />
|
||||||
<SubmitField onClick={onSubmitClick} LabelName="Einloggen" />
|
<SubmitField onClick={onSubmitClick} LabelName="Registrieren" />
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
<Footer />
|
<Footer />
|
||||||
|
|
Loading…
Reference in a new issue