machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Show backend info at the bottom. Removing frontend hostname. Re-adding frontend version and commit on top. JS error fix.

Browse Source
This commit is contained in:
softsimon 2021-04-13 11:51:55 +04:00
parent 089bb38e6a
commit cbe79d7051
No known key found for this signature in database
GPG Key ID: 488D7DCFB5A430D7
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/src/app/components/about/about.component.html
View File

@ -3,13 +3,9 @@
<br> <br>
<img src="./resources/mempool-logo-bigger.png" height="62.5" width="250"> <img src="./resources/mempool-logo-bigger.png" height="62.5" width="250">
<br> <br>
<br>
<div class="text-small"> <div class="text-small text-center offset-md-1">
Frontend: v{{ packetJsonVersion }} [{{ frontendGitCommitHash }}]
v{{ packetJsonVersion }} ({{ frontendGitCommitHash }}) [{{ hostname }}]
<br>
Backend: v{{ (backendInfo$ | async ).version }} ({{ (backendInfo$ | async ).gitCommit | slice:0:8 }}) [{{ (backendInfo$ | async).hostname }}]
</div> </div>
<br> <br>
@ -396,4 +392,10 @@
<a [routerLink]="['/terms-of-service']" i18n="shared.terms-of-service|Terms of Service">Terms of Service</a> <a [routerLink]="['/terms-of-service']" i18n="shared.terms-of-service|Terms of Service">Terms of Service</a>
</div> </div>
<br>
<div class="text-small text-center" *ngIf="officialMempoolSpace">
{{ (backendInfo$ | async)?.hostname }} (v{{ (backendInfo$ | async )?.version }}) [{{ (backendInfo$ | async )?.gitCommit | slice:0:8 }}]
</div>
</div> </div>

4
frontend/src/app/components/about/about.component.ts
View File

@ -6,7 +6,7 @@ import { Observable, Subscription } from 'rxjs';
import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { ApiService } from 'src/app/services/api.service'; import { ApiService } from 'src/app/services/api.service';
import { DomSanitizer, SafeUrl } from '@angular/platform-browser'; import { DomSanitizer, SafeUrl } from '@angular/platform-browser';
import { delay, map, retryWhen, switchMap, tap } from 'rxjs/operators'; import { delay, retryWhen, switchMap, tap } from 'rxjs/operators';
import { IBackendInfo } from 'src/app/interfaces/websocket.interface'; import { IBackendInfo } from 'src/app/interfaces/websocket.interface';
@Component({ @Component({
@ -25,7 +25,7 @@ export class AboutComponent implements OnInit, OnDestroy {
sponsorsEnabled = this.stateService.env.OFFICIAL_MEMPOOL_SPACE; sponsorsEnabled = this.stateService.env.OFFICIAL_MEMPOOL_SPACE;
frontendGitCommitHash = this.stateService.env.GIT_COMMIT_HASH.substr(0, 8); frontendGitCommitHash = this.stateService.env.GIT_COMMIT_HASH.substr(0, 8);
packetJsonVersion = this.stateService.env.PACKAGE_JSON_VERSION; packetJsonVersion = this.stateService.env.PACKAGE_JSON_VERSION;
hostname = document.location.hostname; officialMempoolSpace = this.stateService.env.OFFICIAL_MEMPOOL_SPACE;
sponsors = null; sponsors = null;
contributors = null; contributors = null;
requestSubscription: Subscription | undefined; requestSubscription: Subscription | undefined;