diff --git a/backend/mempool-config.sample.json b/backend/mempool-config.sample.json index 6900c0c15..6372dede5 100644 --- a/backend/mempool-config.sample.json +++ b/backend/mempool-config.sample.json @@ -14,7 +14,7 @@ "TX_PER_SECOND_SPAN_SECONDS": 150, "ELECTRS_API_URL": "https://www.blockstream.info/testnet/api", "BISQ_ENABLED": false, - "BSQ_BLOCKS_DATA_PATH": "/bisq/data/all/", + "BSQ_BLOCKS_DATA_PATH": "/bisq/data", "SSL": false, "SSL_CERT_FILE_PATH": "/etc/letsencrypt/live/mysite/fullchain.pem", "SSL_KEY_FILE_PATH": "/etc/letsencrypt/live/mysite/privkey.pem" diff --git a/backend/src/api/bisq.ts b/backend/src/api/bisq.ts index acf8ecf0e..34bc7eb49 100644 --- a/backend/src/api/bisq.ts +++ b/backend/src/api/bisq.ts @@ -194,7 +194,7 @@ class Bisq { private loadData(): Promise { return new Promise((resolve, reject) => { - fs.readFile(config.BSQ_BLOCKS_DATA_PATH + '/blocks.json', 'utf8', (err, data) => { + fs.readFile(config.BSQ_BLOCKS_DATA_PATH + '/all/blocks.json', 'utf8', (err, data) => { if (err) { reject(err); } diff --git a/frontend/src/app/bisq/bisq.module.ts b/frontend/src/app/bisq/bisq.module.ts index 3d0314f14..29dd1c0c0 100644 --- a/frontend/src/app/bisq/bisq.module.ts +++ b/frontend/src/app/bisq/bisq.module.ts @@ -1,5 +1,4 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; import { BisqRoutingModule } from './bisq.routing.module'; import { SharedModule } from '../shared/shared.module'; import { BisqTransactionsComponent } from './bisq-transactions/bisq-transactions.component'; @@ -35,7 +34,6 @@ import { BsqAmountComponent } from './bsq-amount/bsq-amount.component'; BsqAmountComponent, ], imports: [ - CommonModule, BisqRoutingModule, SharedModule, NgbPaginationModule, diff --git a/frontend/src/app/components/about/about.component.html b/frontend/src/app/components/about/about.component.html index d379bda5e..3f7e8d649 100644 --- a/frontend/src/app/components/about/about.component.html +++ b/frontend/src/app/components/about/about.component.html @@ -4,14 +4,14 @@

-

Contributors

+

Contributors

Development @softsimon_
Operations @wiz

-

Github

+

Open source

@@ -28,54 +28,88 @@

-

HTTP API

+

API

- - - - - - - - - -
Fee API -
- -
-
Mempool blocks -
- -
-
+ + +


diff --git a/frontend/src/app/components/about/about.component.scss b/frontend/src/app/components/about/about.component.scss index 3cb679ce3..5e208bcf8 100644 --- a/frontend/src/app/components/about/about.component.scss +++ b/frontend/src/app/components/about/about.component.scss @@ -9,4 +9,8 @@ tr { white-space: inherit; -} \ No newline at end of file +} + +.nowrap { + white-space: nowrap; +} diff --git a/frontend/src/app/components/about/about.component.ts b/frontend/src/app/components/about/about.component.ts index 7d5f52f3d..7d73b481a 100644 --- a/frontend/src/app/components/about/about.component.ts +++ b/frontend/src/app/components/about/about.component.ts @@ -1,6 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { WebsocketService } from '../../services/websocket.service'; import { SeoService } from 'src/app/services/seo.service'; +import { StateService } from 'src/app/services/state.service'; @Component({ selector: 'app-about', @@ -8,15 +9,24 @@ import { SeoService } from 'src/app/services/seo.service'; styleUrls: ['./about.component.scss'] }) export class AboutComponent implements OnInit { + active = 1; + hostname = document.location.hostname; + constructor( private websocketService: WebsocketService, private seoService: SeoService, + private stateService: StateService, ) { } ngOnInit() { this.seoService.setTitle('Contributors'); this.websocketService.want(['blocks']); + if (this.stateService.network === 'bisq') { + this.active = 2; + } + if (document.location.port !== '443') { + this.hostname = this.hostname + ':' + document.location.port; + } } - } diff --git a/frontend/src/app/shared/shared.module.ts b/frontend/src/app/shared/shared.module.ts index 315e78b8c..274f898c7 100644 --- a/frontend/src/app/shared/shared.module.ts +++ b/frontend/src/app/shared/shared.module.ts @@ -12,6 +12,7 @@ import { TimeSinceComponent } from '../components/time-since/time-since.componen import { ClipboardComponent } from '../components/clipboard/clipboard.component'; import { QrcodeComponent } from '../components/qrcode/qrcode.component'; import { FiatComponent } from '../fiat/fiat.component'; +import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; @NgModule({ declarations: [ @@ -30,11 +31,14 @@ import { FiatComponent } from '../fiat/fiat.component'; ], imports: [ CommonModule, + NgbNavModule, ], providers: [ VbytesPipe, ], exports: [ + NgbNavModule, + CommonModule, ScriptpubkeyTypePipe, RelativeUrlPipe, Hex2asciiPipe,