From 3d25d5de33d8aa0ba00d7514522b25d22bf0e0a1 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 11 Aug 2020 09:54:42 +0200 Subject: Move form modules in the form shared module --- .../src/app/shared/shared-forms/shared-form.module.ts | 14 ++++++++++++++ client/src/app/shared/shared-main/shared-main.module.ts | 17 ++--------------- 2 files changed, 16 insertions(+), 15 deletions(-) (limited to 'client') diff --git a/client/src/app/shared/shared-forms/shared-form.module.ts b/client/src/app/shared/shared-forms/shared-form.module.ts index 19d812948..ea6270083 100644 --- a/client/src/app/shared/shared-forms/shared-form.module.ts +++ b/client/src/app/shared/shared-forms/shared-form.module.ts @@ -1,6 +1,10 @@ import { NgModule } from '@angular/core' import { FormsModule, ReactiveFormsModule } from '@angular/forms' +import { InputMaskModule } from 'primeng/inputmask' +import { InputSwitchModule } from 'primeng/inputswitch' +import { MultiSelectModule } from 'primeng/multiselect' +import { NgSelectModule } from '@ng-select/ng-select' import { BatchDomainsValidatorsService } from '@app/shared/shared-forms/form-validators/batch-domains-validators.service' import { SharedGlobalIconModule } from '../shared-icons' import { SharedMainModule } from '../shared-main/shared-main.module' @@ -37,6 +41,11 @@ import { SelectTagsComponent } from './select-tags.component' FormsModule, ReactiveFormsModule, + InputMaskModule, + InputSwitchModule, + MultiSelectModule, + NgSelectModule, + SharedMainModule, SharedGlobalIconModule ], @@ -58,6 +67,11 @@ import { SelectTagsComponent } from './select-tags.component' FormsModule, ReactiveFormsModule, + InputMaskModule, + InputSwitchModule, + MultiSelectModule, + NgSelectModule, + InputReadonlyCopyComponent, MarkdownTextareaComponent, PeertubeCheckboxComponent, diff --git a/client/src/app/shared/shared-main/shared-main.module.ts b/client/src/app/shared/shared-main/shared-main.module.ts index a4d18d562..c6192f6f8 100644 --- a/client/src/app/shared/shared-main/shared-main.module.ts +++ b/client/src/app/shared/shared-main/shared-main.module.ts @@ -1,8 +1,5 @@ import { BytesPipe, KeysPipe, NgPipesModule } from 'ngx-pipes' import { SharedModule as PrimeSharedModule } from 'primeng/api' -import { InputMaskModule } from 'primeng/inputmask' -import { InputSwitchModule } from 'primeng/inputswitch' -import { MultiSelectModule } from 'primeng/multiselect' import { ClipboardModule } from '@angular/cdk/clipboard' import { CommonModule, DatePipe } from '@angular/common' import { HttpClientModule } from '@angular/common/http' @@ -17,11 +14,11 @@ import { NgbPopoverModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap' -import { NgSelectModule } from '@ng-select/ng-select' import { I18n } from '@ngx-translate/i18n-polyfill' import { SharedGlobalIconModule } from '../shared-icons' import { AccountService, ActorAvatarInfoComponent, AvatarComponent } from './account' import { FromNowPipe, InfiniteScrollerDirective, NumberFormatterPipe, PeerTubeTemplateDirective } from './angular' +import { AUTH_INTERCEPTOR_PROVIDER } from './auth' import { ActionDropdownComponent, ButtonComponent, DeleteButtonComponent, EditButtonComponent } from './buttons' import { DateToggleComponent } from './date' import { FeedComponent } from './feeds' @@ -31,7 +28,6 @@ import { UserHistoryService, UserNotificationsComponent, UserNotificationService import { RedundancyService, VideoImportService, VideoOwnershipService, VideoService } from './video' import { VideoCaptionService } from './video-caption' import { VideoChannelService } from './video-channel' -import { AUTH_INTERCEPTOR_PROVIDER } from './auth' @NgModule({ imports: [ @@ -51,12 +47,7 @@ import { AUTH_INTERCEPTOR_PROVIDER } from './auth' ClipboardModule, PrimeSharedModule, - InputMaskModule, NgPipesModule, - MultiSelectModule, - InputSwitchModule, - - NgSelectModule, SharedGlobalIconModule ], @@ -107,10 +98,8 @@ import { AUTH_INTERCEPTOR_PROVIDER } from './auth' ClipboardModule, PrimeSharedModule, - InputMaskModule, BytesPipe, KeysPipe, - MultiSelectModule, AvatarComponent, ActorAvatarInfoComponent, @@ -137,9 +126,7 @@ import { AUTH_INTERCEPTOR_PROVIDER } from './auth' TopMenuDropdownComponent, UserQuotaComponent, - UserNotificationsComponent, - - NgSelectModule + UserNotificationsComponent ], providers: [ -- cgit v1.2.3