Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion db.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@
"remaining": 10
}
]
}
}
2 changes: 2 additions & 0 deletions src/app/app.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
6 changes: 5 additions & 1 deletion src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
18 changes: 9 additions & 9 deletions src/app/balance/balance.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,23 @@ 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 {

addBalance(amount): void {
this.balance += amount;
this.updateSubject();
this.updateSubject();
}

deductBalance(amount): void {
Expand Down
Empty file.
1 change: 1 addition & 0 deletions src/app/dispense-item/dispense-item.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<button class="button" (click)='onDispenseItem()'>Dispense</button>
25 changes: 25 additions & 0 deletions src/app/dispense-item/dispense-item.component.spec.ts
Original file line number Diff line number Diff line change
@@ -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();
});
});
39 changes: 39 additions & 0 deletions src/app/dispense-item/dispense-item.component.ts
Original file line number Diff line number Diff line change
@@ -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!');
}
}
}
2 changes: 2 additions & 0 deletions src/app/insert-coin/insert-coin.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
<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 -green" (click)='addBalance(1)'>$1</button>
<button class="button" (click)='returnCoins()'>Coin Return</button>
4 changes: 4 additions & 0 deletions src/app/insert-coin/insert-coin.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,8 @@ export class InsertCoinComponent implements OnInit {
this.balanceService.addBalance(amount);
}

returnCoins() {
this.balanceService.setBalance(0);
alert('Coins returned!');
}
}
4 changes: 4 additions & 0 deletions src/app/select-item/select-item.component.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
li {
color: white;
list-style: none;
}
4 changes: 4 additions & 0 deletions src/app/select-item/select-item.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<li *ngFor='let item of items'>
<input type="radio"[value]='item.id' name="soda" (change)='onItemSelected(item)'>
{{item.name}} costs {{item.cost}}
</li>
25 changes: 25 additions & 0 deletions src/app/select-item/select-item.component.spec.ts
Original file line number Diff line number Diff line change
@@ -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();
});
});
23 changes: 23 additions & 0 deletions src/app/select-item/select-item.component.ts
Original file line number Diff line number Diff line change
@@ -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);
}
}