Merge pull request #6703 from Gamboster/v4

Ref: Folders reordered and modules created
This commit is contained in:
Gustavo Maximiliano Cortez 2017-09-05 15:20:29 -03:00 committed by GitHub
commit 383398a469
30 changed files with 278 additions and 146 deletions

View File

@ -1,118 +1,118 @@
{
"name": "copay",
"description": "Copay Bitcoin Wallet",
"version": "0.0.1",
"author": "BitPay",
"homepage": "https://copay.io/",
"private": true,
"scripts": {
"clean": "ionic-app-scripts clean",
"clean-all": "git clean -dfx",
"build": "ionic-app-scripts build",
"lint": "ionic-app-scripts lint",
"ionic:build": "ionic-app-scripts build",
"ionic:serve": "ionic-app-scripts serve",
"test": "karma start ./test-config/karma.conf.js",
"test-ci": "karma start ./test-config/karma.conf.js --single-run",
"extract": "ngx-translate-extract --input ./src --output ./src/assets/i18n/app.pot --clean --sort --format pot"
"name": "copay",
"description": "Copay Bitcoin Wallet",
"version": "0.0.1",
"author": "BitPay",
"homepage": "https://copay.io/",
"private": true,
"scripts": {
"clean": "ionic-app-scripts clean",
"clean-all": "git clean -dfx",
"build": "ionic-app-scripts build",
"lint": "ionic-app-scripts lint",
"ionic:build": "ionic-app-scripts build",
"ionic:serve": "ionic-app-scripts serve",
"test": "karma start ./test-config/karma.conf.js",
"test-ci": "karma start ./test-config/karma.conf.js --single-run",
"extract": "ngx-translate-extract --input ./src --output ./src/assets/i18n/app.pot --clean --sort --format pot"
},
"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",
"@angular/tsc-wrapped": "4.1.3",
"@biesbjerg/ngx-translate-po-http-loader": "1.0.1",
"@ionic-native/clipboard": "4.1.0",
"@ionic-native/core": "3.12.1",
"@ionic-native/file": "4.1.0",
"@ionic-native/qr-scanner": "^4.1.0",
"@ionic-native/social-sharing": "4.1.0",
"@ionic-native/splash-screen": "3.12.1",
"@ionic-native/status-bar": "3.12.1",
"@ionic-native/toast": "4.1.0",
"@ionic/storage": "2.0.1",
"@ngx-translate/core": "6.0.1",
"@nsalaun/ng-logger": "2.0.1",
"ajv": "5.2.2",
"autoprefixer": "7.1.2",
"cordova-android": "^6.2.3",
"cordova-clipboard": "1.0.0",
"cordova-ios": "4.4.0",
"cordova-plugin-console": "1.0.5",
"cordova-plugin-device": "1.1.4",
"cordova-plugin-qrscanner": "^2.5.0",
"cordova-plugin-splashscreen": "4.0.3",
"cordova-plugin-statusbar": "2.2.2",
"cordova-plugin-whitelist": "1.3.1",
"cordova-plugin-wkwebview-engine": "git+https://github.com/ionic-team/cordova-plugin-wkwebview-engine.git",
"cordova-plugin-x-socialsharing": "5.1.8",
"cordova-plugin-x-toast": "2.6.0",
"cordova-sqlite-storage": "2.0.4",
"es6-promise-plugin": "4.1.0",
"ionic-angular": "3.6.0",
"ionic-plugin-keyboard": "2.2.1",
"ionicons": "3.0.0",
"lodash": "4.17.4",
"ngx-clipboard": "8.0.3",
"ngx-qrcode2": "0.0.3",
"rxjs": "5.4.0",
"sw-toolbox": "3.6.0",
"zone.js": "0.8.12"
},
"devDependencies": {
"@angular/cli": "1.3.0",
"@biesbjerg/ngx-translate-extract": "2.3.2",
"@ionic/app-scripts": "2.1.4",
"@types/chrome": "0.0.47",
"@types/cordova-plugin-qrscanner": "^1.0.31",
"@types/jasmine": "2.5.53",
"@types/lodash": "4.14.71",
"angular2-template-loader": "0.6.2",
"codecov": "2.2.0",
"html-loader": "0.4.5",
"ionic": "3.9.2",
"jasmine-core": "2.6.4",
"jasmine-spec-reporter": "4.1.1",
"karma": "1.7.0",
"karma-chrome-launcher": "2.2.0",
"karma-jasmine": "1.1.0",
"karma-jasmine-html-reporter": "0.2.2",
"karma-mocha-reporter": "2.2.3",
"karma-phantomjs-launcher": "1.0.4",
"karma-remap-istanbul": "0.6.0",
"karma-sourcemap-loader": "0.3.7",
"karma-webpack": "2.0.4",
"null-loader": "0.1.1",
"ts-loader": "2.0.3",
"ts-node": "3.3.0",
"tslint": "5.5.0",
"tslint-eslint-rules": "4.1.1",
"typescript": "2.3.4",
"webpack": "3.4.1"
},
"cordova": {
"plugins": {
"cordova-sqlite-storage": {},
"cordova-plugin-console": {},
"cordova-plugin-device": {},
"cordova-plugin-splashscreen": {},
"cordova-plugin-statusbar": {},
"cordova-plugin-whitelist": {},
"ionic-plugin-keyboard": {},
"cordova-clipboard": {},
"cordova-plugin-x-toast": {},
"cordova-plugin-x-socialsharing": {},
"cordova-plugin-qrscanner": {},
"cordova-plugin-wkwebview-engine": {}
},
"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",
"@angular/tsc-wrapped": "4.1.3",
"@biesbjerg/ngx-translate-po-http-loader": "1.0.1",
"@ionic-native/clipboard": "4.1.0",
"@ionic-native/core": "3.12.1",
"@ionic-native/file": "4.1.0",
"@ionic-native/qr-scanner": "^4.1.0",
"@ionic-native/social-sharing": "4.1.0",
"@ionic-native/splash-screen": "3.12.1",
"@ionic-native/status-bar": "3.12.1",
"@ionic-native/toast": "4.1.0",
"@ionic/storage": "2.0.1",
"@ngx-translate/core": "6.0.1",
"@nsalaun/ng-logger": "2.0.1",
"ajv": "5.2.2",
"autoprefixer": "7.1.2",
"cordova-android": "^6.2.3",
"cordova-clipboard": "1.0.0",
"cordova-ios": "4.4.0",
"cordova-plugin-console": "1.0.5",
"cordova-plugin-device": "1.1.4",
"cordova-plugin-qrscanner": "^2.5.0",
"cordova-plugin-splashscreen": "4.0.3",
"cordova-plugin-statusbar": "2.2.2",
"cordova-plugin-whitelist": "1.3.1",
"cordova-plugin-wkwebview-engine": "git+https://github.com/ionic-team/cordova-plugin-wkwebview-engine.git",
"cordova-plugin-x-socialsharing": "5.1.8",
"cordova-plugin-x-toast": "2.6.0",
"cordova-sqlite-storage": "2.0.4",
"es6-promise-plugin": "4.1.0",
"ionic-angular": "3.6.0",
"ionic-plugin-keyboard": "2.2.1",
"ionicons": "3.0.0",
"lodash": "4.17.4",
"ngx-clipboard": "8.0.3",
"ngx-qrcode2": "0.0.3",
"rxjs": "5.4.0",
"sw-toolbox": "3.6.0",
"zone.js": "0.8.12"
},
"devDependencies": {
"@angular/cli": "1.3.0",
"@biesbjerg/ngx-translate-extract": "2.3.2",
"@ionic/app-scripts": "2.1.4",
"@types/chrome": "0.0.47",
"@types/jasmine": "2.5.53",
"@types/lodash": "4.14.71",
"@types/node": "8.0.19",
"angular2-template-loader": "0.6.2",
"codecov": "2.2.0",
"html-loader": "0.4.5",
"ionic": "3.9.2",
"jasmine-core": "2.6.4",
"jasmine-spec-reporter": "4.1.1",
"karma": "1.7.0",
"karma-chrome-launcher": "2.2.0",
"karma-jasmine": "1.1.0",
"karma-jasmine-html-reporter": "0.2.2",
"karma-mocha-reporter": "2.2.3",
"karma-phantomjs-launcher": "1.0.4",
"karma-remap-istanbul": "0.6.0",
"karma-sourcemap-loader": "0.3.7",
"karma-webpack": "2.0.4",
"null-loader": "0.1.1",
"ts-loader": "2.0.3",
"ts-node": "3.3.0",
"tslint": "5.5.0",
"tslint-eslint-rules": "4.1.1",
"typescript": "2.3.4",
"webpack": "3.4.1"
},
"cordova": {
"plugins": {
"cordova-sqlite-storage": {},
"cordova-plugin-console": {},
"cordova-plugin-device": {},
"cordova-plugin-splashscreen": {},
"cordova-plugin-statusbar": {},
"cordova-plugin-whitelist": {},
"ionic-plugin-keyboard": {},
"cordova-clipboard": {},
"cordova-plugin-x-toast": {},
"cordova-plugin-x-socialsharing": {},
"cordova-plugin-qrscanner": {},
"cordova-plugin-wkwebview-engine": {}
},
"platforms": [
"android",
"ios"
]
}
"platforms": [
"android",
"ios"
]
}
}

