Bugfix/fix issue in header after paths to routes restructuring (#4872)

* Fix issue in header

apps/client/src/app/app.component.ts

@@ -78,9 +78,9 @@ export class AppComponent implements OnDestroy, OnInit {
   public routerLinkFaq = ['/' + routes.faq];
   public routerLinkFeatures = ['/' + routes.features];
   public routerLinkMarkets = ['/' + routes.markets];
-  public routerLinkOpenStartup = ['/' + publicRoutes.openStartup.path];
+  public routerLinkOpenStartup = publicRoutes.openStartup.routerLink;
   public routerLinkPricing = ['/' + routes.pricing];
-  public routerLinkRegister = ['/' + publicRoutes.register.path];
+  public routerLinkRegister = publicRoutes.register.routerLink;
   public routerLinkResources = ['/' + routes.resources];
   public showFooter = false;
   public user: User;

apps/client/src/app/components/header/header.component.html

@@ -20,9 +20,11 @@
           mat-flat-button
           [ngClass]="{
             'font-weight-bold':
-              currentRoute === routes.home || currentRoute === routes.zen,
+              currentRoute === internalRoutes.home.path ||
+              currentRoute === internalRoutes.zen.path,
             'text-decoration-underline':
-              currentRoute === routes.home || currentRoute === routes.zen
+              currentRoute === internalRoutes.home.path ||
+              currentRoute === internalRoutes.zen.path
           }"
           [routerLink]="['/']"
           >Overview</a
@@ -34,8 +36,9 @@
           i18n
           mat-flat-button
           [ngClass]="{
-            'font-weight-bold': currentRoute === routes.portfolio,
-            'text-decoration-underline': currentRoute === routes.portfolio
+            'font-weight-bold': currentRoute === internalRoutes.portfolio.path,
+            'text-decoration-underline':
+              currentRoute === internalRoutes.portfolio.path
           }"
           [routerLink]="routerLinkPortfolio"
           >Portfolio</a
@@ -47,8 +50,9 @@
           i18n
           mat-flat-button
           [ngClass]="{
-            'font-weight-bold': currentRoute === routes.accounts,
-            'text-decoration-underline': currentRoute === routes.accounts
+            'font-weight-bold': currentRoute === internalRoutes.accounts.path,
+            'text-decoration-underline':
+              currentRoute === internalRoutes.accounts.path
           }"
           [routerLink]="routerLinkAccounts"
           >Accounts</a
@@ -235,7 +239,8 @@
             mat-menu-item
             [ngClass]="{
               'font-weight-bold':
-                currentRoute === routes.home || currentRoute === routes.zen
+                currentRoute === internalRoutes.home.path ||
+                currentRoute === internalRoutes.zen.path
             }"
             [routerLink]="['/']"
             >Overview</a
@@ -245,7 +250,7 @@
             i18n
             mat-menu-item
             [ngClass]="{
-              'font-weight-bold': currentRoute === routes.portfolio
+              'font-weight-bold': currentRoute === internalRoutes.portfolio.path
             }"
             [routerLink]="routerLinkPortfolio"
             >Portfolio</a
@@ -254,7 +259,9 @@
             class="d-flex d-sm-none"
             i18n
             mat-menu-item
-            [ngClass]="{ 'font-weight-bold': currentRoute === routes.accounts }"
+            [ngClass]="{
+              'font-weight-bold': currentRoute === internalRoutes.accounts.path
+            }"
             [routerLink]="routerLinkAccounts"
             >Accounts</a
           >

apps/client/src/app/components/header/header.component.ts

