From 14006606648c31f68443fbe812c7954b2ebaff0f Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Sun, 15 Jun 2025 08:40:19 +0200 Subject: [PATCH] Feature/refactor tab configuration (#4930) * Refactor path to routerLink --- .../app/pages/about/about-page.component.ts | 12 ++++++------ .../src/app/pages/about/about-page.html | 2 +- .../app/pages/admin/admin-page.component.ts | 10 +++++----- .../src/app/pages/admin/admin-page.html | 2 +- .../src/app/pages/faq/faq-page.component.ts | 6 +++--- apps/client/src/app/pages/faq/faq-page.html | 2 +- .../src/app/pages/home/home-page.component.ts | 10 +++++----- apps/client/src/app/pages/home/home-page.html | 2 +- .../portfolio/portfolio-page.component.ts | 12 +++++++----- .../app/pages/portfolio/portfolio-page.html | 2 +- .../resources/resources-page.component.ts | 19 ++++++++++--------- .../app/pages/resources/resources-page.html | 2 +- .../user-account-page.component.ts | 9 ++++++--- .../pages/user-account/user-account-page.html | 2 +- .../src/app/pages/zen/zen-page.component.ts | 4 ++-- apps/client/src/app/pages/zen/zen-page.html | 2 +- .../interfaces/tab-configuration.interface.ts | 2 +- 17 files changed, 53 insertions(+), 47 deletions(-) diff --git a/apps/client/src/app/pages/about/about-page.component.ts b/apps/client/src/app/pages/about/about-page.component.ts index 5d33ab3ca..6e53d76b9 100644 --- a/apps/client/src/app/pages/about/about-page.component.ts +++ b/apps/client/src/app/pages/about/about-page.component.ts @@ -44,17 +44,17 @@ export class AboutPageComponent implements OnDestroy, OnInit { { iconName: 'information-circle-outline', label: $localize`About`, - path: ['/' + routes.about] + routerLink: ['/' + routes.about] }, { iconName: 'sparkles-outline', label: $localize`Changelog`, - path: ['/' + routes.about, routes.changelog] + routerLink: ['/' + routes.about, routes.changelog] }, { iconName: 'ribbon-outline', label: $localize`License`, - path: ['/' + routes.about, routes.license], + routerLink: ['/' + routes.about, routes.license], showCondition: !this.hasPermissionForSubscription } ]; @@ -63,14 +63,14 @@ export class AboutPageComponent implements OnDestroy, OnInit { this.tabs.push({ iconName: 'shield-checkmark-outline', label: $localize`Privacy Policy`, - path: ['/' + routes.about, routes.privacyPolicy], + routerLink: ['/' + routes.about, routes.privacyPolicy], showCondition: this.hasPermissionForSubscription }); this.tabs.push({ iconName: 'document-text-outline', label: $localize`Terms of Service`, - path: ['/' + routes.about, routes.termsOfService], + routerLink: ['/' + routes.about, routes.termsOfService], showCondition: this.hasPermissionForSubscription }); @@ -82,7 +82,7 @@ export class AboutPageComponent implements OnDestroy, OnInit { this.tabs.push({ iconName: 'happy-outline', label: publicRoutes.about.subRoutes.ossFriends.title, - path: publicRoutes.about.subRoutes.ossFriends.routerLink + routerLink: publicRoutes.about.subRoutes.ossFriends.routerLink }); }); } diff --git a/apps/client/src/app/pages/about/about-page.html b/apps/client/src/app/pages/about/about-page.html index a9dbee450..af3b24b0a 100644 --- a/apps/client/src/app/pages/about/about-page.html +++ b/apps/client/src/app/pages/about/about-page.html @@ -16,7 +16,7 @@ mat-tab-link routerLinkActive [active]="rla.isActive" - [routerLink]="tab.path" + [routerLink]="tab.routerLink" [routerLinkActiveOptions]="{ exact: true }" >