From: Chocobozzz <me@florianbigard.com>
Date: Thu, 27 May 2021 14:12:41 +0000 (+0200)
Subject: Merge branch 'develop' into shorter-URLs-channels-accounts
X-Git-Tag: v3.3.0-rc.1~201
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=8f608a4cb22ab232cfab20665050764b38bac9c7;p=github%2FChocobozzz%2FPeerTube.git

Merge branch 'develop' into shorter-URLs-channels-accounts
---

8f608a4cb22ab232cfab20665050764b38bac9c7
diff --cc client/src/app/app-routing.module.ts
index 0a43ab0ad,4e3cce590..4619c4046
--- a/client/src/app/app-routing.module.ts
+++ b/client/src/app/app-routing.module.ts
@@@ -3,9 -3,8 +3,9 @@@ import { RouteReuseStrategy, RouterModu
  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 { PreloadSelectedModulesList } from './core'
+ import { MetaGuard, PreloadSelectedModulesList } from './core'
  import { EmptyComponent } from './empty.component'
 +import { RootComponent } from './root.component'
  
  const routes: Routes = [
    {
@@@ -24,15 -30,18 +31,18 @@@
    },
    {
      path: 'verify-account',
-     loadChildren: () => import('./+signup/+verify-account/verify-account.module').then(m => m.VerifyAccountModule)
+     loadChildren: () => import('./+signup/+verify-account/verify-account.module').then(m => m.VerifyAccountModule),
+     canActivateChild: [ MetaGuard ]
    },
    {
 -    path: 'accounts',
 +    path: 'a',
-     loadChildren: () => import('./+accounts/accounts.module').then(m => m.AccountsModule)
+     loadChildren: () => import('./+accounts/accounts.module').then(m => m.AccountsModule),
+     canActivateChild: [ MetaGuard ]
    },
    {
 -    path: 'video-channels',
 +    path: 'c',
-     loadChildren: () => import('./+video-channels/video-channels.module').then(m => m.VideoChannelsModule)
+     loadChildren: () => import('./+video-channels/video-channels.module').then(m => m.VideoChannelsModule),
+     canActivateChild: [ MetaGuard ]
    },
    {
      path: 'about',
diff --cc shared/extra-utils/index.ts
index 5c520d0c2,3bc09ead5..9f5b5bb28
--- a/shared/extra-utils/index.ts
+++ b/shared/extra-utils/index.ts
@@@ -1,16 -1,26 +1,27 @@@
 +export * from './actors/actors'
  export * from './bulk/bulk'
+ 
  export * from './cli/cli'
+ 
+ export * from './custom-pages/custom-pages'
+ 
  export * from './feeds/feeds'
+ 
  export * from './mock-servers/mock-instances-index'
- export * from './miscs/miscs'
+ 
+ export * from './miscs/email'
  export * from './miscs/sql'
+ export * from './miscs/miscs'
  export * from './miscs/stubs'
+ 
  export * from './moderation/abuses'
  export * from './plugins/mock-blocklist'
+ 
  export * from './requests/check-api-params'
  export * from './requests/requests'
+ 
  export * from './search/videos'
+ 
  export * from './server/activitypub'
  export * from './server/clients'
  export * from './server/config'