Global footer fixes

This commit is contained in:
softsimon 2023-05-11 11:38:57 -05:00
parent 17dd02ed4e
commit 107746feec
No known key found for this signature in database
GPG key ID: 488D7DCFB5A430D7
5 changed files with 20 additions and 20 deletions

View file

@ -105,8 +105,6 @@
</ng-container> </ng-container>
</div> </div>
<app-language-selector></app-language-selector>
<app-global-footer></app-global-footer> <app-global-footer></app-global-footer>
</div> </div>

View file

@ -17,7 +17,7 @@
</ng-container> </ng-container>
</a> </a>
<div (window:resize)="onResize($event)" ngbDropdown class="dropdown-container" *ngIf="env.TESTNET_ENABLED || env.SIGNET_ENABLED || env.LIQUID_ENABLED || env.BISQ_ENABLED || env.LIQUID_TESTNET_ENABLED"> <div (window:resize)="onResize()" ngbDropdown class="dropdown-container" *ngIf="env.TESTNET_ENABLED || env.SIGNET_ENABLED || env.LIQUID_ENABLED || env.BISQ_ENABLED || env.LIQUID_TESTNET_ENABLED">
<button ngbDropdownToggle type="button" class="btn btn-secondary dropdown-toggle-split" aria-haspopup="true"> <button ngbDropdownToggle type="button" class="btn btn-secondary dropdown-toggle-split" aria-haspopup="true">
<app-svg-images [name]="network.val === '' ? 'bitcoin' : network.val" width="20" height="20" viewBox="0 0 65 65" style="width: 30px; height: 30px; margin-right: 5px;"></app-svg-images> <app-svg-images [name]="network.val === '' ? 'bitcoin' : network.val" width="20" height="20" viewBox="0 0 65 65" style="width: 30px; height: 30px; margin-right: 5px;"></app-svg-images>
</button> </button>
@ -68,5 +68,5 @@
<router-outlet></router-outlet> <router-outlet></router-outlet>
</main> </main>
<app-global-footer></app-global-footer> <app-global-footer *ngIf="footerVisible"></app-global-footer>
</ng-container> </ng-container>

View file

@ -20,6 +20,8 @@ export class MasterPageComponent implements OnInit {
urlLanguage: string; urlLanguage: string;
subdomain = ''; subdomain = '';
networkPaths: { [network: string]: string }; networkPaths: { [network: string]: string };
networkPaths$: Observable<Record<string, string>>;
footerVisible = true;
constructor( constructor(
public stateService: StateService, public stateService: StateService,
@ -28,7 +30,7 @@ export class MasterPageComponent implements OnInit {
private navigationService: NavigationService, private navigationService: NavigationService,
) { } ) { }
ngOnInit() { ngOnInit(): void {
this.env = this.stateService.env; this.env = this.stateService.env;
this.connectionState$ = this.stateService.connectionState$; this.connectionState$ = this.stateService.connectionState$;
this.network$ = merge(of(''), this.stateService.networkChanged$); this.network$ = merge(of(''), this.stateService.networkChanged$);
@ -36,6 +38,11 @@ export class MasterPageComponent implements OnInit {
this.subdomain = this.enterpriseService.getSubdomain(); this.subdomain = this.enterpriseService.getSubdomain();
this.navigationService.subnetPaths.subscribe((paths) => { this.navigationService.subnetPaths.subscribe((paths) => {
this.networkPaths = paths; this.networkPaths = paths;
if (paths.mainnet.indexOf('docs') > -1) {
this.footerVisible = false;
} else {
this.footerVisible = true;
}
}); });
} }
@ -43,7 +50,7 @@ export class MasterPageComponent implements OnInit {
this.navCollapsed = !this.navCollapsed; this.navCollapsed = !this.navCollapsed;
} }
onResize(event: any) { onResize(): void {
this.isMobile = window.innerWidth <= 767.98; this.isMobile = window.innerWidth <= 767.98;
} }
} }

View file

