diff --git a/db.json b/db.json
index baf7af9..90a0a6d 100644
--- a/db.json
+++ b/db.json
@@ -4,25 +4,25 @@
"id": 1,
"name": "Sprite",
"cost": 0.5,
- "remaining": 10
+ "remaining": 6
},
{
"id": 2,
"name": "Coke",
"cost": 0.5,
- "remaining": 10
+ "remaining": -7
},
{
"id": 3,
"name": "Dr. Pepper",
"cost": 0.75,
- "remaining": 10
+ "remaining": -22
},
{
"id": 4,
"name": "Mr Pibbs",
"cost": 0.5,
- "remaining": 10
+ "remaining": 8
}
]
}
\ No newline at end of file
diff --git a/src/app/app.component.html b/src/app/app.component.html
index 20f9499..9faf7de 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -2,3 +2,4 @@
{{title}}
+
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index ef01059..46ce9c0 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -1,5 +1,4 @@
import { Component } from '@angular/core';
-
@Component({
selector: 'app-root',
templateUrl: './app.component.html',
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index b290358..1764d2e 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -8,11 +8,13 @@ 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';
@NgModule({
declarations: [
AppComponent,
- InsertCoinComponent
+ InsertCoinComponent,
+ SelectItemComponent
],
imports: [
BrowserModule,
diff --git a/src/app/insert-coin/insert-coin.component.html b/src/app/insert-coin/insert-coin.component.html
index 0513897..5783223 100644
--- a/src/app/insert-coin/insert-coin.component.html
+++ b/src/app/insert-coin/insert-coin.component.html
@@ -2,3 +2,5 @@
+
+
diff --git a/src/app/insert-coin/insert-coin.component.ts b/src/app/insert-coin/insert-coin.component.ts
index 7c16031..d5d45cd 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..b015b26
--- /dev/null
+++ b/src/app/select-item/select-item.component.html
@@ -0,0 +1,12 @@
+
+ select-item works!
+
+
+
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..0aca207
--- /dev/null
+++ b/src/app/select-item/select-item.component.ts
@@ -0,0 +1,45 @@
+import { Component, OnInit } from '@angular/core';
+import { ItemService } from '../item/item.service';
+import { BalanceService } from '../balance/balance.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, public balanceService: BalanceService) { }
+
+ ngOnInit() {
+ this.itemService.onItemsRetrieved((items) => {
+ this.items = items;
+ })
+ }
+
+ onItemSelected(item) {
+ this.itemService.setSelectedItem(item);
+ }
+
+ itemDispense() {
+ const currentBalance = this.balanceService.getBalance();
+ if(!this.hasSufficientBalance(currentBalance)) return;
+ if(!this.hasRemaining()) return;
+ this.itemService.dispenseItem((item) => {
+ alert('Enjoy your ' + item.name);
+ this.balanceService.deductBalance(item.cost);
+ });
+ }
+
+ hasSufficientBalance(currentBalance) {
+ const hasBalance = this.itemService.hasSufficientBalance(currentBalance);
+ if(!hasBalance) alert('Insufficient balance');
+ return hasBalance;
+ }
+
+ hasRemaining() {
+ const remaining = this.itemService.hasRemaining();
+ if(!remaining) alert('No remaining inventory for this item');
+ return remaining;
+ }
+}