From 107746feecb473c6d99a1f853f4dc3ada98a0f01 Mon Sep 17 00:00:00 2001 From: softsimon Date: Thu, 11 May 2023 11:38:57 -0500 Subject: [PATCH 01/18] Global footer fixes --- .../bisq-main-dashboard.component.html | 2 -- .../master-page/master-page.component.html | 4 ++-- .../master-page/master-page.component.ts | 11 +++++++++-- .../global-footer.component.html | 19 +++++++++---------- .../global-footer/global-footer.component.ts | 4 ---- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/frontend/src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html b/frontend/src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html index eab0537c7..4b2dc59c6 100644 --- a/frontend/src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html +++ b/frontend/src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html @@ -105,8 +105,6 @@ - - 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 6da59197c..0258a8e07 100644 --- a/frontend/src/app/components/master-page/master-page.component.html +++ b/frontend/src/app/components/master-page/master-page.component.html @@ -17,7 +17,7 @@ -
+
@@ -68,5 +68,5 @@ - + diff --git a/frontend/src/app/components/master-page/master-page.component.ts b/frontend/src/app/components/master-page/master-page.component.ts index 7c4f8dcff..7ae5019e0 100644 --- a/frontend/src/app/components/master-page/master-page.component.ts +++ b/frontend/src/app/components/master-page/master-page.component.ts @@ -20,6 +20,8 @@ export class MasterPageComponent implements OnInit { urlLanguage: string; subdomain = ''; networkPaths: { [network: string]: string }; + networkPaths$: Observable>; + footerVisible = true; constructor( public stateService: StateService, @@ -28,7 +30,7 @@ export class MasterPageComponent implements OnInit { private navigationService: NavigationService, ) { } - ngOnInit() { + ngOnInit(): void { this.env = this.stateService.env; this.connectionState$ = this.stateService.connectionState$; this.network$ = merge(of(''), this.stateService.networkChanged$); @@ -36,6 +38,11 @@ export class MasterPageComponent implements OnInit { this.subdomain = this.enterpriseService.getSubdomain(); this.navigationService.subnetPaths.subscribe((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; } - onResize(event: any) { + onResize(): void { this.isMobile = window.innerWidth <= 767.98; } } diff --git a/frontend/src/app/shared/components/global-footer/global-footer.component.html b/frontend/src/app/shared/components/global-footer/global-footer.component.html index d4425687a..efba52203 100644 --- a/frontend/src/app/shared/components/global-footer/global-footer.component.html +++ b/frontend/src/app/shared/components/global-footer/global-footer.component.html @@ -1,18 +1,18 @@ -