diff --git a/package.json b/package.json deleted file mode 100644 index 31c9fb832..000000000 --- a/package.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "distribution-not-selected", - "description": "Choose a distribution by running 'npm run apply:copay' or 'npm run apply:bitpay'.", - "primary-package-json": "See the tempate in app-template/package.json", - "pre-commit": "unstage-package", - "changes": "changes to this file can be commited with the --no-verify option", - "scripts": { - "postinstall": "npm run apply:copay && echo && echo \"Repo configured for standard Copay distribution. To switch to the BitPay distribution, run 'npm run apply:bitpay'.\" && echo", - "start": "echo && echo \"Choose a distribution by running 'npm run apply:copay' or 'npm run apply:bitpay'.\" && echo", - "apply:copay": "npm i fs-extra@0.30 && cd app-template && node apply.js copay && cd .. && npm i", - "apply:bitpay": "npm i fs-extra@0.30 && cd app-template && node apply.js bitpay && cd .. && npm i", - "unstage-package": "git reset package.json", - "clean-all": "git clean -dfx" - }, - "dependencies": { - "pre-commit": "^1.1.3" - }, - "license": "MIT", - "repository": { - "url": "git://github.com/bitpay/bitpay-wallet.git", - "type": "git" - } -} diff --git a/src/app/app.module.ts b/src/app/app.module.ts index c2f8a88ad..e57781c58 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -9,6 +9,8 @@ import { SendPage } from '../pages/send/send'; import { SettingPage } from '../pages/setting/setting'; import { TabsPage } from '../pages/tabs/tabs'; +import { AboutPage } from '../pages/about/about'; + import { StatusBar } from '@ionic-native/status-bar'; import { SplashScreen } from '@ionic-native/splash-screen'; @@ -22,6 +24,7 @@ import { StorageService } from '../providers/storage-service/storage-service'; ReceivePage, SendPage, SettingPage, + AboutPage, TabsPage ], imports: [ @@ -35,6 +38,7 @@ import { StorageService } from '../providers/storage-service/storage-service'; ReceivePage, SendPage, SettingPage, + AboutPage, TabsPage ], providers: [ diff --git a/src/pages/setting/setting.html b/src/pages/setting/setting.html index 1c58f6dff..97ea6eb51 100644 --- a/src/pages/setting/setting.html +++ b/src/pages/setting/setting.html @@ -15,4 +15,10 @@ + + + + diff --git a/src/pages/setting/setting.ts b/src/pages/setting/setting.ts index c114a27ea..da4a75f51 100644 --- a/src/pages/setting/setting.ts +++ b/src/pages/setting/setting.ts @@ -1,24 +1,34 @@ import { Component } from '@angular/core'; import { NavController, NavParams } from 'ionic-angular'; -/** - * Generated class for the SettingPage page. - * - * See http://ionicframework.com/docs/components/#navigation for more info - * on Ionic pages and navigation. - */ +import { AboutPage } from '../about/about'; @Component({ selector: 'page-setting', templateUrl: 'setting.html', }) export class SettingPage { + items: Object[]; constructor(public navCtrl: NavController, public navParams: NavParams) { + this.items = [ + { + name: 'Address book', + page: null + }, { + name: 'About Copay', + page: AboutPage + } + ]; } ionViewDidLoad() { console.log('ionViewDidLoad SettingPage'); } + openPage(page: any) { + if (!page) return; + this.navCtrl.push(page); + } + }