From 4da5f4ffc206d15eaf2ce1adace9514687d208d4 Mon Sep 17 00:00:00 2001 From: Gabriel Masclef Date: Tue, 5 Sep 2017 15:10:58 -0300 Subject: [PATCH] Ref: Folders reordered and modules created --- package.json | 230 +++++++++--------- src/app/app.module.ts | 10 +- src/assets/i18n/app.pot | 2 +- src/assets/i18n/en.po | 4 +- src/assets/i18n/es.po | 2 +- src/pages/home/home.module.ts | 16 ++ src/pages/home/home.ts | 3 +- src/pages/receive/receive.module.ts | 16 ++ src/pages/receive/receive.ts | 3 +- src/pages/scan/scan.module.ts | 16 ++ src/pages/scan/scan.ts | 3 +- src/pages/send/send.module.ts | 16 ++ src/pages/send/send.ts | 3 +- src/pages/setting/setting.scss | 3 - src/pages/{ => settings}/about/about.html | 0 src/pages/settings/about/about.module.ts | 16 ++ src/pages/{ => settings}/about/about.scss | 0 src/pages/{ => settings}/about/about.ts | 7 +- .../about}/terms-of-use/terms-of-use.html | 0 .../about/terms-of-use/terms-of-use.module.ts | 16 ++ .../about}/terms-of-use/terms-of-use.scss | 0 .../about}/terms-of-use/terms-of-use.ts | 0 .../setting.html => settings/settings.html} | 2 +- src/pages/settings/settings.module.ts | 16 ++ src/pages/settings/settings.scss | 3 + .../setting.ts => settings/settings.ts} | 13 +- src/pages/tabs/tabs.html | 2 +- src/pages/tabs/tabs.module.ts | 13 + src/pages/tabs/tabs.ts | 7 +- src/providers/language/language.ts | 2 +- 30 files changed, 278 insertions(+), 146 deletions(-) create mode 100644 src/pages/home/home.module.ts create mode 100644 src/pages/receive/receive.module.ts create mode 100644 src/pages/scan/scan.module.ts create mode 100644 src/pages/send/send.module.ts delete mode 100644 src/pages/setting/setting.scss rename src/pages/{ => settings}/about/about.html (100%) create mode 100644 src/pages/settings/about/about.module.ts rename src/pages/{ => settings}/about/about.scss (100%) rename src/pages/{ => settings}/about/about.ts (74%) rename src/pages/{ => settings/about}/terms-of-use/terms-of-use.html (100%) create mode 100644 src/pages/settings/about/terms-of-use/terms-of-use.module.ts rename src/pages/{ => settings/about}/terms-of-use/terms-of-use.scss (100%) rename src/pages/{ => settings/about}/terms-of-use/terms-of-use.ts (100%) rename src/pages/{setting/setting.html => settings/settings.html} (98%) create mode 100644 src/pages/settings/settings.module.ts create mode 100644 src/pages/settings/settings.scss rename src/pages/{setting/setting.ts => settings/settings.ts} (80%) create mode 100644 src/pages/tabs/tabs.module.ts diff --git a/package.json b/package.json index 516d0d9b6..430d3cbce 100644 --- a/package.json +++ b/package.json @@ -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" + ] + } } \ No newline at end of file diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 3fdcea498..57953c075 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -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 diff --git a/src/assets/i18n/app.pot b/src/assets/i18n/app.pot index 9dbbab552..6bf04324c 100644 --- a/src/assets/i18n/app.pot +++ b/src/assets/i18n/app.pot @@ -13,5 +13,5 @@ msgstr "" msgid "Send" msgstr "" -msgid "Setting" +msgid "Settings" msgstr "" \ No newline at end of file diff --git a/src/assets/i18n/en.po b/src/assets/i18n/en.po index c3f8d9ac0..ef825126b 100644 --- a/src/assets/i18n/en.po +++ b/src/assets/i18n/en.po @@ -21,5 +21,5 @@ msgstr "Receive" msgid "Send" msgstr "Send" -msgid "Setting" -msgstr "Setting" +msgid "Settings" +msgstr "Settings" diff --git a/src/assets/i18n/es.po b/src/assets/i18n/es.po index ac6acb48a..81a18a4be 100644 --- a/src/assets/i18n/es.po +++ b/src/assets/i18n/es.po @@ -21,5 +21,5 @@ msgstr "Recibir" msgid "Send" msgstr "Enviar" -msgid "Setting" +msgid "Settings" msgstr "Configuración" diff --git a/src/pages/home/home.module.ts b/src/pages/home/home.module.ts new file mode 100644 index 000000000..33b4ac274 --- /dev/null +++ b/src/pages/home/home.module.ts @@ -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 {} diff --git a/src/pages/home/home.ts b/src/pages/home/home.ts index f84a52b18..ce3c30f02 100644 --- a/src/pages/home/home.ts +++ b/src/pages/home/home.ts @@ -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' diff --git a/src/pages/receive/receive.module.ts b/src/pages/receive/receive.module.ts new file mode 100644 index 000000000..cfba14ff0 --- /dev/null +++ b/src/pages/receive/receive.module.ts @@ -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 {} diff --git a/src/pages/receive/receive.ts b/src/pages/receive/receive.ts index 20ca0f809..8c816def0 100644 --- a/src/pages/receive/receive.ts +++ b/src/pages/receive/receive.ts @@ -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', diff --git a/src/pages/scan/scan.module.ts b/src/pages/scan/scan.module.ts new file mode 100644 index 000000000..68afe6f63 --- /dev/null +++ b/src/pages/scan/scan.module.ts @@ -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 {} diff --git a/src/pages/scan/scan.ts b/src/pages/scan/scan.ts index 538e697ab..4c0d65f83 100644 --- a/src/pages/scan/scan.ts +++ b/src/pages/scan/scan.ts @@ -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', diff --git a/src/pages/send/send.module.ts b/src/pages/send/send.module.ts new file mode 100644 index 000000000..128ae4780 --- /dev/null +++ b/src/pages/send/send.module.ts @@ -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 {} diff --git a/src/pages/send/send.ts b/src/pages/send/send.ts index b9fb2fecb..05a5095ee 100644 --- a/src/pages/send/send.ts +++ b/src/pages/send/send.ts @@ -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', diff --git a/src/pages/setting/setting.scss b/src/pages/setting/setting.scss deleted file mode 100644 index ab9058742..000000000 --- a/src/pages/setting/setting.scss +++ /dev/null @@ -1,3 +0,0 @@ -page-setting { - -} diff --git a/src/pages/about/about.html b/src/pages/settings/about/about.html similarity index 100% rename from src/pages/about/about.html rename to src/pages/settings/about/about.html diff --git a/src/pages/settings/about/about.module.ts b/src/pages/settings/about/about.module.ts new file mode 100644 index 000000000..39d96eace --- /dev/null +++ b/src/pages/settings/about/about.module.ts @@ -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 {} diff --git a/src/pages/about/about.scss b/src/pages/settings/about/about.scss similarity index 100% rename from src/pages/about/about.scss rename to src/pages/settings/about/about.scss diff --git a/src/pages/about/about.ts b/src/pages/settings/about/about.ts similarity index 74% rename from src/pages/about/about.ts rename to src/pages/settings/about/about.ts index 1e4350dc7..07897de7f 100644 --- a/src/pages/about/about.ts +++ b/src/pages/settings/about/about.ts @@ -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', diff --git a/src/pages/terms-of-use/terms-of-use.html b/src/pages/settings/about/terms-of-use/terms-of-use.html similarity index 100% rename from src/pages/terms-of-use/terms-of-use.html rename to src/pages/settings/about/terms-of-use/terms-of-use.html diff --git a/src/pages/settings/about/terms-of-use/terms-of-use.module.ts b/src/pages/settings/about/terms-of-use/terms-of-use.module.ts new file mode 100644 index 000000000..fab9bc62f --- /dev/null +++ b/src/pages/settings/about/terms-of-use/terms-of-use.module.ts @@ -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 {} diff --git a/src/pages/terms-of-use/terms-of-use.scss b/src/pages/settings/about/terms-of-use/terms-of-use.scss similarity index 100% rename from src/pages/terms-of-use/terms-of-use.scss rename to src/pages/settings/about/terms-of-use/terms-of-use.scss diff --git a/src/pages/terms-of-use/terms-of-use.ts b/src/pages/settings/about/terms-of-use/terms-of-use.ts similarity index 100% rename from src/pages/terms-of-use/terms-of-use.ts rename to src/pages/settings/about/terms-of-use/terms-of-use.ts diff --git a/src/pages/setting/setting.html b/src/pages/settings/settings.html similarity index 98% rename from src/pages/setting/setting.html rename to src/pages/settings/settings.html index e878ac38e..70ab2dc08 100644 --- a/src/pages/setting/setting.html +++ b/src/pages/settings/settings.html @@ -1,7 +1,7 @@ - Setting + Settings diff --git a/src/pages/settings/settings.module.ts b/src/pages/settings/settings.module.ts new file mode 100644 index 000000000..850463460 --- /dev/null +++ b/src/pages/settings/settings.module.ts @@ -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 {} diff --git a/src/pages/settings/settings.scss b/src/pages/settings/settings.scss new file mode 100644 index 000000000..ee78e1c3f --- /dev/null +++ b/src/pages/settings/settings.scss @@ -0,0 +1,3 @@ +page-settings { + +} diff --git a/src/pages/setting/setting.ts b/src/pages/settings/settings.ts similarity index 80% rename from src/pages/setting/setting.ts rename to src/pages/settings/settings.ts index 5fab0f15f..564d5978b 100644 --- a/src/pages/setting/setting.ts +++ b/src/pages/settings/settings.ts @@ -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) { diff --git a/src/pages/tabs/tabs.html b/src/pages/tabs/tabs.html index bcb5104fc..b98891787 100644 --- a/src/pages/tabs/tabs.html +++ b/src/pages/tabs/tabs.html @@ -3,5 +3,5 @@ - + diff --git a/src/pages/tabs/tabs.module.ts b/src/pages/tabs/tabs.module.ts new file mode 100644 index 000000000..8d37cdd5e --- /dev/null +++ b/src/pages/tabs/tabs.module.ts @@ -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 {} diff --git a/src/pages/tabs/tabs.ts b/src/pages/tabs/tabs.ts index 163b393b4..0013e3c53 100644 --- a/src/pages/tabs/tabs.ts +++ b/src/pages/tabs/tabs.ts @@ -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() { diff --git a/src/providers/language/language.ts b/src/providers/language/language.ts index 339087399..f273384a4 100644 --- a/src/providers/language/language.ts +++ b/src/providers/language/language.ts @@ -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); }); }