fix: nav jumping on page reload

This commit is contained in:
eneller
2026-03-27 07:41:05 +01:00
parent bdd6de5fbe
commit 3ca88d9e2f
3 changed files with 26 additions and 13 deletions

View File

@@ -2,9 +2,15 @@
<router-outlet></router-outlet>
</main>
<nav>
<ul ngbNav [activeId]="route.fragment | async" class="nav-tabs custom-navbar bg-body-secondary">
<li ngbNavItem="" class="custom-navitem"><a ngbNavLink routerLink="" routerLinkActive="active"><i class="bi bi-pencil-square"></i>{{ data.getPlayers().length }}</a></li>
<li ngbNavItem="/basic.t" class="custom-navitem"><a ngbNavLink routerLink="/basic.t" routerLinkActive="active"><i class="bi bi-shuffle"></i></a></li>
<li ngbNavItem="/rotations.t" class="custom-navitem"><a ngbNavLink routerLink="/rotations.t" routerLinkActive="active"><i class="bi bi-arrow-repeat"></i></a></li>
<ul ngbNav [activeId]="activeId" class="nav-tabs custom-navbar bg-body-secondary">
<li ngbNavItem="/" class="custom-navitem"><a ngbNavLink routerLink="" routerLinkActive="active">
<i class="bi bi-pencil-square"></i>{{ data.getPlayers().length }}</a>
</li>
<li ngbNavItem="/basic.t" class="custom-navitem"><a ngbNavLink routerLink="/basic.t" routerLinkActive="active">
<i class="bi bi-shuffle"></i></a>
</li>
<li ngbNavItem="/rotations.t" class="custom-navitem"><a ngbNavLink routerLink="/rotations.t" routerLinkActive="active">
<i class="bi bi-arrow-repeat"></i></a>
</li>
</ul>
</nav>

View File

@@ -1,31 +1,39 @@
import { Component, inject, OnInit} from '@angular/core';
import { FormsModule } from '@angular/forms';
import { RouterOutlet, ActivatedRoute, RouterLink } from '@angular/router';
import { RouterOutlet, ActivatedRoute, RouterLink, Router, NavigationEnd } from '@angular/router';
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
import { CommonModule } from '@angular/common';
import { filter, take } from 'rxjs';
import { ScreenBasicComponent } from "./screen-basic/screen-basic.component";
import { ScreenRotationsComponent } from './screen-rotations/screen-rotations.component';
import { Player } from './model';
import { ScreenEditComponent } from './screen-edit/screen-edit.component';
import { DataService } from './data.service';
@Component({
selector: 'app-root',
imports: [NgbModule, RouterOutlet, CommonModule, FormsModule, ScreenBasicComponent, ScreenRotationsComponent, ScreenEditComponent, RouterLink],
imports: [NgbModule, RouterOutlet, CommonModule, FormsModule, RouterLink],
templateUrl: './app.component.html',
styleUrl: './app.component.less'
})
export class AppComponent implements OnInit {
title = 'vb';
data = inject(DataService);
activeId = '/';
constructor(public route: ActivatedRoute){}
constructor(
private route: ActivatedRoute,
private router: Router
){}
ngOnInit(): void {
this.router.events
.pipe(filter(event => event instanceof NavigationEnd))
.subscribe(() => {
this.activeId = this.router.url;
});
// process query params
this.route.queryParams.pipe(
filter(params => Object.keys(params).length > 0), // Only proceed if params are not empty
// Only proceed if params are not empty
filter(params => Object.keys(params).length > 0),
take(1)
).subscribe(params => {
if (params['names']){

View File

@@ -1,7 +1,6 @@
// Original Team Generation Screen for arbitrary size and number of teams
import { Component, inject} from '@angular/core';
import { FormsModule } from '@angular/forms';
import { RouterOutlet, ActivatedRoute } from '@angular/router';
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
import { CommonModule } from '@angular/common';
import { Player } from '../model';
@@ -10,7 +9,7 @@ import { DataService } from '../data.service';
@Component({
selector: 'app-screen-basic',
imports: [NgbModule, RouterOutlet, CommonModule, FormsModule],
imports: [NgbModule, CommonModule, FormsModule],
templateUrl: './screen-basic.component.html',
styleUrl: './screen-basic.component.less'
})