From de5e2a43dc3c9733ec59cc68f363e5ffd418dc73 Mon Sep 17 00:00:00 2001 From: Ivan Socolsky Date: Mon, 31 Jul 2017 13:07:54 -0300 Subject: [PATCH] rename *service to *provider --- package.json | 12 ++++++------ src/app/app.component.ts | 10 +++++----- src/app/app.module.ts | 12 ++++++------ src/pages/about/about.ts | 8 ++++---- src/pages/setting/setting.ts | 6 +++--- .../{app-service/app-service.ts => app/app.ts} | 2 +- .../storage.spec.ts} | 4 ++-- .../storage-service.ts => storage/storage.ts} | 2 +- .../wallet-service.ts => wallet/wallet.ts} | 2 +- 9 files changed, 29 insertions(+), 29 deletions(-) rename src/providers/{app-service/app-service.ts => app/app.ts} (96%) rename src/providers/{storage-service/storage-service.spec.ts => storage/storage.spec.ts} (67%) rename src/providers/{storage-service/storage-service.ts => storage/storage.ts} (85%) rename src/providers/{wallet-service/wallet-service.ts => wallet/wallet.ts} (81%) diff --git a/package.json b/package.json index 0a6f17e24..b38b31fcd 100644 --- a/package.json +++ b/package.json @@ -36,17 +36,16 @@ "zone.js": "0.8.12" }, "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/compiler": "^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/node": "^8.0.17", "codecov": "^2.2.0", + "ionic": "3.6.0", "jasmine-core": "^2.6.4", "jasmine-spec-reporter": "^4.1.1", "karma": "^1.7.0", @@ -56,7 +55,8 @@ "karma-remap-istanbul": "^0.6.0", "ts-node": "^3.3.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" } diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 0e6d8c357..957b5b54c 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -4,7 +4,7 @@ import { StatusBar } from '@ionic-native/status-bar'; import { SplashScreen } from '@ionic-native/splash-screen'; 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'; @@ -19,16 +19,16 @@ export class Copay { statusBar: StatusBar, splashScreen: SplashScreen, log: Logger, - appSrv: AppService + app: AppProvider ) { platform.ready().then(() => { - appSrv.getName().subscribe((name) => { + app.getName().subscribe((name) => { log.info('Name: ' + name); }); - appSrv.getVersion().subscribe((version) => { + app.getVersion().subscribe((version) => { log.info('Version: ' + version); }); - appSrv.getCommitHash().subscribe((commit) => { + app.getCommitHash().subscribe((commit) => { log.info('Commit Hash: #' + commit); }); log.info('Platform: ' + platform.platforms()); diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 32112679b..5b8958503 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -19,9 +19,9 @@ import { TermsOfUsePage } from '../pages/terms-of-use/terms-of-use'; import { StatusBar } from '@ionic-native/status-bar'; import { SplashScreen } from '@ionic-native/splash-screen'; -import { WalletService } from '../providers/wallet-service/wallet-service'; -import { StorageService } from '../providers/storage-service/storage-service'; -import { AppService } from '../providers/app-service/app-service'; +import { WalletProvider } from '../providers/wallet-provider/wallet-provider'; +import { StorageProvider } from '../providers/storage-provider/storage-provider'; +import { AppProvider } from '../providers/app-provider/app-provider'; // Set different log level depending on environment. const LOG_LEVEL = Level.LOG; @@ -61,9 +61,9 @@ if (isDevMode()){ StatusBar, SplashScreen, {provide: ErrorHandler, useClass: IonicErrorHandler}, - WalletService, - StorageService, - AppService + WalletProvider, + StorageProvider, + AppProvider ] }) export class AppModule {} diff --git a/src/pages/about/about.ts b/src/pages/about/about.ts index edeb17b0d..987998599 100644 --- a/src/pages/about/about.ts +++ b/src/pages/about/about.ts @@ -5,7 +5,7 @@ import { Logger } from '@nsalaun/ng-logger'; 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({ selector: 'page-about', @@ -18,16 +18,16 @@ export class AboutPage { constructor( public navCtrl: NavController, public navParams: NavParams, - private appSrv: AppService, + private app: AppProvider, private log: Logger ) {} ionViewDidLoad() { this.log.log('ionViewDidLoad AboutPage'); - this.appSrv.getCommitHash().subscribe((data) => { + this.app.getCommitHash().subscribe((data) => { this.commitHash = data; }); - this.appSrv.getVersion().subscribe((data) => { + this.app.getVersion().subscribe((data) => { this.version = data; }); } diff --git a/src/pages/setting/setting.ts b/src/pages/setting/setting.ts index ddc6c4a8a..e6e8ebb2c 100644 --- a/src/pages/setting/setting.ts +++ b/src/pages/setting/setting.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; 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'; @@ -15,9 +15,9 @@ export class SettingPage { constructor( public navCtrl: NavController, public navParams: NavParams, - public appSrv: AppService + public app: AppProvider ) { - appSrv.getName().subscribe((data) => { + app.getName().subscribe((data) => { this.appName = data; }); } diff --git a/src/providers/app-service/app-service.ts b/src/providers/app/app.ts similarity index 96% rename from src/providers/app-service/app-service.ts rename to src/providers/app/app.ts index d44bb83bb..1a57de8d0 100644 --- a/src/providers/app-service/app-service.ts +++ b/src/providers/app/app.ts @@ -3,7 +3,7 @@ import { Http, Response } from '@angular/http'; import 'rxjs/add/operator/map'; @Injectable() -export class AppService { +export class AppProvider { private jsonPath: string = '../assets/appConfig.json'; constructor(public http: Http) {} diff --git a/src/providers/storage-service/storage-service.spec.ts b/src/providers/storage/storage.spec.ts similarity index 67% rename from src/providers/storage-service/storage-service.spec.ts rename to src/providers/storage/storage.spec.ts index 2d3e5964f..ad97296f3 100644 --- a/src/providers/storage-service/storage-service.spec.ts +++ b/src/providers/storage/storage.spec.ts @@ -1,11 +1,11 @@ -import { StorageService } from './storage-service'; +import { StorageProvider } from './storage-provider'; describe('Storage Service', () => { it('should do nothing', () => { expect(true).toBeTruthy(); }); it('should get', () => { - var storage = new StorageService(); + var storage = new StorageProvider(); expect(storage.get('myKey')).toEqual('myKey'); }); }); \ No newline at end of file diff --git a/src/providers/storage-service/storage-service.ts b/src/providers/storage/storage.ts similarity index 85% rename from src/providers/storage-service/storage-service.ts rename to src/providers/storage/storage.ts index 0de495537..9c715533a 100644 --- a/src/providers/storage-service/storage-service.ts +++ b/src/providers/storage/storage.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; @Injectable() -export class StorageService { +export class StorageProvider { constructor() { console.log('Hello StorageService Provider'); diff --git a/src/providers/wallet-service/wallet-service.ts b/src/providers/wallet/wallet.ts similarity index 81% rename from src/providers/wallet-service/wallet-service.ts rename to src/providers/wallet/wallet.ts index fb988a674..78ea8d7c2 100644 --- a/src/providers/wallet-service/wallet-service.ts +++ b/src/providers/wallet/wallet.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; @Injectable() -export class WalletService { +export class WalletProvider { constructor() { console.log('Hello WalletService Provider');