From 2dbb83c11b067ac1f21a2a0d6431bf9ef29ed67f Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 23 Sep 2024 10:25:19 +0200 Subject: [PATCH] Reorganize main shared --- .../instance-statistics.component.ts | 2 +- .../account-video-channels.component.ts | 6 ++--- .../src/app/+accounts/accounts.component.ts | 8 +++---- client/src/app/+admin/admin.component.ts | 6 ++--- .../edit-advanced-configuration.component.ts | 4 ++-- .../edit-basic-configuration.component.ts | 4 ++-- .../edit-instance-information.component.ts | 4 ++-- .../edit-live-configuration.component.ts | 2 +- .../edit-vod-transcoding.component.ts | 2 +- .../followers-list.component.ts | 2 +- .../following-list.component.ts | 2 +- .../video-redundancies-list.component.ts | 4 ++-- .../video-redundancy-information.component.ts | 2 +- .../instance-account-blocklist.component.ts | 2 +- .../instance-server-blocklist.component.ts | 2 +- .../registration-list.component.ts | 2 +- .../video-block-list.component.ts | 2 +- .../users/user-edit/user-create.component.ts | 6 ++--- .../users/user-edit/user-update.component.ts | 6 ++--- .../users/user-list/user-list.component.ts | 6 ++--- .../overview/videos/video-list.component.ts | 4 ++-- .../plugin-list-installed.component.ts | 2 +- .../plugin-search/plugin-search.component.ts | 4 ++-- .../shared/user-real-quota-info.component.ts | 2 +- .../runner-job-list.component.ts | 2 +- .../runner-list/runner-list.component.ts | 2 +- ...unner-registration-token-list.component.ts | 2 +- .../app/+error-page/error-page.component.ts | 4 ++-- client/src/app/+login/login.component.html | 2 +- client/src/app/+login/login.component.ts | 2 +- .../video-channel-create.component.ts | 6 ++--- .../video-channel-edit/video-channel-edit.ts | 2 +- .../video-channel-update.component.ts | 4 ++-- .../my-account-blocklist.component.ts | 2 +- .../my-account-server-blocklist.component.ts | 2 +- .../my-account-export.component.ts | 2 +- .../my-account-import.component.ts | 2 +- .../app/+my-account/my-account.component.ts | 2 +- .../my-video-channels.component.ts | 12 +++++----- .../my-follows/my-followers.component.ts | 2 +- .../my-follows/my-subscriptions.component.ts | 4 ++-- .../my-history/my-history.component.ts | 2 +- .../app/+my-library/my-library.component.ts | 2 +- .../my-ownership/my-ownership.component.ts | 2 +- .../my-video-channel-syncs.component.ts | 20 ++++++++-------- .../video-channel-sync-edit.component.ts | 12 +++++----- .../my-video-imports.component.ts | 2 +- .../my-video-playlist-create.component.ts | 2 +- .../my-video-playlist-elements.component.ts | 2 +- .../my-video-playlist-update.component.ts | 2 +- .../my-video-playlists.component.ts | 4 ++-- .../my-videos/my-videos.component.ts | 2 +- .../remote-interaction.component.ts | 2 +- client/src/app/+search/search.component.ts | 6 ++--- .../shared/channel-lazy-load.resolver.ts | 2 +- .../+signup/+register/register.component.ts | 4 ++-- .../steps/register-step-about.component.ts | 2 +- .../steps/register-step-channel.component.ts | 2 +- .../steps/register-step-terms.component.ts | 2 +- .../app/+stats/video/video-stats.component.ts | 6 ++--- .../video-channel-playlists.component.ts | 6 ++--- .../video-channel-videos.component.ts | 4 ++-- .../video-channels.component.ts | 6 ++--- ...eo-caption-edit-modal-content.component.ts | 2 +- .../thumbnail-manager.component.ts | 2 +- .../shared/video-edit.component.ts | 4 ++-- .../shared/video-upload.service.ts | 2 +- .../video-go-live.component.ts | 2 +- .../video-import-torrent.component.ts | 4 ++-- .../video-import-url.component.ts | 4 ++-- .../+video-edit/video-add.component.ts | 2 +- .../comment/video-comment-add.component.ts | 24 +++++++++---------- .../shared/comment/video-comment.component.ts | 2 +- .../comment/video-comments.component.ts | 4 ++-- .../metadata/video-attributes.component.ts | 2 +- .../video-transcription.component.ts | 2 +- .../video-watch-playlist.component.ts | 2 +- .../overview/video-overview.component.ts | 2 +- client/src/app/menu/menu.component.ts | 4 ++-- .../menu/notification-dropdown.component.ts | 2 +- .../abuse-list-table.component.ts | 2 +- .../actor-avatar.component.ts | 2 +- .../button-markup.component.ts | 2 +- .../channel-miniature-markup.component.ts | 2 +- .../dynamic-form-field.component.ts | 2 +- .../peertube-checkbox.component.ts | 4 ++-- .../shared-forms/preview-upload.component.ts | 2 +- .../select/select-channel.component.ts | 2 +- .../instance-features-table.component.ts | 8 +++---- .../shared-main/buttons/button.component.ts | 2 +- .../{misc => buttons}/help.component.html | 0 .../{misc => buttons}/help.component.scss | 0 .../{misc => buttons}/help.component.ts | 2 +- .../channels-setup-message.component.html | 0 .../channels-setup-message.component.scss | 0 .../channels-setup-message.component.ts | 2 +- .../video-channel-sync.service.ts | 0 .../video-channel.model.ts | 0 .../video-channel.service.ts | 0 .../auto-colspan.directive.ts | 0 .../autofocus.directive.ts | 0 .../{angular => common}/bytes.pipe.ts | 0 .../defer-loading.directive.ts | 0 .../infinite-scroller.directive.ts | 0 .../{angular => common}/link.component.html | 0 .../{angular => common}/link.component.scss | 0 .../{angular => common}/link.component.ts | 0 .../{loaders => common}/loader.component.ts | 0 .../{angular => common}/nl2br.pipe.ts | 0 .../number-formatter.pipe.ts | 0 .../peertube-template.directive.ts | 0 .../progress-bar.component.html | 0 .../progress-bar.component.scss | 0 .../progress-bar.component.ts | 0 .../shared-main/date/date-toggle.component.ts | 2 +- .../days-duration-formatter.pipe.ts | 0 .../{angular => date}/from-now.pipe.ts | 0 .../time-duration-formatter.pipe.ts | 0 .../app/shared/shared-main/main-providers.ts | 12 ++++++---- .../list-overflow.component.html | 0 .../list-overflow.component.scss | 0 .../{misc => menu}/list-overflow.component.ts | 0 .../top-menu-dropdown.component.html | 0 .../top-menu-dropdown.component.scss | 0 .../top-menu-dropdown.component.ts | 0 .../router/actor-redirect-guard.service.ts | 2 +- .../simple-search-input.component.html | 0 .../simple-search-input.component.scss | 0 .../simple-search-input.component.ts | 0 .../login-link.component.html | 0 .../login-link.component.ts | 4 ++-- .../signup-label.component.html | 0 .../signup-label.component.ts | 0 .../users/user-notification.model.ts | 2 +- .../shared-main/users/user-quota.component.ts | 4 ++-- .../shared-main/video/video-details.model.ts | 2 +- .../shared/shared-main/video/video.service.ts | 4 ++-- .../report-modals/account-report.component.ts | 2 +- .../report-modals/comment-report.component.ts | 2 +- .../report-modals/video-report.component.ts | 2 +- .../shared-search/find-in-bulk.service.ts | 2 +- .../shared/shared-search/search.service.ts | 4 ++-- .../user-video-settings.component.ts | 4 ++-- .../remote-subscribe.component.ts | 4 ++-- .../subscribe-button.component.ts | 4 ++-- .../user-subscription.service.ts | 4 ++-- ...ideo-comment-list-admin-owner.component.ts | 2 +- .../video-files-download.component.ts | 4 ++-- .../video-generate-download.component.ts | 2 +- .../video-miniature.component.ts | 2 +- .../videos-list.component.ts | 2 +- .../videos-selection.component.ts | 4 ++-- .../video-playlist-miniature.component.ts | 4 ++-- .../video-playlist.service.ts | 4 ++-- .../video-views-counter.component.ts | 2 +- .../user-notifications.component.ts | 4 ++-- .../upload-progress.component.ts | 2 +- ...atched-words-list-admin-owner.component.ts | 2 +- 158 files changed, 214 insertions(+), 212 deletions(-) rename client/src/app/shared/shared-main/{misc => buttons}/help.component.html (100%) rename client/src/app/shared/shared-main/{misc => buttons}/help.component.scss (100%) rename client/src/app/shared/shared-main/{misc => buttons}/help.component.ts (97%) rename client/src/app/shared/shared-main/{misc => channel}/channels-setup-message.component.html (100%) rename client/src/app/shared/shared-main/{misc => channel}/channels-setup-message.component.scss (100%) rename client/src/app/shared/shared-main/{misc => channel}/channels-setup-message.component.ts (93%) rename client/src/app/shared/shared-main/{video-channel-sync => channel}/video-channel-sync.service.ts (100%) rename client/src/app/shared/shared-main/{video-channel => channel}/video-channel.model.ts (100%) rename client/src/app/shared/shared-main/{video-channel => channel}/video-channel.service.ts (100%) rename client/src/app/shared/shared-main/{angular => common}/auto-colspan.directive.ts (100%) rename client/src/app/shared/shared-main/{angular => common}/autofocus.directive.ts (100%) rename client/src/app/shared/shared-main/{angular => common}/bytes.pipe.ts (100%) rename client/src/app/shared/shared-main/{angular => common}/defer-loading.directive.ts (100%) rename client/src/app/shared/shared-main/{angular => common}/infinite-scroller.directive.ts (100%) rename client/src/app/shared/shared-main/{angular => common}/link.component.html (100%) rename client/src/app/shared/shared-main/{angular => common}/link.component.scss (100%) rename client/src/app/shared/shared-main/{angular => common}/link.component.ts (100%) rename client/src/app/shared/shared-main/{loaders => common}/loader.component.ts (100%) rename client/src/app/shared/shared-main/{angular => common}/nl2br.pipe.ts (100%) rename client/src/app/shared/shared-main/{angular => common}/number-formatter.pipe.ts (100%) rename client/src/app/shared/shared-main/{angular => common}/peertube-template.directive.ts (100%) rename client/src/app/shared/shared-main/{misc => common}/progress-bar.component.html (100%) rename client/src/app/shared/shared-main/{misc => common}/progress-bar.component.scss (100%) rename client/src/app/shared/shared-main/{misc => common}/progress-bar.component.ts (100%) rename client/src/app/shared/shared-main/{angular => date}/days-duration-formatter.pipe.ts (100%) rename client/src/app/shared/shared-main/{angular => date}/from-now.pipe.ts (100%) rename client/src/app/shared/shared-main/{angular => date}/time-duration-formatter.pipe.ts (100%) rename client/src/app/shared/shared-main/{misc => menu}/list-overflow.component.html (100%) rename client/src/app/shared/shared-main/{misc => menu}/list-overflow.component.scss (100%) rename client/src/app/shared/shared-main/{misc => menu}/list-overflow.component.ts (100%) rename client/src/app/shared/shared-main/{misc => menu}/top-menu-dropdown.component.html (100%) rename client/src/app/shared/shared-main/{misc => menu}/top-menu-dropdown.component.scss (100%) rename client/src/app/shared/shared-main/{misc => menu}/top-menu-dropdown.component.ts (100%) rename client/src/app/shared/shared-main/{misc => search}/simple-search-input.component.html (100%) rename client/src/app/shared/shared-main/{misc => search}/simple-search-input.component.scss (100%) rename client/src/app/shared/shared-main/{misc => search}/simple-search-input.component.ts (100%) rename client/src/app/shared/shared-main/{angular => users}/login-link.component.html (100%) rename client/src/app/shared/shared-main/{angular => users}/login-link.component.ts (91%) rename client/src/app/shared/shared-main/{account => users}/signup-label.component.html (100%) rename client/src/app/shared/shared-main/{account => users}/signup-label.component.ts (100%) diff --git a/client/src/app/+about/about-instance/instance-statistics.component.ts b/client/src/app/+about/about-instance/instance-statistics.component.ts index cc918f856..bc257803f 100644 --- a/client/src/app/+about/about-instance/instance-statistics.component.ts +++ b/client/src/app/+about/about-instance/instance-statistics.component.ts @@ -1,6 +1,6 @@ import { Component, Input } from '@angular/core' import { ServerStats } from '@peertube/peertube-models' -import { BytesPipe } from '../../shared/shared-main/angular/bytes.pipe' +import { BytesPipe } from '../../shared/shared-main/common/bytes.pipe' import { GlobalIconComponent } from '../../shared/shared-icons/global-icon.component' import { NgIf, DecimalPipe } from '@angular/common' diff --git a/client/src/app/+accounts/account-video-channels/account-video-channels.component.ts b/client/src/app/+accounts/account-video-channels/account-video-channels.component.ts index 34e03d6fd..f31382ff9 100644 --- a/client/src/app/+accounts/account-video-channels/account-video-channels.component.ts +++ b/client/src/app/+accounts/account-video-channels/account-video-channels.component.ts @@ -8,12 +8,12 @@ import { MiniatureDisplayOptions, VideoMiniatureComponent } from '../../shared/s import { SubscribeButtonComponent } from '../../shared/shared-user-subscription/subscribe-button.component' import { RouterLink } from '@angular/router' import { ActorAvatarComponent } from '../../shared/shared-actor-image/actor-avatar.component' -import { InfiniteScrollerDirective } from '../../shared/shared-main/angular/infinite-scroller.directive' +import { InfiniteScrollerDirective } from '../../shared/shared-main/common/infinite-scroller.directive' import { NgIf, NgFor } from '@angular/common' import { AccountService } from '@app/shared/shared-main/account/account.service' -import { VideoChannelService } from '@app/shared/shared-main/video-channel/video-channel.service' +import { VideoChannelService } from '@app/shared/shared-main/channel/video-channel.service' import { VideoService } from '@app/shared/shared-main/video/video.service' -import { VideoChannel } from '@app/shared/shared-main/video-channel/video-channel.model' +import { VideoChannel } from '@app/shared/shared-main/channel/video-channel.model' import { Account } from '@app/shared/shared-main/account/account.model' import { Video } from '@app/shared/shared-main/video/video.model' diff --git a/client/src/app/+accounts/accounts.component.ts b/client/src/app/+accounts/accounts.component.ts index add04037b..9a0ed81ff 100644 --- a/client/src/app/+accounts/accounts.component.ts +++ b/client/src/app/+accounts/accounts.component.ts @@ -5,8 +5,8 @@ import { AuthService, MarkdownService, MetaService, Notifier, RedirectService, R import { Account } from '@app/shared/shared-main/account/account.model' import { AccountService } from '@app/shared/shared-main/account/account.service' import { DropdownAction } from '@app/shared/shared-main/buttons/action-dropdown.component' -import { VideoChannel } from '@app/shared/shared-main/video-channel/video-channel.model' -import { VideoChannelService } from '@app/shared/shared-main/video-channel/video-channel.service' +import { VideoChannel } from '@app/shared/shared-main/channel/video-channel.model' +import { VideoChannelService } from '@app/shared/shared-main/channel/video-channel.service' import { VideoService } from '@app/shared/shared-main/video/video.service' import { BlocklistService } from '@app/shared/shared-moderation/blocklist.service' import { AccountReportComponent } from '@app/shared/shared-moderation/report-modals' @@ -16,8 +16,8 @@ import { Subscription } from 'rxjs' import { catchError, distinctUntilChanged, map, switchMap, tap } from 'rxjs/operators' import { ActorAvatarComponent } from '../shared/shared-actor-image/actor-avatar.component' import { CopyButtonComponent } from '../shared/shared-main/buttons/copy-button.component' -import { ListOverflowComponent, ListOverflowItem } from '../shared/shared-main/misc/list-overflow.component' -import { SimpleSearchInputComponent } from '../shared/shared-main/misc/simple-search-input.component' +import { ListOverflowComponent, ListOverflowItem } from '../shared/shared-main/menu/list-overflow.component' +import { SimpleSearchInputComponent } from '../shared/shared-main/search/simple-search-input.component' import { AccountBlockBadgesComponent } from '../shared/shared-moderation/account-block-badges.component' import { UserModerationDropdownComponent } from '../shared/shared-moderation/user-moderation-dropdown.component' import { SubscribeButtonComponent } from '../shared/shared-user-subscription/subscribe-button.component' diff --git a/client/src/app/+admin/admin.component.ts b/client/src/app/+admin/admin.component.ts index 6ee2c02c2..d021ce52f 100644 --- a/client/src/app/+admin/admin.component.ts +++ b/client/src/app/+admin/admin.component.ts @@ -2,10 +2,10 @@ import { NgClass } from '@angular/common' import { Component, OnInit } from '@angular/core' import { RouterOutlet } from '@angular/router' import { AuthService, ScreenService, ServerService } from '@app/core' -import { ListOverflowItem } from '@app/shared/shared-main/misc/list-overflow.component' -import { TopMenuDropdownParam } from '@app/shared/shared-main/misc/top-menu-dropdown.component' +import { ListOverflowItem } from '@app/shared/shared-main/menu/list-overflow.component' +import { TopMenuDropdownParam } from '@app/shared/shared-main/menu/top-menu-dropdown.component' import { UserRight, UserRightType } from '@peertube/peertube-models' -import { TopMenuDropdownComponent } from '../shared/shared-main/misc/top-menu-dropdown.component' +import { TopMenuDropdownComponent } from '../shared/shared-main/menu/top-menu-dropdown.component' @Component({ templateUrl: './admin.component.html', diff --git a/client/src/app/+admin/config/edit-custom-config/edit-advanced-configuration.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-advanced-configuration.component.ts index fd5f915e2..870c647fd 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-advanced-configuration.component.ts +++ b/client/src/app/+admin/config/edit-custom-config/edit-advanced-configuration.component.ts @@ -1,7 +1,7 @@ import { Component, Input } from '@angular/core' import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms' -import { PeerTubeTemplateDirective } from '../../../shared/shared-main/angular/peertube-template.directive' -import { HelpComponent } from '../../../shared/shared-main/misc/help.component' +import { PeerTubeTemplateDirective } from '../../../shared/shared-main/common/peertube-template.directive' +import { HelpComponent } from '../../../shared/shared-main/buttons/help.component' import { NgClass, NgIf } from '@angular/common' @Component({ diff --git a/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.ts index 98510c7c3..b264d53e2 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.ts +++ b/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.ts @@ -5,11 +5,11 @@ import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms' import { MenuService, ThemeService } from '@app/core' import { HTMLServerConfig } from '@peertube/peertube-models' import { ConfigService } from '../shared/config.service' -import { PeerTubeTemplateDirective } from '../../../shared/shared-main/angular/peertube-template.directive' +import { PeerTubeTemplateDirective } from '../../../shared/shared-main/common/peertube-template.directive' import { SelectOptionsComponent } from '../../../shared/shared-forms/select/select-options.component' import { UserRealQuotaInfoComponent } from '../../shared/user-real-quota-info.component' import { MarkdownTextareaComponent } from '../../../shared/shared-forms/markdown-textarea.component' -import { HelpComponent } from '../../../shared/shared-main/misc/help.component' +import { HelpComponent } from '../../../shared/shared-main/buttons/help.component' import { PeertubeCheckboxComponent } from '../../../shared/shared-forms/peertube-checkbox.component' import { SelectCustomValueComponent } from '../../../shared/shared-forms/select/select-custom-value.component' import { NgFor, NgIf, NgClass } from '@angular/common' diff --git a/client/src/app/+admin/config/edit-custom-config/edit-instance-information.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-instance-information.component.ts index 4a5360316..d7a8bc8a5 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-instance-information.component.ts +++ b/client/src/app/+admin/config/edit-custom-config/edit-instance-information.component.ts @@ -16,8 +16,8 @@ import { CustomMarkupHelpComponent } from '../../../shared/shared-custom-markup/ import { MarkdownTextareaComponent } from '../../../shared/shared-forms/markdown-textarea.component' import { PeertubeCheckboxComponent } from '../../../shared/shared-forms/peertube-checkbox.component' import { SelectCheckboxComponent } from '../../../shared/shared-forms/select/select-checkbox.component' -import { PeerTubeTemplateDirective } from '../../../shared/shared-main/angular/peertube-template.directive' -import { HelpComponent } from '../../../shared/shared-main/misc/help.component' +import { PeerTubeTemplateDirective } from '../../../shared/shared-main/common/peertube-template.directive' +import { HelpComponent } from '../../../shared/shared-main/buttons/help.component' @Component({ selector: 'my-edit-instance-information', diff --git a/client/src/app/+admin/config/edit-custom-config/edit-live-configuration.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-live-configuration.component.ts index 8e5e21323..99de24193 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-live-configuration.component.ts +++ b/client/src/app/+admin/config/edit-custom-config/edit-live-configuration.component.ts @@ -8,7 +8,7 @@ import { SelectCustomValueComponent } from '../../../shared/shared-forms/select/ import { RouterLink } from '@angular/router' import { SelectOptionsComponent } from '../../../shared/shared-forms/select/select-options.component' import { NgClass, NgIf, NgFor } from '@angular/common' -import { PeerTubeTemplateDirective } from '../../../shared/shared-main/angular/peertube-template.directive' +import { PeerTubeTemplateDirective } from '../../../shared/shared-main/common/peertube-template.directive' import { PeertubeCheckboxComponent } from '../../../shared/shared-forms/peertube-checkbox.component' @Component({ diff --git a/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.ts index 89493f9c5..d554a6fca 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.ts +++ b/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.ts @@ -8,7 +8,7 @@ import { SelectOptionsItem } from 'src/types/select-options-item.model' import { PeertubeCheckboxComponent } from '../../../shared/shared-forms/peertube-checkbox.component' import { SelectCustomValueComponent } from '../../../shared/shared-forms/select/select-custom-value.component' import { SelectOptionsComponent } from '../../../shared/shared-forms/select/select-options.component' -import { PeerTubeTemplateDirective } from '../../../shared/shared-main/angular/peertube-template.directive' +import { PeerTubeTemplateDirective } from '../../../shared/shared-main/common/peertube-template.directive' import { ConfigService } from '../shared/config.service' import { EditConfigurationService, ResolutionOption } from './edit-configuration.service' diff --git a/client/src/app/+admin/follows/followers-list/followers-list.component.ts b/client/src/app/+admin/follows/followers-list/followers-list.component.ts index 09425ff94..de638f1b0 100644 --- a/client/src/app/+admin/follows/followers-list/followers-list.component.ts +++ b/client/src/app/+admin/follows/followers-list/followers-list.component.ts @@ -3,7 +3,7 @@ import { Component, OnInit } from '@angular/core' import { ConfirmService, Notifier, RestPagination, RestTable } from '@app/core' import { formatICU } from '@app/helpers' import { ActorFollow } from '@peertube/peertube-models' -import { AutoColspanDirective } from '../../../shared/shared-main/angular/auto-colspan.directive' +import { AutoColspanDirective } from '../../../shared/shared-main/common/auto-colspan.directive' import { DeleteButtonComponent } from '../../../shared/shared-main/buttons/delete-button.component' import { ButtonComponent } from '../../../shared/shared-main/buttons/button.component' import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap' diff --git a/client/src/app/+admin/follows/following-list/following-list.component.ts b/client/src/app/+admin/follows/following-list/following-list.component.ts index 61aaf1865..b056c2f90 100644 --- a/client/src/app/+admin/follows/following-list/following-list.component.ts +++ b/client/src/app/+admin/follows/following-list/following-list.component.ts @@ -4,7 +4,7 @@ import { ConfirmService, Notifier, RestPagination, RestTable } from '@app/core' import { ActorFollow } from '@peertube/peertube-models' import { FollowModalComponent } from './follow-modal.component' import { formatICU } from '@app/helpers' -import { AutoColspanDirective } from '../../../shared/shared-main/angular/auto-colspan.directive' +import { AutoColspanDirective } from '../../../shared/shared-main/common/auto-colspan.directive' import { RedundancyCheckboxComponent } from '../shared/redundancy-checkbox.component' import { DeleteButtonComponent } from '../../../shared/shared-main/buttons/delete-button.component' import { AdvancedInputFilter, AdvancedInputFilterComponent } from '../../../shared/shared-forms/advanced-input-filter.component' diff --git a/client/src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.ts b/client/src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.ts index 1761b6000..fb478a260 100644 --- a/client/src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.ts +++ b/client/src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.ts @@ -6,7 +6,7 @@ import { VideoRedundanciesTarget, VideoRedundancy, VideosRedundancyStats } from import { peertubeLocalStorage } from '@root-helpers/peertube-web-storage' import { ChartModule } from 'primeng/chart' import { VideoRedundancyInformationComponent } from './video-redundancy-information.component' -import { AutoColspanDirective } from '../../../shared/shared-main/angular/auto-colspan.directive' +import { AutoColspanDirective } from '../../../shared/shared-main/common/auto-colspan.directive' import { DeleteButtonComponent } from '../../../shared/shared-main/buttons/delete-button.component' import { TableExpanderIconComponent } from '../../../shared/shared-tables/table-expander-icon.component' import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap' @@ -14,7 +14,7 @@ import { NgIf, NgFor } from '@angular/common' import { TableModule } from 'primeng/table' import { FormsModule } from '@angular/forms' import { GlobalIconComponent } from '../../../shared/shared-icons/global-icon.component' -import { BytesPipe } from '@app/shared/shared-main/angular/bytes.pipe' +import { BytesPipe } from '@app/shared/shared-main/common/bytes.pipe' import { RedundancyService } from '@app/shared/shared-main/video/redundancy.service' @Component({ diff --git a/client/src/app/+admin/follows/video-redundancies-list/video-redundancy-information.component.ts b/client/src/app/+admin/follows/video-redundancies-list/video-redundancy-information.component.ts index 169cdbdf7..7142cab44 100644 --- a/client/src/app/+admin/follows/video-redundancies-list/video-redundancy-information.component.ts +++ b/client/src/app/+admin/follows/video-redundancies-list/video-redundancy-information.component.ts @@ -1,6 +1,6 @@ import { Component, Input } from '@angular/core' import { FileRedundancyInformation, StreamingPlaylistRedundancyInformation } from '@peertube/peertube-models' -import { BytesPipe } from '../../../shared/shared-main/angular/bytes.pipe' +import { BytesPipe } from '../../../shared/shared-main/common/bytes.pipe' import { DatePipe } from '@angular/common' @Component({ diff --git a/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.ts b/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.ts index cb74aad76..219308a70 100644 --- a/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.ts +++ b/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core' import { NgIf, DatePipe } from '@angular/common' -import { AutoColspanDirective } from '../../../shared/shared-main/angular/auto-colspan.directive' +import { AutoColspanDirective } from '../../../shared/shared-main/common/auto-colspan.directive' import { ActorAvatarComponent } from '../../../shared/shared-actor-image/actor-avatar.component' import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap' import { AdvancedInputFilterComponent } from '../../../shared/shared-forms/advanced-input-filter.component' diff --git a/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.ts b/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.ts index 7a5cdf5b7..7b4343c7d 100644 --- a/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.ts +++ b/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core' import { BatchDomainsModalComponent } from '../../../shared/shared-moderation/batch-domains-modal.component' import { NgIf, DatePipe } from '@angular/common' -import { AutoColspanDirective } from '../../../shared/shared-main/angular/auto-colspan.directive' +import { AutoColspanDirective } from '../../../shared/shared-main/common/auto-colspan.directive' import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap' import { AdvancedInputFilterComponent } from '../../../shared/shared-forms/advanced-input-filter.component' import { SharedModule } from 'primeng/api' diff --git a/client/src/app/+admin/moderation/registration-list/registration-list.component.ts b/client/src/app/+admin/moderation/registration-list/registration-list.component.ts index 62c6c9d66..4069c9b49 100644 --- a/client/src/app/+admin/moderation/registration-list/registration-list.component.ts +++ b/client/src/app/+admin/moderation/registration-list/registration-list.component.ts @@ -6,7 +6,7 @@ import { formatICU } from '@app/helpers' import { UserRegistration, UserRegistrationState } from '@peertube/peertube-models' import { AdminRegistrationService } from './admin-registration.service' import { ProcessRegistrationModalComponent } from './process-registration-modal.component' -import { AutoColspanDirective } from '../../../shared/shared-main/angular/auto-colspan.directive' +import { AutoColspanDirective } from '../../../shared/shared-main/common/auto-colspan.directive' import { UserEmailInfoComponent } from '../../shared/user-email-info.component' import { TableExpanderIconComponent } from '../../../shared/shared-tables/table-expander-icon.component' import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap' diff --git a/client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts index 33627395d..f04ac769b 100644 --- a/client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts +++ b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts @@ -8,7 +8,7 @@ import { buildVideoEmbedLink, decorateVideoLink } from '@peertube/peertube-core- import { VideoBlacklist, VideoBlacklistType, VideoBlacklistType_Type } from '@peertube/peertube-models' import { buildVideoOrPlaylistEmbed } from '@root-helpers/video' import { EmbedComponent } from '../../../shared/shared-main/video/embed.component' -import { AutoColspanDirective } from '../../../shared/shared-main/angular/auto-colspan.directive' +import { AutoColspanDirective } from '../../../shared/shared-main/common/auto-colspan.directive' import { VideoCellComponent } from '../../../shared/shared-tables/video-cell.component' import { ActionDropdownComponent, DropdownAction } from '../../../shared/shared-main/buttons/action-dropdown.component' import { TableExpanderIconComponent } from '../../../shared/shared-tables/table-expander-icon.component' diff --git a/client/src/app/+admin/overview/users/user-edit/user-create.component.ts b/client/src/app/+admin/overview/users/user-edit/user-create.component.ts index f67358415..d70721370 100644 --- a/client/src/app/+admin/overview/users/user-edit/user-create.component.ts +++ b/client/src/app/+admin/overview/users/user-edit/user-create.component.ts @@ -15,14 +15,14 @@ import { import { FormReactiveService } from '@app/shared/shared-forms/form-reactive.service' import { UserCreate, UserRole } from '@peertube/peertube-models' import { UserEdit } from './user-edit' -import { BytesPipe } from '../../../../shared/shared-main/angular/bytes.pipe' +import { BytesPipe } from '../../../../shared/shared-main/common/bytes.pipe' import { UserPasswordComponent } from './user-password.component' import { PeertubeCheckboxComponent } from '../../../../shared/shared-forms/peertube-checkbox.component' import { UserRealQuotaInfoComponent } from '../../../shared/user-real-quota-info.component' import { SelectCustomValueComponent } from '../../../../shared/shared-forms/select/select-custom-value.component' import { InputTextComponent } from '../../../../shared/shared-forms/input-text.component' -import { PeerTubeTemplateDirective } from '../../../../shared/shared-main/angular/peertube-template.directive' -import { HelpComponent } from '../../../../shared/shared-main/misc/help.component' +import { PeerTubeTemplateDirective } from '../../../../shared/shared-main/common/peertube-template.directive' +import { HelpComponent } from '../../../../shared/shared-main/buttons/help.component' import { FormsModule, ReactiveFormsModule } from '@angular/forms' import { ActorAvatarEditComponent } from '../../../../shared/shared-actor-image-edit/actor-avatar-edit.component' import { NgIf, NgTemplateOutlet, NgClass, NgFor } from '@angular/common' diff --git a/client/src/app/+admin/overview/users/user-edit/user-update.component.ts b/client/src/app/+admin/overview/users/user-edit/user-update.component.ts index b91169c44..41348b3d8 100644 --- a/client/src/app/+admin/overview/users/user-edit/user-update.component.ts +++ b/client/src/app/+admin/overview/users/user-edit/user-update.component.ts @@ -12,14 +12,14 @@ import { import { FormReactiveService } from '@app/shared/shared-forms/form-reactive.service' import { User as UserType, UserAdminFlag, UserRole, UserUpdate } from '@peertube/peertube-models' import { UserEdit } from './user-edit' -import { BytesPipe } from '../../../../shared/shared-main/angular/bytes.pipe' +import { BytesPipe } from '../../../../shared/shared-main/common/bytes.pipe' import { UserPasswordComponent } from './user-password.component' import { PeertubeCheckboxComponent } from '../../../../shared/shared-forms/peertube-checkbox.component' import { UserRealQuotaInfoComponent } from '../../../shared/user-real-quota-info.component' import { SelectCustomValueComponent } from '../../../../shared/shared-forms/select/select-custom-value.component' import { InputTextComponent } from '../../../../shared/shared-forms/input-text.component' -import { PeerTubeTemplateDirective } from '../../../../shared/shared-main/angular/peertube-template.directive' -import { HelpComponent } from '../../../../shared/shared-main/misc/help.component' +import { PeerTubeTemplateDirective } from '../../../../shared/shared-main/common/peertube-template.directive' +import { HelpComponent } from '../../../../shared/shared-main/buttons/help.component' import { FormsModule, ReactiveFormsModule } from '@angular/forms' import { ActorAvatarEditComponent } from '../../../../shared/shared-actor-image-edit/actor-avatar-edit.component' import { NgIf, NgTemplateOutlet, NgClass, NgFor } from '@angular/common' diff --git a/client/src/app/+admin/overview/users/user-list/user-list.component.ts b/client/src/app/+admin/overview/users/user-list/user-list.component.ts index 026fcfd47..3122fc00e 100644 --- a/client/src/app/+admin/overview/users/user-list/user-list.component.ts +++ b/client/src/app/+admin/overview/users/user-list/user-list.component.ts @@ -18,8 +18,8 @@ import { AdvancedInputFilter, AdvancedInputFilterComponent } from '../../../../s import { PeertubeCheckboxComponent } from '../../../../shared/shared-forms/peertube-checkbox.component' import { SelectCheckboxComponent } from '../../../../shared/shared-forms/select/select-checkbox.component' import { GlobalIconComponent } from '../../../../shared/shared-icons/global-icon.component' -import { AutoColspanDirective } from '../../../../shared/shared-main/angular/auto-colspan.directive' -import { BytesPipe } from '../../../../shared/shared-main/angular/bytes.pipe' +import { AutoColspanDirective } from '../../../../shared/shared-main/common/auto-colspan.directive' +import { BytesPipe } from '../../../../shared/shared-main/common/bytes.pipe' import { ActionDropdownComponent, DropdownAction } from '../../../../shared/shared-main/buttons/action-dropdown.component' import { AccountMutedStatus, @@ -28,7 +28,7 @@ import { } from '../../../../shared/shared-moderation/user-moderation-dropdown.component' import { TableExpanderIconComponent } from '../../../../shared/shared-tables/table-expander-icon.component' import { UserEmailInfoComponent } from '../../../shared/user-email-info.component' -import { ProgressBarComponent } from '@app/shared/shared-main/misc/progress-bar.component' +import { ProgressBarComponent } from '@app/shared/shared-main/common/progress-bar.component' type UserForList = User & { rawVideoQuota: number diff --git a/client/src/app/+admin/overview/videos/video-list.component.ts b/client/src/app/+admin/overview/videos/video-list.component.ts index eca0f43ca..63b314155 100644 --- a/client/src/app/+admin/overview/videos/video-list.component.ts +++ b/client/src/app/+admin/overview/videos/video-list.component.ts @@ -19,8 +19,8 @@ import { TableModule, TableRowExpandEvent } from 'primeng/table' import { finalize } from 'rxjs/operators' import { AdvancedInputFilter, AdvancedInputFilterComponent } from '../../../shared/shared-forms/advanced-input-filter.component' import { GlobalIconComponent } from '../../../shared/shared-icons/global-icon.component' -import { AutoColspanDirective } from '../../../shared/shared-main/angular/auto-colspan.directive' -import { BytesPipe } from '../../../shared/shared-main/angular/bytes.pipe' +import { AutoColspanDirective } from '../../../shared/shared-main/common/auto-colspan.directive' +import { BytesPipe } from '../../../shared/shared-main/common/bytes.pipe' import { ActionDropdownComponent, DropdownAction } from '../../../shared/shared-main/buttons/action-dropdown.component' import { ButtonComponent } from '../../../shared/shared-main/buttons/button.component' import { EmbedComponent } from '../../../shared/shared-main/video/embed.component' diff --git a/client/src/app/+admin/plugins/plugin-list-installed/plugin-list-installed.component.ts b/client/src/app/+admin/plugins/plugin-list-installed/plugin-list-installed.component.ts index 61407a7b3..6bea42fce 100644 --- a/client/src/app/+admin/plugins/plugin-list-installed/plugin-list-installed.component.ts +++ b/client/src/app/+admin/plugins/plugin-list-installed/plugin-list-installed.component.ts @@ -10,7 +10,7 @@ import { DeleteButtonComponent } from '../../../shared/shared-main/buttons/delet import { ButtonComponent } from '../../../shared/shared-main/buttons/button.component' import { EditButtonComponent } from '../../../shared/shared-main/buttons/edit-button.component' import { PluginCardComponent } from '../shared/plugin-card.component' -import { InfiniteScrollerDirective } from '../../../shared/shared-main/angular/infinite-scroller.directive' +import { InfiniteScrollerDirective } from '../../../shared/shared-main/common/infinite-scroller.directive' import { NgIf, NgFor } from '@angular/common' import { PluginNavigationComponent } from '../shared/plugin-navigation.component' diff --git a/client/src/app/+admin/plugins/plugin-search/plugin-search.component.ts b/client/src/app/+admin/plugins/plugin-search/plugin-search.component.ts index fbb59628b..42c2c7766 100644 --- a/client/src/app/+admin/plugins/plugin-search/plugin-search.component.ts +++ b/client/src/app/+admin/plugins/plugin-search/plugin-search.component.ts @@ -9,8 +9,8 @@ import { logger } from '@root-helpers/logger' import { ButtonComponent } from '../../../shared/shared-main/buttons/button.component' import { EditButtonComponent } from '../../../shared/shared-main/buttons/edit-button.component' import { PluginCardComponent } from '../shared/plugin-card.component' -import { InfiniteScrollerDirective } from '../../../shared/shared-main/angular/infinite-scroller.directive' -import { AutofocusDirective } from '../../../shared/shared-main/angular/autofocus.directive' +import { InfiniteScrollerDirective } from '../../../shared/shared-main/common/infinite-scroller.directive' +import { AutofocusDirective } from '../../../shared/shared-main/common/autofocus.directive' import { GlobalIconComponent } from '../../../shared/shared-icons/global-icon.component' import { NgIf, NgFor } from '@angular/common' import { PluginNavigationComponent } from '../shared/plugin-navigation.component' diff --git a/client/src/app/+admin/shared/user-real-quota-info.component.ts b/client/src/app/+admin/shared/user-real-quota-info.component.ts index ae2bc5052..36860593b 100644 --- a/client/src/app/+admin/shared/user-real-quota-info.component.ts +++ b/client/src/app/+admin/shared/user-real-quota-info.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit } from '@angular/core' import { ServerService } from '@app/core' import { HTMLServerConfig, VideoResolution } from '@peertube/peertube-models' -import { BytesPipe } from '../../shared/shared-main/angular/bytes.pipe' +import { BytesPipe } from '../../shared/shared-main/common/bytes.pipe' import { NgIf } from '@angular/common' @Component({ diff --git a/client/src/app/+admin/system/runners/runner-job-list/runner-job-list.component.ts b/client/src/app/+admin/system/runners/runner-job-list/runner-job-list.component.ts index b7655f451..fa5f67e03 100644 --- a/client/src/app/+admin/system/runners/runner-job-list/runner-job-list.component.ts +++ b/client/src/app/+admin/system/runners/runner-job-list/runner-job-list.component.ts @@ -9,7 +9,7 @@ import { SharedModule, SortMeta } from 'primeng/api' import { TableModule } from 'primeng/table' import { AdvancedInputFilter, AdvancedInputFilterComponent } from '../../../../shared/shared-forms/advanced-input-filter.component' import { GlobalIconComponent } from '../../../../shared/shared-icons/global-icon.component' -import { AutoColspanDirective } from '../../../../shared/shared-main/angular/auto-colspan.directive' +import { AutoColspanDirective } from '../../../../shared/shared-main/common/auto-colspan.directive' import { ActionDropdownComponent, DropdownAction } from '../../../../shared/shared-main/buttons/action-dropdown.component' import { ButtonComponent } from '../../../../shared/shared-main/buttons/button.component' import { TableExpanderIconComponent } from '../../../../shared/shared-tables/table-expander-icon.component' diff --git a/client/src/app/+admin/system/runners/runner-list/runner-list.component.ts b/client/src/app/+admin/system/runners/runner-list/runner-list.component.ts index f3ed8804f..2e8736a2d 100644 --- a/client/src/app/+admin/system/runners/runner-list/runner-list.component.ts +++ b/client/src/app/+admin/system/runners/runner-list/runner-list.component.ts @@ -4,7 +4,7 @@ import { ConfirmService, Notifier, RestPagination, RestTable } from '@app/core' import { Runner } from '@peertube/peertube-models' import { RunnerService } from '../runner.service' import { DatePipe } from '@angular/common' -import { AutoColspanDirective } from '../../../../shared/shared-main/angular/auto-colspan.directive' +import { AutoColspanDirective } from '../../../../shared/shared-main/common/auto-colspan.directive' import { ActionDropdownComponent, DropdownAction } from '../../../../shared/shared-main/buttons/action-dropdown.component' import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap' import { TableModule } from 'primeng/table' diff --git a/client/src/app/+admin/system/runners/runner-registration-token-list/runner-registration-token-list.component.ts b/client/src/app/+admin/system/runners/runner-registration-token-list/runner-registration-token-list.component.ts index 59ee374ed..69f2ab1d5 100644 --- a/client/src/app/+admin/system/runners/runner-registration-token-list/runner-registration-token-list.component.ts +++ b/client/src/app/+admin/system/runners/runner-registration-token-list/runner-registration-token-list.component.ts @@ -4,7 +4,7 @@ import { ConfirmService, Notifier, RestPagination, RestTable } from '@app/core' import { RunnerRegistrationToken } from '@peertube/peertube-models' import { RunnerService } from '../runner.service' import { DatePipe } from '@angular/common' -import { AutoColspanDirective } from '../../../../shared/shared-main/angular/auto-colspan.directive' +import { AutoColspanDirective } from '../../../../shared/shared-main/common/auto-colspan.directive' import { CopyButtonComponent } from '../../../../shared/shared-main/buttons/copy-button.component' import { ActionDropdownComponent, DropdownAction } from '../../../../shared/shared-main/buttons/action-dropdown.component' import { ButtonComponent } from '../../../../shared/shared-main/buttons/button.component' diff --git a/client/src/app/+error-page/error-page.component.ts b/client/src/app/+error-page/error-page.component.ts index 8b37d14da..ea6ef2f35 100644 --- a/client/src/app/+error-page/error-page.component.ts +++ b/client/src/app/+error-page/error-page.component.ts @@ -1,9 +1,9 @@ +import { NgIf } from '@angular/common' import { Component, OnInit } from '@angular/core' import { Title } from '@angular/platform-browser' import { Router } from '@angular/router' +import { LoginLinkComponent } from '@app/shared/shared-main/users/login-link.component' import { HttpStatusCode, HttpStatusCodeType } from '@peertube/peertube-models' -import { LoginLinkComponent } from '../shared/shared-main/angular/login-link.component' -import { NgIf } from '@angular/common' @Component({ selector: 'my-error-page', diff --git a/client/src/app/+login/login.component.html b/client/src/app/+login/login.component.html index f31c785f0..34bf175a4 100644 --- a/client/src/app/+login/login.component.html +++ b/client/src/app/+login/login.component.html @@ -37,7 +37,7 @@ Sorry but there was an issue with the external login process. Please contact an administrator. -
+