X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp-routing.module.ts;h=1f98e9d2e2966e679d21dda22d4ddd7a1df0cc9c;hb=fc21ef5c62d845576a916414468b3a57370a57b2;hp=4619c404642020344baa4c4d0cb15447ba839890;hpb=8f608a4cb22ab232cfab20665050764b38bac9c7;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/app-routing.module.ts b/client/src/app/app-routing.module.ts
index 4619c4046..1f98e9d2e 100644
--- a/client/src/app/app-routing.module.ts
+++ b/client/src/app/app-routing.module.ts
@@ -3,9 +3,10 @@ import { RouteReuseStrategy, RouterModule, Routes, UrlMatchResult, UrlSegment }
 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 { MetaGuard, PreloadSelectedModulesList } from './core'
+import { HomepageRedirectComponent, MetaGuard, PreloadSelectedModulesList } from './core'
 import { EmptyComponent } from './empty.component'
-import { RootComponent } from './root.component'
+import { USER_USERNAME_REGEX_CHARACTERS } from './shared/form-validators/user-validators'
+import { ActorRedirectGuard } from './shared/shared-main'
 
 const routes: Routes = [
   {
@@ -17,7 +18,8 @@ const routes: Routes = [
   },
   {
     path: 'home',
-    loadChildren: () => import('./+home/home.module').then(m => m.HomeModule)
+    loadChildren: () => import('./+home/home.module').then(m => m.HomeModule),
+    canActivateChild: [ MetaGuard ]
   },
   {
     path: 'my-account',
@@ -34,16 +36,27 @@ const routes: Routes = [
     loadChildren: () => import('./+signup/+verify-account/verify-account.module').then(m => m.VerifyAccountModule),
     canActivateChild: [ MetaGuard ]
   },
+
+  {
+    path: 'accounts',
+    redirectTo: 'a'
+  },
   {
     path: 'a',
     loadChildren: () => import('./+accounts/accounts.module').then(m => m.AccountsModule),
     canActivateChild: [ MetaGuard ]
   },
+
+  {
+    path: 'video-channels',
+    redirectTo: 'c'
+  },
   {
     path: 'c',
     loadChildren: () => import('./+video-channels/video-channels.module').then(m => m.VideoChannelsModule),
     canActivateChild: [ MetaGuard ]
   },
+
   {
     path: 'about',
     loadChildren: () => import('./+about/about.module').then(m => m.AboutModule),
@@ -69,47 +82,81 @@ const routes: Routes = [
     loadChildren: () => import('./+search/search.module').then(m => m.SearchModule),
     canActivateChild: [ MetaGuard ]
   },
+
   {
-    path: 'videos',
-    loadChildren: () => import('./+videos/videos.module').then(m => m.VideosModule),
-    canActivateChild: [ MetaGuard ]
+    path: 'videos/upload',
+    loadChildren: () => import('@app/+videos/+video-edit/video-add.module').then(m => m.VideoAddModule),
+    data: {
+      meta: {
+        title: $localize`Upload a video`
+      }
+    }
   },
   {
-    path: 'remote-interaction',
-    loadChildren: () => import('./+remote-interaction/remote-interaction.module').then(m => m.RemoteInteractionModule),
+    path: 'videos/update/:uuid',
+    loadChildren: () => import('@app/+videos/+video-edit/video-update.module').then(m => m.VideoUpdateModule),
+    data: {
+      meta: {
+        title: $localize`Edit a video`
+      }
+    }
+  },
+
+  {
+    path: 'videos/watch/playlist',
+    redirectTo: 'w/p'
+  },
+  {
+    path: 'videos/watch',
+    redirectTo: 'w'
+  },
+  {
+    path: 'w',
+    loadChildren: () => import('@app/+videos/+video-watch/video-watch.module').then(m => m.VideoWatchModule),
+    data: {
+      preload: 5000
+    }
+  },
+  {
+    path: 'videos',
+    loadChildren: () => import('./+videos/videos.module').then(m => m.VideosModule),
     canActivateChild: [ MetaGuard ]
   },
   {
     path: 'video-playlists/watch',
     redirectTo: 'videos/watch/playlist'
   },
+
   {
-    path: 'accounts',
-    redirectTo: 'a'
-  },
-  {
-    path: 'video-channels',
-    redirectTo: 'c'
+    path: 'remote-interaction',
+    loadChildren: () => import('./+remote-interaction/remote-interaction.module').then(m => m.RemoteInteractionModule),
+    canActivateChild: [ MetaGuard ]
   },
+
+  // Matches /@:actorName
   {
     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), {})
-          }
+      const regex = new RegExp(`^@(${USER_USERNAME_REGEX_CHARACTERS}+)$`)
+      if (url.length !== 1) return null
+
+      const matchResult = url[0].path.match(regex)
+      if (!matchResult) return null
+
+      return {
+        consumed: url,
+        posParams: {
+          actorName: new UrlSegment(matchResult[1], {})
         }
       }
-
-      return null
     },
-    component: RootComponent
+    pathMatch: 'full',
+    canActivate: [ ActorRedirectGuard ],
+    component: EmptyComponent
   },
+
   {
     path: '',
-    component: EmptyComponent // Avoid 404, app component will redirect dynamically
+    component: HomepageRedirectComponent
   }
 ]
 
@@ -117,7 +164,7 @@ const routes: Routes = [
 for (const locale of POSSIBLE_LOCALES) {
   routes.push({
     path: locale,
-    component: EmptyComponent
+    component: HomepageRedirectComponent
   })
 }