X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Bmy-account%2Fmy-account-routing.module.ts;h=ef39c1a365e5a09d1e70d458f0d6a4fdbeb6ee7d;hb=82b9a1005cd5f5d3c338270839a24f217594b35d;hp=0a4897d0797fd33e54178a3924d178efe1d2a18d;hpb=94148c9028829b5576a5dcbfba2c7fb9cf6443d3;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/+my-account/my-account-routing.module.ts b/client/src/app/+my-account/my-account-routing.module.ts
index 0a4897d07..ef39c1a36 100644
--- a/client/src/app/+my-account/my-account-routing.module.ts
+++ b/client/src/app/+my-account/my-account-routing.module.ts
@@ -1,28 +1,19 @@
 import { NgModule } from '@angular/core'
 import { RouterModule, Routes } from '@angular/router'
-import { MetaGuard } from '@ngx-meta/core'
 import { LoginGuard } from '../core'
+import { MyAccountAbusesListComponent } from './my-account-abuses/my-account-abuses-list.component'
+import { MyAccountApplicationsComponent } from './my-account-applications/my-account-applications.component'
 import { MyAccountBlocklistComponent } from './my-account-blocklist/my-account-blocklist.component'
 import { MyAccountServerBlocklistComponent } from './my-account-blocklist/my-account-server-blocklist.component'
-import { MyAccountHistoryComponent } from './my-account-history/my-account-history.component'
 import { MyAccountNotificationsComponent } from './my-account-notifications/my-account-notifications.component'
-import { MyAccountOwnershipComponent } from './my-account-ownership/my-account-ownership.component'
 import { MyAccountSettingsComponent } from './my-account-settings/my-account-settings.component'
-import { MyAccountSubscriptionsComponent } from './my-account-subscriptions/my-account-subscriptions.component'
-import { MyAccountVideoImportsComponent } from './my-account-video-imports/my-account-video-imports.component'
-import { MyAccountVideoPlaylistCreateComponent } from './my-account-video-playlists/my-account-video-playlist-create.component'
-import { MyAccountVideoPlaylistElementsComponent } from './my-account-video-playlists/my-account-video-playlist-elements.component'
-import { MyAccountVideoPlaylistUpdateComponent } from './my-account-video-playlists/my-account-video-playlist-update.component'
-import { MyAccountVideoPlaylistsComponent } from './my-account-video-playlists/my-account-video-playlists.component'
-import { MyAccountVideosComponent } from './my-account-videos/my-account-videos.component'
 import { MyAccountComponent } from './my-account.component'
-import { MyAccountAbusesListComponent } from './my-account-abuses/my-account-abuses-list.component'
 
 const myAccountRoutes: Routes = [
   {
     path: '',
     component: MyAccountComponent,
-    canActivateChild: [ MetaGuard, LoginGuard ],
+    canActivateChild: [ LoginGuard ],
     children: [
       {
         path: '',
@@ -34,102 +25,64 @@ const myAccountRoutes: Routes = [
         component: MyAccountSettingsComponent,
         data: {
           meta: {
-            title: 'Account settings'
+            title: $localize`Account settings`
           }
         }
       },
 
       {
         path: 'video-channels',
-        loadChildren: () => {
-          return import('./+my-account-video-channels/my-account-video-channels.module')
-            .then(m => m.MyAccountVideoChannelsModule)
-        }
+        redirectTo: '/my-library/video-channels',
+        pathMatch: 'full'
       },
 
       {
         path: 'video-playlists',
-        component: MyAccountVideoPlaylistsComponent,
-        data: {
-          meta: {
-            title: 'Account playlists'
-          }
-        }
+        redirectTo: '/my-library/video-playlists',
+        pathMatch: 'full'
       },
       {
         path: 'video-playlists/create',
-        component: MyAccountVideoPlaylistCreateComponent,
-        data: {
-          meta: {
-            title: 'Create new playlist'
-          }
-        }
+        redirectTo: '/my-library/video-playlists/create',
+        pathMatch: 'full'
       },
       {
         path: 'video-playlists/:videoPlaylistId',
-        component: MyAccountVideoPlaylistElementsComponent,
-        data: {
-          meta: {
-            title: 'Playlist elements'
-          }
-        }
+        redirectTo: '/my-library/video-playlists/:videoPlaylistId',
+        pathMatch: 'full'
       },
       {
         path: 'video-playlists/update/:videoPlaylistId',
-        component: MyAccountVideoPlaylistUpdateComponent,
-        data: {
-          meta: {
-            title: 'Update playlist'
-          }
-        }
+        redirectTo: '/my-library/video-playlists/update/:videoPlaylistId',
+        pathMatch: 'full'
       },
 
       {
         path: 'videos',
-        component: MyAccountVideosComponent,
-        data: {
-          meta: {
-            title: 'Account videos'
-          },
-          reuse: {
-            enabled: true,
-            key: 'my-account-videos-list'
-          }
-        }
+        redirectTo: '/my-library/videos',
+        pathMatch: 'full'
       },
       {
         path: 'video-imports',
-        component: MyAccountVideoImportsComponent,
-        data: {
-          meta: {
-            title: 'Account video imports'
-          }
-        }
+        redirectTo: '/my-library/video-imports',
+        pathMatch: 'full'
       },
       {
         path: 'subscriptions',
-        component: MyAccountSubscriptionsComponent,
-        data: {
-          meta: {
-            title: 'Account subscriptions'
-          }
-        }
+        redirectTo: '/my-library/subscriptions',
+        pathMatch: 'full'
       },
       {
         path: 'ownership',
-        component: MyAccountOwnershipComponent,
-        data: {
-          meta: {
-            title: 'Ownership changes'
-          }
-        }
+        redirectTo: '/my-library/ownership',
+        pathMatch: 'full'
       },
       {
         path: 'blocklist/accounts',
         component: MyAccountBlocklistComponent,
         data: {
           meta: {
-            title: 'Muted accounts'
+            title: $localize`Muted accounts`
           }
         }
       },
@@ -138,29 +91,21 @@ const myAccountRoutes: Routes = [
         component: MyAccountServerBlocklistComponent,
         data: {
           meta: {
-            title: 'Muted servers'
+            title: $localize`Muted servers`
           }
         }
       },
       {
         path: 'history/videos',
-        component: MyAccountHistoryComponent,
-        data: {
-          meta: {
-            title: 'Videos history'
-          },
-          reuse: {
-            enabled: true,
-            key: 'my-videos-history-list'
-          }
-        }
+        redirectTo: '/my-library/history/videos',
+        pathMatch: 'full'
       },
       {
         path: 'notifications',
         component: MyAccountNotificationsComponent,
         data: {
           meta: {
-            title: 'Notifications'
+            title: $localize`Notifications`
           }
         }
       },
@@ -169,7 +114,16 @@ const myAccountRoutes: Routes = [
         component: MyAccountAbusesListComponent,
         data: {
           meta: {
-            title: 'My abuses'
+            title: $localize`My abuse reports`
+          }
+        }
+      },
+      {
+        path: 'applications',
+        component: MyAccountApplicationsComponent,
+        data: {
+          meta: {
+            title: $localize`Applications`
           }
         }
       }