Visually updated.

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

@@ -55,9 +55,10 @@ public class CashMachine {
 
     @Override
     public String toString() {
-        return accountData != null ? accountData.toString() : "Try account 1000 or 2000 and click submit.";
+        return accountData != null ? accountData.toString() : "Incorrect account number. \nTry again or click 'Forgot Account Number'";
     }
 
+
     private <T> void tryCall(Supplier<ActionResult<T> > action, Consumer<T> postAction) {
         try {
             ActionResult<T> result = action.get();

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

@@ -1,5 +1,7 @@
 package rocks.zipcode.atm;
 
+import javafx.scene.control.Label;
+import javafx.stage.StageStyle;
 import rocks.zipcode.atm.bank.Bank;
 import javafx.application.Application;
 import javafx.scene.Parent;
@@ -17,25 +19,44 @@ import javafx.scene.layout.FlowPane;
 public class CashMachineApp extends Application {
 
     private TextField field = new TextField();
+    private TextField field2 = new TextField();
     private CashMachine cashMachine = new CashMachine(new Bank());
 
+
     private Parent createContent() {
         VBox vbox = new VBox(10);
         vbox.setPrefSize(600, 600);
+        vbox.setStyle("-fx-background-color: silver; -fx-padding: 20; -fx-font-size: 20;");
 
         TextArea areaInfo = new TextArea();
 
-        Button btnSubmit = new Button("Set Account ID");
+        Button btnSubmit = new Button("Enter");
         btnSubmit.setOnAction(e -> {
             int id = Integer.parseInt(field.getText());
             cashMachine.login(id);
 
             areaInfo.setText(cashMachine.toString());
         });
+/*
+        //Make Button Do something.
+        Button btnNewAccount = new Button("Setup New Account");
+        btnSubmit.setOnAction(e -> {
+            int id = Integer.parseInt(field.getText());
+            cashMachine.login(id);
+
+        });
 
+        //Make Button Do something.
+        Button btnForgotAccountNumber = new Button("Forgot Account Number");
+        btnSubmit.setOnAction(e -> {
+            int id = Integer.parseInt(field.getText());
+            cashMachine.login(id);
+
+        });
+*/
         Button btnDeposit = new Button("Deposit");
         btnDeposit.setOnAction(e -> {
-            int amount = Integer.parseInt(field.getText());
+            int amount = Integer.parseInt(field2.getText());
             cashMachine.deposit(amount);
 
             areaInfo.setText(cashMachine.toString());
@@ -43,36 +64,59 @@ public class CashMachineApp extends Application {
 
         Button btnWithdraw = new Button("Withdraw");
         btnWithdraw.setOnAction(e -> {
-            int amount = Integer.parseInt(field.getText());
+            int amount = Integer.parseInt(field2.getText());
             cashMachine.withdraw(amount);
 
             areaInfo.setText(cashMachine.toString());
         });
 
-        Button btnExit = new Button("Exit");
+        Button btnExit = new Button("LogOut");
         btnExit.setOnAction(e -> {
             cashMachine.exit();
-
-            areaInfo.setText(cashMachine.toString());
+            field.clear();
+            field2.clear();
+            areaInfo.clear();
         });
 
         FlowPane flowpane = new FlowPane();
 
         flowpane.getChildren().add(btnSubmit);
-        flowpane.getChildren().add(btnDeposit);
-        flowpane.getChildren().add(btnWithdraw);
-        flowpane.getChildren().add(btnExit);
-        vbox.getChildren().addAll(field, flowpane, areaInfo);
+        /*
+        flowpane.getChildren().add(btnNewAccount);
+        flowpane.getChildren().add(btnForgotAccountNumber);
+        */
+
+        FlowPane flowpane2 = new FlowPane();
+
+        flowpane2.getChildren().add(btnDeposit);
+        flowpane2.getChildren().add(btnWithdraw);
+        flowpane2.getChildren().add(btnExit);
+        Label fieldLabel2 = new Label("Amount:");
+        Label accountInfo2 = new Label("Account Info:");
+
+        field.setStyle("-fx-background-color: beige;");
+        field2.setStyle("-fx-background-color: beige;");
+        Label fieldLabel = new Label("Account Number:");
+        vbox.getChildren().addAll(fieldLabel, field, flowpane, fieldLabel2, field2, flowpane2, accountInfo2, areaInfo);
+
+
+
         return vbox;
+
+
     }
 
     @Override
     public void start(Stage stage) throws Exception {
+        stage.setTitle("ZipCloud Bank");
         stage.setScene(new Scene(createContent()));
         stage.show();
+
     }
 
     public static void main(String[] args) {
         launch(args);
     }
+
+
 }

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

@@ -11,6 +11,9 @@ import java.util.Map;
 public class Bank {
 
     private Map<Integer, Account> accounts = new HashMap<>();
+    //private static int nextId = 1000;
+
+    /* Add options for user to create an account and have a number issued to them. */
 
     public Bank() {
         accounts.put(1000, new BasicAccount(new AccountData(
@@ -22,13 +25,38 @@ public class Bank {
         )));
     }
 
+/*How to use this???
+    public Bank(String name, String email, int initialBalance, boolean typeOfAccount) {
+        nextId++;
+        if (!typeOfAccount) {
+        accounts.put(nextId, new BasicAccount(new AccountData(
+                nextId, name, email, initialBalance
+        ))); } else {
+            accounts.put(nextId, new PremiumAccount(new AccountData(
+                    nextId, name, email, initialBalance
+            )));
+        }
+
+    }
+
+*/
     public ActionResult<AccountData> getAccountById(int id) {
         Account account = accounts.get(id);
 
         if (account != null) {
             return ActionResult.success(account.getAccountData());
         } else {
-            return ActionResult.fail("No account with id: " + id + "\nTry account 1000 or 2000");
+            return ActionResult.fail("No account with id: " + id);
+        }
+    }
+
+    public ActionResult<AccountData> getByName(int id) {
+        Account account = accounts.get(id);
+
+        if (account != null) {
+            return ActionResult.success(account.getAccountData());
+        } else {
+            return ActionResult.fail("No account with id: " + id);
         }
     }