Merge branch 'release/2.1.0' into develop

[github/Chocobozzz/PeerTube.git] / client / src / app / +admin / users / users.routes.ts

diff --git a/client/src/app/+admin/users/users.routes.ts b/client/src/app/+admin/users/users.routes.ts
index a6a9c4c193ede6fd7579da49a8c6d3b1dd8af3cd..2d4f9305e8d0b173fd15c2cd1877265139fe1b10 100644 (file)
--- a/client/src/app/+admin/users/users.routes.ts
+++ b/client/src/app/+admin/users/users.routes.ts
@@ -1,13 +1,20 @@
 import { Routes } from '@angular/router'
 
+import { UserRightGuard } from '../../core'
+import { UserRight } from '../../../../../shared'
 import { UsersComponent } from './users.component'
-import { UserAddComponent, UserUpdateComponent } from './user-edit'
+import { UserCreateComponent, UserUpdateComponent } from './user-edit'
 import { UserListComponent } from './user-list'
+import { ServerConfigResolver } from '@app/core/routing/server-config-resolver.service'
 
 export const UsersRoutes: Routes = [
   {
     path: 'users',
     component: UsersComponent,
+    canActivate: [ UserRightGuard ],
+    data: {
+      userRight: UserRight.MANAGE_USERS
+    },
     children: [
       {
         path: '',
@@ -24,16 +31,19 @@ export const UsersRoutes: Routes = [
         }
       },
       {
-        path: 'add',
-        component: UserAddComponent,
+        path: 'create',
+        component: UserCreateComponent,
         data: {
           meta: {
-            title: 'Add a user'
+            title: 'Create a user'
           }
+        },
+        resolve: {
+          serverConfig: ServerConfigResolver
         }
       },
       {
-        path: ':id/update',
+        path: 'update/:id',
         component: UserUpdateComponent,
         data: {
           meta: {