Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Team 14 - IDATT1002
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Eirik Steira
Team 14 - IDATT1002
Commits
718a181a
Commit
718a181a
authored
5 years ago
by
Mads Lundegaard
Browse files
Options
Downloads
Patches
Plain Diff
Adding login method to login controller
parent
46f5cb3c
No related branches found
Branches containing commit
No related tags found
3 merge requests
!104
Weekly merge to Master
,
!72
Remove service test
,
!64
WIP: Implement login controller
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/NTNU/IDATT1002/controllers/Login.java
+13
-2
13 additions, 2 deletions
src/main/java/NTNU/IDATT1002/controllers/Login.java
src/main/resources/NTNU/IDATT1002/login.fxml
+2
-2
2 additions, 2 deletions
src/main/resources/NTNU/IDATT1002/login.fxml
with
15 additions
and
4 deletions
src/main/java/NTNU/IDATT1002/controllers/Login.java
+
13
−
2
View file @
718a181a
...
...
@@ -3,8 +3,11 @@ package NTNU.IDATT1002.controllers;
import
java.io.IOException
;
import
NTNU.IDATT1002.App
;
import
NTNU.IDATT1002.service.UserService
;
import
javafx.event.ActionEvent
;
import
javafx.scene.control.Button
;
import
javafx.scene.control.PasswordField
;
import
javafx.scene.control.TextField
;
/**
* Controls the buttons and changeable elements on login.fxml,
...
...
@@ -13,8 +16,12 @@ import javafx.scene.control.Button;
*/
public
class
Login
{
public
TextField
Username
;
public
PasswordField
Password
;
public
Button
signup
;
public
Button
login
;
private
UserService
userService
;
/**
* Method that changes stage to Sign Up page
...
...
@@ -31,7 +38,11 @@ public class Login {
* @throws IOException
*/
public
void
login
(
ActionEvent
actionEvent
)
throws
IOException
{
//TODO: Verify username and password
App
.
setRoot
(
"main"
);
String
username
=
Username
.
getText
();
String
password
=
Password
.
getText
();
if
(
userService
.
logIn
(
username
,
password
));
{
App
.
setRoot
(
"main"
);
}
//TODO: Else raise warning maybe?
}
}
This diff is collapsed.
Click to expand it.
src/main/resources/NTNU/IDATT1002/login.fxml
+
2
−
2
View file @
718a181a
...
...
@@ -27,8 +27,8 @@
<children>
<Text
strokeType=
"OUTSIDE"
strokeWidth=
"0.0"
text=
"Username:"
GridPane.halignment=
"RIGHT"
/>
<Text
strokeType=
"OUTSIDE"
strokeWidth=
"0.0"
text=
"Password:"
GridPane.halignment=
"RIGHT"
GridPane.rowIndex=
"1"
/>
<TextField
GridPane.columnIndex=
"1"
/>
<PasswordField
GridPane.columnIndex=
"1"
GridPane.rowIndex=
"1"
/>
<TextField
fx:id=
"Username"
GridPane.columnIndex=
"1"
/>
<PasswordField
fx:id=
"Password"
GridPane.columnIndex=
"1"
GridPane.rowIndex=
"1"
/>
<Button
fx:id=
"signup"
onAction=
"#switchToSignup"
text=
"Sign Up"
GridPane.columnIndex=
"1"
GridPane.halignment=
"RIGHT"
GridPane.rowIndex=
"2"
/>
<Button
fx:id=
"login"
onAction=
"#login"
layoutX=
"171.0"
layoutY=
"74.0"
text=
"Log In"
GridPane.columnIndex=
"1"
GridPane.halignment=
"LEFT"
GridPane.rowIndex=
"2"
/>
</children>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment