diff options
author | Chocobozzz <me@florianbigard.com> | 2020-08-11 09:54:42 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2020-08-11 09:54:42 +0200 |
commit | 3d25d5de33d8aa0ba00d7514522b25d22bf0e0a1 (patch) | |
tree | cc8255bf4022d725dd64c20af88fb8ed1b5ab247 | |
parent | c9ea405f1024d6cf7ec41869c4d6b0fac551f64f (diff) | |
download | PeerTube-3d25d5de33d8aa0ba00d7514522b25d22bf0e0a1.tar.gz PeerTube-3d25d5de33d8aa0ba00d7514522b25d22bf0e0a1.tar.zst PeerTube-3d25d5de33d8aa0ba00d7514522b25d22bf0e0a1.zip |
Move form modules in the form shared module
-rw-r--r-- | client/src/app/shared/shared-forms/shared-form.module.ts | 14 | ||||
-rw-r--r-- | client/src/app/shared/shared-main/shared-main.module.ts | 17 |
2 files changed, 16 insertions, 15 deletions
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 @@ | |||
1 | 1 | ||
2 | import { NgModule } from '@angular/core' | 2 | import { NgModule } from '@angular/core' |
3 | import { FormsModule, ReactiveFormsModule } from '@angular/forms' | 3 | import { FormsModule, ReactiveFormsModule } from '@angular/forms' |
4 | import { InputMaskModule } from 'primeng/inputmask' | ||
5 | import { InputSwitchModule } from 'primeng/inputswitch' | ||
6 | import { MultiSelectModule } from 'primeng/multiselect' | ||
7 | import { NgSelectModule } from '@ng-select/ng-select' | ||
4 | import { BatchDomainsValidatorsService } from '@app/shared/shared-forms/form-validators/batch-domains-validators.service' | 8 | import { BatchDomainsValidatorsService } from '@app/shared/shared-forms/form-validators/batch-domains-validators.service' |
5 | import { SharedGlobalIconModule } from '../shared-icons' | 9 | import { SharedGlobalIconModule } from '../shared-icons' |
6 | import { SharedMainModule } from '../shared-main/shared-main.module' | 10 | import { SharedMainModule } from '../shared-main/shared-main.module' |
@@ -37,6 +41,11 @@ import { SelectTagsComponent } from './select-tags.component' | |||
37 | FormsModule, | 41 | FormsModule, |
38 | ReactiveFormsModule, | 42 | ReactiveFormsModule, |
39 | 43 | ||
44 | InputMaskModule, | ||
45 | InputSwitchModule, | ||
46 | MultiSelectModule, | ||
47 | NgSelectModule, | ||
48 | |||
40 | SharedMainModule, | 49 | SharedMainModule, |
41 | SharedGlobalIconModule | 50 | SharedGlobalIconModule |
42 | ], | 51 | ], |
@@ -58,6 +67,11 @@ import { SelectTagsComponent } from './select-tags.component' | |||
58 | FormsModule, | 67 | FormsModule, |
59 | ReactiveFormsModule, | 68 | ReactiveFormsModule, |
60 | 69 | ||
70 | InputMaskModule, | ||
71 | InputSwitchModule, | ||
72 | MultiSelectModule, | ||
73 | NgSelectModule, | ||
74 | |||
61 | InputReadonlyCopyComponent, | 75 | InputReadonlyCopyComponent, |
62 | MarkdownTextareaComponent, | 76 | MarkdownTextareaComponent, |
63 | PeertubeCheckboxComponent, | 77 | 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 @@ | |||
1 | import { BytesPipe, KeysPipe, NgPipesModule } from 'ngx-pipes' | 1 | import { BytesPipe, KeysPipe, NgPipesModule } from 'ngx-pipes' |
2 | import { SharedModule as PrimeSharedModule } from 'primeng/api' | 2 | import { SharedModule as PrimeSharedModule } from 'primeng/api' |
3 | import { InputMaskModule } from 'primeng/inputmask' | ||
4 | import { InputSwitchModule } from 'primeng/inputswitch' | ||
5 | import { MultiSelectModule } from 'primeng/multiselect' | ||
6 | import { ClipboardModule } from '@angular/cdk/clipboard' | 3 | import { ClipboardModule } from '@angular/cdk/clipboard' |
7 | import { CommonModule, DatePipe } from '@angular/common' | 4 | import { CommonModule, DatePipe } from '@angular/common' |
8 | import { HttpClientModule } from '@angular/common/http' | 5 | import { HttpClientModule } from '@angular/common/http' |
@@ -17,11 +14,11 @@ import { | |||
17 | NgbPopoverModule, | 14 | NgbPopoverModule, |
18 | NgbTooltipModule | 15 | NgbTooltipModule |
19 | } from '@ng-bootstrap/ng-bootstrap' | 16 | } from '@ng-bootstrap/ng-bootstrap' |
20 | import { NgSelectModule } from '@ng-select/ng-select' | ||
21 | import { I18n } from '@ngx-translate/i18n-polyfill' | 17 | import { I18n } from '@ngx-translate/i18n-polyfill' |
22 | import { SharedGlobalIconModule } from '../shared-icons' | 18 | import { SharedGlobalIconModule } from '../shared-icons' |
23 | import { AccountService, ActorAvatarInfoComponent, AvatarComponent } from './account' | 19 | import { AccountService, ActorAvatarInfoComponent, AvatarComponent } from './account' |
24 | import { FromNowPipe, InfiniteScrollerDirective, NumberFormatterPipe, PeerTubeTemplateDirective } from './angular' | 20 | import { FromNowPipe, InfiniteScrollerDirective, NumberFormatterPipe, PeerTubeTemplateDirective } from './angular' |
21 | import { AUTH_INTERCEPTOR_PROVIDER } from './auth' | ||
25 | import { ActionDropdownComponent, ButtonComponent, DeleteButtonComponent, EditButtonComponent } from './buttons' | 22 | import { ActionDropdownComponent, ButtonComponent, DeleteButtonComponent, EditButtonComponent } from './buttons' |
26 | import { DateToggleComponent } from './date' | 23 | import { DateToggleComponent } from './date' |
27 | import { FeedComponent } from './feeds' | 24 | import { FeedComponent } from './feeds' |
@@ -31,7 +28,6 @@ import { UserHistoryService, UserNotificationsComponent, UserNotificationService | |||
31 | import { RedundancyService, VideoImportService, VideoOwnershipService, VideoService } from './video' | 28 | import { RedundancyService, VideoImportService, VideoOwnershipService, VideoService } from './video' |
32 | import { VideoCaptionService } from './video-caption' | 29 | import { VideoCaptionService } from './video-caption' |
33 | import { VideoChannelService } from './video-channel' | 30 | import { VideoChannelService } from './video-channel' |
34 | import { AUTH_INTERCEPTOR_PROVIDER } from './auth' | ||
35 | 31 | ||
36 | @NgModule({ | 32 | @NgModule({ |
37 | imports: [ | 33 | imports: [ |
@@ -51,12 +47,7 @@ import { AUTH_INTERCEPTOR_PROVIDER } from './auth' | |||
51 | ClipboardModule, | 47 | ClipboardModule, |
52 | 48 | ||
53 | PrimeSharedModule, | 49 | PrimeSharedModule, |
54 | InputMaskModule, | ||
55 | NgPipesModule, | 50 | NgPipesModule, |
56 | MultiSelectModule, | ||
57 | InputSwitchModule, | ||
58 | |||
59 | NgSelectModule, | ||
60 | 51 | ||
61 | SharedGlobalIconModule | 52 | SharedGlobalIconModule |
62 | ], | 53 | ], |
@@ -107,10 +98,8 @@ import { AUTH_INTERCEPTOR_PROVIDER } from './auth' | |||
107 | ClipboardModule, | 98 | ClipboardModule, |
108 | 99 | ||
109 | PrimeSharedModule, | 100 | PrimeSharedModule, |
110 | InputMaskModule, | ||
111 | BytesPipe, | 101 | BytesPipe, |
112 | KeysPipe, | 102 | KeysPipe, |
113 | MultiSelectModule, | ||
114 | 103 | ||
115 | AvatarComponent, | 104 | AvatarComponent, |
116 | ActorAvatarInfoComponent, | 105 | ActorAvatarInfoComponent, |
@@ -137,9 +126,7 @@ import { AUTH_INTERCEPTOR_PROVIDER } from './auth' | |||
137 | TopMenuDropdownComponent, | 126 | TopMenuDropdownComponent, |
138 | 127 | ||
139 | UserQuotaComponent, | 128 | UserQuotaComponent, |
140 | UserNotificationsComponent, | 129 | UserNotificationsComponent |
141 | |||
142 | NgSelectModule | ||
143 | ], | 130 | ], |
144 | 131 | ||
145 | providers: [ | 132 | providers: [ |