Alerts on exit

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

@@ -77,7 +77,7 @@ 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() : "Bye!";
     }
 
 

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

@@ -5,9 +5,7 @@ import javafx.event.EventHandler;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.control.*;
-import javafx.scene.effect.DropShadow;
 import javafx.scene.layout.*;
-
 import javafx.scene.paint.Color;
 import javafx.scene.text.Font;
 import javafx.scene.text.Text;
@@ -25,9 +23,6 @@ import javafx.stage.Stage;
 // 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();
     private CashMachine cashMachine = new CashMachine(new Bank());
 
@@ -46,15 +41,55 @@ public class CashMachineApp extends Application {
 
 
         VBox vbox = new VBox(10);
+        vbox.setBackground(new Background(
+                new BackgroundFill(
+                        Color.color(0.4, 0.6, 0.9), null, null)));
 
-        Scene accountScene = new Scene(vbox, 500, 600);
 
         TextArea areaInfo = new TextArea();
+
+        Button btnDeposit = new Button("Deposit");
+        btnDeposit.setOnAction(e -> {
+            int amount = Integer.parseInt(field.getText());
+            cashMachine.deposit(amount);
+
+            areaInfo.setText(cashMachine.toString());
+        });
+
+        Button btnWithdraw = new Button("Withdraw");
+        btnWithdraw.setOnAction(e -> {
+            int amount = Integer.parseInt(field.getText());
+            cashMachine.withdraw(amount);
+
+            areaInfo.setText(cashMachine.toString());
+        });
+
+        Button btnExit = new Button("Exit");
+        btnExit.setOnAction(new EventHandler<ActionEvent>() {
+            @Override
+            public void handle(ActionEvent event) {
+                cashMachine.exit();
+                areaInfo.setText(cashMachine.toString());
+
+                Alert exitAlert = new Alert(Alert.AlertType.INFORMATION);
+                exitAlert.setContentText("Now Exiting Application.");
+                exitAlert.showAndWait();
+
+                Stage stage = (Stage) btnExit.getScene().getWindow();
+                stage.close();
+            }
+        });
+
+        //
+
+        Scene accountScene = new Scene(vbox, 400, 500);
+
+
         cashMachine.login(id);
 
         areaInfo.setText(cashMachine.toString());
 
-        vbox.getChildren().addAll(areaInfo);
+        vbox.getChildren().addAll(areaInfo, field, btnDeposit, btnWithdraw, btnExit);
 
         account.setScene(accountScene);
 
@@ -68,68 +103,103 @@ public class CashMachineApp extends Application {
         login.setTitle("Account Login");
 
 
-//        GridPane grid = new GridPane();
-//        grid.setAlignment(Pos.CENTER);
-//        grid.setHgap(10);
-//        grid.setVgap(10);
+        GridPane grid = new GridPane();
+        grid.setAlignment(Pos.CENTER);
+        grid.setHgap(10);
+        grid.setVgap(10);
 
         VBox vbox = new VBox(10);
         vbox.setSpacing(10);
 
         vbox.setPadding(new Insets(25, 25, 25, 25));
 
-        Scene scene = new Scene(vbox, 375, 275);
-
-        vbox.setBackground(new Background(new BackgroundFill(Color.color(0.3, 0.6, 0.6), null, null)));
+        Scene scene = new Scene(vbox, 375, 350);
 
+        vbox.setBackground(new Background(
+                new BackgroundFill(
+                        Color.color(0.4, 0.6, 0.9), null, null)));
 
+        // Title
         Text title = new Text("ZipCloudBank");
         title.setTextAlignment(TextAlignment.CENTER);
         title.setFont(Font.font("Verdana", 25));
         title.setFill(Color.WHITE);
 
+        grid.add(title, 0,0);
+
+        // Desc
         Text desc = new Text(" ");
         desc.setFont(Font.font("Verdana", 10));
+        grid.add(desc, 0, 1);
 
 
-        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);
-
+        // Enter username
         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);
 
+        grid.add(userName, 0, 2);
+        grid.add(field, 0, 3);
+
+        // Enter PW
+        TextField pw = new TextField();
+        Label pwLabel = new Label("Enter Password");
+        pwLabel.setFont(Font.font("Verdana", 10));
+        pwLabel.setTextFill(Color.WHITESMOKE);
 
+        grid.add(pwLabel, 0, 4);
+        grid.add(pw, 0, 5);
 
+        // Login Button
         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);
 
-        vbox.getChildren().addAll(title, desc, userName, field, btn, hbBtn);
+        grid.add(btn, 0, 6);
+
+//        // new user text
+//        Text newUser = new Text("\nNew user?");
+//        newUser.setFont(Font.font("Verdana", 10));
+//        newUser.setFill(Color.WHITESMOKE);
+//
+//        grid.add(newUser, 0, 8);
+//
+//        // New user button
+//        Button newbtn = new Button("Create Account");
+//        HBox newHBox = new HBox(10);
+//        newHBox.setAlignment(Pos.CENTER);
+//        newHBox.getChildren().add(newbtn);
+//
+//        grid.add(newHBox, 0,9);
+
 
+        vbox.getChildren().addAll(grid);
+
+        // -------- Button actions ---------
+
+        // Login button action
         btn.setOnAction(new EventHandler<ActionEvent>() {
             @Override
             public void handle(ActionEvent event) {
                 Integer id = Integer.parseInt(field.getText());
 
-                if (cashMachine.checkUserId(id)) {
+                if (cashMachine.checkUserId(id) && cashMachine.comparePassword(id, pw.getText())) {
                     login.hide();
                     mainAccount(id).show();
-                } else {
+                } else if (!cashMachine.checkUserId(id)) {
                     Alert invalidID = new Alert(Alert.AlertType.INFORMATION);
                     invalidID.setContentText("Invalid ID number.");
                     invalidID.showAndWait();
                     field.clear();
+                    pw.clear();
+                } else if (!cashMachine.comparePassword(id, pw.getText())) {
+                    Alert invalidID = new Alert(Alert.AlertType.INFORMATION);
+                    invalidID.setContentText("Wrong password.");
+                    invalidID.showAndWait();
+                    field.clear();
+                    pw.clear();
                 }
             }
         });
@@ -141,13 +211,6 @@ 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 {
@@ -167,40 +230,3 @@ public class CashMachineApp extends Application {
 
 }
 
-
-//        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/AccountData.java

@@ -16,6 +16,7 @@ public final class AccountData {
         this.name = name;
         this.email = email;
         this.balance = balance;
+
     }
 
     public int getId() {
@@ -38,6 +39,7 @@ public final class AccountData {
         return balance;
     }
 
+
     @Override
     public String toString() {
         return "Account id: " + id + '\n' +