Make /a and /c default URLs for accounts and channels

[github/Chocobozzz/PeerTube.git] / client / src / app / app-routing.module.ts

diff --git a/client/src/app/app-routing.module.ts b/client/src/app/app-routing.module.ts
index c0a2d29e4bddeec80f9ffb8086bfd2050f2ec98b..0a43ab0ad82b3788b4d02fdd49c6b30ffa385125 100644 (file)
--- a/client/src/app/app-routing.module.ts
+++ b/client/src/app/app-routing.module.ts
@@ -1,11 +1,11 @@
 import { NgModule } from '@angular/core'
-import { RouteReuseStrategy, RouterModule, Routes } from '@angular/router'
+import { RouteReuseStrategy, RouterModule, Routes, UrlMatchResult, UrlSegment } from '@angular/router'
 import { CustomReuseStrategy } from '@app/core/routing/custom-reuse-strategy'
 import { MenuGuards } from '@app/core/routing/menu-guard.service'
 import { POSSIBLE_LOCALES } from '@shared/core-utils/i18n'
 import { PreloadSelectedModulesList } from './core'
 import { EmptyComponent } from './empty.component'
-import { ActorsComponent } from './+actors/actors.component'
+import { RootComponent } from './root.component'
 
 const routes: Routes = [
   {
@@ -27,11 +27,11 @@ const routes: Routes = [
     loadChildren: () => import('./+signup/+verify-account/verify-account.module').then(m => m.VerifyAccountModule)
   },
   {
-    path: 'accounts',
+    path: 'a',
     loadChildren: () => import('./+accounts/accounts.module').then(m => m.AccountsModule)
   },
   {
-    path: 'video-channels',
+    path: 'c',
     loadChildren: () => import('./+video-channels/video-channels.module').then(m => m.VideoChannelsModule)
   },
   {
@@ -67,16 +67,28 @@ const routes: Routes = [
     redirectTo: 'videos/watch/playlist'
   },
   {
-    path: 'a',
-    redirectTo: 'accounts'
-  },
-  {
-    path: 'c',
-    redirectTo: 'video-channels'
+    path: 'accounts',
+    redirectTo: 'a'
   },
   {
-    path: ':actorName',
-    component: ActorsComponent
+    path: 'video-channels',
+    redirectTo: 'c'
+  },
+  {
+    matcher: (url): UrlMatchResult => {
+      // Matches /@:actorName
+      if (url.length === 1 && url[0].path.match(/^@[\w]+$/gm)) {
+        return {
+          consumed: url,
+          posParams: {
+            actorName: new UrlSegment(url[0].path.substr(1), {})
+          }
+        }
+      }
+
+      return null
+    },
+    component: RootComponent
   },
   {
     path: '',