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

Merge pull request #3564 from mempool/simon/global-footer

Browse Source 
Global footer
This commit is contained in:
softsimon 2023-05-05 02:14:36 +04:00 committed by GitHub
commit 603a85f06f
19 changed files with 101 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html
View File

@ -107,12 +107,7 @@
<app-language-selector></app-language-selector>
<div class="text-small text-center mt-3">
<a [routerLink]="['/terms-of-service']" i18n="shared.terms-of-service|Terms of Service">Terms of Service</a>
|
<a [routerLink]="['/privacy-policy']" i18n="shared.privacy-policy|Privacy Policy">Privacy Policy</a>
</div>
<app-global-footer></app-global-footer>
</div>
<ng-template #loadingTmpl>

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

@ -408,7 +408,6 @@
<div class="footer-links">
<a href="/3rdpartylicenses.txt">Third-party Licenses</a>
<a [routerLink]="['/terms-of-service']" i18n="shared.terms-of-service|Terms of Service">Terms of Service</a>
<div class="social-icons">
<a target="_blank" href="https://github.com/mempool/mempool">
<svg aria-hidden="true" focusable="false" data-prefix="fab" data-icon="github" class="svg-inline--fa fa-github fa-w-16 fa-2x" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><path fill="currentColor" d="M165.9 397.4c0 2-2.3 3.6-5.2 3.6-3.3.3-5.6-1.3-5.6-3.6 0-2 2.3-3.6 5.2-3.6 3-.3 5.6 1.3 5.6 3.6zm-31.1-4.5c-.7 2 1.3 4.3 4.3 4.9 2.6 1 5.6 0 6.2-2s-1.3-4.3-4.3-5.2c-2.6-.7-5.5.3-6.2 2.3zm44.2-1.7c-2.9.7-4.9 2.6-4.6 4.9.3 2 2.9 3.3 5.9 2.6 2.9-.7 4.9-2.6 4.6-4.6-.3-1.9-3-3.2-5.9-2.9zM244.8 8C106.1 8 0 113.3 0 252c0 110.9 69.8 205.8 169.5 239.2 12.8 2.3 17.3-5.6 17.3-12.1 0-6.2-.3-40.4-.3-61.4 0 0-70 15-84.7-29.8 0 0-11.4-29.1-27.8-36.6 0 0-22.9-15.7 1.6-15.4 0 0 24.9 2 38.6 25.8 21.9 38.6 58.6 27.5 72.9 20.9 2.3-16 8.8-27.1 16-33.7-55.9-6.2-112.3-14.3-112.3-110.5 0-27.5 7.6-41.3 23.6-58.9-2.6-6.5-11.1-33.3 2.6-67.9 20.9-6.5 69 27 69 27 20-5.6 41.5-8.5 62.8-8.5s42.8 2.9 62.8 8.5c0 0 48.1-33.6 69-27 13.7 34.7 5.2 61.4 2.6 67.9 16 17.7 25.8 31.5 25.8 58.9 0 96.5-58.9 104.2-114.8 110.5 9.2 7.9 17 22.9 17 46.4 0 33.7-.3 75.4-.3 83.6 0 6.5 4.6 14.4 17.3 12.1C428.2 457.8 496 362.9 496 252 496 113.3 383.5 8 244.8 8zM97.2 352.9c-1.3 1-1 3.3.7 5.2 1.6 1.6 3.9 2.3 5.2 1 1.3-1 1-3.3-.7-5.2-1.6-1.6-3.9-2.3-5.2-1zm-10.8-8.1c-.7 1.3.3 2.9 2.3 3.9 1.6 1 3.6.7 4.3-.7.7-1.3-.3-2.9-2.3-3.9-2-.6-3.6-.3-4.3.7zm32.4 35.6c-1.6 1.3-1 4.3 1.3 6.2 2.3 2.3 5.2 2.6 6.5 1 1.3-1.3.7-4.3-1.3-6.2-2.2-2.3-5.2-2.6-6.5-1zm-11.4-14.7c-1.6 1-1.6 3.6 0 5.9 1.6 2.3 4.3 3.3 5.6 2.3 1.6-1.3 1.6-3.9 0-6.2-1.4-2.3-4-3.3-5.6-2z"></path></svg>
@ -432,9 +431,12 @@
{{ (backendInfo$ | async)?.hostname }} (v{{ (backendInfo$ | async )?.version }}) [<a href="https://github.com/mempool/mempool/commit/{{ (backendInfo$ | async )?.gitCommit | slice:0:8 }}">{{ (backendInfo$ | async )?.gitCommit | slice:0:8 }}</a>]
</div>
<br>
</div>
<ng-template #loadingSponsors>
<br>
<div class="spinner-border text-light"></div>
</ng-template>

3
frontend/src/app/components/liquid-master-page/liquid-master-page.component.html
View File

@ -96,5 +96,6 @@
<router-outlet></router-outlet>
<br>
<app-global-footer></app-global-footer>
</ng-container>

8
frontend/src/app/components/master-page/master-page.component.html
View File

