X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Bvideos%2Fvideos-routing.module.ts;h=7db519615edfa51932e234574d2ddccd10e7c64a;hb=dd24f1bb0a4b252e5342b251ba36853364da7b8e;hp=cf5f0b2e80d0f538d5cfe8258f97fe28a5a062b2;hpb=f29f487ef8892453a481628a6a3cff802dc89213;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/+videos/videos-routing.module.ts b/client/src/app/+videos/videos-routing.module.ts
index cf5f0b2e8..7db519615 100644
--- a/client/src/app/+videos/videos-routing.module.ts
+++ b/client/src/app/+videos/videos-routing.module.ts
@@ -1,11 +1,8 @@
 import { NgModule } from '@angular/core'
-import { RouterModule, Routes } from '@angular/router'
-import { MetaGuard } from '@ngx-meta/core'
+import { RouterModule, Routes, UrlSegment } from '@angular/router'
+import { LoginGuard } from '@app/core'
+import { VideosListCommonPageComponent } from './video-list'
 import { VideoOverviewComponent } from './video-list/overview/video-overview.component'
-import { VideoLocalComponent } from './video-list/video-local.component'
-import { VideoMostLikedComponent } from './video-list/video-most-liked.component'
-import { VideoRecentlyAddedComponent } from './video-list/video-recently-added.component'
-import { VideoTrendingComponent } from './video-list/video-trending.component'
 import { VideoUserSubscriptionsComponent } from './video-list/video-user-subscriptions.component'
 import { VideosComponent } from './videos.component'
 
@@ -13,7 +10,6 @@ const videosRoutes: Routes = [
   {
     path: '',
     component: VideosComponent,
-    canActivateChild: [ MetaGuard ],
     children: [
       {
         path: 'overview',
@@ -24,47 +20,38 @@ const videosRoutes: Routes = [
           }
         }
       },
+
       {
-        path: 'trending',
-        component: VideoTrendingComponent,
-        data: {
-          meta: {
-            title: $localize`Trending videos`
-          },
-          reuse: {
-            enabled: true,
-            key: 'trending-videos-list'
-          }
-        }
-      },
-      {
+        // Old URL redirection
         path: 'most-liked',
-        component: VideoMostLikedComponent,
-        data: {
-          meta: {
-            title: $localize`Most liked videos`
-          },
-          reuse: {
-            enabled: true,
-            key: 'most-liked-videos-list'
-          }
-        }
+        redirectTo: 'trending?sort=most-liked'
       },
       {
-        path: 'recently-added',
-        component: VideoRecentlyAddedComponent,
+        matcher: (url: UrlSegment[]) => {
+          if (url.length === 1 && [ 'recently-added', 'trending', 'local' ].includes(url[0].path)) {
+            return {
+              consumed: url,
+              posParams: {
+                page: new UrlSegment(url[0].path, {})
+              }
+            }
+          }
+
+          return null
+        },
+
+        component: VideosListCommonPageComponent,
         data: {
-          meta: {
-            title: $localize`Recently added videos`
-          },
           reuse: {
             enabled: true,
-            key: 'recently-added-videos-list'
+            key: 'videos-list'
           }
         }
       },
+
       {
         path: 'subscriptions',
+        canActivate: [ LoginGuard ],
         component: VideoUserSubscriptionsComponent,
         data: {
           meta: {
@@ -75,44 +62,6 @@ const videosRoutes: Routes = [
             key: 'subscription-videos-list'
           }
         }
-      },
-      {
-        path: 'local',
-        component: VideoLocalComponent,
-        data: {
-          meta: {
-            title: $localize`Local videos`
-          },
-          reuse: {
-            enabled: true,
-            key: 'local-videos-list'
-          }
-        }
-      },
-      {
-        path: 'upload',
-        loadChildren: () => import('@app/+videos/+video-edit/video-add.module').then(m => m.VideoAddModule),
-        data: {
-          meta: {
-            title: $localize`Upload a video`
-          }
-        }
-      },
-      {
-        path: 'update/:uuid',
-        loadChildren: () => import('@app/+videos/+video-edit/video-update.module').then(m => m.VideoUpdateModule),
-        data: {
-          meta: {
-            title: $localize`Edit a video`
-          }
-        }
-      },
-      {
-        path: 'watch',
-        loadChildren: () => import('@app/+videos/+video-watch/video-watch.module').then(m => m.VideoWatchModule),
-        data: {
-          preload: 3000
-        }
       }
     ]
   }