diff --git a/db.json b/db.json
index baf7af9..da1290f 100644
--- a/db.json
+++ b/db.json
@@ -25,4 +25,4 @@
"remaining": 10
}
]
-}
\ No newline at end of file
+}
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/balance/balance.service.ts b/src/app/balance/balance.service.ts
index 7dd9878..c8b97fb 100644
--- a/src/app/balance/balance.service.ts
+++ b/src/app/balance/balance.service.ts
@@ -8,23 +8,23 @@ export class BalanceService {
private subject: Subject = new Subject();
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 {
+
+ addBalance(amount): void {
this.balance += amount;
- this.updateSubject();
+ this.updateSubject();
}
deductBalance(amount): void {
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..cf17bf6
--- /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..c3edf92
--- /dev/null
+++ b/src/app/dispense-item/dispense-item.component.ts
@@ -0,0 +1,39 @@
+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 items;
+ coinBalance = 0;
+ public selectedItem;
+ constructor(public itemService: ItemService, public balanceService: BalanceService) { }
+
+ ngOnInit() {
+ this.itemService.onItemsRetrieved((items) => this.items = items);
+ this.balanceService.onBalanceUpdated((balance) => {
+ this.coinBalance = balance;
+ });
+ }
+
+ onDispenseItem() {
+ this.selectedItem = this.itemService.getSelectedItem();
+ if (this.coinBalance >= this.selectedItem.cost && this.selectedItem.remaining > 0) {
+ this.itemService.dispenseItem((item) => {
+ alert(`Thank you for purchasing a ${item.name}!!`);
+ this.balanceService.deductBalance(0);
+ });
+ this.balanceService.setBalance(0);
+ } else if (this.selectedItem.remaining <= 0){
+ this.itemService.dispenseItem((item) => {
+ alert(`${item.name} is Sold Out!!`);
+ });
+ } else {
+ alert('You have insufficient balance!');
+ }
+ }
+}
diff --git a/src/app/insert-coin/insert-coin.component.html b/src/app/insert-coin/insert-coin.component.html
index 0513897..70604ba 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..27e4420 100644
--- a/src/app/insert-coin/insert-coin.component.ts
+++ b/src/app/insert-coin/insert-coin.component.ts
@@ -21,4 +21,8 @@ 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..dc10eb7
--- /dev/null
+++ b/src/app/select-item/select-item.component.css
@@ -0,0 +1,4 @@
+li {
+ color: white;
+ list-style: none;
+}
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..81c3abf
--- /dev/null
+++ b/src/app/select-item/select-item.component.html
@@ -0,0 +1,4 @@
+
+
+ {{item.name}} costs {{item.cost}}
+
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..cb5c025
--- /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;
+ public selectedItem;
+ constructor(public itemService: ItemService) { }
+
+ ngOnInit() {
+ this.itemService.onItemsRetrieved((items)=> {
+ this.items = items;
+ })
+ }
+
+ onItemSelected(item) {
+ this.itemService.setSelectedItem(item);
+ }
+}