diff --git a/frontend/static/js/api/account.js b/frontend/static/js/api/account.js index 3e44d0e..2247106 100644 --- a/frontend/static/js/api/account.js +++ b/frontend/static/js/api/account.js @@ -20,7 +20,7 @@ class Account if (response_data == "user created") { - this._logged = true; + await this.client._update_logged(true); return null; } return response_data @@ -31,13 +31,13 @@ class Account let response = await this.client._delete("/api/accounts/delete", {password: password}); let response_data = await response.json(); - if (JSON.stringify(response_data) == JSON.stringify({'detail': 'Authentication credentials were not provided.'})) + if (response.status === 403) { this.client._update_logged(false); - return null; + return null; } if (response_data == "user deleted") - this.client._logged = false; + this.client._update_logged(false); return response_data; } @@ -46,10 +46,10 @@ class Account let response = await this.client._get("/api/accounts/edit"); let response_data = await response.json(); - if (JSON.stringify(response_data) == JSON.stringify({'detail': 'Authentication credentials were not provided.'})) + if (response.status === 403) { - this.client._logged = false; - return null; + this.client._update_logged(false); + return null; } return response_data; } @@ -60,13 +60,13 @@ class Account let response = await this.client._patch_json("/api/accounts/edit", data); let response_data = await response.json(); - if (JSON.stringify(response_data) == JSON.stringify({'detail': 'Authentication credentials were not provided.'})) + if (response.status === 403) { - this.client._; + this.client._update_logged(false); return null; } return response_data; } } -export { Account } \ No newline at end of file +export { Account } diff --git a/frontend/static/js/views/accounts/RegisterView.js b/frontend/static/js/views/accounts/RegisterView.js index f1a4812..64be415 100644 --- a/frontend/static/js/views/accounts/RegisterView.js +++ b/frontend/static/js/views/accounts/RegisterView.js @@ -6,7 +6,15 @@ async function register() { let username = document.getElementById("username-input").value; let password = document.getElementById("password-input").value; - + if (username === '' || password === '') { + clear("innerHTML", ["username", "password"]); + if (username === '') + document.getElementById('username').innerHTML = 'This field may not be blank.'; + if (password === '') + document.getElementById('password').innerHTML = 'This field may not be blank.'; + return; + } + let response_data = await client.account.create(username, password); if (response_data == null) @@ -26,6 +34,17 @@ export default class extends AbstractNonAuthentifiedView { async postInit() { + let usernameField = document.getElementById('username-input'); + usernameField.addEventListener('keydown', ev => { + if (ev.key === 'Enter') + register(); + }); + usernameField.focus(); + let passwordField = document.getElementById('password-input'); + passwordField.addEventListener('keydown', ev => { + if (ev.key === 'Enter') + register(); + }); document.getElementById("register-button").onclick = register; }