From 261241fcc8fcbf056292a5b1e8263be656304b4a Mon Sep 17 00:00:00 2001 From: softsimon Date: Fri, 24 Mar 2023 18:16:19 +0900 Subject: [PATCH 1/7] Global footer --- .../app/components/about/about.component.html | 2 ++ .../master-page/master-page.component.html | 27 ++++++++++++++++--- .../master-page/master-page.component.scss | 24 +++++++++++++++++ .../master-page/master-page.component.ts | 1 + .../mining-dashboard.component.html | 20 -------------- .../mining-dashboard.component.scss | 23 ---------------- .../transaction/transaction.component.html | 2 -- .../app/dashboard/dashboard.component.html | 20 -------------- .../app/dashboard/dashboard.component.scss | 19 ------------- .../src/app/docs/docs/docs.component.html | 10 ------- .../lightning-dashboard.component.html | 20 -------------- .../lightning-dashboard.component.scss | 20 -------------- .../app/lightning/node/node.component.html | 2 -- frontend/src/styles.scss | 11 +++++--- 14 files changed, 58 insertions(+), 143 deletions(-) diff --git a/frontend/src/app/components/about/about.component.html b/frontend/src/app/components/about/about.component.html index 8a0e13335..0b9b81dc6 100644 --- a/frontend/src/app/components/about/about.component.html +++ b/frontend/src/app/components/about/about.component.html @@ -434,6 +434,8 @@ +
+
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 5724530e5..3075b109a 100644 --- a/frontend/src/app/components/master-page/master-page.component.html +++ b/frontend/src/app/components/master-page/master-page.component.html @@ -65,9 +65,30 @@
+
+ +
- - -
+ diff --git a/frontend/src/app/components/master-page/master-page.component.scss b/frontend/src/app/components/master-page/master-page.component.scss index 54a22a470..39aee903d 100644 --- a/frontend/src/app/components/master-page/master-page.component.scss +++ b/frontend/src/app/components/master-page/master-page.component.scss @@ -193,3 +193,27 @@ nav { font-size: 7px; } } + +footer { + text-align: center; + margin-top: auto; +} + +.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; + } + } +} 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..fcec8cdf6 100644 --- a/frontend/src/app/components/master-page/master-page.component.ts +++ b/frontend/src/app/components/master-page/master-page.component.ts @@ -35,6 +35,7 @@ export class MasterPageComponent implements OnInit { this.urlLanguage = this.languageService.getLanguageForUrl(); this.subdomain = this.enterpriseService.getSubdomain(); this.navigationService.subnetPaths.subscribe((paths) => { + console.log(paths); this.networkPaths = paths; }); } diff --git a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html index 2e6cbbada..a7fbd0066 100644 --- a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html +++ b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html @@ -73,24 +73,4 @@ - -
-
- -
-
- -
-
- -
- Terms of Service - | - Privacy Policy - | - Broadcast Transaction -
- -
- diff --git a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss index 218b8e04d..4f01f7cad 100644 --- a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss +++ b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss @@ -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; - } - } -} \ No newline at end of file diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html index 0b5e12001..e4dc0f8cc 100644 --- a/frontend/src/app/components/transaction/transaction.component.html +++ b/frontend/src/app/components/transaction/transaction.component.html @@ -465,8 +465,6 @@ -
- diff --git a/frontend/src/app/dashboard/dashboard.component.html b/frontend/src/app/dashboard/dashboard.component.html index add846e24..69b0e5616 100644 --- a/frontend/src/app/dashboard/dashboard.component.html +++ b/frontend/src/app/dashboard/dashboard.component.html @@ -143,26 +143,6 @@ - -
-
- -
-
- -
-
- -
- Terms of Service - | - Privacy Policy - | - Broadcast Transaction -
- -
- diff --git a/frontend/src/app/dashboard/dashboard.component.scss b/frontend/src/app/dashboard/dashboard.component.scss index 4a844eb52..eb466fc16 100644 --- a/frontend/src/app/dashboard/dashboard.component.scss +++ b/frontend/src/app/dashboard/dashboard.component.scss @@ -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; - } - } -} \ No newline at end of file diff --git a/frontend/src/app/docs/docs/docs.component.html b/frontend/src/app/docs/docs/docs.component.html index cf3bdb070..fa9df5459 100644 --- a/frontend/src/app/docs/docs/docs.component.html +++ b/frontend/src/app/docs/docs/docs.component.html @@ -45,15 +45,5 @@
-
- -
- Terms of Service - | - Privacy Policy -
- -
- diff --git a/frontend/src/app/lightning/lightning-dashboard/lightning-dashboard.component.html b/frontend/src/app/lightning/lightning-dashboard/lightning-dashboard.component.html index b73d21bcd..123069479 100644 --- a/frontend/src/app/lightning/lightning-dashboard/lightning-dashboard.component.html +++ b/frontend/src/app/lightning/lightning-dashboard/lightning-dashboard.component.html @@ -84,24 +84,4 @@ -
-
- -
-
- -
-
- -
- Terms of Service - | - Privacy Policy - | - Connect to our nodes - Broadcast Transaction -
- -
- \ No newline at end of file diff --git a/frontend/src/app/lightning/lightning-dashboard/lightning-dashboard.component.scss b/frontend/src/app/lightning/lightning-dashboard/lightning-dashboard.component.scss index 218b8e04d..e91f7606a 100644 --- a/frontend/src/app/lightning/lightning-dashboard/lightning-dashboard.component.scss +++ b/frontend/src/app/lightning/lightning-dashboard/lightning-dashboard.component.scss @@ -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; - } - } -} \ No newline at end of file diff --git a/frontend/src/app/lightning/node/node.component.html b/frontend/src/app/lightning/node/node.component.html index e46a99e21..2a74a68aa 100644 --- a/frontend/src/app/lightning/node/node.component.html +++ b/frontend/src/app/lightning/node/node.component.html @@ -352,5 +352,3 @@ - -
diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss index d9ea867dc..d928223e5 100644 --- a/frontend/src/styles.scss +++ b/frontend/src/styles.scss @@ -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,9 @@ th { .visually-hidden { display: none; } + +app-master-page { + display: flex; + flex-direction: column; + min-height: 100vh; +} From 9ca9ab63f5724a5bae405f168b00490ed7781c37 Mon Sep 17 00:00:00 2001 From: softsimon Date: Fri, 24 Mar 2023 18:32:33 +0900 Subject: [PATCH 2/7] Bottom padding for mobile --- frontend/src/styles.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss index d928223e5..88b7521f2 100644 --- a/frontend/src/styles.scss +++ b/frontend/src/styles.scss @@ -1143,4 +1143,8 @@ app-master-page { display: flex; flex-direction: column; min-height: 100vh; + padding-bottom: 60px; + @media (min-width: 992px) { + padding-bottom: 0px; + } } From e9a0be4941a5ce88b34b4259e236957c2e9c0948 Mon Sep 17 00:00:00 2001 From: softsimon Date: Fri, 24 Mar 2023 23:05:34 +0900 Subject: [PATCH 3/7] Remove logger Co-authored-by: Bufo <32884105+bufo24@users.noreply.github.com> --- frontend/src/app/components/master-page/master-page.component.ts | 1 - 1 file changed, 1 deletion(-) 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 fcec8cdf6..7c4f8dcff 100644 --- a/frontend/src/app/components/master-page/master-page.component.ts +++ b/frontend/src/app/components/master-page/master-page.component.ts @@ -35,7 +35,6 @@ export class MasterPageComponent implements OnInit { this.urlLanguage = this.languageService.getLanguageForUrl(); this.subdomain = this.enterpriseService.getSubdomain(); this.navigationService.subnetPaths.subscribe((paths) => { - console.log(paths); this.networkPaths = paths; }); } From e3e273a68830ee8b10300ef1f092608c62e199a3 Mon Sep 17 00:00:00 2001 From: softsimon Date: Sat, 1 Apr 2023 18:02:39 +0900 Subject: [PATCH 4/7] Fixing position on mobile view --- frontend/src/app/docs/docs/docs.component.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/app/docs/docs/docs.component.scss b/frontend/src/app/docs/docs/docs.component.scss index 9e7a2e03a..64852a1f6 100644 --- a/frontend/src/app/docs/docs/docs.component.scss +++ b/frontend/src/app/docs/docs/docs.component.scss @@ -2,6 +2,7 @@ text-align: left; padding-top: 1rem; scroll-behavior: smooth; + margin-bottom: 20px; } #footer { From d40344aa92c5e39fbc1616508ca6ec959516f54f Mon Sep 17 00:00:00 2001 From: softsimon Date: Fri, 5 May 2023 01:38:58 +0400 Subject: [PATCH 5/7] Global footer component that fixes Liquid --- .../bisq-main-dashboard.component.html | 7 +---- .../app/components/about/about.component.html | 3 +- .../liquid-master-page.component.html | 3 +- .../master-page/master-page.component.html | 23 +-------------- .../master-page/master-page.component.scss | 24 ---------------- .../global-footer.component.html | 22 +++++++++++++++ .../global-footer.component.scss | 23 +++++++++++++++ .../global-footer/global-footer.component.ts | 28 +++++++++++++++++++ frontend/src/app/shared/shared.module.ts | 3 ++ 9 files changed, 82 insertions(+), 54 deletions(-) create mode 100644 frontend/src/app/shared/components/global-footer/global-footer.component.html create mode 100644 frontend/src/app/shared/components/global-footer/global-footer.component.scss create mode 100644 frontend/src/app/shared/components/global-footer/global-footer.component.ts 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 2d7df05e1..eab0537c7 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 @@ -107,12 +107,7 @@ -
- Terms of Service - | - Privacy Policy -
- + diff --git a/frontend/src/app/components/about/about.component.html b/frontend/src/app/components/about/about.component.html index 0b9b81dc6..f711bb167 100644 --- a/frontend/src/app/components/about/about.component.html +++ b/frontend/src/app/components/about/about.component.html @@ -432,11 +432,12 @@ {{ (backendInfo$ | async)?.hostname }} (v{{ (backendInfo$ | async )?.version }}) [{{ (backendInfo$ | async )?.gitCommit | slice:0:8 }}] +