@ -65,9 +65,9 @@
<app-testnet-alert *ngIf="network.val === 'testnet' || network.val === 'signet'"></app-testnet-alert>
<br />
<main>
<router-outlet></router-outlet>
</main>
<router-outlet></router-outlet>
<br>
<app-global-footer></app-global-footer>
</ng-container>

20
frontend/src/app/components/mining-dashboard/mining-dashboard.component.html
View File

@ -73,24 +73,4 @@
</div>
</div>
<div class="pref-selectors">
<div class="selector">
<app-language-selector></app-language-selector>
</div>
<div class="selector">
<app-fiat-selector></app-fiat-selector>
</div>
</div>
<div class="terms-of-service">
<a [routerLink]="['/terms-of-service']" i18n="shared.terms-of-service|Terms of Service">Terms of Service</a>
|
<a [routerLink]="['/privacy-policy']" i18n="shared.privacy-policy|Privacy Policy">Privacy Policy</a>
|
<a [routerLink]="['/tx/push' | relativeUrl]" i18n="shared.broadcast-transaction|Broadcast Transaction">Broadcast Transaction</a>
</div>
<br>
</div>

23
frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss
View File

@ -1,10 +1,6 @@
.dashboard-container {
padding-bottom: 60px;
text-align: center;
margin-top: 0.5rem;
@media (min-width: 992px) {
padding-bottom: 0px;
}
.col {
margin-bottom: 1.5rem;
}
@ -104,22 +100,3 @@
text-decoration: none;
color: inherit;
}
.terms-of-service {
margin-top: 1rem;
}
.pref-selectors {
display: flex;
flex-direction: row;
flex-wrap: wrap;
justify-content: center;
.selector {
margin-left: .5em;
margin-bottom: .5em;
&:first {
margin-left: 0;
}
}
}

2
frontend/src/app/components/transaction/transaction.component.html
View File

@ -465,8 +465,6 @@
</div>
<br>
<ng-template #feeTable>
<table class="table table-borderless table-striped">
<tbody>

20
frontend/src/app/dashboard/dashboard.component.html
View File

@ -143,26 +143,6 @@
</div>
</div>
</div>
<div class="pref-selectors">
<div class="selector">
<app-language-selector></app-language-selector>
</div>
<div class="selector">
<app-fiat-selector></app-fiat-selector>
</div>
</div>
<div class="terms-of-service">
<a [routerLink]="['/terms-of-service']" i18n="shared.terms-of-service|Terms of Service">Terms of Service</a>
|
<a [routerLink]="['/privacy-policy']" i18n="shared.privacy-policy|Privacy Policy">Privacy Policy</a>
|
<a [routerLink]="['/tx/push' | relativeUrl]" i18n="shared.broadcast-transaction|Broadcast Transaction">Broadcast Transaction</a>
</div>
<br>
</div>
<ng-template #loadingAssetsTable>

19
frontend/src/app/dashboard/dashboard.component.scss
View File

@ -1,10 +1,6 @@
.dashboard-container {
padding-bottom: 60px;
text-align: center;
margin-top: 0.5rem;
@media (min-width: 992px) {
padding-bottom: 0px;
}
.col {
margin-bottom: 1.5rem;
}
@ -324,18 +320,3 @@
text-decoration: none;
color: inherit;
}
.pref-selectors {
display: flex;
flex-direction: row;
flex-wrap: wrap;
justify-content: center;
.selector {
margin-left: .5em;
margin-bottom: .5em;
&:first {
margin-left: 0;
}
}
}

10
frontend/src/app/docs/docs/docs.component.html
View File

@ -45,15 +45,5 @@
<div id="main-tab-content" [ngbNavOutlet]="nav"></div>
<br>
<div id="footer" class="text-center">
<a [routerLink]="['/terms-of-service']" i18n="shared.terms-of-service|Terms of Service">Terms of Service</a>
|
<a [routerLink]="['/privacy-policy']" i18n="shared.privacy-policy|Privacy Policy">Privacy Policy</a>
</div>
<br>
</div>
</div>

1
frontend/src/app/docs/docs/docs.component.scss
View File

@ -2,6 +2,7 @@
text-align: left;
padding-top: 1rem;
scroll-behavior: smooth;
margin-bottom: 20px;
}
#footer {

20
frontend/src/app/lightning/lightning-dashboard/lightning-dashboard.component.html
View File

@ -84,24 +84,4 @@
</div>
<div class="pref-selectors">
<div class="selector">
<app-language-selector></app-language-selector>
</div>
<div class="selector">
<app-fiat-selector></app-fiat-selector>
</div>
</div>
<div class="terms-of-service">
<a [routerLink]="['/terms-of-service']" i18n="shared.terms-of-service|Terms of Service">Terms of Service</a>
|
<a [routerLink]="['/privacy-policy']" i18n="shared.privacy-policy|Privacy Policy">Privacy Policy</a>
|
<a *ngIf="officialMempoolSpace" [routerLink]="['/lightning/group/the-mempool-open-source-project' | relativeUrl]">Connect to our nodes</a>
<a *ngIf="!officialMempoolSpace" [routerLink]="['/tx/push' | relativeUrl]" i18n="shared.broadcast-transaction|Broadcast Transaction">Broadcast Transaction</a>
</div>
<br>
</div>