@ -1,18 +1,18 @@
<footer *ngIf="networkPaths$ | async as networkPaths"> <footer>
<div class="container-fluid"> <div class="container-fluid">
<div class="row main"> <div class="row main">
<div class="col-sm-4 branding"> <div class="col-sm-4 branding">
<h5>The Mempool Open Source Project</h5> <h5 i18n="about.about-the-project">The Mempool Open Source Project</h5>
<p>Explore the full Bitcoin ecosystem.</p> <p i18="@@7deec1c1520f06170e1f8e8ddfbe4532312f638f">Explore the full Bitcoin ecosystem</p>
<div class="selector"> <div class="selector">
<app-language-selector></app-language-selector> <app-language-selector></app-language-selector>
</div> </div>
<div class="selector"> <div class="selector">
<app-fiat-selector></app-fiat-selector> <app-fiat-selector></app-fiat-selector>
</div> </div>
<a class="cta btn btn-purple sponsor" [routerLink]="['/signup' | relativeUrl]">Sign In / Sign Up</a> <a *ngIf="officialMempoolSpace" class="cta btn btn-purple sponsor" [routerLink]="['/signup' | relativeUrl]">Sign In / Sign Up</a>
<p class="cta-secondary"><a [routerLink]="['/tx/push' | relativeUrl]" i18n="shared.broadcast-transaction|Broadcast Transaction">Broadcast Transaction</a></p> <p class="cta-secondary"><a [routerLink]="['/tx/push' | relativeUrl]" i18n="shared.broadcast-transaction|Broadcast Transaction">Broadcast Transaction</a></p>
<p class="cta-secondary"><a [routerLink]="['/lightning/group/the-mempool-open-source-project' | relativeUrl]">Connect to Mempool Nodes</a></p> <p *ngIf="officialMempoolSpace && env.LIGHTNING" class="cta-secondary"><a [routerLink]="['/lightning/group/the-mempool-open-source-project' | relativeUrl]" i18n="footer.connect-to-our-nodes">Connect to our nodes</a></p>
</div> </div>
<div class="col-sm-8 links"> <div class="col-sm-8 links">
<div class="row"> <div class="row">
@ -21,7 +21,6 @@
<p><a [routerLink]="['/mining' | relativeUrl]">Mining Dashboard</a></p> <p><a [routerLink]="['/mining' | relativeUrl]">Mining Dashboard</a></p>
<p><a [routerLink]="['/lightning' | relativeUrl]">Lightning Dashboard</a></p> <p><a [routerLink]="['/lightning' | relativeUrl]">Lightning Dashboard</a></p>
<p><a [routerLink]="['/blocks' | relativeUrl]">Recent Blocks</a></p> <p><a [routerLink]="['/blocks' | relativeUrl]">Recent Blocks</a></p>
<p><a [routerLink]="['/rbf' | relativeUrl]">Recent RBF Transactions</a></p>
</div> </div>
<div class="col-sm-4 links"> <div class="col-sm-4 links">
<p class="category">Learn</p> <p class="category">Learn</p>
@ -50,10 +49,10 @@
</div> </div>
<div class="col-sm-4 links"> <div class="col-sm-4 links">
<p class="category">More Networks</p> <p class="category">More Networks</p>
<p><a [routerLink]="['/testnet' | relativeUrl]">Testnet Block Explorer</a></p> <p><a [routerLink]="['/testnet' | relativeUrl]">Testnet Explorer</a></p>
<p><a [routerLink]="['/signet' | relativeUrl]">Signet Block Explorer</a></p> <p><a [routerLink]="['/signet' | relativeUrl]">Signet Explorer</a></p>
<p><a href="https://liquid.network">Liquid Block Explorer</a></p> <p><a href="https://liquid.network">Liquid Explorer</a></p>
<p><a href="https://bisq.network">Bisq Block Explorer</a></p> <p><a href="https://bisq.network">Bisq Explorer</a></p>
</div> </div>
<div class="col-sm-4 links"> <div class="col-sm-4 links">
<p class="category">Legal</p> <p class="category">Legal</p>

View file

@ -1,6 +1,5 @@
import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { NavigationService } from '../../../services/navigation.service';
import { Env, StateService } from '../../../services/state.service'; import { Env, StateService } from '../../../services/state.service';
import { IBackendInfo } from '../../../interfaces/websocket.interface'; import { IBackendInfo } from '../../../interfaces/websocket.interface';
@ -14,19 +13,16 @@ export class GlobalFooterComponent implements OnInit {
env: Env; env: Env;
networkPaths: { [network: string]: string }; networkPaths: { [network: string]: string };
officialMempoolSpace = this.stateService.env.OFFICIAL_MEMPOOL_SPACE; officialMempoolSpace = this.stateService.env.OFFICIAL_MEMPOOL_SPACE;
networkPaths$: Observable<Record<string, string>>;
backendInfo$: Observable<IBackendInfo>; backendInfo$: Observable<IBackendInfo>;
frontendGitCommitHash = this.stateService.env.GIT_COMMIT_HASH; frontendGitCommitHash = this.stateService.env.GIT_COMMIT_HASH;
packetJsonVersion = this.stateService.env.PACKAGE_JSON_VERSION; packetJsonVersion = this.stateService.env.PACKAGE_JSON_VERSION;
constructor( constructor(
public stateService: StateService, public stateService: StateService,
private navigationService: NavigationService,
) {} ) {}
ngOnInit(): void { ngOnInit(): void {
this.env = this.stateService.env; this.env = this.stateService.env;
this.networkPaths$ = this.navigationService.subnetPaths;
this.backendInfo$ = this.stateService.backendInfo$; this.backendInfo$ = this.stateService.backendInfo$;
} }