-

 + diff --git a/frontend/src/app/components/liquid-master-page/liquid-master-page.component.html b/frontend/src/app/components/liquid-master-page/liquid-master-page.component.html index 3df488c7f..6a2ad4965 100644 --- a/frontend/src/app/components/liquid-master-page/liquid-master-page.component.html +++ b/frontend/src/app/components/liquid-master-page/liquid-master-page.component.html @@ -96,5 +96,6 @@ -
+ + \ No newline at end of file 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 3075b109a..a5efeeea2 100644 --- a/frontend/src/app/components/master-page/master-page.component.html +++ b/frontend/src/app/components/master-page/master-page.component.html @@ -69,26 +69,5 @@ - + diff --git a/frontend/src/app/components/master-page/master-page.component.scss b/frontend/src/app/components/master-page/master-page.component.scss index 39aee903d..54a22a470 100644 --- a/frontend/src/app/components/master-page/master-page.component.scss +++ b/frontend/src/app/components/master-page/master-page.component.scss @@ -193,27 +193,3 @@ nav { font-size: 7px; } } - -footer { - text-align: center; - margin-top: auto; -} - -.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; - } - } -} 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 new file mode 100644 index 000000000..1eca9e303 --- /dev/null +++ b/frontend/src/app/shared/components/global-footer/global-footer.component.html @@ -0,0 +1,22 @@ + \ No newline at end of file diff --git a/frontend/src/app/shared/components/global-footer/global-footer.component.scss b/frontend/src/app/shared/components/global-footer/global-footer.component.scss new file mode 100644 index 000000000..37da744fe --- /dev/null +++ b/frontend/src/app/shared/components/global-footer/global-footer.component.scss @@ -0,0 +1,23 @@ +footer { + text-align: center; + margin-top: auto; +} + +.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; + } + } +} diff --git a/frontend/src/app/shared/components/global-footer/global-footer.component.ts b/frontend/src/app/shared/components/global-footer/global-footer.component.ts new file mode 100644 index 000000000..6d161b7dd --- /dev/null +++ b/frontend/src/app/shared/components/global-footer/global-footer.component.ts @@ -0,0 +1,28 @@ +import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; +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; + + constructor( + public stateService: StateService, + private navigationService: NavigationService, + ) {} + + ngOnInit(): void { + this.env = this.stateService.env; + this.navigationService.subnetPaths.subscribe((paths) => { + this.networkPaths = paths; + }); + } + +} diff --git a/frontend/src/app/shared/shared.module.ts b/frontend/src/app/shared/shared.module.ts index 7286056f9..7d3e51d20 100644 --- a/frontend/src/app/shared/shared.module.ts +++ b/frontend/src/app/shared/shared.module.ts @@ -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 { From e7ae9049bbccb15f5103b9e415e95daf6b4f709b Mon Sep 17 00:00:00 2001 From: softsimon Date: Fri, 5 May 2023 01:49:11 +0400 Subject: [PATCH 6/7] Enabling footer on about page --- frontend/src/app/components/about/about.component.html | 3 +-- .../components/global-footer/global-footer.component.html | 2 +- .../components/global-footer/global-footer.component.ts | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/frontend/src/app/components/about/about.component.html b/frontend/src/app/components/about/about.component.html index f711bb167..a2d1fae84 100644 --- a/frontend/src/app/components/about/about.component.html +++ b/frontend/src/app/components/about/about.component.html @@ -408,7 +408,6 @@
Third-party Licenses - Terms of Service -

+
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 1eca9e303..e3cdc07e3 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,4 +1,4 @@ -
+
diff --git a/frontend/src/app/shared/components/global-footer/global-footer.component.ts b/frontend/src/app/shared/components/global-footer/global-footer.component.ts index 6d161b7dd..f886a6505 100644 --- a/frontend/src/app/shared/components/global-footer/global-footer.component.ts +++ b/frontend/src/app/shared/components/global-footer/global-footer.component.ts @@ -1,4 +1,5 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; +import { Observable } from 'rxjs'; import { NavigationService } from '../../../services/navigation.service'; import { Env, StateService } from '../../../services/state.service'; @@ -12,6 +13,7 @@ export class GlobalFooterComponent implements OnInit { env: Env; networkPaths: { [network: string]: string }; officialMempoolSpace = this.stateService.env.OFFICIAL_MEMPOOL_SPACE; + networkPaths$: Observable>; constructor( public stateService: StateService, @@ -20,9 +22,7 @@ export class GlobalFooterComponent implements OnInit { ngOnInit(): void { this.env = this.stateService.env; - this.navigationService.subnetPaths.subscribe((paths) => { - this.networkPaths = paths; - }); + this.networkPaths$ = this.navigationService.subnetPaths; } } From 4c5ece82491b1df880e591fe0479338e754cf9fb Mon Sep 17 00:00:00 2001 From: softsimon Date: Fri, 5 May 2023 02:06:48 +0400 Subject: [PATCH 7/7] Fixing navbar overflowing footer --- .../components/global-footer/global-footer.component.scss | 1 - frontend/src/styles.scss | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/shared/components/global-footer/global-footer.component.scss b/frontend/src/app/shared/components/global-footer/global-footer.component.scss index 37da744fe..cf4aa02c4 100644 --- a/frontend/src/app/shared/components/global-footer/global-footer.component.scss +++ b/frontend/src/app/shared/components/global-footer/global-footer.component.scss @@ -1,6 +1,5 @@ footer { text-align: center; - margin-top: auto; } .terms-of-service { diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss index 88b7521f2..fbaaa5ed2 100644 --- a/frontend/src/styles.scss +++ b/frontend/src/styles.scss @@ -1139,7 +1139,7 @@ th { display: none; } -app-master-page { +app-master-page, app-liquid-master-page { display: flex; flex-direction: column; min-height: 100vh; @@ -1148,3 +1148,7 @@ app-master-page { padding-bottom: 0px; } } + +app-global-footer { + margin-top: auto; +} \ No newline at end of file