mirror of https://github.com/BTCPrivate/copay.git
rename *service to *provider
This commit is contained in:
parent
d4c2289ab2
commit
de5e2a43dc
12
package.json
12
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"
|
||||
}
|
||||
|
|
|
@ -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());
|
||||
|
|
|
@ -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 {}
|
||||
|
|
|
@ -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;
|
||||
});
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
});
|
||||
}
|
||||
|
|
|
@ -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) {}
|
|
@ -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');
|
||||
});
|
||||
});
|
|
@ -1,7 +1,7 @@
|
|||
import { Injectable } from '@angular/core';
|
||||
|
||||
@Injectable()
|
||||
export class StorageService {
|
||||
export class StorageProvider {
|
||||
|
||||
constructor() {
|
||||
console.log('Hello StorageService Provider');
|
|
@ -1,7 +1,7 @@
|
|||
import { Injectable } from '@angular/core';
|
||||
|
||||
@Injectable()
|
||||
export class WalletService {
|
||||
export class WalletProvider {
|
||||
|
||||
constructor() {
|
||||
console.log('Hello WalletService Provider');
|
Loading…
Reference in New Issue