Merge branch 'SonicWizard-master'
This commit is contained in:
commit
ed642d1ff7
2
app/.gitignore
vendored
2
app/.gitignore
vendored
@ -12,6 +12,8 @@ log.txt
|
|||||||
.vscode/
|
.vscode/
|
||||||
npm-debug.log*
|
npm-debug.log*
|
||||||
|
|
||||||
|
.sourcemaps/
|
||||||
|
|
||||||
.idea/
|
.idea/
|
||||||
.sass-cache/
|
.sass-cache/
|
||||||
.tmp/
|
.tmp/
|
||||||
|
|||||||
5028
app/package-lock.json
generated
5028
app/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -3,11 +3,7 @@ import { Platform, MenuController, Nav } from 'ionic-angular';
|
|||||||
import { StatusBar } from '@ionic-native/status-bar';
|
import { StatusBar } from '@ionic-native/status-bar';
|
||||||
import { SplashScreen } from '@ionic-native/splash-screen';
|
import { SplashScreen } from '@ionic-native/splash-screen';
|
||||||
import {
|
import {
|
||||||
HomePage,
|
HomePage
|
||||||
BlocksPage,
|
|
||||||
BroadcastTxPage
|
|
||||||
// NodeStatusPage,
|
|
||||||
// VerifyMessagePage
|
|
||||||
} from '../pages';
|
} from '../pages';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
@ -41,8 +37,8 @@ export class InsightApp {
|
|||||||
// set our app's pages
|
// set our app's pages
|
||||||
this.pages = [
|
this.pages = [
|
||||||
{ title: 'Home', component: HomePage },
|
{ title: 'Home', component: HomePage },
|
||||||
{ title: 'Blocks', component: BlocksPage },
|
{ title: 'Blocks', component: 'blocks' },
|
||||||
{ title: 'Broadcast Transaction', component: BroadcastTxPage }
|
{ title: 'Broadcast Transaction', component: 'BroadcastTxPage' }
|
||||||
// { title: 'Verify Signed Message', component: VerifyMessagePage },
|
// { title: 'Verify Signed Message', component: VerifyMessagePage },
|
||||||
// { title: 'Node Status', component: NodeStatusPage }
|
// { title: 'Node Status', component: NodeStatusPage }
|
||||||
];
|
];
|
||||||
|
|||||||
@ -19,9 +19,7 @@ import { BlocksProvider } from '../providers/blocks/blocks';
|
|||||||
BrowserModule,
|
BrowserModule,
|
||||||
HttpModule,
|
HttpModule,
|
||||||
PagesModule,
|
PagesModule,
|
||||||
IonicModule.forRoot(InsightApp, {
|
IonicModule.forRoot(InsightApp)
|
||||||
locationStrategy: 'path'
|
|
||||||
})
|
|
||||||
],
|
],
|
||||||
bootstrap: [IonicApp],
|
bootstrap: [IonicApp],
|
||||||
entryComponents: [
|
entryComponents: [
|
||||||
|
|||||||
@ -1,7 +1,6 @@
|
|||||||
import { Component, NgZone, Input } from '@angular/core';
|
import { Component, NgZone, Input } from '@angular/core';
|
||||||
import { BlocksProvider } from '../../providers/blocks/blocks';
|
import { BlocksProvider } from '../../providers/blocks/blocks';
|
||||||
import { NavController } from 'ionic-angular';
|
import { NavController } from 'ionic-angular';
|
||||||
import { BlocksPage } from '../../pages';
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Generated class for the LatestBlocksComponent component.
|
* Generated class for the LatestBlocksComponent component.
|
||||||
@ -63,7 +62,7 @@ export class LatestBlocksComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public goToBlocks(): void {
|
public goToBlocks(): void {
|
||||||
this.navCtrl.push(BlocksPage);
|
this.navCtrl.push('blocks');
|
||||||
}
|
}
|
||||||
|
|
||||||
private ngOnDestroy(): void {
|
private ngOnDestroy(): void {
|
||||||
|
|||||||
@ -7,7 +7,7 @@
|
|||||||
<ion-spinner name="crescent"></ion-spinner>
|
<ion-spinner name="crescent"></ion-spinner>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div *ngIf="!loading">
|
<div *ngIf="!loading" class="page-content">
|
||||||
<h1>Address</h1>
|
<h1>Address</h1>
|
||||||
<p class="ellipsis"><b>Address</b> {{ address.addrStr }}</p>
|
<p class="ellipsis"><b>Address</b> {{ address.addrStr }}</p>
|
||||||
<p>{{ currency.getConvertedNumber(address.balance) | number:'1.0-8' }} {{ currency.currencySymbol }}</p>
|
<p>{{ currency.getConvertedNumber(address.balance) | number:'1.0-8' }} {{ currency.currencySymbol }}</p>
|
||||||
|
|||||||
@ -10,7 +10,7 @@ import { BlocksProvider } from '../../providers/blocks/blocks';
|
|||||||
*/
|
*/
|
||||||
@IonicPage({
|
@IonicPage({
|
||||||
name: 'blocks',
|
name: 'blocks',
|
||||||
segment: 'blocks/'
|
segment: 'blocks'
|
||||||
})
|
})
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'page-blocks',
|
selector: 'page-blocks',
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user