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

@@ -1,5 +1,11 @@
 package rocks.zipcode.atm;
 
+import javafx.scene.control.Alert;
+import javafx.scene.control.PasswordField;
+import javafx.scene.control.TextInputDialog;
+
+import java.util.Optional;
+
 /**
  * @author ZipCodeWilmington
  */
@@ -32,7 +38,33 @@ public class ActionResult<T> {
         return new ActionResult<E>(data);
     }
 
-    public static <E> ActionResult<E> fail(String errorMessage) {
-        return new ActionResult<E>(errorMessage);
+//    public static <E> ActionResult<E> fail(String errorMessage) {
+//        return new ActionResult<E>(errorMessage);
+//    }
+
+    public static void fail(String errorMessage) {
+        Alert alert = new Alert(Alert.AlertType.ERROR);
+        alert.setTitle("Error Dialog");
+        alert.setHeaderText("An error has occurred!");
+        alert.setContentText(errorMessage);
+
+        alert.showAndWait();
     }
+
+    public static Optional<String> getInfo(String title, String text) {
+        TextInputDialog textDialog = new TextInputDialog();
+        textDialog.setTitle(title);
+        textDialog.setHeaderText(null);
+
+        textDialog.setContentText(text);
+        return textDialog.showAndWait();
+    }
+
+    public static String getPassword(String prompt) {
+        PasswordField passwordField = new PasswordField();
+        passwordField.setPromptText(prompt);
+
+        return passwordField.getText();
+    }
+
 }

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

@@ -29,19 +29,40 @@ public class CashMachine {
         );
     }
 
