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
28 changes: 28 additions & 0 deletions db-1489763535590.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"items": [
{
"id": 1,
"name": "Sprite",
"cost": 0.5,
"remaining": 10
},
{
"id": 2,
"name": "Coke",
"cost": 0.5,
"remaining": 10
},
{
"id": 3,
"name": "Dr. Pepper",
"cost": 0.75,
"remaining": 10
},
{
"id": 4,
"name": "Mr Pibbs",
"cost": 0.5,
"remaining": 10
}
]
}
28 changes: 28 additions & 0 deletions db-1489777448046.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"items": [
{
"id": 1,
"name": "Sprite",
"cost": 0.5,
"remaining": 10
},
{
"id": 2,
"name": "Coke",
"cost": 0.5,
"remaining": 10
},
{
"id": 3,
"name": "Dr. Pepper",
"cost": 0.75,
"remaining": 10
},
{
"id": 4,
"name": "Mr Pibbs",
"cost": 0.5,
"remaining": 10
}
]
}
28 changes: 28 additions & 0 deletions db-1489779834210.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"items": [
{
"id": 1,
"name": "Sprite",
"cost": 0.5,
"remaining": 10
},
{
"id": 2,
"name": "Coke",
"cost": 0.5,
"remaining": 10
},
{
"id": 3,
"name": "Dr. Pepper",
"cost": 0.75,
"remaining": 10
},
{
"id": 4,
"name": "Mr Pibbs",
"cost": 0.5,
"remaining": 0
}
]
}
28 changes: 28 additions & 0 deletions db-1489779895182.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"items": [
{
"id": 1,
"name": "Sprite",
"cost": 0.5,
"remaining": 10
},
{
"id": 2,
"name": "Coke",
"cost": 0.5,
"remaining": 10
},
{
"id": 3,
"name": "Dr. Pepper",
"cost": 0.75,
"remaining": 10
},
{
"id": 4,
"name": "Mr Pibbs",
"cost": 0.5,
"remaining": 0
}
]
}
28 changes: 28 additions & 0 deletions db-1489780609463.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"items": [
{
"id": 1,
"name": "Sprite",
"cost": 0.5,
"remaining": 10
},
{
"id": 2,
"name": "Coke",
"cost": 0.5,
"remaining": 10
},
{
"id": 3,
"name": "Dr. Pepper",
"cost": 0.75,
"remaining": 10
},
{
"id": 4,
"name": "Mr Pibbs",
"cost": 0.5,
"remaining": 10
}
]
}
2 changes: 1 addition & 1 deletion db.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"id": 1,
"name": "Sprite",
"cost": 0.5,
"remaining": 10
"remaining": 5
},
{
"id": 2,
Expand Down
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
20 changes: 11 additions & 9 deletions src/app/balance/balance.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,29 @@ 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.balance = (Math.round(this.balance * 100) / 100);
this.updateSubject();
}

deductBalance(amount): void {
this.balance -= amount;
this.balance = (Math.round(this.balance * 100) / 100);
this.updateSubject();
}

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 (click)='onDispenseClick()'>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();
});
});
32 changes: 32 additions & 0 deletions src/app/dispense-item/dispense-item.component.ts
Original file line number Diff line number Diff line change
@@ -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 {

constructor(private itemService: ItemService, private balanceService: BalanceService) { }

ngOnInit() {
}

onDispenseClick() {
let item = this.itemService.getSelectedItem();
let balance = this.balanceService.getBalance();

if (this.itemService.hasRemaining() && this.itemService.hasSufficientBalance(balance)) {
this.itemService.dispenseItem(() => {
this.balanceService.deductBalance(item.cost);
alert('Successfully dispensed ' + item.name);
});
} else if (!this.itemService.hasRemaining()) {
alert('No more ' + item.name);
} else {
alert('Insufficient funds');
}
}
}
1 change: 1 addition & 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,4 @@
<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" (click)='returnCoins()'>Return Coins</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');
}
}
3 changes: 3 additions & 0 deletions src/app/select-item/select-item.component.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
li {
list-style: none;
}
5 changes: 5 additions & 0 deletions src/app/select-item/select-item.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<ul>
<li *ngFor='let item of items'>
<input type="radio" name="soda" [value]='item.id' (change)='onItemSelected(item)'> {{item.name}} ${{item.cost}}
</li>
</ul>
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();
});
});
24 changes: 24 additions & 0 deletions src/app/select-item/select-item.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
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(private itemService: ItemService) { }

ngOnInit() {
this.itemService.onItemsRetrieved((items) => {
this.items = items
});
}

onItemSelected(item){
this.itemService.setSelectedItem(item);
}

}