diff options
Diffstat (limited to 'client/src/app/+admin/users')
6 files changed, 27 insertions, 48 deletions
diff --git a/client/src/app/+admin/users/user-edit/user-create.component.ts b/client/src/app/+admin/users/user-edit/user-create.component.ts index b459eb8fa..f9f5b90bd 100644 --- a/client/src/app/+admin/users/user-edit/user-create.component.ts +++ b/client/src/app/+admin/users/user-edit/user-create.component.ts | |||
@@ -1,14 +1,11 @@ | |||
1 | import { Component, OnInit } from '@angular/core' | 1 | import { Component, OnInit } from '@angular/core' |
2 | import { Router, ActivatedRoute } from '@angular/router' | 2 | import { ActivatedRoute, Router } from '@angular/router' |
3 | import { AuthService, Notifier, ServerService } from '@app/core' | ||
4 | import { UserCreate, UserRole } from '../../../../../../shared' | ||
5 | import { UserEdit } from './user-edit' | ||
6 | import { I18n } from '@ngx-translate/i18n-polyfill' | ||
7 | import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' | ||
8 | import { UserValidatorsService } from '@app/shared/forms/form-validators/user-validators.service' | ||
9 | import { ConfigService } from '@app/+admin/config/shared/config.service' | 3 | import { ConfigService } from '@app/+admin/config/shared/config.service' |
10 | import { UserService } from '@app/shared' | 4 | import { AuthService, Notifier, ScreenService, ServerService, UserService } from '@app/core' |
11 | import { ScreenService } from '@app/shared/misc/screen.service' | 5 | import { FormValidatorService, UserValidatorsService } from '@app/shared/shared-forms' |
6 | import { I18n } from '@ngx-translate/i18n-polyfill' | ||
7 | import { UserCreate, UserRole } from '@shared/models' | ||
8 | import { UserEdit } from './user-edit' | ||
12 | 9 | ||
13 | @Component({ | 10 | @Component({ |
14 | selector: 'my-user-create', | 11 | selector: 'my-user-create', |
diff --git a/client/src/app/+admin/users/user-edit/user-edit.ts b/client/src/app/+admin/users/user-edit/user-edit.ts index 5f5cc590c..8fa4b0635 100644 --- a/client/src/app/+admin/users/user-edit/user-edit.ts +++ b/client/src/app/+admin/users/user-edit/user-edit.ts | |||
@@ -1,11 +1,8 @@ | |||
1 | import { AuthService, ServerService } from '../../../core' | ||
2 | import { FormReactive } from '../../../shared' | ||
3 | import { ServerConfig, USER_ROLE_LABELS, UserRole, VideoResolution } from '../../../../../../shared' | ||
4 | import { ConfigService } from '@app/+admin/config/shared/config.service' | ||
5 | import { UserAdminFlag } from '@shared/models/users/user-flag.model' | ||
6 | import { OnInit } from '@angular/core' | 1 | import { OnInit } from '@angular/core' |
7 | import { User } from '@app/shared/users/user.model' | 2 | import { ConfigService } from '@app/+admin/config/shared/config.service' |
8 | import { ScreenService } from '@app/shared/misc/screen.service' | 3 | import { AuthService, ScreenService, ServerService, User } from '@app/core' |
4 | import { FormReactive } from '@app/shared/shared-forms' | ||
5 | import { ServerConfig, USER_ROLE_LABELS, UserAdminFlag, UserRole, VideoResolution } from '@shared/models' | ||
9 | 6 | ||
10 | export abstract class UserEdit extends FormReactive implements OnInit { | 7 | export abstract class UserEdit extends FormReactive implements OnInit { |
11 | videoQuotaOptions: { value: string, label: string, disabled?: boolean }[] = [] | 8 | videoQuotaOptions: { value: string, label: string, disabled?: boolean }[] = [] |
diff --git a/client/src/app/+admin/users/user-edit/user-password.component.ts b/client/src/app/+admin/users/user-edit/user-password.component.ts index ecad000f7..33c7de31f 100644 --- a/client/src/app/+admin/users/user-edit/user-password.component.ts +++ b/client/src/app/+admin/users/user-edit/user-password.component.ts | |||
@@ -1,12 +1,8 @@ | |||
1 | import { Component, Input, OnInit } from '@angular/core' | 1 | import { Component, Input, OnInit } from '@angular/core' |
2 | import { ActivatedRoute, Router } from '@angular/router' | 2 | import { Notifier, UserService } from '@app/core' |
3 | import { UserService } from '@app/shared/users/user.service' | 3 | import { FormReactive, FormValidatorService, UserValidatorsService } from '@app/shared/shared-forms' |
4 | import { Notifier } from '../../../core' | ||
5 | import { User, UserUpdate } from '../../../../../../shared' | ||
6 | import { I18n } from '@ngx-translate/i18n-polyfill' | 4 | import { I18n } from '@ngx-translate/i18n-polyfill' |
7 | import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' | 5 | import { UserUpdate } from '@shared/models' |
8 | import { UserValidatorsService } from '@app/shared/forms/form-validators/user-validators.service' | ||
9 | import { FormReactive } from '../../../shared' | ||
10 | 6 | ||
11 | @Component({ | 7 | @Component({ |
12 | selector: 'my-user-password', | 8 | selector: 'my-user-password', |
diff --git a/client/src/app/+admin/users/user-edit/user-update.component.ts b/client/src/app/+admin/users/user-edit/user-update.component.ts index 035c0d4bb..870880fee 100644 --- a/client/src/app/+admin/users/user-edit/user-update.component.ts +++ b/client/src/app/+admin/users/user-edit/user-update.component.ts | |||
@@ -1,18 +1,12 @@ | |||
1 | import { Subscription } from 'rxjs' | ||
1 | import { Component, OnDestroy, OnInit } from '@angular/core' | 2 | import { Component, OnDestroy, OnInit } from '@angular/core' |
2 | import { ActivatedRoute, Router } from '@angular/router' | 3 | import { ActivatedRoute, Router } from '@angular/router' |
3 | import { Subscription } from 'rxjs' | ||
4 | import { AuthService, Notifier } from '@app/core' | ||
5 | import { ServerService } from '../../../core' | ||
6 | import { UserEdit } from './user-edit' | ||
7 | import { User as UserType, UserUpdate, UserRole } from '../../../../../../shared' | ||
8 | import { I18n } from '@ngx-translate/i18n-polyfill' | ||
9 | import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' | ||
10 | import { UserValidatorsService } from '@app/shared/forms/form-validators/user-validators.service' | ||
11 | import { ConfigService } from '@app/+admin/config/shared/config.service' | 4 | import { ConfigService } from '@app/+admin/config/shared/config.service' |
12 | import { UserService } from '@app/shared' | 5 | import { AuthService, Notifier, ScreenService, ServerService, User, UserService } from '@app/core' |
13 | import { UserAdminFlag } from '@shared/models/users/user-flag.model' | 6 | import { FormValidatorService, UserValidatorsService } from '@app/shared/shared-forms' |
14 | import { User } from '@app/shared/users/user.model' | 7 | import { I18n } from '@ngx-translate/i18n-polyfill' |
15 | import { ScreenService } from '@app/shared/misc/screen.service' | 8 | import { User as UserType, UserAdminFlag, UserRole, UserUpdate } from '@shared/models' |
9 | import { UserEdit } from './user-edit' | ||
16 | 10 | ||
17 | @Component({ | 11 | @Component({ |
18 | selector: 'my-user-update', | 12 | selector: 'my-user-update', |
diff --git a/client/src/app/+admin/users/user-list/user-list.component.ts b/client/src/app/+admin/users/user-list/user-list.component.ts index da50b7ed0..8f01c7d51 100644 --- a/client/src/app/+admin/users/user-list/user-list.component.ts +++ b/client/src/app/+admin/users/user-list/user-list.component.ts | |||
@@ -1,13 +1,10 @@ | |||
1 | import { Component, OnInit, ViewChild } from '@angular/core' | ||
2 | import { AuthService, Notifier } from '@app/core' | ||
3 | import { SortMeta } from 'primeng/api' | 1 | import { SortMeta } from 'primeng/api' |
4 | import { ConfirmService, ServerService } from '../../../core' | 2 | import { Component, OnInit, ViewChild } from '@angular/core' |
5 | import { RestPagination, RestTable, UserService } from '../../../shared' | 3 | import { AuthService, ConfirmService, Notifier, RestPagination, RestTable, ServerService, UserService } from '@app/core' |
4 | import { Actor, DropdownAction } from '@app/shared/shared-main' | ||
5 | import { UserBanModalComponent } from '@app/shared/shared-moderation' | ||
6 | import { I18n } from '@ngx-translate/i18n-polyfill' | 6 | import { I18n } from '@ngx-translate/i18n-polyfill' |
7 | import { ServerConfig, User } from '../../../../../../shared' | 7 | import { ServerConfig, User } from '@shared/models' |
8 | import { UserBanModalComponent } from '@app/shared/moderation' | ||
9 | import { DropdownAction } from '@app/shared/buttons/action-dropdown.component' | ||
10 | import { Actor } from '@app/shared/actor/actor.model' | ||
11 | 8 | ||
12 | @Component({ | 9 | @Component({ |
13 | selector: 'my-user-list', | 10 | selector: 'my-user-list', |
diff --git a/client/src/app/+admin/users/users.routes.ts b/client/src/app/+admin/users/users.routes.ts index 2d4f9305e..6560f0260 100644 --- a/client/src/app/+admin/users/users.routes.ts +++ b/client/src/app/+admin/users/users.routes.ts | |||
@@ -1,11 +1,9 @@ | |||
1 | import { Routes } from '@angular/router' | 1 | import { Routes } from '@angular/router' |
2 | 2 | import { ServerConfigResolver, UserRightGuard } from '@app/core' | |
3 | import { UserRightGuard } from '../../core' | 3 | import { UserRight } from '@shared/models' |
4 | import { UserRight } from '../../../../../shared' | ||
5 | import { UsersComponent } from './users.component' | ||
6 | import { UserCreateComponent, UserUpdateComponent } from './user-edit' | 4 | import { UserCreateComponent, UserUpdateComponent } from './user-edit' |
7 | import { UserListComponent } from './user-list' | 5 | import { UserListComponent } from './user-list' |
8 | import { ServerConfigResolver } from '@app/core/routing/server-config-resolver.service' | 6 | import { UsersComponent } from './users.component' |
9 | 7 | ||
10 | export const UsersRoutes: Routes = [ | 8 | export const UsersRoutes: Routes = [ |
11 | { | 9 | { |