From da606e73146c1f43be5e64417c55f12f248a9286 Mon Sep 17 00:00:00 2001 From: Douglas Morais Date: Tue, 24 Oct 2017 11:49:01 -0200 Subject: [PATCH] Resolves issue #30 - Update the code and dependencies for AngularFire5 --- ionic.config.json | 3 ++- package.json | 37 ++++++++++++++++++------------------- src/providers/data/data.ts | 12 ++++++------ www/index.html | 2 +- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/ionic.config.json b/ionic.config.json index e14d27a..9f2c9dd 100644 --- a/ionic.config.json +++ b/ionic.config.json @@ -1,5 +1,6 @@ { "name": "pet", "app_id": "", - "type": "ionic-angular" + "type": "ionic-angular", + "integrations": {} } diff --git a/package.json b/package.json index 280cabe..d62a6e2 100644 --- a/package.json +++ b/package.json @@ -12,35 +12,34 @@ "ionic:serve": "ionic-app-scripts serve" }, "dependencies": { - "@angular/common": "4.1.3", - "@angular/compiler": "4.1.3", - "@angular/compiler-cli": "4.1.3", - "@angular/core": "4.1.3", - "@angular/forms": "4.1.3", - "@angular/http": "4.1.3", - "@angular/platform-browser": "4.1.3", - "@angular/platform-browser-dynamic": "4.1.3", - "@ionic-native/core": "3.12.1", + "@angular/common": "4.4.6", + "@angular/compiler": "4.4.6", + "@angular/compiler-cli": "4.4.6", + "@angular/core": "4.4.6", + "@angular/forms": "4.4.6", + "@angular/http": "4.4.6", + "@angular/platform-browser": "4.4.6", + "@angular/platform-browser-dynamic": "4.4.6", + "@ionic-native/core": "4.3.2", "@ionic-native/facebook": "^4.1.0", - "@ionic-native/splash-screen": "3.12.1", - "@ionic-native/status-bar": "3.12.1", + "@ionic-native/splash-screen": "4.3.2", + "@ionic-native/status-bar": "4.3.2", "@ionic/storage": "2.0.1", - "angularfire2": "^4.0.0-rc.1", + "angularfire2": "^5.0.0-rc.3", "firebase": "^4.2.0", "font-awesome": "^4.7.0", - "ionic-angular": "3.6.0", + "ionic-angular": "3.7.1", "ionicons": "3.0.0", - "rxjs": "5.4.0", + "rxjs": "5.5.0", "sw-toolbox": "3.6.0", "tslint-config-airbnb": "^5.2.1", - "zone.js": "0.8.12" + "zone.js": "0.8.18" }, "devDependencies": { - "@ionic/app-scripts": "2.1.3", - "@ionic/cli-plugin-ionic-angular": "1.4.0", + "@ionic/app-scripts": "3.0.1", "cz-conventional-changelog": "^2.0.0", - "ionic": "3.6.0", - "typescript": "2.3.4" + "ionic": "3.14.0", + "typescript": "2.5.3" }, "description": "An Ionic project", "config": { diff --git a/src/providers/data/data.ts b/src/providers/data/data.ts index 00fa3a3..9c30ea1 100644 --- a/src/providers/data/data.ts +++ b/src/providers/data/data.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; -import { AngularFireDatabase, FirebaseListObservable, - FirebaseObjectObservable } from 'angularfire2/database'; +import { AngularFireDatabase, AngularFireList, + AngularFireObject } from 'angularfire2/database'; import { Observable } from 'rxjs/Observable'; @Injectable() @@ -22,12 +22,12 @@ export class DataProvider { update(path: string, data: any) { return this.afDB.object(path).update(data); } - - list(path: string, query: any = {}): FirebaseListObservable { - return this.afDB.list(path, { query }); + + list(path: string): AngularFireList { + return this.afDB.list(path); } - object(path: string): FirebaseObjectObservable { + object(path: string): AngularFireObject { return this.afDB.object(path); } diff --git a/www/index.html b/www/index.html index 00624ef..0e8383f 100644 --- a/www/index.html +++ b/www/index.html @@ -2,7 +2,7 @@ Ionic App