diff --git a/frontend/custom-sv-config.json b/frontend/custom-sv-config.json
index f64f41be8..7a62d1ec5 100644
--- a/frontend/custom-sv-config.json
+++ b/frontend/custom-sv-config.json
@@ -1,12 +1,12 @@
{
- "theme": "contrast",
+ "theme": "bukele",
"enterprise": "onbtc",
"branding": {
"name": "onbtc",
- "title": "Oficina Nacional del Bitcoin",
+ "title": "Bitcoin Office",
"site_id": 19,
- "header_img": "/resources/onbtc.svg",
- "img": "/resources/elsalvador.svg",
+ "header_img": "/resources/onbtclogo.svg",
+ "footer_img": "/resources/onbtclogo.svg",
"rounded_corner": true
},
"dashboard": {
diff --git a/frontend/src/app/components/liquid-master-page/liquid-master-page.component.scss b/frontend/src/app/components/liquid-master-page/liquid-master-page.component.scss
index b0f3ce9c6..17bc8aeb5 100644
--- a/frontend/src/app/components/liquid-master-page/liquid-master-page.component.scss
+++ b/frontend/src/app/components/liquid-master-page/liquid-master-page.component.scss
@@ -4,6 +4,7 @@
top: 0;
width: 100%;
z-index: 100;
+ background-color: var(--bg);
}
li.nav-item.active {
@@ -17,7 +18,7 @@ fa-icon {
.navbar {
z-index: 100;
min-height: 64px;
- background-color: var(--bg);
+ background-color: var(--nav-bg);
}
li.nav-item {
@@ -48,7 +49,7 @@ li.nav-item {
}
.navbar-nav {
- background: var(--navbar-bg);
+ background: var(--nav-bg);
bottom: 0;
box-shadow: 0px 0px 15px 0px #000;
flex-direction: row;
diff --git a/frontend/src/app/components/master-page-preview/master-page-preview.component.html b/frontend/src/app/components/master-page-preview/master-page-preview.component.html
index 49efce400..8f3204ec4 100644
--- a/frontend/src/app/components/master-page-preview/master-page-preview.component.html
+++ b/frontend/src/app/components/master-page-preview/master-page-preview.component.html
@@ -6,7 +6,7 @@
}
@if (enterpriseInfo?.header_img) {
-
+
} @else {
diff --git a/frontend/src/app/components/master-page-preview/master-page-preview.component.scss b/frontend/src/app/components/master-page-preview/master-page-preview.component.scss
index fb0fd5c24..bb2e5b706 100644
--- a/frontend/src/app/components/master-page-preview/master-page-preview.component.scss
+++ b/frontend/src/app/components/master-page-preview/master-page-preview.component.scss
@@ -5,6 +5,7 @@
max-width: 1200px;
max-height: 600px;
padding-top: 80px;
+ background: var(--nav-bg);
header {
position: absolute;
@@ -18,7 +19,7 @@
flex-direction: row;
justify-content: space-between;
align-items: center;
- background: var(--stat-box-bg);
+ background: var(--nav-bg);
text-align: start;
font-size: 1.8em;
}
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 18fbeac68..169dd24a3 100644
--- a/frontend/src/app/components/master-page/master-page.component.html
+++ b/frontend/src/app/components/master-page/master-page.component.html
@@ -17,16 +17,16 @@
-
-
-
![]()
-
-
-
@if (enterpriseInfo?.header_img) {
-
+
} @else {
+
+
+
![]()
+
+
+
}
@@ -38,24 +38,28 @@
-
-
-
![]()
-
-
-
-
- @if (enterpriseInfo?.header_img) {
-
- } @else {
-
-
- }
-
-
Offline
-
Reconnecting...
-
-
+ @if (enterpriseInfo?.header_img) {
+
+ } @else {
+
+
+
![]()
+
+
+
+
+ @if (enterpriseInfo?.header_img) {
+
+ } @else {
+
+
+ }
+
+
Offline
+
Reconnecting...
+
+
+ }
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 8704d193a..6bd4fd821 100644
--- a/frontend/src/app/components/master-page/master-page.component.scss
+++ b/frontend/src/app/components/master-page/master-page.component.scss
@@ -3,6 +3,7 @@
position: -webkit-sticky;
top: 0;
width: 100%;
+ background-color: var(--bg);
z-index: 100;
}
@@ -18,7 +19,7 @@ fa-icon {
z-index: 100;
min-height: 64px;
width: 100%;
- background-color: var(--bg);
+ background-color: var(--nav-bg);
}
li.nav-item {
@@ -59,7 +60,7 @@ li.nav-item {
}
.navbar-nav {
- background: var(--navbar-bg);
+ background: var(--nav-bg);
bottom: 0;
box-shadow: 0px 0px 15px 0px #000;
flex-direction: row;
diff --git a/frontend/src/app/services/state.service.ts b/frontend/src/app/services/state.service.ts
index 36fdf0b03..be44716d8 100644
--- a/frontend/src/app/services/state.service.ts
+++ b/frontend/src/app/services/state.service.ts
@@ -27,7 +27,9 @@ export interface Customization {
name: string;
site_id?: number;
title: string;
- img: string;
+ img?: string;
+ header_img?: string;
+ footer_img?: string;
rounded_corner: boolean;
},
dashboard: {
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 5b0fd77b9..a14076022 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
@@ -4,13 +4,19 @@
-
-
+ @if (enterpriseInfo?.footer_img) {
+
![enterpriseInfo.title]()
+ } @else {
+
+
+ }
-
- Explore the full Bitcoin ecosystem
- ®
-
+ @if (!enterpriseInfo?.footer_img) {
+
+ Explore the full Bitcoin ecosystem
+ ®
+
+ }
@@ -32,14 +38,16 @@
-
-
- Explore the full Bitcoin ecosystem
- ®
-
+ @if (!enterpriseInfo?.footer_img) {
+
+
+ Explore the full Bitcoin ecosystem
+ ®
+
+ }
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 a0ab07401..469a12076 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,4 @@
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit, Inject, LOCALE_ID, HostListener } from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit, Inject, LOCALE_ID, HostListener, OnDestroy } from '@angular/core';
import { Router, ActivatedRoute } from '@angular/router';
import { Observable, merge, of, Subject, Subscription } from 'rxjs';
import { tap, takeUntil } from 'rxjs/operators';
@@ -8,6 +8,7 @@ import { LanguageService } from '../../../services/language.service';
import { NavigationService } from '../../../services/navigation.service';
import { StorageService } from '../../../services/storage.service';
import { WebsocketService } from '../../../services/websocket.service';
+import { EnterpriseService } from '../../../services/enterprise.service';
@Component({
selector: 'app-global-footer',
@@ -15,7 +16,7 @@ import { WebsocketService } from '../../../services/websocket.service';
styleUrls: ['./global-footer.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush,
})
-export class GlobalFooterComponent implements OnInit {
+export class GlobalFooterComponent implements OnInit, OnDestroy {
private destroy$: Subject
= new Subject();
env: Env;
officialMempoolSpace = this.stateService.env.OFFICIAL_MEMPOOL_SPACE;
@@ -32,10 +33,14 @@ export class GlobalFooterComponent implements OnInit {
urlSubscription: Subscription;
isServicesPage = false;
+ enterpriseInfo: any;
+ enterpriseInfo$: Subscription;
+
constructor(
public stateService: StateService,
private languageService: LanguageService,
private navigationService: NavigationService,
+ private enterpriseService: EnterpriseService,
@Inject(LOCALE_ID) public locale: string,
private storageService: StorageService,
private route: ActivatedRoute,
@@ -54,6 +59,9 @@ export class GlobalFooterComponent implements OnInit {
this.navigationService.subnetPaths.subscribe((paths) => {
this.networkPaths = paths;
});
+ this.enterpriseInfo$ = this.enterpriseService.info$.subscribe(info => {
+ this.enterpriseInfo = info;
+ });
this.network$ = merge(of(''), this.stateService.networkChanged$).pipe(
tap((network: string) => {
return network;
@@ -73,6 +81,9 @@ export class GlobalFooterComponent implements OnInit {
this.destroy$.next(true);
this.destroy$.complete();
this.urlSubscription.unsubscribe();
+ if (this.enterpriseInfo$) {
+ this.enterpriseInfo$.unsubscribe();
+ }
}
networkLink(network) {
diff --git a/frontend/src/index.sv.html b/frontend/src/index.sv.html
index a18c1d7fe..58cfd179b 100644
--- a/frontend/src/index.sv.html
+++ b/frontend/src/index.sv.html
@@ -3,7 +3,7 @@
- Oficina Nacional del Bitcoin - Bitcoin Explorer
+ Bitcoin Office - Explorer
diff --git a/frontend/src/resources/elsalvador.svg b/frontend/src/resources/elsalvador.svg
index eb2aff426..fc5a59185 100644
--- a/frontend/src/resources/elsalvador.svg
+++ b/frontend/src/resources/elsalvador.svg
@@ -1,37 +1,12 @@
-
-