Maura Pine pull request

db.json

@@ -10,13 +10,13 @@
       "id": 2,
       "name": "Coke",
       "cost": 0.5,
-      "remaining": 10
+      "remaining": 9
     },
     {
       "id": 3,
       "name": "Dr. Pepper",
       "cost": 0.75,
-      "remaining": 10
+      "remaining": 9
     },
     {
       "id": 4,

src/app/app.component.html

@@ -2,3 +2,5 @@ <h1>
   {{title}}
 </h1>
 <app-insert-coin></app-insert-coin>
+<app-select-item></app-select-item>
+<app-dispense-item></app-dispense-item>

src/app/app.module.ts

@@ -8,11 +8,15 @@ import { InsertCoinComponent } from './insert-coin/insert-coin.component';
 
 import { ItemService } from './item/item.service';
 import { BalanceService } from './balance/balance.service';
+import { SelectItemComponent } from './select-item/select-item.component';
+import { DispenseItemComponent } from './dispense-item/dispense-item.component';
 
 @NgModule({
   declarations: [
     AppComponent,
-    InsertCoinComponent
+    InsertCoinComponent,
+    SelectItemComponent,
+    DispenseItemComponent
   ],
   imports: [
     BrowserModule,

src/app/balance/balance.service.ts

@@ -8,27 +8,29 @@ export class BalanceService {
   private subject: Subject<number> = new Subject<number>();
 
   constructor() { }
-  
+
   private updateSubject(): void {
     this.subject.next(this.balance);
   }
 
-  setBalance(amount): void { 
-  	this.balance = amount; 
+  setBalance(amount): void {
+  	this.balance = amount;
   	this.updateSubject();
   }
-  
-  getBalance(): number { 
-  	return this.balance; 
+
+  getBalance(): number {
+  	return this.balance;
   }
-
-  addBalance(amount): void { 
-  	this.balance += amount;
-  	this.updateSubject(); 
+
+  addBalance(amount): void {
+    this.balance += amount;
+    this.balance = (Math.round(this.balance * 100) / 100);
+    this.updateSubject();
   }
 
   deductBalance(amount): void {
     this.balance -= amount;
+    this.balance = (Math.round(this.balance * 100) / 100);
     this.updateSubject();
   }
 

src/app/dispense-item/dispense-item.component.html

@@ -0,0 +1 @@
+<button (click)='onDispenseClick()'>Dispense</button>

src/app/dispense-item/dispense-item.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { DispenseItemComponent } from './dispense-item.component';
+
+describe('DispenseItemComponent', () => {
+  let component: DispenseItemComponent;
+  let fixture: ComponentFixture<DispenseItemComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ DispenseItemComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DispenseItemComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/dispense-item/dispense-item.component.ts

@@ -0,0 +1,33 @@
+import { Component, OnInit } from '@angular/core';
+import { ItemService } from '../item/item.service';
+import { BalanceService } from '../balance/balance.service';
+
+@Component({
+  selector: 'app-dispense-item',
+  templateUrl: './dispense-item.component.html',
+  styleUrls: ['./dispense-item.component.css']
+})
+export class DispenseItemComponent implements OnInit {
+
+  constructor(public itemService: ItemService, private balanceService: BalanceService) { }
+
+  ngOnInit() {
+  }
+
+  onDispenseClick () {
+    let item = this.itemService.getSelectedItem();
+    let balance = this.balanceService.getBalance();
+
+    if(this.itemService.hasRemaining() && this.itemService.hasSufficientBalance(balance)) {
+      this.itemService.dispenseItem(() => {
+        this.balanceService.deductBalance(item.cost);
+          alert('Please enjoy you ' +item.name)
+      });
+    } else if (!this.itemService.hasRemaining()){
+      alert('No more ' +item.name)
+    } else {
+      alert('Insufficient Balance')
+    }
+  }
+
+}

src/app/insert-coin/insert-coin.component.html

@@ -2,3 +2,4 @@
 <button class="button -yellow" (click)='addBalance(.05)'>05c</button>
 <button class="button -blue" (click)='addBalance(.10)'>10c</button>
 <button class="button -green" (click)='addBalance(.25)'>25c</button>
+<button class="button" (click)='returnCoins()'> Return Coins</button>

src/app/insert-coin/insert-coin.component.ts

@@ -21,4 +21,9 @@ export class InsertCoinComponent implements OnInit {
   	this.balanceService.addBalance(amount);
   }
 
+  returnCoins() {
+  this.balanceService.setBalance(0);
+  alert('Coins Returned!')
+  }
+
 }

src/app/select-item/select-item.component.css

@@ -0,0 +1,3 @@
+li {
+  list-style: none;
+}

src/app/select-item/select-item.component.html

@@ -0,0 +1,5 @@
+
+  <li *ngFor='let item of items'>
+    <input type="radio" name="soda" [value]='item.id' (change)='onItemSelected(item)'>
+    {{item.name}}  ${{item.cost}} {{item.remaining}}
+  </li>

src/app/select-item/select-item.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { SelectItemComponent } from './select-item.component';
+
+describe('SelectItemComponent', () => {
+  let component: SelectItemComponent;
+  let fixture: ComponentFixture<SelectItemComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ SelectItemComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SelectItemComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/select-item/select-item.component.ts

@@ -0,0 +1,22 @@
+import { Component, OnInit } from '@angular/core';
+import { ItemService } from '../item/item.service';
+
+@Component({
+  selector: 'app-select-item',
+  templateUrl: './select-item.component.html',
+  styleUrls: ['./select-item.component.css']
+})
+export class SelectItemComponent implements OnInit {
+  public items;
+  public title = 'Lebron is not the GOAT';
+  constructor(public itemService: ItemService) { }
+
+  ngOnInit() {
+    this.itemService.onItemsRetrieved((items) => {
+      this.items = items;
+    })
+  }
+  onItemSelected(item) {
+    this.itemService.setSelectedItem(item);
+  }
+}