diff --git a/package.json b/package.json index 385381e..9f621ca 100644 --- a/package.json +++ b/package.json @@ -21,12 +21,12 @@ "@angular/platform-server": "2.2.1", "@ionic/storage": "1.1.7", "@ngrx/core": "^1.2.0", - "@ngrx/effects": "^2.0.0", + "@ngrx/effects": "^2.0.1", "@ngrx/store": "^2.2.1", "ionic-angular": "2.0.0-rc.4", "ionic-native": "2.2.11", "ionicons": "3.0.0", - "pouchdb": "^6.1.0", + "pouchdb": "^6.1.2", "rxjs": "5.0.0-beta.12", "zone.js": "0.6.26" }, diff --git a/src/effects/birthday.effects.ts b/src/effects/birthday.effects.ts index 1ceb5f7..c314ef8 100644 --- a/src/effects/birthday.effects.ts +++ b/src/effects/birthday.effects.ts @@ -1,7 +1,9 @@ import { Injectable } from '@angular/core'; import { Effect, toPayload, Actions } from '@ngrx/effects'; -import { Observable } from 'rxjs/rx'; +import { Observable } from 'rxjs/Rx'; +import 'rxjs/add/operator/map'; +import 'rxjs/add/operator/mergeMap'; import { BirthdayService } from '../services/birthday.service'; import { Birthday } from '../models/birthday'; diff --git a/src/pages/home/home.ts b/src/pages/home/home.ts index 339fe29..199c159 100644 --- a/src/pages/home/home.ts +++ b/src/pages/home/home.ts @@ -1,7 +1,7 @@ import { Component, ChangeDetectionStrategy } from "@angular/core"; import { ModalController, NavController } from 'ionic-angular'; import { Store } from '@ngrx/store'; -import { Observable } from 'rxjs/rx'; +import { Observable } from 'rxjs/Rx'; import { AppState } from '../../services/app-state'; import { Birthday } from '../../models/birthday'; diff --git a/src/services/birthday.service.ts b/src/services/birthday.service.ts index f7bc2a3..c9b181e 100644 --- a/src/services/birthday.service.ts +++ b/src/services/birthday.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { Platform } from 'ionic-angular'; -import { Observable } from 'rxjs/rx'; +import { Observable } from 'rxjs/Rx'; import { Birthday } from '../models/birthday'; import * as PouchDB from 'pouchdb';