diff --git a/src/app/app.module.ts b/src/app/app.module.ts index c71f9bd69..2a5f96d8f 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -24,6 +24,7 @@ import { TranslatePoHttpLoader } from '@biesbjerg/ngx-translate-po-http-loader'; import { CopayApp } from './app.component'; /* Pages */ +import { AddPage } from '../pages/add/add'; import { BackupRequestPage } from '../pages/onboarding/backup-request/backup-request'; import { DisclaimerPage } from '../pages/onboarding/disclaimer/disclaimer'; import { EmailPage } from '../pages/onboarding/email/email'; @@ -73,6 +74,7 @@ export function createTranslateLoader(http: Http) { } let pages: any = [ + AddPage, AboutPage, AdvancedPage, AltCurrencyPage, diff --git a/src/pages/add/add.html b/src/pages/add/add.html new file mode 100644 index 000000000..45f37142b --- /dev/null +++ b/src/pages/add/add.html @@ -0,0 +1,31 @@ + + + Add Wallet + + + + + + + New personal wallet + + + + + + Create shared wallet + + + + + + Join shared wallet + + + + + + Import wallet + + + \ No newline at end of file diff --git a/src/pages/add/add.scss b/src/pages/add/add.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src/pages/add/add.ts b/src/pages/add/add.ts new file mode 100644 index 000000000..d00fc631d --- /dev/null +++ b/src/pages/add/add.ts @@ -0,0 +1,30 @@ +import { Component } from '@angular/core'; +import { NavController } from 'ionic-angular'; + +@Component({ + selector: 'page-add', + templateUrl: 'add.html' +}) +export class AddPage { + constructor(public navCtrl: NavController) {} + + ionViewDidLoad() { + console.log('ionViewDidLoad AddPage'); + } + + goToSingleWallet() { + // this.navCtrl.push(); + } + + goToSharedeWallet() { + // this.navCtrl.push(); + } + + goToJoinWallet() { + // this.navCtrl.push(); + } + + goToImportWallet() { + // this.navCtrl.push(); + } +} diff --git a/src/pages/home/home.html b/src/pages/home/home.html index a31ed6f60..ed2452302 100644 --- a/src/pages/home/home.html +++ b/src/pages/home/home.html @@ -5,6 +5,14 @@ +
+ + + Create a new wallet + + +
+ {{wallet.credentials.walletName}} {{wallet.credentials.m}}-{{wallet.credentials.n}} diff --git a/src/pages/home/home.ts b/src/pages/home/home.ts index ef88c5a62..394aa7d4a 100644 --- a/src/pages/home/home.ts +++ b/src/pages/home/home.ts @@ -1,5 +1,6 @@ import { Component } from '@angular/core'; import { NavController } from 'ionic-angular'; +import { AddPage } from "../add/add"; import { ProfileProvider } from '../../providers/profile/profile'; import { LatestReleaseProvider } from '../../providers/latestRelease/latestRelease'; @@ -28,4 +29,8 @@ export class HomePage { }); console.log('[home.ts:20]', this.wallets); //TODO } + + goToAddView() { + this.navCtrl.push(AddPage); + } } diff --git a/src/theme/variables.scss b/src/theme/variables.scss index cc0cddce1..b048ee88f 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -5,16 +5,13 @@ // roboto, and noto sans fonts $font-path: "../assets/fonts"; - // The app direction is used to include // rtl styles in your app. For more info, please see: // http://ionicframework.com/docs/theming/rtl-support/ $app-direction: ltr; - @import "ionic.globals"; - // Shared Variables // -------------------------------------------------- // To customize the look and feel of this app, you can override @@ -23,8 +20,6 @@ $app-direction: ltr; // http://ionicframework.com/docs/theming/overriding-ionic-variables/ - - // Named Color Variables // -------------------------------------------------- // Named colors makes it easy to reuse colors on various components. @@ -77,13 +72,13 @@ $v-visible-radius: 6px !default; // -------------------------------------------------- // Material Design only Sass variables can go here - - +$item-md-detail-push-show: true; // App Windows Variables // -------------------------------------------------- // Windows only Sass variables can go here +$item-wp-detail-push-show: true;