Add routerLink

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

@@ -92,11 +92,11 @@ export class HeaderComponent implements OnChanges {
   public routes = routes;
   public routerLinkAbout = ['/' + routes.about];
   public routerLinkAccount = ['/' + routes.account];
-  public routerLinkAccounts = ['/' + internalRoutes.accounts.path];
+  public routerLinkAccounts = internalRoutes.accounts.routerLink;
   public routerLinkAdminControl = ['/' + routes.adminControl];
   public routerLinkFeatures = ['/' + routes.features];
   public routerLinkMarkets = ['/' + routes.markets];
-  public routerLinkPortfolio = ['/' + internalRoutes.portfolio.path];
+  public routerLinkPortfolio = internalRoutes.portfolio.routerLink;
   public routerLinkPricing = ['/' + routes.pricing];
   public routerLinkRegister = ['/' + publicRoutes.register.path];
   public routerLinkResources = ['/' + routes.resources];

apps/client/src/app/components/home-overview/home-overview.component.ts

@@ -37,8 +37,8 @@ export class HomeOverviewComponent implements OnDestroy, OnInit {
   public isLoadingPerformance = true;
   public performance: PortfolioPerformance;
   public precision = 2;
-  public routerLinkAccounts = ['/' + internalRoutes.accounts.path];
+  public routerLinkAccounts = internalRoutes.accounts.routerLink;
-  public routerLinkPortfolio = ['/' + internalRoutes.portfolio.path];
+  public routerLinkPortfolio = internalRoutes.portfolio.routerLink;
   public routerLinkPortfolioActivities = [
     '/' + internalRoutes.portfolio.path,
     internalRoutes.portfolio.subRoutes.activities.path

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

@@ -95,14 +95,14 @@ export class AuthGuard {
             state.url.startsWith(`/${internalRoutes.home.path}`) &&
             user.settings.viewMode === 'ZEN'
           ) {
-            this.router.navigate(['/' + internalRoutes.zen.path]);
+            this.router.navigate(internalRoutes.zen.routerLink);
             resolve(false);
             return;
           } else if (state.url.startsWith(`/${routes.start}`)) {
             if (user.settings.viewMode === 'ZEN') {
-              this.router.navigate(['/' + internalRoutes.zen.path]);
+              this.router.navigate(internalRoutes.zen.routerLink);
             } else {
-              this.router.navigate(['/' + internalRoutes.home.path]);
+              this.router.navigate(internalRoutes.home.routerLink);
             }
 
             resolve(false);
@@ -111,7 +111,7 @@ export class AuthGuard {
             state.url.startsWith(`/${internalRoutes.zen.path}`) &&
             user.settings.viewMode === 'DEFAULT'
           ) {
-            this.router.navigate(['/' + internalRoutes.home.path]);
+            this.router.navigate(internalRoutes.home.routerLink);
             resolve(false);
             return;
           }

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

@@ -36,8 +36,8 @@ export class HomePageComponent implements OnDestroy, OnInit {
           this.tabs = [
             {
               iconName: 'analytics-outline',
-              label: $localize`Overview`,
+              label: internalRoutes.home.title,
-              path: ['/' + internalRoutes.home.path]
+              path: internalRoutes.home.routerLink
             },
             {
               iconName: 'wallet-outline',

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

@@ -34,7 +34,7 @@ export class PortfolioPageComponent implements OnDestroy, OnInit {
             {
               iconName: 'analytics-outline',
               label: $localize`Analysis`,
-              path: ['/' + internalRoutes.portfolio.path]
+              path: internalRoutes.portfolio.routerLink
             },
             {
               iconName: 'swap-vertical-outline',

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

@@ -33,12 +33,12 @@ export class ZenPageComponent implements OnDestroy, OnInit {
           this.tabs = [
             {
               iconName: 'analytics-outline',
-              label: $localize`Overview`,
+              label: internalRoutes.zen.title,
-              path: ['/' + internalRoutes.zen.path]
+              path: internalRoutes.zen.routerLink
             },
             {
               iconName: 'wallet-outline',
-              label: internalRoutes.zen.title,
+              label: internalRoutes.zen.subRoutes.holdings.title,
               path: [
                 '/' + internalRoutes.zen.path,
                 internalRoutes.zen.subRoutes.holdings.path

libs/common/src/lib/routes.ts

@@ -47,15 +47,17 @@ export const routes = {
 export const internalRoutes = {
   accounts: {
     path: 'accounts',
-    subRoutes: {},
+    routerLink: ['/accounts'],
     title: $localize`Accounts`
   },
   home: {
     excludeFromAssistant: true,
     path: 'home',
+    routerLink: ['/home'],
     subRoutes: {
       holdings: {
         path: 'holdings',
+        routerLink: [], // TODO
         title: $localize`Holdings`
       }
     },
@@ -63,9 +65,11 @@ export const internalRoutes = {
   },
   portfolio: {
     path: 'portfolio',
+    routerLink: ['/portfolio'],
     subRoutes: {
       activities: {
         path: 'activities',
+        routerLink: [], // TODO
         title: $localize`Activities`
       }
     },
@@ -74,9 +78,11 @@ export const internalRoutes = {
   zen: {
     excludeFromAssistant: true,
     path: 'zen',
+    routerLink: ['/zen'],
     subRoutes: {
       holdings: {
         path: 'holdings',
+        routerLink: [], // TODO
         title: $localize`Holdings`
       }
     },