From eeae81428e933b923dc9d9b6c9ce5c9fcf0de1a7 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 29 Oct 2021 11:33:28 +0200 Subject: [PATCH] Remove useless components --- client/src/app/+admin/admin.module.ts | 11 ++-------- .../src/app/+admin/config/config.component.ts | 7 ------- client/src/app/+admin/config/config.routes.ts | 2 -- client/src/app/+admin/config/index.ts | 1 - .../followers-list.component.ts | 2 +- .../following-list.component.ts | 2 +- .../app/+admin/follows/follows.component.html | 1 - .../app/+admin/follows/follows.component.scss | 11 ---------- .../app/+admin/follows/follows.component.ts | 8 -------- .../src/app/+admin/follows/follows.routes.ts | 2 -- client/src/app/+admin/follows/index.ts | 1 - .../video-redundancies-list.component.html | 2 +- .../video-redundancies-list.component.ts | 2 +- client/src/app/+admin/moderation/index.ts | 1 - .../moderation/moderation.component.html | 1 - .../+admin/moderation/moderation.component.ts | 20 ------------------- .../+admin/moderation/moderation.routes.ts | 2 -- .../video-block-list.component.scss | 4 ---- .../users/user-list/user-list.component.scss | 4 ---- client/src/app/+admin/system/index.ts | 1 - .../+admin/system/jobs/jobs.component.scss | 4 ---- .../app/+admin/system/system.component.html | 1 - .../src/app/+admin/system/system.component.ts | 8 -------- client/src/app/+admin/system/system.routes.ts | 2 -- .../my-ownership/my-ownership.component.scss | 4 ---- .../my-video-imports.component.scss | 4 ---- .../src/app/+videos/videos-routing.module.ts | 2 -- client/src/app/+videos/videos.component.ts | 6 ------ client/src/app/+videos/videos.module.ts | 7 +------ client/src/sass/application.scss | 16 --------------- client/src/sass/primeng-custom.scss | 7 +++++-- 31 files changed, 12 insertions(+), 134 deletions(-) delete mode 100644 client/src/app/+admin/config/config.component.ts delete mode 100644 client/src/app/+admin/follows/follows.component.html delete mode 100644 client/src/app/+admin/follows/follows.component.scss delete mode 100644 client/src/app/+admin/follows/follows.component.ts delete mode 100644 client/src/app/+admin/moderation/moderation.component.html delete mode 100644 client/src/app/+admin/moderation/moderation.component.ts delete mode 100644 client/src/app/+admin/system/system.component.html delete mode 100644 client/src/app/+admin/system/system.component.ts delete mode 100644 client/src/app/+videos/videos.component.ts diff --git a/client/src/app/+admin/admin.module.ts b/client/src/app/+admin/admin.module.ts index d04c11a20..0cb4d1056 100644 --- a/client/src/app/+admin/admin.module.ts +++ b/client/src/app/+admin/admin.module.ts @@ -16,7 +16,6 @@ import { SharedVideoMiniatureModule } from '@app/shared/shared-video-miniature' import { AdminRoutingModule } from './admin-routing.module' import { AdminComponent } from './admin.component' import { - ConfigComponent, EditAdvancedConfigurationComponent, EditBasicConfigurationComponent, EditConfigurationService, @@ -27,13 +26,12 @@ import { EditVODTranscodingComponent } from './config' import { ConfigService } from './config/shared/config.service' -import { FollowersListComponent, FollowModalComponent, FollowsComponent, VideoRedundanciesListComponent } from './follows' +import { FollowersListComponent, FollowModalComponent, VideoRedundanciesListComponent } from './follows' import { FollowingListComponent } from './follows/following-list/following-list.component' import { RedundancyCheckboxComponent } from './follows/shared/redundancy-checkbox.component' import { VideoRedundancyInformationComponent } from './follows/video-redundancies-list/video-redundancy-information.component' import { AbuseListComponent, VideoBlockListComponent } from './moderation' import { InstanceAccountBlocklistComponent, InstanceServerBlocklistComponent } from './moderation/instance-blocklist' -import { ModerationComponent } from './moderation/moderation.component' import { VideoCommentListComponent } from './moderation/video-comment-list' import { UserCreateComponent, UserListComponent, UserPasswordComponent, UserUpdateComponent, VideoListComponent } from './overview' import { PluginListInstalledComponent } from './plugins/plugin-list-installed/plugin-list-installed.component' @@ -41,7 +39,7 @@ import { PluginSearchComponent } from './plugins/plugin-search/plugin-search.com import { PluginShowInstalledComponent } from './plugins/plugin-show-installed/plugin-show-installed.component' import { PluginsComponent } from './plugins/plugins.component' import { PluginApiService } from './plugins/shared/plugin-api.service' -import { JobService, LogsComponent, LogsService, SystemComponent } from './system' +import { JobService, LogsComponent, LogsService } from './system' import { DebugComponent, DebugService } from './system/debug' import { JobsComponent } from './system/jobs/jobs.component' @@ -71,7 +69,6 @@ import { JobsComponent } from './system/jobs/jobs.component' VideoListComponent, - FollowsComponent, FollowersListComponent, FollowingListComponent, FollowModalComponent, @@ -84,7 +81,6 @@ import { JobsComponent } from './system/jobs/jobs.component' UserPasswordComponent, UserListComponent, - ModerationComponent, VideoBlockListComponent, AbuseListComponent, VideoCommentListComponent, @@ -97,13 +93,10 @@ import { JobsComponent } from './system/jobs/jobs.component' PluginSearchComponent, PluginShowInstalledComponent, - SystemComponent, JobsComponent, LogsComponent, DebugComponent, - ConfigComponent, - EditCustomConfigComponent, EditBasicConfigurationComponent, EditVODTranscodingComponent, diff --git a/client/src/app/+admin/config/config.component.ts b/client/src/app/+admin/config/config.component.ts deleted file mode 100644 index e0eb77278..000000000 --- a/client/src/app/+admin/config/config.component.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { Component } from '@angular/core' - -@Component({ - template: '' -}) -export class ConfigComponent { -} diff --git a/client/src/app/+admin/config/config.routes.ts b/client/src/app/+admin/config/config.routes.ts index 1b76b29cc..6d255ac46 100644 --- a/client/src/app/+admin/config/config.routes.ts +++ b/client/src/app/+admin/config/config.routes.ts @@ -2,12 +2,10 @@ import { Routes } from '@angular/router' import { EditCustomConfigComponent } from '@app/+admin/config/edit-custom-config' import { UserRightGuard } from '@app/core' import { UserRight } from '@shared/models' -import { ConfigComponent } from './config.component' export const ConfigRoutes: Routes = [ { path: 'config', - component: ConfigComponent, canActivate: [ UserRightGuard ], data: { userRight: UserRight.MANAGE_CONFIGURATION diff --git a/client/src/app/+admin/config/index.ts b/client/src/app/+admin/config/index.ts index b47ebf8db..898e92546 100644 --- a/client/src/app/+admin/config/index.ts +++ b/client/src/app/+admin/config/index.ts @@ -1,3 +1,2 @@ export * from './edit-custom-config' -export * from './config.component' export * from './config.routes' 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 b867b4ba5..329e3bcc7 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 @@ -7,7 +7,7 @@ import { ActorFollow } from '@shared/models' @Component({ selector: 'my-followers-list', templateUrl: './followers-list.component.html', - styleUrls: [ '../follows.component.scss', './followers-list.component.scss' ] + styleUrls: [ './followers-list.component.scss' ] }) export class FollowersListComponent extends RestTable implements OnInit { followers: ActorFollow[] = [] 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 383f66ffd..2c0f6db0c 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 @@ -7,7 +7,7 @@ import { FollowModalComponent } from './follow-modal.component' @Component({ templateUrl: './following-list.component.html', - styleUrls: [ '../follows.component.scss', './following-list.component.scss' ] + styleUrls: [ './following-list.component.scss' ] }) export class FollowingListComponent extends RestTable implements OnInit { @ViewChild('followModal') followModal: FollowModalComponent diff --git a/client/src/app/+admin/follows/follows.component.html b/client/src/app/+admin/follows/follows.component.html deleted file mode 100644 index 0680b43f9..000000000 --- a/client/src/app/+admin/follows/follows.component.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/client/src/app/+admin/follows/follows.component.scss b/client/src/app/+admin/follows/follows.component.scss deleted file mode 100644 index 944135c5e..000000000 --- a/client/src/app/+admin/follows/follows.component.scss +++ /dev/null @@ -1,11 +0,0 @@ -@use '_mixins' as *; - -.form-sub-title { - @include margin-right(30px); - - flex-grow: 0; -} - -.badge { - @include table-badge; -} diff --git a/client/src/app/+admin/follows/follows.component.ts b/client/src/app/+admin/follows/follows.component.ts deleted file mode 100644 index 1ec7e598b..000000000 --- a/client/src/app/+admin/follows/follows.component.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { Component } from '@angular/core' - -@Component({ - templateUrl: './follows.component.html', - styleUrls: [ './follows.component.scss' ] -}) -export class FollowsComponent { -} diff --git a/client/src/app/+admin/follows/follows.routes.ts b/client/src/app/+admin/follows/follows.routes.ts index 3843b42b5..1825ce278 100644 --- a/client/src/app/+admin/follows/follows.routes.ts +++ b/client/src/app/+admin/follows/follows.routes.ts @@ -4,12 +4,10 @@ import { UserRightGuard } from '@app/core' import { UserRight } from '@shared/models' import { FollowersListComponent } from './followers-list' import { FollowingListComponent } from './following-list/following-list.component' -import { FollowsComponent } from './follows.component' export const FollowsRoutes: Routes = [ { path: 'follows', - component: FollowsComponent, canActivate: [ UserRightGuard ], data: { userRight: UserRight.MANAGE_SERVER_FOLLOW diff --git a/client/src/app/+admin/follows/index.ts b/client/src/app/+admin/follows/index.ts index 285955468..b52ec7e8c 100644 --- a/client/src/app/+admin/follows/index.ts +++ b/client/src/app/+admin/follows/index.ts @@ -1,5 +1,4 @@ export * from './followers-list' export * from './following-list' export * from './video-redundancies-list' -export * from './follows.component' export * from './follows.routes' diff --git a/client/src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.html b/client/src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.html index 6d6384829..d0095a01e 100644 --- a/client/src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.html +++ b/client/src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.html @@ -86,7 +86,7 @@
-
Enabled strategies stats
+
Enabled strategies stats
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 2f87c6743..c862cd250 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 @@ -10,7 +10,7 @@ import { VideosRedundancyStats } from '@shared/models/server' @Component({ selector: 'my-video-redundancies-list', templateUrl: './video-redundancies-list.component.html', - styleUrls: [ '../follows.component.scss', './video-redundancies-list.component.scss' ] + styleUrls: [ './video-redundancies-list.component.scss' ] }) export class VideoRedundanciesListComponent extends RestTable implements OnInit { private static LOCAL_STORAGE_DISPLAY_TYPE = 'video-redundancies-list-display-type' diff --git a/client/src/app/+admin/moderation/index.ts b/client/src/app/+admin/moderation/index.ts index 53e4bc991..9dab270cc 100644 --- a/client/src/app/+admin/moderation/index.ts +++ b/client/src/app/+admin/moderation/index.ts @@ -1,5 +1,4 @@ export * from './abuse-list' export * from './instance-blocklist' export * from './video-block-list' -export * from './moderation.component' export * from './moderation.routes' diff --git a/client/src/app/+admin/moderation/moderation.component.html b/client/src/app/+admin/moderation/moderation.component.html deleted file mode 100644 index 90c6b6463..000000000 --- a/client/src/app/+admin/moderation/moderation.component.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/client/src/app/+admin/moderation/moderation.component.ts b/client/src/app/+admin/moderation/moderation.component.ts deleted file mode 100644 index 44dd11c47..000000000 --- a/client/src/app/+admin/moderation/moderation.component.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { Component, OnInit } from '@angular/core' -import { ServerService } from '@app/core' - -@Component({ - templateUrl: './moderation.component.html', - styleUrls: [ ] -}) -export class ModerationComponent implements OnInit { - autoBlockVideosEnabled = false - - constructor ( - private serverService: ServerService - ) { } - - ngOnInit (): void { - const serverConfig = this.serverService.getHTMLConfig() - - this.autoBlockVideosEnabled = serverConfig.autoBlacklist.videos.ofUsers.enabled - } -} diff --git a/client/src/app/+admin/moderation/moderation.routes.ts b/client/src/app/+admin/moderation/moderation.routes.ts index 2e28f0911..5c39ff366 100644 --- a/client/src/app/+admin/moderation/moderation.routes.ts +++ b/client/src/app/+admin/moderation/moderation.routes.ts @@ -1,7 +1,6 @@ import { Routes } from '@angular/router' import { AbuseListComponent } from '@app/+admin/moderation/abuse-list' import { InstanceAccountBlocklistComponent, InstanceServerBlocklistComponent } from '@app/+admin/moderation/instance-blocklist' -import { ModerationComponent } from '@app/+admin/moderation/moderation.component' import { VideoBlockListComponent } from '@app/+admin/moderation/video-block-list' import { VideoCommentListComponent } from './video-comment-list' import { UserRightGuard } from '@app/core' @@ -10,7 +9,6 @@ import { UserRight } from '@shared/models' export const ModerationRoutes: Routes = [ { path: 'moderation', - component: ModerationComponent, children: [ { path: '', diff --git a/client/src/app/+admin/moderation/video-block-list/video-block-list.component.scss b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.scss index 6152d9651..9cae08e85 100644 --- a/client/src/app/+admin/moderation/video-block-list/video-block-list.component.scss +++ b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.scss @@ -5,7 +5,3 @@ my-global-icon { width: 24px; height: 24px; } - -.badge { - @include table-badge; -} diff --git a/client/src/app/+admin/overview/users/user-list/user-list.component.scss b/client/src/app/+admin/overview/users/user-list/user-list.component.scss index e425306b5..335bd2995 100644 --- a/client/src/app/+admin/overview/users/user-list/user-list.component.scss +++ b/client/src/app/+admin/overview/users/user-list/user-list.component.scss @@ -43,10 +43,6 @@ my-global-icon { @include chip; } -.badge { - @include table-badge; -} - .progress { @include progressbar($small: true); diff --git a/client/src/app/+admin/system/index.ts b/client/src/app/+admin/system/index.ts index 8cced0cdb..b398832cc 100644 --- a/client/src/app/+admin/system/index.ts +++ b/client/src/app/+admin/system/index.ts @@ -1,5 +1,4 @@ export * from './debug' export * from './jobs' export * from './logs' -export * from './system.component' export * from './system.routes' diff --git a/client/src/app/+admin/system/jobs/jobs.component.scss b/client/src/app/+admin/system/jobs/jobs.component.scss index 4d564f4b7..eadaf7904 100644 --- a/client/src/app/+admin/system/jobs/jobs.component.scss +++ b/client/src/app/+admin/system/jobs/jobs.component.scss @@ -55,7 +55,3 @@ pre { .job-error { color: #ff0000; } - -.badge { - @include table-badge; -} diff --git a/client/src/app/+admin/system/system.component.html b/client/src/app/+admin/system/system.component.html deleted file mode 100644 index 0680b43f9..000000000 --- a/client/src/app/+admin/system/system.component.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/client/src/app/+admin/system/system.component.ts b/client/src/app/+admin/system/system.component.ts deleted file mode 100644 index b63160b86..000000000 --- a/client/src/app/+admin/system/system.component.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { Component } from '@angular/core' - -@Component({ - templateUrl: './system.component.html', - styleUrls: [] -}) -export class SystemComponent { -} diff --git a/client/src/app/+admin/system/system.routes.ts b/client/src/app/+admin/system/system.routes.ts index 72ab6705a..d180aa3b9 100644 --- a/client/src/app/+admin/system/system.routes.ts +++ b/client/src/app/+admin/system/system.routes.ts @@ -4,12 +4,10 @@ import { UserRight } from '@shared/models' import { DebugComponent } from './debug' import { JobsComponent } from './jobs/jobs.component' import { LogsComponent } from './logs' -import { SystemComponent } from './system.component' export const SystemRoutes: Routes = [ { path: 'system', - component: SystemComponent, children: [ { path: '', diff --git a/client/src/app/+my-library/my-ownership/my-ownership.component.scss b/client/src/app/+my-library/my-ownership/my-ownership.component.scss index 296659ea0..d32477270 100644 --- a/client/src/app/+my-library/my-ownership/my-ownership.component.scss +++ b/client/src/app/+my-library/my-ownership/my-ownership.component.scss @@ -6,10 +6,6 @@ @include chip; } -.badge { - @include table-badge; -} - .video-table-video { display: inline-flex; diff --git a/client/src/app/+my-library/my-video-imports/my-video-imports.component.scss b/client/src/app/+my-library/my-video-imports/my-video-imports.component.scss index 2fc94e23a..7acacd47f 100644 --- a/client/src/app/+my-library/my-video-imports/my-video-imports.component.scss +++ b/client/src/app/+my-library/my-video-imports/my-video-imports.component.scss @@ -8,7 +8,3 @@ pre { .video-import-error { color: #ff0000; } - -.badge { - @include table-badge; -} diff --git a/client/src/app/+videos/videos-routing.module.ts b/client/src/app/+videos/videos-routing.module.ts index 7db519615..8c777fbb6 100644 --- a/client/src/app/+videos/videos-routing.module.ts +++ b/client/src/app/+videos/videos-routing.module.ts @@ -4,12 +4,10 @@ import { LoginGuard } from '@app/core' import { VideosListCommonPageComponent } from './video-list' import { VideoOverviewComponent } from './video-list/overview/video-overview.component' import { VideoUserSubscriptionsComponent } from './video-list/video-user-subscriptions.component' -import { VideosComponent } from './videos.component' const videosRoutes: Routes = [ { path: '', - component: VideosComponent, children: [ { path: 'overview', diff --git a/client/src/app/+videos/videos.component.ts b/client/src/app/+videos/videos.component.ts deleted file mode 100644 index 585a3ad9a..000000000 --- a/client/src/app/+videos/videos.component.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { Component } from '@angular/core' - -@Component({ - template: '' -}) -export class VideosComponent {} diff --git a/client/src/app/+videos/videos.module.ts b/client/src/app/+videos/videos.module.ts index 523533c11..f06f4be2b 100644 --- a/client/src/app/+videos/videos.module.ts +++ b/client/src/app/+videos/videos.module.ts @@ -9,7 +9,6 @@ import { OverviewService, VideosListCommonPageComponent } from './video-list' import { VideoOverviewComponent } from './video-list/overview/video-overview.component' import { VideoUserSubscriptionsComponent } from './video-list/video-user-subscriptions.component' import { VideosRoutingModule } from './videos-routing.module' -import { VideosComponent } from './videos.component' @NgModule({ imports: [ @@ -24,16 +23,12 @@ import { VideosComponent } from './videos.component' ], declarations: [ - VideosComponent, - VideoUserSubscriptionsComponent, VideoOverviewComponent, VideosListCommonPageComponent ], - exports: [ - VideosComponent - ], + exports: [], providers: [ OverviewService diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index e0e8fc828..1f8166d8a 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss @@ -262,10 +262,6 @@ my-input-toggle-hidden ::ng-deep input { align-items: center; margin-bottom: 30px; - .form-sub-title { - flex-grow: 1; - } - .admin-sub-nav a { @include disable-default-a-behaviour; @@ -289,11 +285,6 @@ my-input-toggle-hidden ::ng-deep input { } } -.form-sub-title { - font-size: 20px; - font-weight: bold; -} - // In tables, don't have a hover different background table { .action-button-edit, @@ -412,13 +403,6 @@ ngx-loading-bar { .admin-sub-header { flex-direction: column; - .form-sub-title { - @include margin-right(0 !important); - - margin-bottom: 10px; - text-align: center; - } - .admin-sub-nav { display: block; overflow-x: auto; diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss index 7aba69e4a..66b4056cb 100644 --- a/client/src/sass/primeng-custom.scss +++ b/client/src/sass/primeng-custom.scss @@ -495,7 +495,7 @@ body p-selectbutton.ng-dirty.ng-invalid .p-button { border: 1px solid #a80000; } -// +// data table customizations @mixin glyphicon-light { font-family: 'Glyphicons Halflings'; @@ -504,7 +504,6 @@ body p-selectbutton.ng-dirty.ng-invalid .p-button { font-display: swap; } -// data table customizations p-table { .p-datatable-header { border: none !important; @@ -759,6 +758,10 @@ p-table { } } } + + .badge { + @include table-badge; + } } // overflow data table