Got login to work

src/main/java/rocks/zipcode/atm/CashMachine.java

@@ -1,9 +1,12 @@
 package rocks.zipcode.atm;
 
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
 import javafx.scene.control.Alert;
 import rocks.zipcode.atm.bank.AccountData;
 import rocks.zipcode.atm.bank.Bank;
 
+import java.util.Set;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
@@ -24,6 +27,14 @@ public class CashMachine {
         accountData = data;
     };
 
+    public boolean checkUserId (int id) {
+       return bank.accountExists(id);
+    }
+
+    public boolean comparePassword (int id, String pw) {
+        return bank.checkPassword(id, pw);
+    }
+
     public void login(int id) {
         tryCall(
                 () -> bank.getAccountById(id),
@@ -60,11 +71,17 @@ public class CashMachine {
         }
     }
 
+    public Set<Integer> accountSet() {
+        return bank.allAccounts();
+    }
+
     @Override
     public String toString() {
         return accountData != null ? accountData.toString() : "Try account 1000 or 2000 and click submit.";
     }
 
+
+
     private <T> void tryCall(Supplier<ActionResult<T> > action, Consumer<T> postAction) {
         try {
             ActionResult<T> result = action.get();
@@ -81,4 +98,5 @@ public class CashMachine {
             System.out.println("Error: " + e.getMessage());
         }
     }
+
 }

src/main/java/rocks/zipcode/atm/CashMachineApp.java

@@ -1,22 +1,22 @@
 package rocks.zipcode.atm;
 
 import javafx.event.ActionEvent;
-import javafx.event.Event;
 import javafx.event.EventHandler;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.control.*;
-import javafx.scene.layout.GridPane;
-import javafx.scene.layout.HBox;
+import javafx.scene.effect.DropShadow;
+import javafx.scene.layout.*;
+
+import javafx.scene.paint.Color;
+import javafx.scene.text.Font;
+import javafx.scene.text.Text;
+import javafx.scene.text.TextAlignment;
 import rocks.zipcode.atm.bank.Bank;
 import javafx.application.Application;
-import javafx.scene.Parent;
 import javafx.scene.Scene;
-import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
-import javafx.scene.layout.FlowPane;
 
-import javax.swing.*;
 
 /**
  * @author ZipCodeWilmington
@@ -25,108 +25,115 @@ import javax.swing.*;
 // Eventually 2 display fields : 1 for account info, 2: account transactions/alerts/status
 public class CashMachineApp extends Application {
 
+    String checkId;
+
+
     private TextField field = new TextField();
-    final PasswordField passwordField = new PasswordField();
     private CashMachine cashMachine = new CashMachine(new Bank());
 
-    Label passwordLabel = new Label ("Password: ");
+    private final PasswordField passwordField = new PasswordField();
+
+
+    //Login -> profile, new stages for each, change stages.
+    //
+
+    private Stage mainAccount(int id) {
+
+        Stage account = new Stage();
+
+
+        account.setTitle("Account Details");
 
 
-    private Parent createContent() {
         VBox vbox = new VBox(10);
-        vbox.setPrefSize(600, 600);
 
-        TextArea areaInfo = new TextArea();
+        Scene accountScene = new Scene(vbox, 500, 600);
 
-        Button btnSubmit = new Button("Set Account ID");
-        btnSubmit.setOnAction(e -> {
-            int id = Integer.parseInt(field.getText());
-            cashMachine.login(id);
+        TextArea areaInfo = new TextArea();
+        cashMachine.login(id);
 
-            areaInfo.setText(cashMachine.toString());
-        });
+        areaInfo.setText(cashMachine.toString());
 
-        passwordField.setPromptText("Enter your password");
+        vbox.getChildren().addAll(areaInfo);
 
-        Button btnDeposit = new Button("Deposit");
-        btnDeposit.setOnAction(e -> {
-            float amount = Float.parseFloat(field.getText());
-            cashMachine.deposit(amount);
+        account.setScene(accountScene);
 
-            areaInfo.setText(cashMachine.toString());
-        });
+        return account;
+    }
 
-        passwordField.setOnAction(new EventHandler<ActionEvent>() {
-            @Override
-            public void handle(ActionEvent event) {
 
-            }
-        });
+    private Stage loginStage() {
 
-        Button btnWithdraw = new Button("Withdraw");
-        btnWithdraw.setOnAction(e -> {
-            float amount = Float.parseFloat(field.getText());
-            cashMachine.withdraw(amount);
+        Stage login = new Stage();
+        login.setTitle("Account Login");
 
-            areaInfo.setText(cashMachine.toString());
-        });
 
-        Button btnExit = new Button("Exit");
-        btnExit.setOnAction(e -> {
-            cashMachine.exit();
+//        GridPane grid = new GridPane();
+//        grid.setAlignment(Pos.CENTER);
+//        grid.setHgap(10);
+//        grid.setVgap(10);
 
-            areaInfo.setText(cashMachine.toString());
-        });
+        VBox vbox = new VBox(10);
+        vbox.setSpacing(10);
 
-        MenuItem menuItem1 = new MenuItem("Option 1 ");
-        menuItem1.setOnAction(event -> {
+        vbox.setPadding(new Insets(25, 25, 25, 25));
 
-        });
+        Scene scene = new Scene(vbox, 375, 275);
 
-        MenuButton menuButton = new MenuButton("Options", null, menuItem1);
-        // Adding menu options
-        //HBox hBox = new HBox(menuButton);
+        vbox.setBackground(new Background(new BackgroundFill(Color.color(0.3, 0.6, 0.6), null, null)));
 
-        FlowPane flowpane = new FlowPane();
 
-        flowpane.getChildren().add(btnSubmit);
-        flowpane.getChildren().add(btnDeposit);
-        flowpane.getChildren().add(btnWithdraw);
-        flowpane.getChildren().add(btnExit);
+        Text title = new Text("ZipCloudBank");
+        title.setTextAlignment(TextAlignment.CENTER);
+        title.setFont(Font.font("Verdana", 25));
+        title.setFill(Color.WHITE);
 
-        // testing password field
-        PasswordField passwordField = new PasswordField();
+        Text desc = new Text(" ");
+        desc.setFont(Font.font("Verdana", 10));
 
-        // HBox hbox = new HBox(passwordField);
 
-        vbox.getChildren().addAll(field, passwordLabel, passwordField, flowpane, areaInfo);
-        return vbox;
-    }
+        DropShadow ds = new DropShadow();
+        ds.setOffsetY(4.0f);
+        ds.setOffsetX(4.0f);
+        ds.setColor(Color.color(0.4f, 0.4f, 0.4f));
+//        title.setEffect(ds);
 
+//        grid.add(title, 0,0);
 
-    private Stage popUpStage() {
-        Stage login = new Stage();
-        login.setTitle("Account Login");
+        Label userName = new Label ("Enter Account Number");
+        userName.setFont(Font.font("Verdana", 10));
+        userName.setLabelFor(field);
+        userName.setTextFill(Color.WHITESMOKE);
+//        grid.add(userName, 0, 2);
+//        grid.add(field, 0, 3);
 
-        GridPane grid = new GridPane();
-        grid.setAlignment(Pos.CENTER);
-        grid.setHgap(10);
-        grid.setVgap(10);
 
-        grid.setPadding(new Insets(25, 25, 25, 25));
 
-        Scene scene = new Scene(grid, 300, 275);
+        Button btn = new Button("Log in");
+        HBox hbBtn = new HBox(10);
+        hbBtn.setAlignment(Pos.BOTTOM_RIGHT);
+        hbBtn.getChildren().add(btn);
+//        grid.add(hbBtn, 0, 6);
 
-        Label userName = new Label ("Select Account");
-        grid.add(userName, 0, 1);
-        MenuItem menuItem1 = new MenuItem("Option 1 ");
-        menuItem1.setOnAction(event -> {
+        vbox.getChildren().addAll(title, desc, userName, field, btn, hbBtn);
 
+        btn.setOnAction(new EventHandler<ActionEvent>() {
+            @Override
+            public void handle(ActionEvent event) {
+                Integer id = Integer.parseInt(field.getText());
+
+                if (cashMachine.checkUserId(id)) {
+                    login.hide();
+                    mainAccount(id).show();
+                } else {
+                    Alert invalidID = new Alert(Alert.AlertType.INFORMATION);
+                    invalidID.setContentText("Invalid ID number.");
+                    invalidID.showAndWait();
+                    field.clear();
+                }
+            }
         });
 
-        MenuButton menuButton = new MenuButton("Options", null, menuItem1);
-        grid.add(menuButton, 2, 1);
-
 
         login.setScene(scene);
 
@@ -134,23 +141,66 @@ public class CashMachineApp extends Application {
 
     }
 
+    public String getPassword() {
+        return passwordField.getText();
+    }
+
+    public int getId(String id) {
+        return Integer.parseInt(id);
+    }
+
     @Override
     public void start(Stage stage) throws Exception {
 
-        stage.setScene(new Scene(createContent()));
-        Stage login = popUpStage();
-
-        stage.show();
+        Stage login = loginStage();
 
         login.alwaysOnTopProperty();
 
         login.show();
 
-
-
     }
 
     public static void main(String[] args) {
         launch(args);
     }
+
+
 }
+
+
+//        login.setOnCloseRequest( event -> {
+//            // when button is clicked then open new one
+//            stage.show();
+//        });
+
+//         btn.setOnAction(e -> {
+//            if (cashMachine.checkUserId(getId())) {
+//
+//                if (cashMachine.comparePassword(getId(), passwordAccount)) {
+//                    login.close();
+//
+//                } else {
+//                    actionText.setText("Password was incorrect.");
+//                    grid.add(actionText, 1, 6);
+//                }
+//            } else {
+//                actionText.setText("Invalid Id.");
+//                grid.add(actionText, 1, 6);
+//            }
+//        });
+
+
+
+
+//int loginId = Integer.parseInt(loginAccount);
+
+
+//        Label passWord = new Label("Password");
+//        grid.add(passWord, 0, 3);
+//
+//
+//        PasswordField passwordField = new PasswordField();
+//        grid.add(passwordField, 0, 4);
+//
+//        String passwordAccount = passwordField.getText();
+

src/main/java/rocks/zipcode/atm/bank/Bank.java

@@ -7,6 +7,7 @@ import rocks.zipcode.atm.ActionResult;
 import java.awt.event.ActionEvent;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * @author ZipCodeWilmington
@@ -34,6 +35,23 @@ public class Bank {
         }
     }
 
+    public Set<Integer> allAccounts() {
+        return passwords.keySet();
+    }
+
+    public boolean accountExists(Integer id) {
+        boolean hasAccount = false;
+
+        for (Integer key: allAccounts()) {
+            if (key.equals(id)) {
+                hasAccount = true;
+                break;
+            }
+        }
+
+        return hasAccount;
+    }
+
     public boolean checkPassword(int id, String password) {
         boolean correctPassword =  true;