rename *service to *provider

This commit is contained in:
Ivan Socolsky 2017-07-31 13:07:54 -03:00
parent d4c2289ab2
commit de5e2a43dc
No known key found for this signature in database
GPG Key ID: FAECE6A05FAA4F56
9 changed files with 29 additions and 29 deletions

View File

@ -36,17 +36,16 @@
"zone.js": "0.8.12" "zone.js": "0.8.12"
}, },
"devDependencies": { "devDependencies": {
"@ionic/app-scripts": "2.0.2",
"@ionic/cli-plugin-cordova": "1.4.1",
"@ionic/cli-plugin-ionic-angular": "1.3.2",
"ionic": "3.6.0",
"typescript": "2.3.4",
"@angular/cli": "^1.2.5", "@angular/cli": "^1.2.5",
"@angular/compiler": "^4.3.1", "@angular/compiler": "^4.3.1",
"@angular/compiler-cli": "^4.3.1", "@angular/compiler-cli": "^4.3.1",
"@ionic/app-scripts": "2.0.2",
"@ionic/cli-plugin-cordova": "1.5.0",
"@ionic/cli-plugin-ionic-angular": "1.4.0",
"@types/jasmine": "^2.5.53", "@types/jasmine": "^2.5.53",
"@types/node": "^8.0.17", "@types/node": "^8.0.17",
"codecov": "^2.2.0", "codecov": "^2.2.0",
"ionic": "3.6.0",
"jasmine-core": "^2.6.4", "jasmine-core": "^2.6.4",
"jasmine-spec-reporter": "^4.1.1", "jasmine-spec-reporter": "^4.1.1",
"karma": "^1.7.0", "karma": "^1.7.0",
@ -56,7 +55,8 @@
"karma-remap-istanbul": "^0.6.0", "karma-remap-istanbul": "^0.6.0",
"ts-node": "^3.3.0", "ts-node": "^3.3.0",
"tslint": "^5.5.0", "tslint": "^5.5.0",
"tslint-eslint-rules": "^4.1.1" "tslint-eslint-rules": "^4.1.1",
"typescript": "2.3.4"
}, },
"description": "Copay Bitcoin Wallet" "description": "Copay Bitcoin Wallet"
} }

View File

@ -4,7 +4,7 @@ import { StatusBar } from '@ionic-native/status-bar';
import { SplashScreen } from '@ionic-native/splash-screen'; import { SplashScreen } from '@ionic-native/splash-screen';
import { Logger } from '@nsalaun/ng-logger'; import { Logger } from '@nsalaun/ng-logger';
import { AppService } from '../providers/app-service/app-service'; import { AppProvider } from '../providers/app-provider/app-provider';
import { TabsPage } from '../pages/tabs/tabs'; import { TabsPage } from '../pages/tabs/tabs';
@ -19,16 +19,16 @@ export class Copay {
statusBar: StatusBar, statusBar: StatusBar,
splashScreen: SplashScreen, splashScreen: SplashScreen,
log: Logger, log: Logger,
appSrv: AppService app: AppProvider
) { ) {
platform.ready().then(() => { platform.ready().then(() => {
appSrv.getName().subscribe((name) => { app.getName().subscribe((name) => {
log.info('Name: ' + name); log.info('Name: ' + name);
}); });
appSrv.getVersion().subscribe((version) => { app.getVersion().subscribe((version) => {
log.info('Version: ' + version); log.info('Version: ' + version);
}); });
appSrv.getCommitHash().subscribe((commit) => { app.getCommitHash().subscribe((commit) => {
log.info('Commit Hash: #' + commit); log.info('Commit Hash: #' + commit);
}); });
log.info('Platform: ' + platform.platforms()); log.info('Platform: ' + platform.platforms());

View File

@ -19,9 +19,9 @@ import { TermsOfUsePage } from '../pages/terms-of-use/terms-of-use';
import { StatusBar } from '@ionic-native/status-bar'; import { StatusBar } from '@ionic-native/status-bar';
import { SplashScreen } from '@ionic-native/splash-screen'; import { SplashScreen } from '@ionic-native/splash-screen';
import { WalletService } from '../providers/wallet-service/wallet-service'; import { WalletProvider } from '../providers/wallet-provider/wallet-provider';
import { StorageService } from '../providers/storage-service/storage-service'; import { StorageProvider } from '../providers/storage-provider/storage-provider';
import { AppService } from '../providers/app-service/app-service'; import { AppProvider } from '../providers/app-provider/app-provider';
// Set different log level depending on environment. // Set different log level depending on environment.
const LOG_LEVEL = Level.LOG; const LOG_LEVEL = Level.LOG;
@ -61,9 +61,9 @@ if (isDevMode()){
StatusBar, StatusBar,
SplashScreen, SplashScreen,
{provide: ErrorHandler, useClass: IonicErrorHandler}, {provide: ErrorHandler, useClass: IonicErrorHandler},
WalletService, WalletProvider,
StorageService, StorageProvider,
AppService AppProvider
] ]
}) })
export class AppModule {} export class AppModule {}