View File

@ -25,11 +25,11 @@ import { HomePage } from '../pages/home/home';
import { ReceivePage } from '../pages/receive/receive';
import { ScanPage } from '../pages/scan/scan';
import { SendPage } from '../pages/send/send';
import { SettingPage } from '../pages/setting/setting';
import { SettingsPage } from '../pages/settings/settings';
import { TabsPage } from '../pages/tabs/tabs';
import { AboutPage } from '../pages/about/about';
import { TermsOfUsePage } from '../pages/terms-of-use/terms-of-use';
import { AboutPage } from '../pages/settings/about/about';
import { TermsOfUsePage } from '../pages/settings/about/terms-of-use/terms-of-use';
/* Providers */
import { WalletProvider } from '../providers/wallet/wallet';
@ -52,7 +52,7 @@ export function createTranslateLoader(http: Http) {
ReceivePage,
SendPage,
ScanPage,
SettingPage,
SettingsPage,
AboutPage,
TermsOfUsePage,
TabsPage
@ -78,7 +78,7 @@ export function createTranslateLoader(http: Http) {
ReceivePage,
ScanPage,
SendPage,
SettingPage,
SettingsPage,
AboutPage,
TermsOfUsePage,
TabsPage

View File

@ -13,5 +13,5 @@ msgstr ""
msgid "Send"
msgstr ""
msgid "Setting"
msgid "Settings"
msgstr ""

View File

@ -21,5 +21,5 @@ msgstr "Receive"
msgid "Send"
msgstr "Send"
msgid "Setting"
msgstr "Setting"
msgid "Settings"
msgstr "Settings"

View File

@ -21,5 +21,5 @@ msgstr "Recibir"
msgid "Send"
msgstr "Enviar"
msgid "Setting"
msgid "Settings"
msgstr "Configuración"

View File

@ -0,0 +1,16 @@
import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import { HomePage } from './home';
@NgModule({
declarations: [
HomePage,
],
imports: [
IonicPageModule.forChild(HomePage),
],
exports: [
HomePage
]
})
export class HomePageModule {}

View File

@ -1,6 +1,7 @@
import { Component } from '@angular/core';
import { NavController } from 'ionic-angular';
import { IonicPage, NavController } from 'ionic-angular';
@IonicPage()
@Component({
selector: 'page-home',
templateUrl: 'home.html'

View File

@ -0,0 +1,16 @@
import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import { ReceivePage } from './receive';
@NgModule({
declarations: [
ReceivePage,
],
imports: [
IonicPageModule.forChild(ReceivePage),
],
exports: [
ReceivePage
]
})
export class ReceivePageModule {}

View File

@ -1,5 +1,5 @@
import { Component } from '@angular/core';
import { NavController, NavParams } from 'ionic-angular';
import { IonicPage, NavController, NavParams } from 'ionic-angular';
/**
* Generated class for the ReceivePage page.
@ -8,6 +8,7 @@ import { NavController, NavParams } from 'ionic-angular';
* on Ionic pages and navigation.
*/
@IonicPage()
@Component({
selector: 'page-receive',
templateUrl: 'receive.html',

View File

@ -0,0 +1,16 @@
import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import { ScanPage } from './scan';
@NgModule({
declarations: [
ScanPage,
],
imports: [
IonicPageModule.forChild(ScanPage),
],
exports: [
ScanPage
]
})
export class ScanPageModule {}

View File

@ -1,10 +1,11 @@
import { Component } from '@angular/core';
import { NavController, NavParams } from 'ionic-angular';
import { IonicPage, NavController, NavParams } from 'ionic-angular';
import { QRScanner, QRScannerStatus } from '@ionic-native/qr-scanner';
import { PlatformProvider } from '../../providers/platform/platform';
import { ScanProvider } from '../../providers/scan/scan';
//import { QRScanner as QRScannerBrowser } from 'cordova-plugin-qrscanner/src/browser/src/library'
@IonicPage()
@Component({
selector: 'page-scan',
templateUrl: 'scan.html',

View File

@ -0,0 +1,16 @@
import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import { SendPage } from './send';
@NgModule({
declarations: [
SendPage,
],
imports: [
IonicPageModule.forChild(SendPage),
],
exports: [
SendPage,
],
})
export class SendPageModule {}

View File

@ -1,5 +1,5 @@
import { Component } from '@angular/core';
import { NavController, NavParams } from 'ionic-angular';
import { IonicPage, NavController, NavParams } from 'ionic-angular';
/**
* Generated class for the SendPage page.
@ -8,6 +8,7 @@ import { NavController, NavParams } from 'ionic-angular';
* on Ionic pages and navigation.
*/
@IonicPage()
@Component({
selector: 'page-send',
templateUrl: 'send.html',

View File

@ -1,3 +0,0 @@
page-setting {
}

View File

@ -0,0 +1,16 @@
import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import { AboutPage } from './about';
@NgModule({
declarations: [
AboutPage,
],
imports: [
IonicPageModule.forChild(AboutPage),
],
exports: [
AboutPage
]
})
export class AboutPageModule {}

View File

@ -1,12 +1,13 @@
import { Component } from '@angular/core';
import { NavController, NavParams } from 'ionic-angular';
import { IonicPage, NavController, NavParams } from 'ionic-angular';
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 { AppProvider } from '../../providers/app/app';
import { AppProvider } from '../../../providers/app/app';
@IonicPage()
@Component({
selector: 'page-about',
templateUrl: 'about.html',

View File

@ -0,0 +1,16 @@
import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import { TermsOfUsePage } from './terms-of-use';
@NgModule({
declarations: [
TermsOfUsePage,
],
imports: [
IonicPageModule.forChild(TermsOfUsePage),
],
exports: [
TermsOfUsePage
]
})
export class TermsOfUsePageModule {}

View File

@ -1,7 +1,7 @@
<ion-header>
<ion-navbar>
<ion-title>Setting</ion-title>
<ion-title>Settings</ion-title>
</ion-navbar>
</ion-header>

View File

@ -0,0 +1,16 @@
import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import { SettingsPage } from './settings';
@NgModule({
declarations: [
SettingsPage,
],
imports: [
IonicPageModule.forChild(SettingsPage),
],
exports: [
SettingsPage
]
})
export class SettingsPageModule {}

View File

@ -0,0 +1,3 @@
page-settings {
}

View File

@ -1,17 +1,18 @@
import { Component } from '@angular/core';
import { NavController, NavParams } from 'ionic-angular';
import { IonicPage, NavController, NavParams } from 'ionic-angular';
import { AppProvider } from '../../providers/app/app';
import { LanguageProvider } from '../../providers/language/language';
import { UnitProvider } from '../../providers/unit/unit';
import { AboutPage } from '../about/about';
import { AboutPage } from './about/about';
@IonicPage()
@Component({
selector: 'page-setting',
templateUrl: 'setting.html',
selector: 'page-settings',
templateUrl: 'settings.html',
})
export class SettingPage {
export class SettingsPage {
appName: string;
currentLanguage: string;
currentUnitCode: string;
@ -36,7 +37,7 @@ export class SettingPage {
}
ionViewDidLoad() {
console.log('ionViewDidLoad SettingPage');
console.log('ionViewDidLoad SettingsPage');
}
setLanguage(lang: string) {

View File

@ -3,5 +3,5 @@
<ion-tab [root]="receiveRoot" tabTitle="{{'Receive'|translate}}" tabIcon="archive"></ion-tab>
<ion-tab [root]="scanRoot" tabTitle="{{'Scan'|translate}}" tabIcon="md-qr-scanner"></ion-tab>
<ion-tab [root]="sendRoot" tabTitle="{{'Send'|translate}}" tabIcon="send"></ion-tab>
<ion-tab [root]="settingRoot" tabTitle="{{'Setting'|translate}}" tabIcon="settings"></ion-tab>
<ion-tab [root]="settingsRoot" tabTitle="{{'Settings'|translate}}" tabIcon="settings"></ion-tab>
</ion-tabs>

View File

@ -0,0 +1,13 @@
import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import { TabsPage } from './tabs';
@NgModule({
declarations: [
TabsPage,
],
imports: [
IonicPageModule.forChild(TabsPage),
],
})
export class TabsPageModule {}

View File

@ -1,11 +1,12 @@
import { Component } from '@angular/core';
import { IonicPage } from 'ionic-angular';
import { HomePage } from '../home/home';
import { ReceivePage } from '../receive/receive';
import { ScanPage } from '../scan/scan';
import { SendPage } from '../send/send';
import { SettingPage } from '../setting/setting';
import { SettingsPage } from '../settings/settings';
@IonicPage()
@Component({
templateUrl: 'tabs.html'
})
@ -15,7 +16,7 @@ export class TabsPage {
receiveRoot = ReceivePage;
scanRoot = ScanPage;
sendRoot = SendPage;
settingRoot = SettingPage;
settingsRoot = SettingsPage;
constructor() {

View File

@ -52,7 +52,7 @@ export class LanguageProvider {
) {
this.logger.info('LanguageProvider initialized.');
this.translate.onLangChange.subscribe((event) => {
this.logger.info('Setting language changed to: ' + event.lang);
this.logger.info('Settings language changed to: ' + event.lang);
});
}