README.md

@@ -10,7 +10,7 @@ viable product in CashMachine. The response from customers has been, shall we sa
 The original coder has gone off to another startup, in Thailand, where they code on surfboards
 all day long.
 The Board of Directors of ZipCloudBank have empowered me to let you take a crack at "upping their game"
-and improving their app over this weekend. Impressed that you are a ZipCode student, they are
+and improving their app over this **weekend. Impressed that you are a ZipCode student, they are
 expecting great things. Don't panic: we think you can do this.
 
 The point of this lab is to read thru some existing code, in this case, a program/app that 

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

@@ -3,17 +3,37 @@ package rocks.zipcode.atm;
 import rocks.zipcode.atm.bank.AccountData;
 import rocks.zipcode.atm.bank.Bank;
 
+import java.awt.event.ActionEvent;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
+import javafx.fxml.FXML;
+import javafx.scene.control.Label;
+import javafx.scene.control.PasswordField;
+import javafx.scene.control.TextField;
+
 /**
  * @author ZipCodeWilmington
  */
 public class CashMachine {
 
+    @FXML
+    private Label title;
+
+    @FXML
+    private TextField username;
+
+    @FXML
+    private PasswordField password;
+
+    @FXML
+    private Label loginFailed;
+
     private final Bank bank;
     private AccountData accountData = null;
-
+    /*private String message = null;
+    private Integer amount = 0;
+*/
     public CashMachine(Bank bank) {
         this.bank = bank;
     }
@@ -22,6 +42,23 @@ public class CashMachine {
         accountData = data;
     };
 
+    /*private Consumer<String> update2 = data -> {
+        message = data;
+    };
+    private Consumer<Integer> update3 = data -> {
+        amount = data;
+    };*/
+
+    public void login(ActionEvent event){
+
+        if(username.getText().equals("user") && password.getText().equals("password")){
+            title.setText("Login Success");
+        }
+        else
+            loginFailed.setVisible(true);
+
+    }
+
     public void login(int id) {
         tryCall(
                 () -> bank.getAccountById(id),
@@ -29,6 +66,23 @@ public class CashMachine {
         );
     }
 
+   /* public void checkAccount(){
+        if(accountData != null){
+            tryCall(
+                    () -> bank.getAccountType(accountData), update
+            );
+        }
+    }*/
+
+    public void checkBalance() {
+        if(accountData != null){
+            tryCall(
+                    () -> bank.getBalance(accountData), update
+            );
+        }
+
+    }
+
     public void deposit(int amount) {
         if (accountData != null) {
             tryCall(
@@ -53,9 +107,13 @@ public class CashMachine {
         }
     }
 
+    public String getUser(){
+        return "Welcome " + accountData.getName();
+    }
+
     @Override
     public String toString() {
-        return accountData != null ? accountData.toString() : "Try account 1000 or 2000 and click submit.";
+        return accountData != null ? accountData.toString() : "Try giving a valid account number and click submit.";
     }
 
     private <T> void tryCall(Supplier<ActionResult<T> > action, Consumer<T> postAction) {
@@ -72,4 +130,13 @@ public class CashMachine {
             System.out.println("Error: " + e.getMessage());
         }
     }
+
+
+    public String goodBye() {
+        return "Good Bye!! Thanks for using our Cash Machine";
+    }
+
+    public String getBalance() {
+        return "The Balance in your account is "+ this.accountData.getBalance();
+    }
 }

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

@@ -1,5 +1,9 @@
 package rocks.zipcode.atm;
 
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Group;
+import javafx.scene.image.ImageView;
+
 import rocks.zipcode.atm.bank.Bank;
 import javafx.application.Application;
 import javafx.scene.Parent;
@@ -11,25 +15,54 @@ import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
 import javafx.scene.layout.FlowPane;
 
+
+
 /**
  * @author ZipCodeWilmington
  */
 public class CashMachineApp extends Application {
 
+
+
     private TextField field = new TextField();
     private CashMachine cashMachine = new CashMachine(new Bank());
 
     private Parent createContent() {
         VBox vbox = new VBox(10);
-        vbox.setPrefSize(600, 600);
+        vbox.setPrefSize(800, 800);
 
         TextArea areaInfo = new TextArea();
+        areaInfo.setStyle("-fx-background-color: aquamarine;");
+
+       /* Button btnCreateBasicAccount = new Button("Create Account");
+        btnCreateBasicAccount.setOnAction(e -> {
+            int id = Integer.parseInt(field.getText());
+            cashMachine.login(id);
+
+            areaInfo.setText(cashMachine.toString());
+        });*/
 
         Button btnSubmit = new Button("Set Account ID");
         btnSubmit.setOnAction(e -> {
             int id = Integer.parseInt(field.getText());
             cashMachine.login(id);
 
+            areaInfo.setText(cashMachine.getUser());
+        });
+
+        Button btnCheckBalance = new Button("Check Balance");
+        btnCheckBalance.setOnAction(e -> {
+            int amount = Integer.parseInt(field.getText());
+            cashMachine.checkBalance();
+
+            areaInfo.setText(cashMachine.getBalance());
+        });
+
+        Button btnAccountDetails = new Button("Account Information");
+        btnAccountDetails.setOnAction(e -> {
+            int amount = Integer.parseInt(field.getText());
+            cashMachine.toString();
+
             areaInfo.setText(cashMachine.toString());
         });
 
@@ -38,7 +71,7 @@ public class CashMachineApp extends Application {
             int amount = Integer.parseInt(field.getText());
             cashMachine.deposit(amount);
 
-            areaInfo.setText(cashMachine.toString());
+            areaInfo.setText(cashMachine.getBalance());
         });
 
         Button btnWithdraw = new Button("Withdraw");
@@ -46,30 +79,54 @@ public class CashMachineApp extends Application {
             int amount = Integer.parseInt(field.getText());
             cashMachine.withdraw(amount);
 
-            areaInfo.setText(cashMachine.toString());
+            areaInfo.setText(cashMachine.getBalance());
         });
 
         Button btnExit = new Button("Exit");
         btnExit.setOnAction(e -> {
             cashMachine.exit();
 
-            areaInfo.setText(cashMachine.toString());
+            areaInfo.setText(cashMachine.goodBye());
         });
 
         FlowPane flowpane = new FlowPane();
 
         flowpane.getChildren().add(btnSubmit);
+        flowpane.getChildren().add(btnCheckBalance);
         flowpane.getChildren().add(btnDeposit);
         flowpane.getChildren().add(btnWithdraw);
+        flowpane.getChildren().add(btnAccountDetails);
         flowpane.getChildren().add(btnExit);
+
+
+        //Image image = new Image("file:atm.jpg");
+        ImageView mv = new ImageView("file:atm.jpg");
+
+        Group root = new Group();
+        root.getChildren().addAll(mv);
+
+        vbox.setStyle("-fx-background-color: silver; -fx-padding: 20; -fx-font-size: 20;");
         vbox.getChildren().addAll(field, flowpane, areaInfo);
         return vbox;
     }
 
     @Override
     public void start(Stage stage) throws Exception {
+
+        stage.setTitle("ZIPCLOUD BANK");
         stage.setScene(new Scene(createContent()));
         stage.show();
+
+        /*try {
+
+            Parent root = FXMLLoader.load(getClass().getResource("/Users/thulasipuppala/Labs/CashMachine/src/main/java/rocks/zipcode/atm/Login.fxml"));
+            Scene scene1 = new Scene(root, 600, 600);
+            stage.setScene(scene1);
+            stage.show();
+        }
+        catch (Exception e){
+            e.printStackTrace();
+        }*/
     }
 
     public static void main(String[] args) {

src/main/java/rocks/zipcode/atm/Login.fxml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.PasswordField?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.text.Font?>
+
+
+<AnchorPane fx:id="loginFailed" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/10.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="rocks.zipcode.atm.CashMachine">
+   <children>
+      <TextField fx:id="username" layoutX="174.0" layoutY="139.0" prefHeight="55.0" prefWidth="243.0" promptText="UserName">
+         <font>
+            <Font size="18.0" />
+         </font>
+      </TextField>
+      <Button layoutX="263.0" layoutY="300.0" mnemonicParsing="false" onAction="#login" prefHeight="37.0" prefWidth="74.0" text="Login" />
+      <PasswordField fx:id="password" layoutX="174.0" layoutY="219.0" prefHeight="55.0" prefWidth="243.0" promptText="Password">
+         <font>
+            <Font size="18.0" />
+         </font>
+      </PasswordField>
+      <Label alignment="CENTER" layoutX="231.0" layoutY="352.0" prefHeight="17.0" prefWidth="133.0" text="Login Failed!" textFill="#d32626" visible="false" />
+      <Label alignment="CENTER" contentDisplay="CENTER" layoutX="76.0" layoutY="25.0" prefHeight="92.0" prefWidth="434.0" text="ZIPCLOUD BANK" textFill="#3f599a">
+         <font>
+            <Font name="Apple Color Emoji" size="48.0" />
+         </font>
+      </Label>
+   </children>
+</AnchorPane>

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

@@ -0,0 +1,32 @@
+package rocks.zipcode.atm;
+
+import javafx.application.Application;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
+import rocks.zipcode.atm.bank.Bank;
+import javafx.application.Application;
+import javafx.scene.Parent;
+import javafx.scene.control.Button;
+import javafx.scene.control.TextArea;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.VBox;
+import javafx.scene.layout.FlowPane;
+
+public class LoginWindow extends Application {
+
+    private CashMachine cashMachine = new CashMachine(new Bank());
+
+    public static void main(String[] args) {
+        launch(args);
+    }
+
+    @Override
+    public void start(Stage primaryStage) {
+
+
+
+    }
+}

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

@@ -14,11 +14,19 @@ public class Bank {
 
     public Bank() {
         accounts.put(1000, new BasicAccount(new AccountData(
-                1000, "Example 1", "example1@gmail.com", 500
+                1000, "Sreya", "sreya@gmail.com", 500
         )));
 
-        accounts.put(2000, new PremiumAccount(new AccountData(
-                2000, "Example 2", "example2@gmail.com", 200
+        accounts.put(2000, new BasicAccount(new AccountData(
+                2000, "Sreeram", "sreeram@gmail.com", 200
+        )));
+
+        accounts.put(3000, new PremiumAccount(new AccountData(
+                3000, "Thulasi", "thulasi@gmail.com", 20000
+        )));
+
+        accounts.put(4000, new PremiumAccount(new AccountData(
+                4000, "Chandra", "chandra@gmail.com", 20000
         )));
     }
 
@@ -28,10 +36,17 @@ public class Bank {
         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 + "\nTry again");
         }
     }
 
+    public ActionResult<AccountData> getBalance(AccountData accountData) {
+        Account account = accounts.get(accountData.getId());
+        account.getBalance();
+
+        return ActionResult.success(account.getAccountData());
+    }
+
     public ActionResult<AccountData> deposit(AccountData accountData, int amount) {
         Account account = accounts.get(accountData.getId());
         account.deposit(amount);
@@ -49,4 +64,7 @@ public class Bank {
             return ActionResult.fail("Withdraw failed: " + amount + ". Account has: " + account.getBalance());
         }
     }
+
+
+
 }