Skip to content
Snippets Groups Projects
Commit f8406ceb authored by Eirik Steira's avatar Eirik Steira
Browse files

Merge branch 'loginFix' into 'dev'

Small but critical login fix

See merge request !80
parents 8cefd4ba e3188938
No related branches found
No related tags found
2 merge requests!104Weekly merge to Master,!80Small but critical login fix
......@@ -11,6 +11,8 @@ import javafx.scene.control.Button;
import javafx.scene.control.PasswordField;
import javafx.scene.control.TextField;
import javax.security.auth.login.FailedLoginException;
/**
* Controls the buttons and changeable elements on login.fxml,
* the page where you log into the application
......@@ -43,9 +45,12 @@ public class Login {
userService = new UserService();
String username = Username.getText();
String password = Password.getText();
if(userService.logIn(username, password)); {
if(userService.logIn(username, password)) {
App.setRoot("main");
}
else {
//TODO: Make popup window to inform the user that wrong details was entered
}
//TODO: Else raise warning maybe?
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment