ahhhhh

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

@@ -3,6 +3,7 @@ package rocks.zipcode.atm;
 import rocks.zipcode.atm.bank.AccountData;
 import rocks.zipcode.atm.bank.Bank;
 
+import java.util.ArrayList;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
@@ -53,6 +54,26 @@ public class CashMachine {
         }
     }
 
+    public String accountIdToString(){
+        return "Account id: " + accountData.getId() + "\n";
+    }
+
+    public String nameToString(){
+        return "Name : " + accountData.getName() + "\n";
+    }
+
+    public String emailToString(){
+        return "Email : " + accountData.getEmail() + "\n";
+    }
+
+    public String balanceToString(){
+        return "Balance : " + accountData.getBalance() + "\n";
+    }
+
+    public ArrayList<String> listAccounts(){
+        return bank.listAccounts();
+    }
+
     @Override
     public String toString() {
         return accountData != null ? accountData.toString() : "Try account 1000 or 2000 and click submit.";

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

@@ -1,17 +1,20 @@
 package rocks.zipcode.atm;
 
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.control.*;
+import javafx.scene.layout.GridPane;
 import javafx.scene.text.Text;
 import rocks.zipcode.atm.bank.Bank;
 import javafx.application.Application;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
-import javafx.scene.control.Button;
-import javafx.scene.control.TextArea;
-import javafx.scene.control.TextField;
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
 import javafx.scene.layout.FlowPane;
 
+import java.util.ArrayList;
+
 /**
  * @author ZipCodeWilmington
  */
@@ -19,100 +22,112 @@ public class CashMachineApp extends Application {
 
     private TextField field = new TextField();
     private CashMachine cashMachine = new CashMachine(new Bank());
-    private TextField amountField = new TextField();
 
     private Parent createContent() {
-        field.setPromptText("Enter your account ID");
         field.setFocusTraversable(false);
-
+        field.setPromptText("Enter Account ID");
+        FlowPane flowpane = new FlowPane();
         VBox vbox = new VBox(10);
         vbox.setPrefSize(600, 600);
 
-        Text areaInfo = new Text();
-        areaInfo.setVisible(false);
-
-        FlowPane flowpane = new FlowPane();
+        TextArea areaInfo = new TextArea();
 
-        Button btnSubmit = new Button("Login");
-        btnSubmit.setOnAction(e -> {
-            int id = Integer.parseInt(field.getText());
-            cashMachine.login(id);
-        });
-//
-//        String[] acctFields;
-//        acctFields = String.valueOf(areaInfo).split("\n");
+        GridPane gridPane = new GridPane();
+        gridPane.setAlignment(Pos.CENTER_LEFT);
+        gridPane.setVgap(5);
+        gridPane.setHgap(5);
+        Text account = new Text();
+        Text name = new Text();
+        Text email = new Text();
+        Text balance = new Text();
 
-//        Text acctID = new Text(acctFields[0]);
-//        Text name = new Text(acctFields[1]);
-//        Text email = new Text(acctFields[2]);
-//        Text balance = new Text(acctFields[3]);
 
-//        grid.setAlignment(Pos.CENTER_LEFT);
-//        grid.setHgap(10);
-//        grid.setVgap(10);
-//        Text gridTitle = new Text("Your account details");
-//        gridTitle.setFont(Font.font("Times New Roman", FontWeight.SEMI_BOLD, 14));
-//        grid.add(gridTitle, 0, 0, 2, 1);
-
-//        grid.add(acctID,1,1);
-//        grid.add(name,1,2);
-//        grid.add(email,1,3);
-//        grid.add(balance,1,4);
-
-//        grid.setPadding(new Insets(100,300,250,50));
-
-        flowpane.getChildren().add(btnSubmit);
-
-
-        vbox.getChildren().addAll(field, amountField, flowpane, areaInfo); //grid);
-        return vbox;
-    }
-
-    private Parent createContent2(){
-        FlowPane flowpane = new FlowPane();
-        Text areaInfo = new Text();
-        areaInfo.setVisible(true);
-        amountField.setPromptText("Enter amounts");
-        areaInfo.setText(cashMachine.toString());
-
-        VBox vbox = new VBox(10);
-        vbox.setPrefSize(600, 600);
+        MenuBar menuBar = new MenuBar();
 
         Button btnDeposit = new Button("Deposit");
         btnDeposit.setOnAction(e -> {
-            double amount = Integer.parseInt(amountField.getText());
+            int amount = Integer.parseInt(field.getText());
             cashMachine.deposit(amount);
 
-            areaInfo.setText(cashMachine.toString());
-
+            account.setText(cashMachine.accountIdToString());
+            name.setText(cashMachine.nameToString());
+            email.setText(cashMachine.emailToString());
+            balance.setText(cashMachine.balanceToString());
         });
 
-
         Button btnWithdraw = new Button("Withdraw");
         btnWithdraw.setOnAction(e -> {
-            double amount = Integer.parseInt(amountField.getText());
+            int amount = Integer.parseInt(field.getText());
             cashMachine.withdraw(amount);
 
-            areaInfo.setText(cashMachine.toString());
+            account.setText(cashMachine.accountIdToString());
+            name.setText(cashMachine.nameToString());
+            email.setText(cashMachine.emailToString());
+            balance.setText(cashMachine.balanceToString());
         });
 
         Button btnExit = new Button("Exit");
         btnExit.setOnAction(e -> {
             cashMachine.exit();
+            account.setText(cashMachine.accountIdToString());
+            name.setText(cashMachine.nameToString());
+            email.setText(cashMachine.emailToString());
+            balance.setText(cashMachine.balanceToString());
+        });
+
+        Button btnSubmit = new Button("Login");
+        btnSubmit.setOnAction(e -> {
+            int id = Integer.parseInt(field.getText());
+            cashMachine.login(id);
+            account.setText(cashMachine.accountIdToString());
+            name.setText(cashMachine.nameToString());
+            email.setText(cashMachine.emailToString());
+            balance.setText(cashMachine.balanceToString());
+            btnDeposit.setVisible(true);
+            btnWithdraw.setVisible(true);
+            btnExit.setVisible(true);
+            menuBar.setVisible(true);
+
 
-            areaInfo.setText(cashMachine.toString());
         });
 
+        btnDeposit.setVisible(false);
+        btnWithdraw.setVisible(false);
+        btnExit.setVisible(false);
+        menuBar.setVisible(false);
+
+        Menu accountMenu = new Menu("All Accounts");
+
+        flowpane.getChildren().add(btnSubmit);
         flowpane.getChildren().add(btnDeposit);
         flowpane.getChildren().add(btnWithdraw);
         flowpane.getChildren().add(btnExit);
-
-        vbox.getChildren().addAll(amountField, flowpane, areaInfo); //grid);
+        flowpane.getChildren().add(menuBar);
+        menuBar.getMenus().add(accountMenu);
+
+        ArrayList<String> accountList = cashMachine.listAccounts();
+        for(String acct : accountList){
+            MenuItem newItem = new MenuItem(acct);
+            newItem.setOnAction(e -> {
+                field.clear();
+                field.setPromptText("Enter Id and click \"Login\"");
+            });
+
+            accountMenu.getItems().add(newItem);
+
+        }
+
+        gridPane.setPadding(new Insets(25,25,25,25));
+        gridPane.add(account,0,1);
+        gridPane.add(name,0,2);
+        gridPane.add(email,0,3);
+        gridPane.add(balance,0,4);
+        vbox.getChildren().addAll(field, flowpane, gridPane);
         return vbox;
     }
+
     @Override
     public void start(Stage stage) throws Exception {
-        stage.setTitle("Cash Machine");
         stage.setScene(new Scene(createContent()));
         stage.show();
     }

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

@@ -2,6 +2,8 @@ package rocks.zipcode.atm.bank;
 
 import rocks.zipcode.atm.ActionResult;
 
+import java.security.Key;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -57,4 +59,12 @@ public class Bank {
             return ActionResult.fail("Withdraw failed: " + amount + ". Account has: " + account.getBalance());
         }
     }
+
+    public ArrayList<String> listAccounts(){
+        ArrayList<String> accountList = new ArrayList<>();
+        for(Integer key : accounts.keySet()){
+            accountList.add(accounts.get(key).getAccountData().getName());
+        }
+        return accountList;
+    }
 }