X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fshared%2Fshared.module.ts;h=d1320aeece0f4226b0391e33a9a8dd7c38620c13;hb=7b95f31385eca59ac18197539de30268acc18986;hp=fdfb90600b2f63fb13b48efc620ab25073524c73;hpb=0f7fedc39857ebc0eb29182c1588a92b9adfb75a;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/shared/shared.module.ts b/client/src/app/shared/shared.module.ts index fdfb90600..d1320aeec 100644 --- a/client/src/app/shared/shared.module.ts +++ b/client/src/app/shared/shared.module.ts @@ -8,17 +8,13 @@ import { HelpComponent } from '@app/shared/misc/help.component' import { InfiniteScrollerDirective } from '@app/shared/video/infinite-scroller.directive' import { MarkdownService } from '@app/videos/shared' -import { BsDropdownModule } from 'ngx-bootstrap/dropdown' -import { ModalModule } from 'ngx-bootstrap/modal' -import { PopoverModule } from 'ngx-bootstrap/popover' -import { TabsModule } from 'ngx-bootstrap/tabs' -import { TooltipModule } from 'ngx-bootstrap/tooltip' import { BytesPipe, KeysPipe, NgPipesModule } from 'ngx-pipes' import { SharedModule as PrimeSharedModule } from 'primeng/components/common/shared' import { AUTH_INTERCEPTOR_PROVIDER } from './auth' -import { DeleteButtonComponent } from './misc/delete-button.component' -import { EditButtonComponent } from './misc/edit-button.component' +import { ButtonComponent } from './buttons/button.component' +import { DeleteButtonComponent } from './buttons/delete-button.component' +import { EditButtonComponent } from './buttons/edit-button.component' import { FromNowPipe } from './misc/from-now.pipe' import { LoaderComponent } from './misc/loader.component' import { NumberFormatterPipe } from './misc/number-formatter.pipe' @@ -27,8 +23,9 @@ import { RestExtractor, RestService } from './rest' import { UserService } from './users' import { VideoAbuseService } from './video-abuse' import { VideoBlacklistService } from './video-blacklist' +import { VideoOwnershipService } from './video-ownership' import { VideoMiniatureComponent } from './video/video-miniature.component' -import { VideoFeedComponent } from './video/video-feed.component' +import { FeedComponent } from './video/feed.component' import { VideoThumbnailComponent } from './video/video-thumbnail.component' import { VideoService } from './video/video.service' import { AccountService } from '@app/shared/account/account.service' @@ -37,15 +34,39 @@ import { I18n } from '@ngx-translate/i18n-polyfill' import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' import { CustomConfigValidatorsService, - LoginValidatorsService, ReactiveFileComponent, + LoginValidatorsService, + ReactiveFileComponent, ResetPasswordValidatorsService, - UserValidatorsService, VideoAbuseValidatorsService, VideoChannelValidatorsService, VideoCommentValidatorsService, VideoValidatorsService + InstanceValidatorsService, + TextareaAutoResizeDirective, + UserValidatorsService, + VideoAbuseValidatorsService, + VideoAcceptOwnershipValidatorsService, + VideoBlacklistValidatorsService, + VideoChangeOwnershipValidatorsService, + VideoChannelValidatorsService, + VideoCommentValidatorsService, + VideoValidatorsService } from '@app/shared/forms' import { I18nPrimengCalendarService } from '@app/shared/i18n/i18n-primeng-calendar' import { ScreenService } from '@app/shared/misc/screen.service' import { VideoCaptionsValidatorsService } from '@app/shared/forms/form-validators/video-captions-validators.service' import { VideoCaptionService } from '@app/shared/video-caption' import { PeertubeCheckboxComponent } from '@app/shared/forms/peertube-checkbox.component' +import { VideoImportService } from '@app/shared/video-import/video-import.service' +import { ActionDropdownComponent } from '@app/shared/buttons/action-dropdown.component' +import { NgbDropdownModule, NgbModalModule, NgbPopoverModule, NgbTabsetModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap' +import { RemoteSubscribeComponent, SubscribeButtonComponent, UserSubscriptionService } from '@app/shared/user-subscription' +import { InstanceFeaturesTableComponent } from '@app/shared/instance/instance-features-table.component' +import { OverviewService } from '@app/shared/overview' +import { UserBanModalComponent } from '@app/shared/moderation' +import { UserModerationDropdownComponent } from '@app/shared/moderation/user-moderation-dropdown.component' +import { BlocklistService } from '@app/shared/blocklist' +import { TopMenuDropdownComponent } from '@app/shared/menu/top-menu-dropdown.component' +import { UserHistoryService } from '@app/shared/users/user-history.service' +import { UserNotificationService } from '@app/shared/users/user-notification.service' +import { UserNotificationsComponent } from '@app/shared/users/user-notifications.component' +import { InstanceService } from '@app/shared/instance/instance.service' @NgModule({ imports: [ @@ -55,11 +76,11 @@ import { PeertubeCheckboxComponent } from '@app/shared/forms/peertube-checkbox.c RouterModule, HttpClientModule, - BsDropdownModule.forRoot(), - ModalModule.forRoot(), - PopoverModule.forRoot(), - TabsModule.forRoot(), - TooltipModule.forRoot(), + NgbDropdownModule, + NgbModalModule, + NgbPopoverModule, + NgbTabsetModule, + NgbTooltipModule, PrimeSharedModule, NgPipesModule @@ -69,17 +90,27 @@ import { PeertubeCheckboxComponent } from '@app/shared/forms/peertube-checkbox.c LoaderComponent, VideoThumbnailComponent, VideoMiniatureComponent, - VideoFeedComponent, + FeedComponent, + ButtonComponent, DeleteButtonComponent, EditButtonComponent, + ActionDropdownComponent, NumberFormatterPipe, ObjectLengthPipe, FromNowPipe, MarkdownTextareaComponent, InfiniteScrollerDirective, + TextareaAutoResizeDirective, HelpComponent, ReactiveFileComponent, - PeertubeCheckboxComponent + PeertubeCheckboxComponent, + SubscribeButtonComponent, + RemoteSubscribeComponent, + InstanceFeaturesTableComponent, + UserBanModalComponent, + UserModerationDropdownComponent, + TopMenuDropdownComponent, + UserNotificationsComponent ], exports: [ @@ -89,11 +120,12 @@ import { PeertubeCheckboxComponent } from '@app/shared/forms/peertube-checkbox.c RouterModule, HttpClientModule, - BsDropdownModule, - ModalModule, - PopoverModule, - TabsModule, - TooltipModule, + NgbDropdownModule, + NgbModalModule, + NgbPopoverModule, + NgbTabsetModule, + NgbTooltipModule, + PrimeSharedModule, BytesPipe, KeysPipe, @@ -101,14 +133,24 @@ import { PeertubeCheckboxComponent } from '@app/shared/forms/peertube-checkbox.c LoaderComponent, VideoThumbnailComponent, VideoMiniatureComponent, - VideoFeedComponent, + FeedComponent, + ButtonComponent, DeleteButtonComponent, EditButtonComponent, + ActionDropdownComponent, MarkdownTextareaComponent, InfiniteScrollerDirective, + TextareaAutoResizeDirective, HelpComponent, ReactiveFileComponent, PeertubeCheckboxComponent, + SubscribeButtonComponent, + RemoteSubscribeComponent, + InstanceFeaturesTableComponent, + UserBanModalComponent, + UserModerationDropdownComponent, + TopMenuDropdownComponent, + UserNotificationsComponent, NumberFormatterPipe, ObjectLengthPipe, @@ -121,12 +163,15 @@ import { PeertubeCheckboxComponent } from '@app/shared/forms/peertube-checkbox.c RestService, VideoAbuseService, VideoBlacklistService, + VideoOwnershipService, UserService, VideoService, AccountService, MarkdownService, VideoChannelService, VideoCaptionService, + VideoImportService, + UserSubscriptionService, FormValidatorService, CustomConfigValidatorsService, @@ -138,10 +183,20 @@ import { PeertubeCheckboxComponent } from '@app/shared/forms/peertube-checkbox.c VideoCommentValidatorsService, VideoValidatorsService, VideoCaptionsValidatorsService, + VideoBlacklistValidatorsService, + OverviewService, + VideoChangeOwnershipValidatorsService, + VideoAcceptOwnershipValidatorsService, + InstanceValidatorsService, + BlocklistService, + UserHistoryService, + InstanceService, I18nPrimengCalendarService, ScreenService, + UserNotificationService, + I18n ] })