20
frontend/src/app/lightning/lightning-dashboard/lightning-dashboard.component.scss
View File

@ -1,5 +1,4 @@
.dashboard-container {
padding-bottom: 60px;
text-align: center;
margin-top: 0.5rem;
@media (min-width: 992px) {
@ -104,22 +103,3 @@
text-decoration: none;
color: inherit;
}
.terms-of-service {
margin-top: 1rem;
}
.pref-selectors {
display: flex;
flex-direction: row;
flex-wrap: wrap;
justify-content: center;
.selector {
margin-left: .5em;
margin-bottom: .5em;
&:first {
margin-left: 0;
}
}
}

2
frontend/src/app/lightning/node/node.component.html
View File

@ -352,5 +352,3 @@
</div>
</ng-template>
<br>

22
frontend/src/app/shared/components/global-footer/global-footer.component.html Normal file
View File

@ -0,0 +1,22 @@
<footer *ngIf="networkPaths$ | async as networkPaths">
<div class="pref-selectors">
<div class="selector">
<app-language-selector></app-language-selector>
</div>
<div class="selector">
<app-fiat-selector></app-fiat-selector>
</div>
</div>
<div class="terms-of-service">
<a [routerLink]="['/terms-of-service']" i18n="shared.terms-of-service|Terms of Service">Terms of Service</a>
|
<a [routerLink]="['/privacy-policy']" i18n="shared.privacy-policy|Privacy Policy">Privacy Policy</a>
|
<a *ngIf="officialMempoolSpace && networkPaths['mainnet'] === '/lightning' else broadcastTransaction" [routerLink]="['/lightning/group/the-mempool-open-source-project' | relativeUrl]">Connect to our nodes</a>
<ng-template #broadcastTransaction>
<a [routerLink]="['/tx/push' | relativeUrl]" i18n="shared.broadcast-transaction|Broadcast Transaction">Broadcast Transaction</a>
</ng-template>
</div>
<br>
</footer>

22
frontend/src/app/shared/components/global-footer/global-footer.component.scss Normal file
View File

@ -0,0 +1,22 @@
footer {
text-align: center;
}
.terms-of-service {
margin-top: 1rem;
}
.pref-selectors {
display: flex;
flex-direction: row;
flex-wrap: wrap;
justify-content: center;
.selector {
margin-left: .5em;
margin-bottom: .5em;
&:first {
margin-left: 0;
}
}
}

28
frontend/src/app/shared/components/global-footer/global-footer.component.ts Normal file
View File

@ -0,0 +1,28 @@
import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
import { Observable } from 'rxjs';
import { NavigationService } from '../../../services/navigation.service';
import { Env, StateService } from '../../../services/state.service';
@Component({
selector: 'app-global-footer',
templateUrl: './global-footer.component.html',
styleUrls: ['./global-footer.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class GlobalFooterComponent implements OnInit {
env: Env;
networkPaths: { [network: string]: string };
officialMempoolSpace = this.stateService.env.OFFICIAL_MEMPOOL_SPACE;
networkPaths$: Observable<Record<string, string>>;
constructor(
public stateService: StateService,
private navigationService: NavigationService,
) {}
ngOnInit(): void {
this.env = this.stateService.env;
this.networkPaths$ = this.navigationService.subnetPaths;
}
}

3
frontend/src/app/shared/shared.module.ts
View File

@ -88,6 +88,7 @@ import { TimestampComponent } from './components/timestamp/timestamp.component';
import { ToggleComponent } from './components/toggle/toggle.component';
import { GeolocationComponent } from '../shared/components/geolocation/geolocation.component';
import { TestnetAlertComponent } from './components/testnet-alert/testnet-alert.component';
import { GlobalFooterComponent } from './components/global-footer/global-footer.component';
@NgModule({
declarations: [
@ -170,6 +171,7 @@ import { TestnetAlertComponent } from './components/testnet-alert/testnet-alert.
ToggleComponent,
GeolocationComponent,
TestnetAlertComponent,
GlobalFooterComponent,
],
imports: [
CommonModule,
@ -276,6 +278,7 @@ import { TestnetAlertComponent } from './components/testnet-alert/testnet-alert.
ToggleComponent,
GeolocationComponent,
PreviewTitleComponent,
GlobalFooterComponent,
]
})
export class SharedModule {

19
frontend/src/styles.scss
View File

@ -60,11 +60,8 @@ body {
.container {
position: relative;
padding-bottom: 60px;
}
.container-xl {
padding-bottom: 60px;
}
.full-height {
@media (max-width: 767.98px) {
min-height: 100vh;
@ -1141,3 +1138,17 @@ th {
.visually-hidden {
display: none;
}
app-master-page, app-liquid-master-page {
display: flex;
flex-direction: column;
min-height: 100vh;
padding-bottom: 60px;
@media (min-width: 992px) {
padding-bottom: 0px;
}
}
app-global-footer {
margin-top: auto;
}