-    public void deposit(int amount) {
+    public void newID(int id) {
+        tryCall(
+                () -> bank.createAccountById(id),
+                update
+        );
+    }
+
+    public void newName(int id) {
+        tryCall(
+                () -> bank.editAccountName1(id),
+                update
+        );
+    }
+
+    public void newEmail(int id) {
+        tryCall(
+                () -> bank.editAccountEmail(id),
+                update
+        );
+    }
+
+    public void deposit(int id) {
         if (accountData != null) {
             tryCall(
-                    () -> bank.deposit(accountData, amount),
+                    () -> bank.deposit(id),
                     update
             );
         }
     }
 
-    public void withdraw(int amount) {
+    public void withdraw(int id) {
         if (accountData != null) {
             tryCall(
-                    () -> bank.withdraw(accountData, amount),
+                    () -> bank.withdraw(id),
                     update
             );
         }
@@ -72,4 +93,5 @@ public class CashMachine {
             System.out.println("Error: " + e.getMessage());
         }
     }
+
 }

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

@@ -1,5 +1,6 @@
 package rocks.zipcode.atm;
 
+import javafx.scene.control.Label;
 import rocks.zipcode.atm.bank.Bank;
 import javafx.application.Application;
 import javafx.scene.Parent;
@@ -19,13 +20,15 @@ public class CashMachineApp extends Application {
     private TextField field = new TextField();
     private CashMachine cashMachine = new CashMachine(new Bank());
 
+    Stage mainStage;
+
     private Parent createContent() {
         VBox vbox = new VBox(10);
-        vbox.setPrefSize(600, 600);
+        vbox.setPrefSize(700, 500);
 
         TextArea areaInfo = new TextArea();
 
-        Button btnSubmit = new Button("Set Account ID");
+        Button btnSubmit = new Button("Get ID Info");
         btnSubmit.setOnAction(e -> {
             int id = Integer.parseInt(field.getText());
             cashMachine.login(id);
@@ -33,6 +36,31 @@ public class CashMachineApp extends Application {
             areaInfo.setText(cashMachine.toString());
         });
 
+        Button btnNewID = new Button("Create New ID");
+        btnNewID.setOnAction(e -> {
+            int id = Integer.parseInt(field.getText());
+            cashMachine.newID(id);
+
+            areaInfo.setText(cashMachine.toString());
+        });
+
+        Button btnNewName = new Button("Edit name");
+        btnNewName.setOnAction(e -> {
+            int id = Integer.parseInt(field.getText());
+            cashMachine.newName(id);
+
+            areaInfo.setText(cashMachine.toString());
+        });
+
+        Button btnNewEmail = new Button("Edit email");
+        btnNewEmail.setOnAction(e -> {
+            int id = Integer.parseInt(field.getText());
+            cashMachine.newEmail(id);
+
+            areaInfo.setText(cashMachine.toString());
+        });
+
+
         Button btnDeposit = new Button("Deposit");
         btnDeposit.setOnAction(e -> {
             int amount = Integer.parseInt(field.getText());
@@ -59,6 +87,9 @@ public class CashMachineApp extends Application {
         FlowPane flowpane = new FlowPane();
 
         flowpane.getChildren().add(btnSubmit);
+        flowpane.getChildren().add(btnNewID);
+        flowpane.getChildren().add(btnNewName);
+        flowpane.getChildren().add(btnNewEmail);
         flowpane.getChildren().add(btnDeposit);
         flowpane.getChildren().add(btnWithdraw);
         flowpane.getChildren().add(btnExit);
@@ -66,9 +97,25 @@ public class CashMachineApp extends Application {
         return vbox;
     }
 
+
+//    private Parent mainScene() {
+//        VBox vbox = new VBox(10);
+//        vbox.setPrefSize(700, 500);
+//
+//        Scene scene1 = createContent();
+//
+//        Label label1 = new Label("Welcome to the first scene!");
+//        Button button1 = new Button("Go to scene 2");
+//        button1.setOnAction(e -> mainStage.setScene(createContent()));
+//
+//        return vbox;
+//    }
+
     @Override
     public void start(Stage stage) throws Exception {
+        // mainStage = stage;
         stage.setScene(new Scene(createContent()));
+        // Scene loggedIn = new Scene(mainScene());
         stage.show();
     }
 

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

@@ -3,7 +3,7 @@ package rocks.zipcode.atm.bank;
 /**
  * @author ZipCodeWilmington
  */
-public abstract class Account {
+public class Account {
 
     private AccountData accountData;
 

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

@@ -10,6 +10,7 @@ public final class AccountData {
     private final String email;
 
     private final int balance;
+    // private final String password;
 
     AccountData(int id, String name, String email, int balance) {
         this.id = id;
@@ -34,11 +35,14 @@ public final class AccountData {
         return balance;
     }
 
+    // public String getPassword() {return password;}
+
     @Override
     public String toString() {
-        return "Account id: " + id + '\n' +
-                "Name: " + name + '\n' +
-                "Email: " + email + '\n' +
-                "Balance: " + balance;
+        return "Hello " + name + "!" + '\n' + '\n' +
+                "Account ID: " + id + '\n' +
+                "E-mail: " + email + '\n' +
+                "Current Balance: " + balance;
     }
+
 }

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

@@ -1,9 +1,12 @@
 package rocks.zipcode.atm.bank;
 
+import javafx.scene.control.TextInputDialog;
 import rocks.zipcode.atm.ActionResult;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
+import java.util.Scanner;
 
 /**
  * @author ZipCodeWilmington
@@ -11,42 +14,154 @@ import java.util.Map;
 public class Bank {
 
     private Map<Integer, Account> accounts = new HashMap<>();
+    private String name;
+    private String email;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
 
     public Bank() {
-        accounts.put(1000, new BasicAccount(new AccountData(
-                1000, "Example 1", "example1@gmail.com", 500
-        )));
+//
+//        this.name = "No name available";
+//        this.email = "No e-mail available";
+
+        accounts.put(1000, new BasicAccount(new AccountData(1000, "Example 1", "example1@gmail.com", 500)));
 
         accounts.put(2000, new PremiumAccount(new AccountData(
-                2000, "Example 2", "example2@gmail.com", 200
-        )));
+                2000, "Example 2", "example2@gmail.com", 200)));
     }
 
     public ActionResult<AccountData> getAccountById(int id) {
         Account account = accounts.get(id);
 
+        ActionResult result;
+
         if (account != null) {
-            return ActionResult.success(account.getAccountData());
+            result = ActionResult.success(account.getAccountData());
         } else {
-            return ActionResult.fail("No account with id: " + id + "\nTry account 1000 or 2000");
+            result = null;
+            ActionResult.fail("Account ID " + id + " does not exist. Please create new account.");
         }
+
+        return result;
+    }
+
+    public ActionResult<AccountData> createAccountById(int id) {
+        Account account = accounts.get(id);
+
+        ActionResult result;
+
+        if (account == null) {
+
+            Optional<String> newName = ActionResult.getInfo("Set Name", "Enter name: ");
+            Optional<String> newEmail = ActionResult.getInfo("Set E-mail", "Enter e-mail: ");
+            Optional<String> initialDeposit = ActionResult.getInfo("Initial Deposit", "Enter initial deposit: ");
+
+            // Fetch user input
+            AccountData accountData = new AccountData(id, newName.get(), newEmail.get(), Integer.parseInt(initialDeposit.get()));
+            Account newAccount = new Account(accountData);
+
+            accounts.put(id, newAccount);
+
+            result = ActionResult.success(newAccount.getAccountData());
+        } else {
+            result = null;
+            ActionResult.fail("Account ID " + id + " already exists. Please try again.");
+        }
+
+        return result;
+    }
+
+    public ActionResult<AccountData> editAccountName1(int id) {
+        Account account = accounts.get(id);
+        AccountData accountInfo = account.getAccountData();
+
+        Optional<String> newName = ActionResult.getInfo("Edit name", "Enter new name: ");
+
+        AccountData accountData = new AccountData(id, newName.get(), accountInfo.getEmail(), accountInfo.getBalance());
+        Account newAccount = new Account(accountData);
+
+        accounts.put(id, newAccount);
+
+        return ActionResult.success(newAccount.getAccountData());
     }
 
-    public ActionResult<AccountData> deposit(AccountData accountData, int amount) {
-        Account account = accounts.get(accountData.getId());
-        account.deposit(amount);
+//    public ActionResult<AccountData> editAccountName(String name) {
+//
+//        AccountData accountData = new AccountData(55, name, "akjsdkas@kasd.com", 500);
+//
+//        Account account = new Account(accountData);
+//
+//        accounts.put(55, account);
+//
+//        return ActionResult.success(account.getAccountData());
+//    }
+
+    public ActionResult<AccountData> editAccountEmail(int id) {
+        Account account = accounts.get(id);
+        AccountData accountInfo = account.getAccountData();
 
-        return ActionResult.success(account.getAccountData());
+        Optional<String> newEmail = ActionResult.getInfo("Edit E-mail", "Enter new e-mail: ");
+
+        AccountData accountData = new AccountData(id, accountInfo.getName(), newEmail.get(), accountInfo.getBalance());
+        Account newAccount = new Account(accountData);
+
+        accounts.put(id, newAccount);
+
+        return ActionResult.success(newAccount.getAccountData());
     }
 
-    public ActionResult<AccountData> withdraw(AccountData accountData, int amount) {
-        Account account = accounts.get(accountData.getId());
+    public ActionResult<AccountData> deposit(int id) {
+        Account account = accounts.get(id);
+        AccountData accountInfo = account.getAccountData();
+
+        Optional<String> depositAmount = ActionResult.getInfo("Deposit into Account", "Enter amount to deposit: ");
+
+        AccountData accountData = new AccountData(id, accountInfo.getName(), accountInfo.getEmail(), accountInfo.getBalance() + Integer.parseInt(depositAmount.get()));
+        Account newAccount = new Account(accountData);
+
+        accounts.put(id, newAccount);
+
+        return ActionResult.success(newAccount.getAccountData());
+    }
+
+    public ActionResult<AccountData> withdraw(int id) {
+        Account account = accounts.get(id);
+        AccountData accountInfo = account.getAccountData();
+
+        Optional<String> withdrawAmount = ActionResult.getInfo("Withdraw from Account", "Enter amount to withdraw: ");
+
+        int amount = Integer.parseInt(withdrawAmount.get());
+
         boolean ok = account.withdraw(amount);
 
+        ActionResult result;
+
         if (ok) {
-            return ActionResult.success(account.getAccountData());
+            AccountData accountData = new AccountData(id, accountInfo.getName(), accountInfo.getEmail(), accountInfo.getBalance() - Integer.parseInt(withdrawAmount.get()));
+            Account newAccount = new Account(accountData);
+
+            accounts.put(id, newAccount);
+
+            result = ActionResult.success(newAccount.getAccountData());
         } else {
-            return ActionResult.fail("Withdraw failed: " + amount + ". Account has: " + account.getBalance());
+            result = null;
+            ActionResult.fail("Withdraw failed: " + amount + ". Account has: " + account.getBalance());
         }
+
+        return result;
     }
 }