fix: nav
This commit is contained in:
@@ -4,6 +4,7 @@
|
|||||||
"scripts": {
|
"scripts": {
|
||||||
"ng": "ng",
|
"ng": "ng",
|
||||||
"start": "ng serve",
|
"start": "ng serve",
|
||||||
|
"serve": "ng serve --host 0.0.0.0",
|
||||||
"build": "ng build",
|
"build": "ng build",
|
||||||
"watch": "ng build --watch --configuration development",
|
"watch": "ng build --watch --configuration development",
|
||||||
"test": "ng test"
|
"test": "ng test"
|
||||||
|
|||||||
@@ -3,13 +3,13 @@
|
|||||||
</main>
|
</main>
|
||||||
<nav>
|
<nav>
|
||||||
<ul ngbNav [(activeId)]="active" class="nav-tabs custom-navbar bg-body-secondary">
|
<ul ngbNav [(activeId)]="active" class="nav-tabs custom-navbar bg-body-secondary">
|
||||||
<li [ngbNavItem]="1" class="custom-navitem"><a ngbNavLink routerLink="/send">
|
<li ngbNavItem="/send" class="custom-navitem"><a ngbNavLink routerLink="/send">
|
||||||
<i class="bi bi-cash"></i>
|
<i class="bi bi-cash"></i>
|
||||||
</a></li>
|
</a></li>
|
||||||
<li [ngbNavItem]="2" class="custom-navitem"><a ngbNavLink routerLink="/receive">
|
<li ngbNavItem="/receive" class="custom-navitem"><a ngbNavLink routerLink="/receive">
|
||||||
<i class="bi bi-piggy-bank"></i>
|
<i class="bi bi-piggy-bank"></i>
|
||||||
</a></li>
|
</a></li>
|
||||||
<li [ngbNavItem]="3" class="custom-navitem"><a ngbNavLink routerLink="/profile">
|
<li ngbNavItem="/profile" class="custom-navitem"><a ngbNavLink routerLink="/profile">
|
||||||
<i class="bi bi-person"></i>
|
<i class="bi bi-person"></i>
|
||||||
</a></li>
|
</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { Component, signal } from '@angular/core';
|
import { Component, OnInit, signal } from '@angular/core';
|
||||||
import { RouterOutlet, RouterLinkWithHref } from '@angular/router';
|
import { RouterOutlet, RouterLinkWithHref, Router, NavigationEnd } from '@angular/router';
|
||||||
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
|
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
|
||||||
import {
|
import {
|
||||||
NgbNav,
|
NgbNav,
|
||||||
@@ -7,6 +7,7 @@ import {
|
|||||||
NgbNavItemRole,
|
NgbNavItemRole,
|
||||||
NgbNavLinkBase,
|
NgbNavLinkBase,
|
||||||
} from '@ng-bootstrap/ng-bootstrap/nav';
|
} from '@ng-bootstrap/ng-bootstrap/nav';
|
||||||
|
import { filter } from 'rxjs';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-root',
|
selector: 'app-root',
|
||||||
@@ -14,8 +15,21 @@ import {
|
|||||||
templateUrl: './app.html',
|
templateUrl: './app.html',
|
||||||
styleUrl: './app.less'
|
styleUrl: './app.less'
|
||||||
})
|
})
|
||||||
export class App {
|
export class App implements OnInit{
|
||||||
protected readonly title = signal('client');
|
protected readonly title = signal('client');
|
||||||
//FIXME nav jumping back to 1 after reload
|
active = '/';
|
||||||
active = 1;
|
|
||||||
|
constructor(
|
||||||
|
private router: Router
|
||||||
|
){}
|
||||||
|
|
||||||
|
ngOnInit(): void {
|
||||||
|
this.router.events
|
||||||
|
.pipe(filter(event => event instanceof NavigationEnd))
|
||||||
|
.subscribe(() =>{
|
||||||
|
this.active = this.router.url;
|
||||||
|
console.log(this.active);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import { Injectable } from '@angular/core';
|
|||||||
import { BehaviorSubject, catchError, map, Observable, of, tap } from 'rxjs';
|
import { BehaviorSubject, catchError, map, Observable, of, tap } from 'rxjs';
|
||||||
import Transaction from '@model/transaction'
|
import Transaction from '@model/transaction'
|
||||||
import { SendRequest, SendResponse } from '@message/Send';
|
import { SendRequest, SendResponse } from '@message/Send';
|
||||||
|
import { TransactionsRequest } from '@message/Transactions';
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
providedIn: 'root',
|
providedIn: 'root',
|
||||||
|
|||||||
Reference in New Issue
Block a user