@@ -83,13 +83,13 @@ export class HeaderComponent implements OnChanges {
   public hasPermissionToAccessFearAndGreedIndex: boolean;
   public hasPermissionToCreateUser: boolean;
   public impersonationId: string;
+  public internalRoutes = internalRoutes;
   public isMenuOpen: boolean;
   public routeAbout = routes.about;
   public routeFeatures = routes.features;
   public routeMarkets = routes.markets;
   public routePricing = routes.pricing;
   public routeResources = routes.resources;
-  public routes = routes;
   public routerLinkAbout = ['/' + routes.about];
   public routerLinkAccount = ['/' + routes.account];
   public routerLinkAccounts = internalRoutes.accounts.routerLink;
@@ -98,8 +98,9 @@ export class HeaderComponent implements OnChanges {
   public routerLinkMarkets = ['/' + routes.markets];
   public routerLinkPortfolio = internalRoutes.portfolio.routerLink;
   public routerLinkPricing = ['/' + routes.pricing];
-  public routerLinkRegister = ['/' + publicRoutes.register.path];
+  public routerLinkRegister = publicRoutes.register.routerLink;
   public routerLinkResources = ['/' + routes.resources];
+  public routes = routes;
 
   private unsubscribeSubject = new Subject<void>();
 

apps/client/src/app/core/auth.guard.ts

@@ -55,7 +55,7 @@ export class AuthGuard {
               this.router.navigate(['/' + routes.demo]);
               resolve(false);
             } else if (utmSource === 'trusted-web-activity') {
-              this.router.navigate(['/' + publicRoutes.register.path]);
+              this.router.navigate(publicRoutes.register.routerLink);
               resolve(false);
             } else if (
               AuthGuard.PUBLIC_PAGE_ROUTES.some((publicPageRoute) => {

apps/client/src/app/pages/about/overview/about-overview-page.component.ts

@@ -21,7 +21,7 @@ export class AboutOverviewPageComponent implements OnDestroy, OnInit {
   public routerLinkBlog = ['/' + routes.blog];
   public routerLinkFaq = ['/' + routes.faq];
   public routerLinkFeatures = ['/' + routes.features];
-  public routerLinkOpenStartup = ['/' + publicRoutes.openStartup.path];
+  public routerLinkOpenStartup = publicRoutes.openStartup.routerLink;
   public user: User;
 
   private unsubscribeSubject = new Subject<void>();

apps/client/src/app/pages/blog/2023/09/hacktoberfest-2023/hacktoberfest-2023-page.component.ts

@@ -13,5 +13,5 @@ import { RouterModule } from '@angular/router';
 export class Hacktoberfest2023PageComponent {
   public routerLinkAbout = ['/' + routes.about];
   public routerLinkBlog = ['/' + routes.blog];
-  public routerLinkOpenStartup = ['/' + publicRoutes.openStartup.path];
+  public routerLinkOpenStartup = publicRoutes.openStartup.routerLink;
 }

apps/client/src/app/pages/blog/2024/09/hacktoberfest-2024/hacktoberfest-2024-page.component.ts

@@ -13,5 +13,5 @@ import { RouterModule } from '@angular/router';
 export class Hacktoberfest2024PageComponent {
   public routerLinkAbout = ['/' + routes.about];
   public routerLinkBlog = ['/' + routes.blog];
-  public routerLinkOpenStartup = ['/' + publicRoutes.openStartup.path];
+  public routerLinkOpenStartup = publicRoutes.openStartup.routerLink;
 }

apps/client/src/app/pages/faq/saas/saas-page.component.ts

@@ -20,7 +20,7 @@ export class SaasPageComponent implements OnDestroy {
     routes.membership
   ];
   public routerLinkMarkets = ['/' + routes.markets];
-  public routerLinkRegister = ['/' + publicRoutes.register.path];
+  public routerLinkRegister = publicRoutes.register.routerLink;
   public user: User;
 
   private unsubscribeSubject = new Subject<void>();

apps/client/src/app/pages/features/features-page.component.ts

@@ -26,7 +26,7 @@ import { Subject, takeUntil } from 'rxjs';
 export class GfFeaturesPageComponent implements OnDestroy {
   public hasPermissionForSubscription: boolean;
   public info: InfoItem;
-  public routerLinkRegister = ['/' + publicRoutes.register.path];
+  public routerLinkRegister = publicRoutes.register.routerLink;
   public routerLinkResources = ['/' + routes.resources];
   public user: User;
 

apps/client/src/app/pages/landing/landing-page.component.ts

@@ -27,8 +27,8 @@ export class LandingPageComponent implements OnDestroy, OnInit {
   public hasPermissionToCreateUser: boolean;
   public routerLinkAbout = ['/' + routes.about];
   public routerLinkDemo = ['/' + routes.demo];
-  public routerLinkOpenStartup = ['/' + publicRoutes.openStartup.path];
-  public routerLinkRegister = ['/' + publicRoutes.register.path];
+  public routerLinkOpenStartup = publicRoutes.openStartup.routerLink;
+  public routerLinkRegister = publicRoutes.register.routerLink;
   public statistics: Statistics;
   public testimonials = [
     {

apps/client/src/app/pages/pricing/pricing-page.component.ts

@@ -42,7 +42,7 @@ export class PricingPageComponent implements OnDestroy, OnInit {
     'PROFESSIONAL_DATA_PROVIDER_TOOLTIP_PREMIUM'
   );
   public routerLinkFeatures = ['/' + routes.features];
-  public routerLinkRegister = ['/' + publicRoutes.register.path];
+  public routerLinkRegister = publicRoutes.register.routerLink;
   public user: User;
 
   private unsubscribeSubject = new Subject<void>();

libs/common/src/lib/routes.ts

@@ -93,10 +93,12 @@ export const internalRoutes = {
 export const publicRoutes = {
   openStartup: {
     path: 'open',
+    routerLink: ['/open'],
     title: 'Open Startup'
   },
   register: {
     path: $localize`:kebab-case:register`,
+    routerLink: ['/' + $localize`:kebab-case:register`],
     title: $localize`Registration`
   }
 };