cp

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

@@ -3,6 +3,7 @@ package rocks.zipcode.atm;
 import javafx.application.Application;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
+import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.scene.control.*;
 import javafx.scene.layout.FlowPane;
@@ -41,23 +42,42 @@ public class CashMachineApp extends Application {
     VBox vb3 = new VBox();
     VBox vb = new VBox();
     VBox vb2 = new VBox();
+
     private TextField field = new TextField();
     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();
 
     @Override
     public void start(Stage primaryStage) {
+        this.primaryStage = primaryStage;
+
+        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);
 
-        Scene scene1 = new Scene(vb,300,250, Color.BURLYWOOD);
-        Scene scene2 = new Scene(vb2,300,250, Color.BURLYWOOD);
-        Scene scene3 = new Scene(vb3,300,250, Color.BURLYWOOD);
+        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);
 
         btnSubmit.setOnAction(e -> {
             int id = Integer.parseInt(field.getText());
@@ -65,6 +85,17 @@ public class CashMachineApp extends Application {
             primaryStage.setScene(scene2);
         });
 
+        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 -> {
             double amount = Integer.parseInt(field2.getText());
             cashMachine.deposit(amount);
@@ -76,7 +107,6 @@ public class CashMachineApp extends Application {
             balance.setText(cashMachine.balanceToString());
         });
 
-
         btnWithdraw.setOnAction(e -> {
             double amount = Integer.parseInt(field2.getText());
             cashMachine.withdraw(amount);
@@ -96,6 +126,7 @@ public class CashMachineApp extends Application {
         });
 
         btnExit.setOnAction(e -> {
+            gp2.setVisible(false);
             cashMachine.exit();
             field.clear();
             primaryStage.setScene(scene1);
@@ -105,40 +136,6 @@ public class CashMachineApp extends Application {
             System.exit(0);
         }); //add alert box to ask Are you sure??
 
-        btnSubmit2.setOnAction(e ->{
-            final ToggleGroup group = new ToggleGroup();
-            basicAcct.setToggleGroup(group);
-            premAcct.setToggleGroup(group);
-            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();
-        });
-
-        //scene1 items
-        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);
-
-        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");
-
-        //scene2items
         Label zipCloud2 = new Label("ZipCloud Bank");
         zipCloud2.setPrefSize(180,80);
         zipCloud2.setFont(new Font("Gotham",24));
@@ -150,9 +147,9 @@ public class CashMachineApp extends Application {
         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);
+            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);
@@ -163,22 +160,42 @@ public class CashMachineApp extends Application {
         gp2.setOpacity(20);
         gp2.setAlignment(Pos.BOTTOM_CENTER);
         gp2.setPrefSize(100,50);
-        gp2.setStyle("-fx-font-size: 12; -fx-font-smoothing-type: LCD; -fx-font-family: fantasy");
+        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");
 
-        //scene3items
+        return vb2;
+    }
+
+    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();
+        });
+
         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");
 
-        primaryStage.setTitle("Zip Cloud Bank");
-        primaryStage.setScene(scene1);
-        primaryStage.show();
+        return vb3;
     }
 }

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

@@ -24,11 +24,11 @@ public class Bank {
         )));
 
         accounts.put(3000, new BasicAccount(new AccountData(
-                3000, "Little Demetrius", "lilDee@gmail.com", 1000
+                3000, "Chester Marlow", "cmarlow@gmail.com", 1000
         )));
 
         accounts.put(4000, new PremiumAccount(new AccountData(
-                4000, "Big Demetrius", "bigDee@gmail.com", 100000
+                4000, "Rodney Fillet", "filletallday@gmail.com", 10000
         )));
     }