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

@@ -1,8 +1,10 @@
 package rocks.zipcode.atm;
 
+import rocks.zipcode.atm.bank.Account;
 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;
 
@@ -29,7 +31,7 @@ public class CashMachine {
         );
     }
 
-    public void deposit(int amount) {
+    public void deposit(double amount) {
         if (accountData != null) {
             tryCall(
                     () -> bank.deposit(accountData, amount),
@@ -38,7 +40,7 @@ public class CashMachine {
         }
     }
 
-    public void withdraw(int amount) {
+    public void withdraw(double amount) {
         if (accountData != null) {
             tryCall(
                     () -> bank.withdraw(accountData, amount),
@@ -53,6 +55,36 @@ 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();
+    }
+
+    public int newBasicAccount(String name, String email, double balance) {
+        bank.addBasicAccount(name,email,balance);
+        return bank.newId();
+    }
+
+    public int newPremiumAccount(String name, String email, double balance) {
+        bank.addPremiumAccount(name,email,balance);
+        return bank.newId();
+    }
+
     @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,78 +1,201 @@
 package rocks.zipcode.atm;
 
-import rocks.zipcode.atm.bank.Bank;
 import javafx.application.Application;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
 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.control.*;
+import javafx.scene.layout.FlowPane;
+import javafx.scene.layout.GridPane;
 import javafx.scene.layout.VBox;
+import javafx.scene.paint.Color;
+import javafx.scene.text.Font;
+import javafx.scene.text.Text;
 import javafx.stage.Stage;
-import javafx.scene.layout.FlowPane;
+import rocks.zipcode.atm.bank.Bank;
+
+import java.util.ArrayList;
 
-/**
- * @author ZipCodeWilmington
- */
 public class CashMachineApp extends Application {
+    CashMachine cashMachine = new CashMachine(new Bank());
+    Text account = new Text();
+    Text name = new Text();
+    Text email = new Text();
+    Text balance = new Text();
+    Button btnDeposit = new Button("Deposit");
+    Button btnWithdraw = new Button("Withdraw");
+    Button btnExit = new Button("Logout");
+    Button btnSubmit = new Button("Login");
+    Button btnClose = new Button("Exit");
+    Button btnNewAccount = new Button("New Account");
+    TextField name1 = new TextField("Name");
+    TextField email1 = new TextField("Email");
+    TextField balance1 = new TextField("Balance");
+    RadioButton basicAcct = new RadioButton("Basic Account");
+    RadioButton premAcct = new RadioButton("Premium Account");
+    Button btnSubmit2 = new Button("Create Account");
+
+    FlowPane fp = new FlowPane();
+    FlowPane fp2 = new FlowPane();
+    GridPane gp2 = new GridPane();
+    VBox vb3 = new VBox();
+    VBox vb = new VBox();
+    VBox vb2 = new VBox();
 
     private TextField field = new TextField();
-    private CashMachine cashMachine = new CashMachine(new Bank());
+    private TextField field2 = new TextField();
+
+    Scene scene1 = new Scene(vb1(),300,250, Color.BURLYWOOD);
+    Scene scene2 = new Scene(vb2(),300,250, Color.BURLYWOOD);
+    Scene scene3 = new Scene(vb3(),300,250, Color.BURLYWOOD);
+
+    public static void main(String[] args) {
+        launch(args);
+    }
+    Stage primaryStage = new Stage();
 
-    private Parent createContent() {
-        VBox vbox = new VBox(10);
-        vbox.setPrefSize(600, 600);
+    @Override
+    public void start(Stage primaryStage) {
+        this.primaryStage = primaryStage;
 
-        TextArea areaInfo = new TextArea();
+        primaryStage.setTitle("Zip Cloud Bank");
+        primaryStage.setScene(scene1);
+        primaryStage.show();
+    }
+
+    public Parent vb1(){
+        field.setFocusTraversable(false);
+        field.setPromptText("Enter Account ID");
+        field.setPadding(new Insets(5,0,5,0));
+        field.setMaxWidth(250);
+
+        Label zipCloud = new Label("ZipCloud Bank");
+        Label phrase = new Label("We Make It Rain");
+        zipCloud.setPrefSize(180,60);
+        zipCloud.setFont(new Font("Gotham",24));
+        zipCloud.setAlignment(Pos.TOP_CENTER);
+        phrase.setPrefSize(150,20);
+        phrase.setPadding(new Insets(0,0,20,0));
+        phrase.setAlignment(Pos.TOP_CENTER);
 
-        Button btnSubmit = new Button("Set Account ID");
         btnSubmit.setOnAction(e -> {
             int id = Integer.parseInt(field.getText());
             cashMachine.login(id);
-
-            areaInfo.setText(cashMachine.toString());
+            primaryStage.setScene(scene2);
         });
 
-        Button btnDeposit = new Button("Deposit");
+        fp.getChildren().addAll(btnSubmit,btnClose);
+        fp.setPadding(new Insets(0,25,0,25));
+        vb.getChildren().addAll(zipCloud, phrase, field,fp);
+        vb.setAlignment(Pos.CENTER);
+        vb.setStyle("-fx-background-color: burlywood; -fx-padding: 2; -fx-border-color: dimgrey; -fx-border-style: solid; -fx-border-width: 2; -fx-vgap: 5");
+
+        return vb;
+    }
+
+    public Parent vb2(){
+
         btnDeposit.setOnAction(e -> {
-            int amount = Integer.parseInt(field.getText());
+            double amount = Integer.parseInt(field2.getText());
             cashMachine.deposit(amount);
 
-            areaInfo.setText(cashMachine.toString());
+            gp2.setVisible(true);
+            account.setText(cashMachine.accountIdToString());
+            name.setText(cashMachine.nameToString());
+            email.setText(cashMachine.emailToString());
+            balance.setText(cashMachine.balanceToString());
         });
 
-        Button btnWithdraw = new Button("Withdraw");
         btnWithdraw.setOnAction(e -> {
-            int amount = Integer.parseInt(field.getText());
+            double amount = Integer.parseInt(field2.getText());
             cashMachine.withdraw(amount);
 
-            areaInfo.setText(cashMachine.toString());
+            gp2.setVisible(true);
+            account.setText(cashMachine.accountIdToString());
+            name.setText(cashMachine.nameToString());
+            email.setText(cashMachine.emailToString());
+            balance.setText(cashMachine.balanceToString());
+        });
+
+        btnNewAccount.setOnAction(e -> {
+            primaryStage.setScene(scene3);
+            field2.clear();
+            field.clear();
+            gp2.setVisible(false);
         });
 
-        Button btnExit = new Button("Exit");
         btnExit.setOnAction(e -> {
+            gp2.setVisible(false);
             cashMachine.exit();
-
-            areaInfo.setText(cashMachine.toString());
+            field.clear();
+            primaryStage.setScene(scene1);
         });
 
-        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);
-        return vbox;
+        btnClose.setOnAction(e -> {
+            System.exit(0);
+        }); //add alert box to ask Are you sure??
+
+        Label zipCloud2 = new Label("ZipCloud Bank");
+        zipCloud2.setPrefSize(180,80);
+        zipCloud2.setFont(new Font("Gotham",24));
+        zipCloud2.setAlignment(Pos.TOP_CENTER);
+
+        Menu accountMenu = new Menu("Switch Accounts");
+        MenuBar menuBar = new MenuBar();
+        menuBar.getMenus().add(accountMenu);
+        menuBar.setStyle("-fx-background-color: burlywood;");
+        ArrayList<String> accountList = cashMachine.listAccounts();
+        for(String acct : accountList) {
+            MenuItem newItem = new MenuItem(acct);
+            newItem.setOnAction(e -> btnExit.fire());
+            accountMenu.getItems().add(newItem);
+        }
+        fp2.getChildren().addAll(btnDeposit,btnWithdraw,btnNewAccount,btnExit, btnClose);
+        fp2.setAlignment(Pos.CENTER);
+
+        gp2.setVgap(.1);
+        gp2.setHgap(10);
+        gp2.setPadding(new Insets(25,25,25,25));
+        gp2.setOpacity(20);
+        gp2.setAlignment(Pos.BOTTOM_CENTER);
+        gp2.setPrefSize(100,50);
+        gp2.setStyle("-fx-font-size: 10; -fx-text-wrap: true; -fx-font-smoothing-type: LCD; -fx-font-family: fantasy");
+
+        gp2.add(account,0,0);
+        gp2.add(name,0,1);
+        gp2.add(email,1,0);
+        gp2.add(balance,1,1);
+
+        vb2.getChildren().addAll(menuBar, zipCloud2, field2,fp2,gp2);
+        vb2.setAlignment(Pos.BOTTOM_CENTER);
+        vb2.setStyle("-fx-background-color: burlywood; -fx-padding: 2; -fx-border-color: dimgrey; -fx-border-style: solid; -fx-border-width: 2; -fx-vgap: 5");
+
+        return vb2;
     }
 
-    @Override
-    public void start(Stage stage) throws Exception {
-        stage.setScene(new Scene(createContent()));
-        stage.show();
-    }
+    public Parent vb3(){
+        final ToggleGroup group = new ToggleGroup();
+        basicAcct.setToggleGroup(group);
+        premAcct.setToggleGroup(group);
+
+        btnSubmit2.setOnAction(e ->{
+            if (basicAcct.isSelected()) {
+                cashMachine.newBasicAccount(name1.getText(), email1.getText(), Double.parseDouble(balance1.getText()));
+                int id = Integer.valueOf(cashMachine.newBasicAccount(name1.getText(), email1.getText(), Double.parseDouble(balance1.getText())));
+                cashMachine.login(id);
+                primaryStage.setScene(scene2);
+            } else {
+                int id = Integer.valueOf(cashMachine.newPremiumAccount(name1.getText(), email1.getText(), Double.parseDouble(balance1.getText())));
+                cashMachine.login(id);
+                primaryStage.setScene(scene2);
+            }
+            name1.clear(); email1.clear(); balance1.clear();
+        });
 
-    public static void main(String[] args) {
-        launch(args);
+        vb3.getChildren().addAll(name1,email1,balance1,basicAcct,premAcct,btnSubmit2);
+        vb3.setStyle("-fx-background-color: burlywood; -fx-padding: 2; -fx-border-color: dimgrey; -fx-border-style: solid; -fx-border-width: 2; -fx-vgap: 5");
+
+        return vb3;
     }
 }

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

@@ -15,11 +15,11 @@ public abstract class Account {
         return accountData;
     }
 
-    public void deposit(int amount) {
+    public void deposit(double amount) {
         updateBalance(getBalance() + amount);
     }
 
-    public boolean withdraw(int amount) {
+    public boolean withdraw(double amount) {
         if (canWithdraw(amount)) {
             updateBalance(getBalance() - amount);
             return true;
@@ -28,15 +28,15 @@ public abstract class Account {
         }
     }
 
-    protected boolean canWithdraw(int amount) {
+    protected boolean canWithdraw(double amount) {
         return getBalance() >= amount;
     }
 
-    public int getBalance() {
+    public double getBalance() {
         return accountData.getBalance();
     }
 
-    private void updateBalance(int newBalance) {
+    private void updateBalance(double newBalance) {
         accountData = new AccountData(accountData.getId(), accountData.getName(), accountData.getEmail(),
                 newBalance);
     }

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

@@ -9,9 +9,9 @@ public final class AccountData {
     private final String name;
     private final String email;
 
-    private final int balance;
+    private final double balance;
 
-    AccountData(int id, String name, String email, int balance) {
+    AccountData(int id, String name, String email, double balance) {
         this.id = id;
         this.name = name;
         this.email = email;
@@ -30,7 +30,7 @@ public final class AccountData {
         return email;
     }
 
-    public int getBalance() {
+    public double getBalance() {
         return balance;
     }
 

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;
 
@@ -20,6 +22,29 @@ public class Bank {
         accounts.put(2000, new PremiumAccount(new AccountData(
                 2000, "Example 2", "example2@gmail.com", 200
         )));
+
+        accounts.put(3000, new BasicAccount(new AccountData(
+                3000, "Chester Marlow", "cmarlow@gmail.com", 1000
+        )));
+
+        accounts.put(4000, new PremiumAccount(new AccountData(
+                4000, "Rodney Fillet", "filletallday@gmail.com", 10000
+        )));
+    }
+
+    public void addBasicAccount(String name, String email, double balance) {
+         accounts.put(newId(), new BasicAccount(new AccountData(newId(), name, email, balance)));
+    }
+    public void addPremiumAccount(String name, String email, double balance) {
+        accounts.put(newId(), new PremiumAccount(new AccountData(newId(), name, email, balance)));
+    }
+
+    public int newId(){
+        int highestId = 0;
+        for(Integer id : accounts.keySet()){
+            if(id>highestId) highestId = id;
+        }
+        return highestId;
     }
 
     public ActionResult<AccountData> getAccountById(int id) {
@@ -32,14 +57,14 @@ public class Bank {
         }
     }
 
-    public ActionResult<AccountData> deposit(AccountData accountData, int amount) {
+    public ActionResult<AccountData> deposit(AccountData accountData, double amount) {
         Account account = accounts.get(accountData.getId());
         account.deposit(amount);
 
         return ActionResult.success(account.getAccountData());
     }
 
-    public ActionResult<AccountData> withdraw(AccountData accountData, int amount) {
+    public ActionResult<AccountData> withdraw(AccountData accountData, double amount) {
         Account account = accounts.get(accountData.getId());
         boolean ok = account.withdraw(amount);
 
@@ -49,4 +74,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;
+    }
 }

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

@@ -12,7 +12,7 @@ public class PremiumAccount extends Account {
     }
 
     @Override
-    protected boolean canWithdraw(int amount) {
+    protected boolean canWithdraw(double amount) {
         return getBalance() + OVERDRAFT_LIMIT >= amount;
     }
 }