diff --git a/db.json b/db.json index baf7af9..b62fad1 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": -19 }, { "id": 4, "name": "Mr Pibbs", "cost": 0.5, - "remaining": 10 + "remaining": 7 } ] } \ 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..86fca99 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,5 +1,6 @@ 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..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/item/item.service.ts b/src/app/item/item.service.ts index b9597b6..e4f119f 100644 --- a/src/app/item/item.service.ts +++ b/src/app/item/item.service.ts @@ -3,6 +3,7 @@ import { Observable } from 'rxjs/Observable'; import 'rxjs/add/operator/map'; import { Http, Response, Headers, RequestOptions } from '@angular/http'; + @Injectable() export class ItemService { private apiUrl = 'http://localhost:3000/items';