Merge branch 'develop' into pr/1285

[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 1d55b4cea2db272dac5ec2b3737a138487c39cd8..cff37a7d6f187930eb7622881cdac10ce493aa58 100644 (file)
--- a/client/src/app/app-routing.module.ts
+++ b/client/src/app/app-routing.module.ts
@@ -2,6 +2,7 @@ import { NgModule } from '@angular/core'
 import { RouterModule, Routes } from '@angular/router'
 
 import { PreloadSelectedModulesList } from './core'
+import { AppComponent } from '@app/app.component'
 
 const routes: Routes = [
   {
@@ -9,8 +10,32 @@ const routes: Routes = [
     loadChildren: './+admin/admin.module#AdminModule'
   },
   {
-    path: 'account',
-    loadChildren: './+account/account.module#AccountModule'
+    path: 'my-account',
+    loadChildren: './+my-account/my-account.module#MyAccountModule'
+  },
+  {
+    path: 'verify-account',
+    loadChildren: './+verify-account/verify-account.module#VerifyAccountModule'
+  },
+  {
+    path: 'accounts',
+    loadChildren: './+accounts/accounts.module#AccountsModule'
+  },
+  {
+    path: 'video-channels',
+    loadChildren: './+video-channels/video-channels.module#VideoChannelsModule'
+  },
+  {
+    path: 'about',
+    loadChildren: './+about/about.module#AboutModule'
+  },
+  {
+    path: '',
+    component: AppComponent // Avoid 404, app component will redirect dynamically
+  },
+  {
+    path: '**',
+    loadChildren: './+page-not-found/page-not-found.module#PageNotFoundModule'
   }
 ]
 
@@ -18,7 +43,8 @@ const routes: Routes = [
   imports: [
     RouterModule.forRoot(routes, {
       useHash: Boolean(history.pushState) === false,
-      preloadingStrategy: PreloadSelectedModulesList
+      preloadingStrategy: PreloadSelectedModulesList,
+      anchorScrolling: 'enabled'
     })
   ],
   providers: [