Merge branch 'SonicWizard-master'

This commit is contained in:
Justin Langston 2018-05-18 16:50:33 -04:00
commit ed642d1ff7
No known key found for this signature in database
GPG Key ID: EBB3714C72F9FE5D
8 changed files with 2524 additions and 2529 deletions

2
app/.gitignore vendored
View File

@ -12,6 +12,8 @@ log.txt
.vscode/
npm-debug.log*
.sourcemaps/
.idea/
.sass-cache/
.tmp/

5028
app/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -3,11 +3,7 @@ import { Platform, MenuController, Nav } from 'ionic-angular';
import { StatusBar } from '@ionic-native/status-bar';
import { SplashScreen } from '@ionic-native/splash-screen';
import {
HomePage,
BlocksPage,
BroadcastTxPage
// NodeStatusPage,
// VerifyMessagePage
HomePage
} from '../pages';
@Component({
@ -41,8 +37,8 @@ export class InsightApp {
// set our app's pages
this.pages = [
{ title: 'Home', component: HomePage },
{ title: 'Blocks', component: BlocksPage },
{ title: 'Broadcast Transaction', component: BroadcastTxPage }
{ title: 'Blocks', component: 'blocks' },
{ title: 'Broadcast Transaction', component: 'BroadcastTxPage' }
// { title: 'Verify Signed Message', component: VerifyMessagePage },
// { title: 'Node Status', component: NodeStatusPage }
];

View File

@ -19,9 +19,7 @@ import { BlocksProvider } from '../providers/blocks/blocks';
BrowserModule,
HttpModule,
PagesModule,
IonicModule.forRoot(InsightApp, {
locationStrategy: 'path'
})
IonicModule.forRoot(InsightApp)
],
bootstrap: [IonicApp],
entryComponents: [

View File

@ -1,7 +1,6 @@
import { Component, NgZone, Input } from '@angular/core';
import { BlocksProvider } from '../../providers/blocks/blocks';
import { NavController } from 'ionic-angular';
import { BlocksPage } from '../../pages';
/**
* Generated class for the LatestBlocksComponent component.
@ -63,7 +62,7 @@ export class LatestBlocksComponent {
}
public goToBlocks(): void {
this.navCtrl.push(BlocksPage);
this.navCtrl.push('blocks');
}
private ngOnDestroy(): void {

View File

@ -7,7 +7,7 @@
<ion-spinner name="crescent"></ion-spinner>
</div>
<div *ngIf="!loading">
<div *ngIf="!loading" class="page-content">
<h1>Address</h1>
<p class="ellipsis"><b>Address</b> {{ address.addrStr }}</p>
<p>{{ currency.getConvertedNumber(address.balance) | number:'1.0-8' }} {{ currency.currencySymbol }}</p>

View File

@ -10,7 +10,7 @@ import { BlocksProvider } from '../../providers/blocks/blocks';
*/
@IonicPage({
name: 'blocks',
segment: 'blocks/'
segment: 'blocks'
})
@Component({
selector: 'page-blocks',