diff --git a/app/src/app/app.module.ts b/app/src/app/app.module.ts index 8e5cca9..d36933b 100644 --- a/app/src/app/app.module.ts +++ b/app/src/app/app.module.ts @@ -7,10 +7,12 @@ import { SplashScreen } from '@ionic-native/splash-screen'; import { InsightApp } from './app.component'; import { PagesModule, BlocksPage, BroadcastTxPage, NodeStatusPage, VerifyMessagePage } from '../pages'; import { BlocksService, StorageService } from '../services'; +import { TransactionComponent } from '../components/transaction/transaction'; @NgModule({ declarations: [ - InsightApp + InsightApp, + TransactionComponent ], imports: [ BrowserModule, diff --git a/app/src/components/transactions/transactions.html b/app/src/components/transaction-list/transaction-list.html similarity index 100% rename from app/src/components/transactions/transactions.html rename to app/src/components/transaction-list/transaction-list.html diff --git a/app/src/components/transactions/transactions.module.ts b/app/src/components/transaction-list/transaction-list.module.ts similarity index 51% rename from app/src/components/transactions/transactions.module.ts rename to app/src/components/transaction-list/transaction-list.module.ts index d60c200..997d4f5 100644 --- a/app/src/components/transactions/transactions.module.ts +++ b/app/src/components/transaction-list/transaction-list.module.ts @@ -1,16 +1,16 @@ import { NgModule } from '@angular/core'; import { IonicModule } from 'ionic-angular'; -import { TransactionsComponent } from './transactions'; +import { TransactionListComponent } from './transaction-list'; @NgModule({ declarations: [ - TransactionsComponent + TransactionListComponent ], imports: [ IonicModule ], exports: [ - TransactionsComponent + TransactionListComponent ] }) -export class TransactionsComponentModule {} +export class TransactionListComponentModule {} diff --git a/app/src/components/transaction-list/transaction-list.scss b/app/src/components/transaction-list/transaction-list.scss new file mode 100644 index 0000000..6e9f0ff --- /dev/null +++ b/app/src/components/transaction-list/transaction-list.scss @@ -0,0 +1,3 @@ +transaction-list { + +} diff --git a/app/src/components/transactions/transactions.ts b/app/src/components/transaction-list/transaction-list.ts similarity index 88% rename from app/src/components/transactions/transactions.ts rename to app/src/components/transaction-list/transaction-list.ts index db8aa08..0e73c07 100644 --- a/app/src/components/transactions/transactions.ts +++ b/app/src/components/transaction-list/transaction-list.ts @@ -4,16 +4,16 @@ import { NavController } from 'ionic-angular'; import { Http } from '@angular/http'; /** - * Generated class for the TransactionsComponent component. + * Generated class for the TransactionListComponent component. * * See https://angular.io/docs/ts/latest/api/core/index/ComponentMetadata-class.html * for more info on Angular Components. */ @Component({ - selector: 'transactions', - templateUrl: 'transactions.html' + selector: 'transaction-list', + templateUrl: 'transaction-list.html' }) -export class TransactionsComponent { +export class TransactionListComponent { public loading: boolean = true; @Input() public queryType: string; @@ -54,7 +54,7 @@ export class TransactionsComponent { public goToTx(txId: string): void { this.navCtrl.push('transaction', { - 'txId': txId + 'txId': txId }); } diff --git a/app/src/components/transaction/transaction.html b/app/src/components/transaction/transaction.html new file mode 100644 index 0000000..34b405c --- /dev/null +++ b/app/src/components/transaction/transaction.html @@ -0,0 +1,4 @@ + +
+ {{text}} +
diff --git a/app/src/components/transaction/transaction.module.ts b/app/src/components/transaction/transaction.module.ts new file mode 100644 index 0000000..b35d59f --- /dev/null +++ b/app/src/components/transaction/transaction.module.ts @@ -0,0 +1,16 @@ +import { NgModule } from '@angular/core'; +import { IonicModule } from 'ionic-angular'; +import { TransactionComponent } from './transaction'; + +@NgModule({ + declarations: [ + TransactionComponent, + ], + imports: [ + IonicModule, + ], + exports: [ + TransactionComponent + ] +}) +export class TransactionComponentModule {} diff --git a/app/src/components/transaction/transaction.scss b/app/src/components/transaction/transaction.scss new file mode 100644 index 0000000..6fb401f --- /dev/null +++ b/app/src/components/transaction/transaction.scss @@ -0,0 +1,3 @@ +transaction { + +} diff --git a/app/src/components/transaction/transaction.ts b/app/src/components/transaction/transaction.ts new file mode 100644 index 0000000..c8bd7e8 --- /dev/null +++ b/app/src/components/transaction/transaction.ts @@ -0,0 +1,22 @@ +import { Component } from '@angular/core'; + +/** + * Generated class for the TransactionComponent component. + * + * See https://angular.io/docs/ts/latest/api/core/index/ComponentMetadata-class.html + * for more info on Angular Components. + */ +@Component({ + selector: 'transaction', + templateUrl: 'transaction.html' +}) +export class TransactionComponent { + + text: string; + + constructor() { + console.log('Hello TransactionComponent Component'); + this.text = 'Hello World'; + } + +} diff --git a/app/src/components/transactions/transactions.scss b/app/src/components/transactions/transactions.scss deleted file mode 100644 index 0912214..0000000 --- a/app/src/components/transactions/transactions.scss +++ /dev/null @@ -1,3 +0,0 @@ -transactions { - -} diff --git a/app/src/pages/address/address.html b/app/src/pages/address/address.html index c297fbd..8c0d204 100644 --- a/app/src/pages/address/address.html +++ b/app/src/pages/address/address.html @@ -49,5 +49,5 @@ - + diff --git a/app/src/pages/address/address.module.ts b/app/src/pages/address/address.module.ts index 9a6151e..7db7464 100644 --- a/app/src/pages/address/address.module.ts +++ b/app/src/pages/address/address.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { IonicPageModule } from 'ionic-angular'; import { AddressPage } from './address'; -import { TransactionsComponentModule } from '../../components/transactions/transactions.module'; +import { TransactionListComponentModule } from '../../components/transaction-list/transaction-list.module'; @NgModule({ declarations: [ @@ -9,7 +9,7 @@ import { TransactionsComponentModule } from '../../components/transactions/trans ], imports: [ IonicPageModule.forChild(AddressPage), - TransactionsComponentModule + TransactionListComponentModule ], exports: [ AddressPage diff --git a/app/src/pages/block-detail/block-detail.html b/app/src/pages/block-detail/block-detail.html index 83ff588..8e746b3 100644 --- a/app/src/pages/block-detail/block-detail.html +++ b/app/src/pages/block-detail/block-detail.html @@ -33,7 +33,7 @@

Next Block {{ block.height + 1 }}

Transactions

- +

Loading...

diff --git a/app/src/pages/block-detail/block-detail.module.ts b/app/src/pages/block-detail/block-detail.module.ts index 8a301c0..0a3f8e6 100644 --- a/app/src/pages/block-detail/block-detail.module.ts +++ b/app/src/pages/block-detail/block-detail.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { IonicPageModule } from 'ionic-angular'; import { BlockDetailPage } from './block-detail'; -import { TransactionsComponentModule } from '../../components/transactions/transactions.module'; +import { TransactionListComponentModule } from '../../components/transaction-list/transaction-list.module'; @NgModule({ declarations: [ @@ -9,7 +9,7 @@ import { TransactionsComponentModule } from '../../components/transactions/trans ], imports: [ IonicPageModule.forChild(BlockDetailPage), - TransactionsComponentModule + TransactionListComponentModule ], exports: [ BlockDetailPage