mirror of
https://github.com/mempool/mempool.git
synced 2025-02-24 22:58:30 +01:00
Use url parameter instead of query parameter
This commit is contained in:
parent
7b6246a035
commit
09f7dddf14
4 changed files with 16 additions and 9 deletions
|
@ -73,12 +73,11 @@ export class BlocksList implements OnInit {
|
|||
this.seoService.setDescription($localize`:@@meta.description.bitcoin.blocks:See the most recent Bitcoin${seoDescriptionNetwork(this.stateService.network)} blocks along with basic stats such as block height, block reward, block size, and more.`);
|
||||
}
|
||||
|
||||
this.blocksCountInitializedSubscription = combineLatest([this.blocksCountInitialized$, this.route.queryParams]).pipe(
|
||||
this.blocksCountInitializedSubscription = combineLatest([this.blocksCountInitialized$, this.route.params]).pipe(
|
||||
filter(([blocksCountInitialized, _]) => blocksCountInitialized),
|
||||
tap(([_, params]) => {
|
||||
this.page = +params['page'] || 1;
|
||||
this.page === 1 ? this.fromHeightSubject.next(undefined) : this.fromHeightSubject.next((this.blocksCount - 1) - (this.page - 1) * 15);
|
||||
this.cd.markForCheck();
|
||||
})
|
||||
).subscribe();
|
||||
|
||||
|
@ -181,7 +180,7 @@ export class BlocksList implements OnInit {
|
|||
}
|
||||
|
||||
pageChange(page: number): void {
|
||||
this.router.navigate([], { queryParams: { page: page } });
|
||||
this.router.navigate(['blocks', page]);
|
||||
}
|
||||
|
||||
trackByBlock(index: number, block: BlockExtended): number {
|
||||
|
|
|
@ -36,7 +36,7 @@ export class RecentPegsListComponent implements OnInit {
|
|||
lastPegBlockUpdate: number = 0;
|
||||
lastPegAmount: string = '';
|
||||
isLoad: boolean = true;
|
||||
queryParamSubscription: Subscription;
|
||||
paramSubscription: Subscription;
|
||||
keyNavigationSubscription: Subscription;
|
||||
dir: 'rtl' | 'ltr' = 'ltr';
|
||||
|
||||
|
@ -66,7 +66,7 @@ export class RecentPegsListComponent implements OnInit {
|
|||
this.seoService.setTitle($localize`:@@a8b0889ea1b41888f1e247f2731cc9322198ca04:Recent Peg-In / Out's`);
|
||||
this.websocketService.want(['blocks']);
|
||||
|
||||
this.queryParamSubscription = this.route.queryParams.pipe(
|
||||
this.paramSubscription = this.route.params.pipe(
|
||||
tap((params) => {
|
||||
this.page = +params['page'] || 1;
|
||||
this.startingIndexSubject.next((this.page - 1) * 15);
|
||||
|
@ -173,12 +173,12 @@ export class RecentPegsListComponent implements OnInit {
|
|||
ngOnDestroy(): void {
|
||||
this.destroy$.next(1);
|
||||
this.destroy$.complete();
|
||||
this.queryParamSubscription?.unsubscribe();
|
||||
this.paramSubscription?.unsubscribe();
|
||||
this.keyNavigationSubscription?.unsubscribe();
|
||||
}
|
||||
|
||||
pageChange(page: number): void {
|
||||
this.router.navigate([], { queryParams: { page: page } });
|
||||
this.router.navigate(['audit', 'pegs', page]);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -84,10 +84,14 @@ const routes: Routes = [
|
|||
]
|
||||
},
|
||||
{
|
||||
path: 'audit/pegs',
|
||||
path: 'audit/pegs/:page',
|
||||
data: { networks: ['liquid'] },
|
||||
component: RecentPegsListComponent,
|
||||
},
|
||||
{
|
||||
path: 'audit/pegs',
|
||||
redirectTo: 'audit/pegs/1'
|
||||
},
|
||||
{
|
||||
path: 'assets',
|
||||
data: { networks: ['liquid'] },
|
||||
|
|
|
@ -45,9 +45,13 @@ const routes: Routes = [
|
|||
loadChildren: () => import('./components/about/about.module').then(m => m.AboutModule),
|
||||
},
|
||||
{
|
||||
path: 'blocks',
|
||||
path: 'blocks/:page',
|
||||
component: BlocksList,
|
||||
},
|
||||
{
|
||||
path: 'blocks',
|
||||
redirectTo: 'blocks/1',
|
||||
},
|
||||
{
|
||||
path: 'rbf',
|
||||
component: RbfList,
|
||||
|
|
Loading…
Add table
Reference in a new issue