X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp-routing.module.ts;h=a87f4ce1babd219fe73280491451dffed623c004;hb=1bab226f5c2e678039ed40f87ab3fe05f3ebd0f4;hp=04c53548eb375999361ab90a478ed9964450bcaf;hpb=a51bad1accfade25916db0dadaeb879a182cf19b;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/app-routing.module.ts b/client/src/app/app-routing.module.ts
index 04c53548e..a87f4ce1b 100644
--- a/client/src/app/app-routing.module.ts
+++ b/client/src/app/app-routing.module.ts
@@ -1,28 +1,49 @@
 import { NgModule } from '@angular/core'
-import { RouterModule, Routes } from '@angular/router'
+import { RouteReuseStrategy, RouterModule, Routes } from '@angular/router'
 
 import { PreloadSelectedModulesList } from './core'
+import { AppComponent } from '@app/app.component'
+import { CustomReuseStrategy } from '@app/core/routing/custom-reuse-strategy'
+import { MenuGuards } from '@app/core/routing/menu-guard.service'
 
 const routes: Routes = [
   {
     path: 'admin',
-    loadChildren: './+admin/admin.module#AdminModule'
+    canActivate: [ MenuGuards.close() ],
+    canDeactivate: [ MenuGuards.open() ],
+    loadChildren: () => import('./+admin/admin.module').then(m => m.AdminModule)
   },
   {
     path: 'my-account',
-    loadChildren: './+my-account/my-account.module#MyAccountModule'
+    loadChildren: () => import('./+my-account/my-account.module').then(m => m.MyAccountModule)
+  },
+  {
+    path: 'verify-account',
+    loadChildren: () => import('./+signup/+verify-account/verify-account.module').then(m => m.VerifyAccountModule)
   },
   {
     path: 'accounts',
-    loadChildren: './+accounts/accounts.module#AccountsModule'
+    loadChildren: () => import('./+accounts/accounts.module').then(m => m.AccountsModule)
   },
   {
     path: 'video-channels',
-    loadChildren: './+video-channels/video-channels.module#VideoChannelsModule'
+    loadChildren: () => import('./+video-channels/video-channels.module').then(m => m.VideoChannelsModule)
+  },
+  {
+    path: 'about',
+    loadChildren: () => import('./+about/about.module').then(m => m.AboutModule)
+  },
+  {
+    path: 'signup',
+    loadChildren: () => import('./+signup/+register/register.module').then(m => m.RegisterModule)
+  },
+  {
+    path: '',
+    component: AppComponent // Avoid 404, app component will redirect dynamically
   },
   {
     path: '**',
-    loadChildren: './+page-not-found/page-not-found.module#PageNotFoundModule'
+    loadChildren: () => import('./+page-not-found/page-not-found.module').then(m => m.PageNotFoundModule)
   }
 ]
 
@@ -30,11 +51,15 @@ const routes: Routes = [
   imports: [
     RouterModule.forRoot(routes, {
       useHash: Boolean(history.pushState) === false,
-      preloadingStrategy: PreloadSelectedModulesList
+      scrollPositionRestoration: 'disabled',
+      preloadingStrategy: PreloadSelectedModulesList,
+      anchorScrolling: 'disabled'
     })
   ],
   providers: [
-    PreloadSelectedModulesList
+    MenuGuards.guards,
+    PreloadSelectedModulesList,
+    { provide: RouteReuseStrategy, useClass: CustomReuseStrategy }
   ],
   exports: [ RouterModule ]
 })