From 71176ef35de9e01583f308bca7ddbcbb35e34a0c Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Sun, 15 Jun 2025 20:44:48 +0200
Subject: [PATCH] Refactor various routes

---
 libs/common/src/lib/routes/routes.ts | 72 +++++++++++++++++++++++-----
 1 file changed, 61 insertions(+), 11 deletions(-)

diff --git a/libs/common/src/lib/routes/routes.ts b/libs/common/src/lib/routes/routes.ts
index d993da7ed..6f6017623 100644
--- a/libs/common/src/lib/routes/routes.ts
+++ b/libs/common/src/lib/routes/routes.ts
@@ -3,22 +3,11 @@ import '@angular/localize/init';
 import { IRoute } from './interfaces/interfaces';
 
 export const routes = {
-  access: 'access',
-  adminControl: 'admin',
   api: 'api',
-  auth: 'auth',
-  demo: 'demo',
   i18n: 'i18n',
-  jobs: 'jobs',
   market: 'market',
-  marketData: 'market-data',
-  membership: 'membership',
   personalFinanceTools: 'personal-finance-tools',
   public: 'p',
-  settings: 'settings',
-  start: 'start',
-  users: 'users',
-  webauthn: 'webauthn',
 
   // Publicly accessible pages
   openSourceAlternativeTo: $localize`:kebab-case:open-source-alternative-to`
@@ -28,13 +17,59 @@ export const internalRoutes: Record<string, IRoute> = {
   account: {
     path: 'account',
     routerLink: ['/account'],
+    subRoutes: {
+      access: {
+        path: 'access',
+        routerLink: ['/account', 'access'],
+        title: $localize`Access`
+      },
+      membership: {
+        path: 'membership',
+        routerLink: ['/account', 'membership'],
+        title: $localize`Membership`
+      }
+    },
     title: $localize`Settings`
   },
+  adminControl: {
+    excludeFromAssistant: true,
+    path: 'admin',
+    routerLink: ['/admin'],
+    subRoutes: {
+      jobs: {
+        path: 'jobs',
+        routerLink: ['/admin', 'jobs'],
+        title: $localize`Job Queue`
+      },
+      marketData: {
+        path: 'market-data',
+        routerLink: ['/admin', 'market-data'],
+        title: $localize`Market Data`
+      },
+      settings: {
+        path: 'settings',
+        routerLink: ['/admin', 'settings'],
+        title: $localize`Settings`
+      },
+      users: {
+        path: 'users',
+        routerLink: ['/admin', 'users'],
+        title: $localize`Users`
+      }
+    },
+    title: $localize`Admin Control`
+  },
   accounts: {
     path: 'accounts',
     routerLink: ['/accounts'],
     title: $localize`Accounts`
   },
+  auth: {
+    excludeFromAssistant: true,
+    path: 'auth',
+    routerLink: ['/auth'],
+    title: $localize`Sign in`
+  },
   home: {
     path: 'home',
     routerLink: ['/home'],
@@ -89,6 +124,12 @@ export const internalRoutes: Record<string, IRoute> = {
     },
     title: $localize`Portfolio`
   },
+  webauthn: {
+    excludeFromAssistant: true,
+    path: 'webauthn',
+    routerLink: ['/webauthn'],
+    title: $localize`Sign in`
+  },
   zen: {
     excludeFromAssistant: true,
     path: 'zen',
@@ -154,6 +195,11 @@ export const publicRoutes = {
     routerLink: ['/blog'],
     title: $localize`Blog`
   },
+  demo: {
+    path: 'demo',
+    routerLink: ['/demo'],
+    title: $localize`Live Demo`
+  },
   faq: {
     path: $localize`:kebab-case:faq`,
     routerLink: ['/' + $localize`:kebab-case:faq`],
@@ -229,5 +275,9 @@ export const publicRoutes = {
       }
     },
     title: $localize`Resources`
+  },
+  start: {
+    path: 'start',
+    routerLink: ['/start']
   }
 };