View File

@ -5,7 +5,7 @@ import { Logger } from '@nsalaun/ng-logger';
import { TermsOfUsePage } from '../terms-of-use/terms-of-use'; import { TermsOfUsePage } from '../terms-of-use/terms-of-use';
import { AppService } from '../../providers/app-service/app-service'; import { AppProvider } from '../../providers/app-provider/app-provider';
@Component({ @Component({
selector: 'page-about', selector: 'page-about',
@ -18,16 +18,16 @@ export class AboutPage {
constructor( constructor(
public navCtrl: NavController, public navCtrl: NavController,
public navParams: NavParams, public navParams: NavParams,
private appSrv: AppService, private app: AppProvider,
private log: Logger private log: Logger
) {} ) {}
ionViewDidLoad() { ionViewDidLoad() {
this.log.log('ionViewDidLoad AboutPage'); this.log.log('ionViewDidLoad AboutPage');
this.appSrv.getCommitHash().subscribe((data) => { this.app.getCommitHash().subscribe((data) => {
this.commitHash = data; this.commitHash = data;
}); });
this.appSrv.getVersion().subscribe((data) => { this.app.getVersion().subscribe((data) => {
this.version = data; this.version = data;
}); });
} }

View File

@ -1,7 +1,7 @@
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { NavController, NavParams } from 'ionic-angular'; import { NavController, NavParams } from 'ionic-angular';
import { AppService } from '../../providers/app-service/app-service'; import { AppProvider } from '../../providers/app-provider/app-provider';
import { AboutPage } from '../about/about'; import { AboutPage } from '../about/about';
@ -15,9 +15,9 @@ export class SettingPage {
constructor( constructor(
public navCtrl: NavController, public navCtrl: NavController,
public navParams: NavParams, public navParams: NavParams,
public appSrv: AppService public app: AppProvider
) { ) {
appSrv.getName().subscribe((data) => { app.getName().subscribe((data) => {
this.appName = data; this.appName = data;
}); });
} }

View File

@ -3,7 +3,7 @@ import { Http, Response } from '@angular/http';
import 'rxjs/add/operator/map'; import 'rxjs/add/operator/map';
@Injectable() @Injectable()
export class AppService { export class AppProvider {
private jsonPath: string = '../assets/appConfig.json'; private jsonPath: string = '../assets/appConfig.json';
constructor(public http: Http) {} constructor(public http: Http) {}

View File

@ -1,11 +1,11 @@
import { StorageService } from './storage-service'; import { StorageProvider } from './storage-provider';
describe('Storage Service', () => { describe('Storage Service', () => {
it('should do nothing', () => { it('should do nothing', () => {
expect(true).toBeTruthy(); expect(true).toBeTruthy();
}); });
it('should get', () => { it('should get', () => {
var storage = new StorageService(); var storage = new StorageProvider();
expect(storage.get('myKey')).toEqual('myKey'); expect(storage.get('myKey')).toEqual('myKey');
}); });
}); });

View File

@ -1,7 +1,7 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
@Injectable() @Injectable()
export class StorageService { export class StorageProvider {
constructor() { constructor() {
console.log('Hello StorageService Provider'); console.log('Hello StorageService Provider');

View File

@ -1,7 +1,7 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
@Injectable() @Injectable()
export class WalletService { export class WalletProvider {
constructor() { constructor() {
console.log('Hello WalletService Provider'); console.log('Hello WalletService Provider');