From 8e52a2ba06997460ff22cdda68b25b28dcb5b202 Mon Sep 17 00:00:00 2001 From: Simon Lindh Date: Tue, 25 Feb 2020 20:05:34 +0700 Subject: [PATCH] Design updates. --- .../app/components/about/about.component.html | 10 +--------- .../address-labels.component.html | 1 + .../address-labels/address-labels.component.ts | 18 +++++++++++++----- .../app/components/block/block.component.html | 8 ++++---- .../components/footer/footer.component.scss | 1 + .../master-page/master-page.component.html | 2 +- .../master-page/master-page.component.scss | 5 +++++ 7 files changed, 26 insertions(+), 19 deletions(-) diff --git a/frontend/src/app/components/about/about.component.html b/frontend/src/app/components/about/about.component.html index cc6191620..6a7d8dded 100644 --- a/frontend/src/app/components/about/about.component.html +++ b/frontend/src/app/components/about/about.component.html @@ -42,15 +42,7 @@ Default push: {{ '{' }} action: 'want', data: ['blocks', ...] {{ '}' }} to express what you want pushed. Available: 'blocks', 'mempool-blocks', 'live-2h-chart' and 'stats'. - - -
- -
- - - - +

Push transactions related to address: {{ '{' }} 'track-address': '3PbJ...bF9B' {{ '}' }} to receive all new transactions containing that address as input or output. Returns an array of transactions. 'address-transactions' for new mempool transactions and 'address-block-transactions' for new block confirmed transactions. diff --git a/frontend/src/app/components/address-labels/address-labels.component.html b/frontend/src/app/components/address-labels/address-labels.component.html index 8da796dd5..4b092f436 100644 --- a/frontend/src/app/components/address-labels/address-labels.component.html +++ b/frontend/src/app/components/address-labels/address-labels.component.html @@ -1 +1,2 @@ multisig {{ multisigM }} of {{ multisigN }} +Lightning Channel Force Close diff --git a/frontend/src/app/components/address-labels/address-labels.component.ts b/frontend/src/app/components/address-labels/address-labels.component.ts index c34a92c40..160533821 100644 --- a/frontend/src/app/components/address-labels/address-labels.component.ts +++ b/frontend/src/app/components/address-labels/address-labels.component.ts @@ -16,6 +16,8 @@ export class AddressLabelsComponent implements OnInit { multisigM: number; multisigN: number; + lnChannelClose = false; + constructor() { } ngOnInit() { @@ -27,11 +29,17 @@ export class AddressLabelsComponent implements OnInit { } handleVin() { - if (this.vin.inner_witnessscript_asm && this.vin.inner_witnessscript_asm.indexOf('OP_CHECKMULTISIG') > -1) { - const matches = this.getMatches(this.vin.inner_witnessscript_asm, /OP_PUSHNUM_([0-9])/g, 1); - this.multisig = true; - this.multisigM = matches[0]; - this.multisigN = matches[1]; + if (this.vin.inner_witnessscript_asm) { + if (this.vin.inner_witnessscript_asm.indexOf('OP_CHECKMULTISIG') > -1) { + const matches = this.getMatches(this.vin.inner_witnessscript_asm, /OP_PUSHNUM_([0-9])/g, 1); + this.multisig = true; + this.multisigM = matches[0]; + this.multisigN = matches[1]; + } + + if (/OP_IF (.+) OP_ELSE (.+) OP_CSV OP_DROP/.test(this.vin.inner_witnessscript_asm)) { + this.lnChannelClose = true; + } } if (this.vin.inner_redeemscript_asm && this.vin.inner_redeemscript_asm.indexOf('OP_CHECKMULTISIG') > -1) { diff --git a/frontend/src/app/components/block/block.component.html b/frontend/src/app/components/block/block.component.html index 0b2cc3ca2..e20516d22 100644 --- a/frontend/src/app/components/block/block.component.html +++ b/frontend/src/app/components/block/block.component.html @@ -31,10 +31,6 @@ Weight {{ block.weight | wuBytes: 2 }} - - Status - {{ (latestBlock.height - block.height + 1) }} confirmation{{ (latestBlock.height - block.height + 1) === 1 ? '' : 's' }} - @@ -53,6 +49,10 @@ Block subsidy {{ blockSubsidy | number: '1.2-2' }} BTC ({{ conversions.USD * blockSubsidy | currency:'USD':'symbol':'1.0-0' }}) + + Status + {{ (latestBlock.height - block.height + 1) }} confirmation{{ (latestBlock.height - block.height + 1) === 1 ? '' : 's' }} + diff --git a/frontend/src/app/components/footer/footer.component.scss b/frontend/src/app/components/footer/footer.component.scss index 0538e8220..d127c981d 100644 --- a/frontend/src/app/components/footer/footer.component.scss +++ b/frontend/src/app/components/footer/footer.component.scss @@ -4,6 +4,7 @@ width: 100%; height: 60px; background-color: #1d1f31; + box-shadow: 15px 15px 15px 15px #000; } .footer > .container { diff --git a/frontend/src/app/components/master-page/master-page.component.html b/frontend/src/app/components/master-page/master-page.component.html index 47fe481fb..9fc75159f 100644 --- a/frontend/src/app/components/master-page/master-page.component.html +++ b/frontend/src/app/components/master-page/master-page.component.html @@ -18,7 +18,7 @@ TV view  
  • - Team + Contributors
    • diff --git a/frontend/src/app/components/master-page/master-page.component.scss b/frontend/src/app/components/master-page/master-page.component.scss index b84e374c8..e32dada0e 100644 --- a/frontend/src/app/components/master-page/master-page.component.scss +++ b/frontend/src/app/components/master-page/master-page.component.scss @@ -23,3 +23,8 @@ li.nav-item { li.nav-item a { color: #ffffff; } + + +nav { + box-shadow: 0px 0px 15px 0px #000; +} \ No newline at end of file