diff --git a/db.json b/db.json
index baf7af9..663323c 100644
--- a/db.json
+++ b/db.json
@@ -4,19 +4,19 @@
"id": 1,
"name": "Sprite",
"cost": 0.5,
- "remaining": 10
+ "remaining": 0
},
{
"id": 2,
"name": "Coke",
"cost": 0.5,
- "remaining": 10
+ "remaining": 8
},
{
"id": 3,
"name": "Dr. Pepper",
"cost": 0.75,
- "remaining": 10
+ "remaining": 9
},
{
"id": 4,
diff --git a/src/app/app.component.html b/src/app/app.component.html
index 20f9499..a4fee6a 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -2,3 +2,5 @@
{{title}}
+
+
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index b290358..62f9f67 100644
--- a/src/app/app.module.ts
+++ b/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,
diff --git a/src/app/dispense-item/dispense-item.component.css b/src/app/dispense-item/dispense-item.component.css
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/dispense-item/dispense-item.component.html b/src/app/dispense-item/dispense-item.component.html
new file mode 100644
index 0000000..c1d9988
--- /dev/null
+++ b/src/app/dispense-item/dispense-item.component.html
@@ -0,0 +1 @@
+
diff --git a/src/app/dispense-item/dispense-item.component.spec.ts b/src/app/dispense-item/dispense-item.component.spec.ts
new file mode 100644
index 0000000..e3d2ca1
--- /dev/null
+++ b/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;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ DispenseItemComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(DispenseItemComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/dispense-item/dispense-item.component.ts b/src/app/dispense-item/dispense-item.component.ts
new file mode 100644
index 0000000..2e823a1
--- /dev/null
+++ b/src/app/dispense-item/dispense-item.component.ts
@@ -0,0 +1,32 @@
+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 {
+ public currentBalance = 0
+ public selectedItem
+ constructor(public itemService: ItemService, public balanceService: BalanceService) { }
+
+ ngOnInit() {
+ }
+
+ onDispenseItem() {
+ this.currentBalance = this.balanceService.getBalance();
+ this.selectedItem = this.itemService.getSelectedItem();
+ if ((this.itemService.hasSufficientBalance(this.currentBalance)) && (this.selectedItem.remaining > 0)) {
+ this.itemService.dispenseItem(this.selectedItem);
+ this.balanceService.deductBalance(this.selectedItem.cost);
+ alert('You bought a ' + this.selectedItem.name +'!')
+ } else if (!this.itemService.hasSufficientBalance(this.currentBalance)) {
+ alert('You don\'t have enough money!')
+ } else if (!(this.selectedItem.remaining > 0)) {
+ alert('I\'m sorry, we\'re out of ' + this.selectedItem.name +'!')
+ }
+ }
+
+}
diff --git a/src/app/insert-coin/insert-coin.component.html b/src/app/insert-coin/insert-coin.component.html
index 0513897..d0ef4c8 100644
--- a/src/app/insert-coin/insert-coin.component.html
+++ b/src/app/insert-coin/insert-coin.component.html
@@ -2,3 +2,4 @@
+
diff --git a/src/app/insert-coin/insert-coin.component.ts b/src/app/insert-coin/insert-coin.component.ts
index 7c16031..29f68f0 100644
--- a/src/app/insert-coin/insert-coin.component.ts
+++ b/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!');
+ }
+
}
diff --git a/src/app/select-item/select-item.component.css b/src/app/select-item/select-item.component.css
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/select-item/select-item.component.html b/src/app/select-item/select-item.component.html
new file mode 100644
index 0000000..444aa98
--- /dev/null
+++ b/src/app/select-item/select-item.component.html
@@ -0,0 +1,8 @@
+
+
+{{title}}
diff --git a/src/app/select-item/select-item.component.spec.ts b/src/app/select-item/select-item.component.spec.ts
new file mode 100644
index 0000000..217a5ae
--- /dev/null
+++ b/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;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ SelectItemComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(SelectItemComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/select-item/select-item.component.ts b/src/app/select-item/select-item.component.ts
new file mode 100644
index 0000000..5312136
--- /dev/null
+++ b/src/app/select-item/select-item.component.ts
@@ -0,0 +1,23 @@
+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 = [];
+
+ constructor(public itemService: ItemService) { }
+
+ ngOnInit() {
+ this.itemService.onItemsRetrieved((items) =>{
+ this.items = items;
+ })
+ }
+
+ onItemSelected(item) {
+ this.itemService.setSelectedItem(item);
+ }
+}