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

[debug] SERVICES -> GIT_COMMIT_HASH_MEMPOOL_SPACE in env

Browse Source
This commit is contained in:
nymkappa
2023-08-21 08:57:27 +02:00
parent e82b43e340
commit a1e2d2fd74
6 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,8 +4,8 @@
<span style="margin-left: auto; margin-right: -20px; margin-bottom: -20px">&reg;</span>
<img class="logo" src="/resources/mempool-logo-bigger.png" />
<div class="version">
<span *ngIf="!stateService.env.SERVICES">v{{ packetJsonVersion }} [<a href="https://github.com/mempool/mempool/commit/{{ frontendGitCommitHash }}">{{ frontendGitCommitHash }}</a>]</span>
<span *ngIf="stateService.env.SERVICES">v{{ packetJsonVersion }} [<a href="https://github.com/mempool/mempool.space/commit/{{ frontendGitCommitHash }}">{{ frontendGitCommitHash }}</a>]</span>
<span *ngIf="!stateService.env.GIT_COMMIT_HASH_MEMPOOL_SPACE">v{{ packetJsonVersion }} [<a href="https://github.com/mempool/mempool/commit/{{ frontendGitCommitHash }}">{{ frontendGitCommitHash }}</a>]</span>
<span *ngIf="stateService.env.GIT_COMMIT_HASH_MEMPOOL_SPACE">v{{ packetJsonVersion }} [<a href="https://github.com/mempool/mempool.space/commit/{{ frontendGitCommitHash }}">{{ stateService.env.GIT_COMMIT_HASH_MEMPOOL_SPACE }}</a>]</span>
</div>
</div>

18
frontend/src/app/components/menu/menu.component.ts
View File

@@ -4,6 +4,7 @@ import { ApiService } from '../../services/api.service';
import { MenuGroup } from '../../interfaces/services.interface';
import { StorageService } from '../../services/storage.service';
import { Router } from '@angular/router';
import { StateService } from '../../services/state.service';
@Component({
selector: 'app-menu',
@@ -17,20 +18,23 @@ export class MenuComponent implements OnInit {
navOpen: boolean = false;
userMenuGroups$: Observable<MenuGroup[]> | undefined;
userAuth: any | undefined;
isServices = false;
isServicesPage = false;
constructor(
private apiService: ApiService,
private storageService: StorageService,
private router: Router
private router: Router,
private stateService: StateService
) {}
ngOnInit(): void {
this.userAuth = this.storageService.getAuth();
this.userMenuGroups$ = this.apiService.getUserMenuGroups$();
if (this.stateService.env.GIT_COMMIT_HASH_MEMPOOL_SPACE) {
this.userMenuGroups$ = this.apiService.getUserMenuGroups$();
}
this.isServices = this.router.url.includes('/services/');
this.navOpen = this.isServices && !this.isSmallScreen();
this.isServicesPage = this.router.url.includes('/services/');
this.navOpen = this.isServicesPage && !this.isSmallScreen();
}
isSmallScreen() {
@@ -43,7 +47,7 @@ export class MenuComponent implements OnInit {
}
onLinkClick() {
if (!this.isServices || this.isSmallScreen()) {
if (!this.isServicesPage || this.isSmallScreen()) {
this.navOpen = false;
}
}
@@ -54,7 +58,7 @@ export class MenuComponent implements OnInit {
@HostListener('window:resize', ['$event'])
onResize(event) {
if (this.isServices) {
if (this.isServicesPage) {
this.navOpen = !this.isSmallScreen();
}
}