diff options
31 files changed, 12 insertions, 134 deletions
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' | |||
16 | import { AdminRoutingModule } from './admin-routing.module' | 16 | import { AdminRoutingModule } from './admin-routing.module' |
17 | import { AdminComponent } from './admin.component' | 17 | import { AdminComponent } from './admin.component' |
18 | import { | 18 | import { |
19 | ConfigComponent, | ||
20 | EditAdvancedConfigurationComponent, | 19 | EditAdvancedConfigurationComponent, |
21 | EditBasicConfigurationComponent, | 20 | EditBasicConfigurationComponent, |
22 | EditConfigurationService, | 21 | EditConfigurationService, |
@@ -27,13 +26,12 @@ import { | |||
27 | EditVODTranscodingComponent | 26 | EditVODTranscodingComponent |
28 | } from './config' | 27 | } from './config' |
29 | import { ConfigService } from './config/shared/config.service' | 28 | import { ConfigService } from './config/shared/config.service' |
30 | import { FollowersListComponent, FollowModalComponent, FollowsComponent, VideoRedundanciesListComponent } from './follows' | 29 | import { FollowersListComponent, FollowModalComponent, VideoRedundanciesListComponent } from './follows' |
31 | import { FollowingListComponent } from './follows/following-list/following-list.component' | 30 | import { FollowingListComponent } from './follows/following-list/following-list.component' |
32 | import { RedundancyCheckboxComponent } from './follows/shared/redundancy-checkbox.component' | 31 | import { RedundancyCheckboxComponent } from './follows/shared/redundancy-checkbox.component' |
33 | import { VideoRedundancyInformationComponent } from './follows/video-redundancies-list/video-redundancy-information.component' | 32 | import { VideoRedundancyInformationComponent } from './follows/video-redundancies-list/video-redundancy-information.component' |
34 | import { AbuseListComponent, VideoBlockListComponent } from './moderation' | 33 | import { AbuseListComponent, VideoBlockListComponent } from './moderation' |
35 | import { InstanceAccountBlocklistComponent, InstanceServerBlocklistComponent } from './moderation/instance-blocklist' | 34 | import { InstanceAccountBlocklistComponent, InstanceServerBlocklistComponent } from './moderation/instance-blocklist' |
36 | import { ModerationComponent } from './moderation/moderation.component' | ||
37 | import { VideoCommentListComponent } from './moderation/video-comment-list' | 35 | import { VideoCommentListComponent } from './moderation/video-comment-list' |
38 | import { UserCreateComponent, UserListComponent, UserPasswordComponent, UserUpdateComponent, VideoListComponent } from './overview' | 36 | import { UserCreateComponent, UserListComponent, UserPasswordComponent, UserUpdateComponent, VideoListComponent } from './overview' |
39 | import { PluginListInstalledComponent } from './plugins/plugin-list-installed/plugin-list-installed.component' | 37 | import { PluginListInstalledComponent } from './plugins/plugin-list-installed/plugin-list-installed.component' |
@@ -41,7 +39,7 @@ import { PluginSearchComponent } from './plugins/plugin-search/plugin-search.com | |||
41 | import { PluginShowInstalledComponent } from './plugins/plugin-show-installed/plugin-show-installed.component' | 39 | import { PluginShowInstalledComponent } from './plugins/plugin-show-installed/plugin-show-installed.component' |
42 | import { PluginsComponent } from './plugins/plugins.component' | 40 | import { PluginsComponent } from './plugins/plugins.component' |
43 | import { PluginApiService } from './plugins/shared/plugin-api.service' | 41 | import { PluginApiService } from './plugins/shared/plugin-api.service' |
44 | import { JobService, LogsComponent, LogsService, SystemComponent } from './system' | 42 | import { JobService, LogsComponent, LogsService } from './system' |
45 | import { DebugComponent, DebugService } from './system/debug' | 43 | import { DebugComponent, DebugService } from './system/debug' |
46 | import { JobsComponent } from './system/jobs/jobs.component' | 44 | import { JobsComponent } from './system/jobs/jobs.component' |
47 | 45 | ||
@@ -71,7 +69,6 @@ import { JobsComponent } from './system/jobs/jobs.component' | |||
71 | 69 | ||
72 | VideoListComponent, | 70 | VideoListComponent, |
73 | 71 | ||
74 | FollowsComponent, | ||
75 | FollowersListComponent, | 72 | FollowersListComponent, |
76 | FollowingListComponent, | 73 | FollowingListComponent, |
77 | FollowModalComponent, | 74 | FollowModalComponent, |
@@ -84,7 +81,6 @@ import { JobsComponent } from './system/jobs/jobs.component' | |||
84 | UserPasswordComponent, | 81 | UserPasswordComponent, |
85 | UserListComponent, | 82 | UserListComponent, |
86 | 83 | ||
87 | ModerationComponent, | ||
88 | VideoBlockListComponent, | 84 | VideoBlockListComponent, |
89 | AbuseListComponent, | 85 | AbuseListComponent, |
90 | VideoCommentListComponent, | 86 | VideoCommentListComponent, |
@@ -97,13 +93,10 @@ import { JobsComponent } from './system/jobs/jobs.component' | |||
97 | PluginSearchComponent, | 93 | PluginSearchComponent, |
98 | PluginShowInstalledComponent, | 94 | PluginShowInstalledComponent, |
99 | 95 | ||
100 | SystemComponent, | ||
101 | JobsComponent, | 96 | JobsComponent, |
102 | LogsComponent, | 97 | LogsComponent, |
103 | DebugComponent, | 98 | DebugComponent, |
104 | 99 | ||
105 | ConfigComponent, | ||
106 | |||
107 | EditCustomConfigComponent, | 100 | EditCustomConfigComponent, |
108 | EditBasicConfigurationComponent, | 101 | EditBasicConfigurationComponent, |
109 | EditVODTranscodingComponent, | 102 | 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 @@ | |||
1 | import { Component } from '@angular/core' | ||
2 | |||
3 | @Component({ | ||
4 | template: '<router-outlet></router-outlet>' | ||
5 | }) | ||
6 | export class ConfigComponent { | ||
7 | } | ||
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' | |||
2 | import { EditCustomConfigComponent } from '@app/+admin/config/edit-custom-config' | 2 | import { EditCustomConfigComponent } from '@app/+admin/config/edit-custom-config' |
3 | import { UserRightGuard } from '@app/core' | 3 | import { UserRightGuard } from '@app/core' |
4 | import { UserRight } from '@shared/models' | 4 | import { UserRight } from '@shared/models' |
5 | import { ConfigComponent } from './config.component' | ||
6 | 5 | ||
7 | export const ConfigRoutes: Routes = [ | 6 | export const ConfigRoutes: Routes = [ |
8 | { | 7 | { |
9 | path: 'config', | 8 | path: 'config', |
10 | component: ConfigComponent, | ||
11 | canActivate: [ UserRightGuard ], | 9 | canActivate: [ UserRightGuard ], |
12 | data: { | 10 | data: { |
13 | userRight: UserRight.MANAGE_CONFIGURATION | 11 | 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 @@ | |||
1 | export * from './edit-custom-config' | 1 | export * from './edit-custom-config' |
2 | export * from './config.component' | ||
3 | export * from './config.routes' | 2 | 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' | |||
7 | @Component({ | 7 | @Component({ |
8 | selector: 'my-followers-list', | 8 | selector: 'my-followers-list', |
9 | templateUrl: './followers-list.component.html', | 9 | templateUrl: './followers-list.component.html', |
10 | styleUrls: [ '../follows.component.scss', './followers-list.component.scss' ] | 10 | styleUrls: [ './followers-list.component.scss' ] |
11 | }) | 11 | }) |
12 | export class FollowersListComponent extends RestTable implements OnInit { | 12 | export class FollowersListComponent extends RestTable implements OnInit { |
13 | followers: ActorFollow[] = [] | 13 | 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' | |||
7 | 7 | ||
8 | @Component({ | 8 | @Component({ |
9 | templateUrl: './following-list.component.html', | 9 | templateUrl: './following-list.component.html', |
10 | styleUrls: [ '../follows.component.scss', './following-list.component.scss' ] | 10 | styleUrls: [ './following-list.component.scss' ] |
11 | }) | 11 | }) |
12 | export class FollowingListComponent extends RestTable implements OnInit { | 12 | export class FollowingListComponent extends RestTable implements OnInit { |
13 | @ViewChild('followModal') followModal: FollowModalComponent | 13 | @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 @@ | |||
1 | <router-outlet></router-outlet> | ||
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 @@ | |||
1 | @use '_mixins' as *; | ||
2 | |||
3 | .form-sub-title { | ||
4 | @include margin-right(30px); | ||
5 | |||
6 | flex-grow: 0; | ||
7 | } | ||
8 | |||
9 | .badge { | ||
10 | @include table-badge; | ||
11 | } | ||
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 @@ | |||
1 | import { Component } from '@angular/core' | ||
2 | |||
3 | @Component({ | ||
4 | templateUrl: './follows.component.html', | ||
5 | styleUrls: [ './follows.component.scss' ] | ||
6 | }) | ||
7 | export class FollowsComponent { | ||
8 | } | ||
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' | |||
4 | import { UserRight } from '@shared/models' | 4 | import { UserRight } from '@shared/models' |
5 | import { FollowersListComponent } from './followers-list' | 5 | import { FollowersListComponent } from './followers-list' |
6 | import { FollowingListComponent } from './following-list/following-list.component' | 6 | import { FollowingListComponent } from './following-list/following-list.component' |
7 | import { FollowsComponent } from './follows.component' | ||
8 | 7 | ||
9 | export const FollowsRoutes: Routes = [ | 8 | export const FollowsRoutes: Routes = [ |
10 | { | 9 | { |
11 | path: 'follows', | 10 | path: 'follows', |
12 | component: FollowsComponent, | ||
13 | canActivate: [ UserRightGuard ], | 11 | canActivate: [ UserRightGuard ], |
14 | data: { | 12 | data: { |
15 | userRight: UserRight.MANAGE_SERVER_FOLLOW | 13 | 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 @@ | |||
1 | export * from './followers-list' | 1 | export * from './followers-list' |
2 | export * from './following-list' | 2 | export * from './following-list' |
3 | export * from './video-redundancies-list' | 3 | export * from './video-redundancies-list' |
4 | export * from './follows.component' | ||
5 | export * from './follows.routes' | 4 | 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 @@ | |||
86 | 86 | ||
87 | 87 | ||
88 | <div class="redundancies-charts" *ngIf="isDisplayingRemoteVideos()"> | 88 | <div class="redundancies-charts" *ngIf="isDisplayingRemoteVideos()"> |
89 | <div class="form-sub-title" i18n>Enabled strategies stats</div> | 89 | <h6 i18n>Enabled strategies stats</h6> |
90 | 90 | ||
91 | <div class="chart-blocks"> | 91 | <div class="chart-blocks"> |
92 | 92 | ||
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' | |||
10 | @Component({ | 10 | @Component({ |
11 | selector: 'my-video-redundancies-list', | 11 | selector: 'my-video-redundancies-list', |
12 | templateUrl: './video-redundancies-list.component.html', | 12 | templateUrl: './video-redundancies-list.component.html', |
13 | styleUrls: [ '../follows.component.scss', './video-redundancies-list.component.scss' ] | 13 | styleUrls: [ './video-redundancies-list.component.scss' ] |
14 | }) | 14 | }) |
15 | export class VideoRedundanciesListComponent extends RestTable implements OnInit { | 15 | export class VideoRedundanciesListComponent extends RestTable implements OnInit { |
16 | private static LOCAL_STORAGE_DISPLAY_TYPE = 'video-redundancies-list-display-type' | 16 | 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 @@ | |||
1 | export * from './abuse-list' | 1 | export * from './abuse-list' |
2 | export * from './instance-blocklist' | 2 | export * from './instance-blocklist' |
3 | export * from './video-block-list' | 3 | export * from './video-block-list' |
4 | export * from './moderation.component' | ||
5 | export * from './moderation.routes' | 4 | 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 @@ | |||
1 | <router-outlet></router-outlet> \ 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 @@ | |||
1 | import { Component, OnInit } from '@angular/core' | ||
2 | import { ServerService } from '@app/core' | ||
3 | |||
4 | @Component({ | ||
5 | templateUrl: './moderation.component.html', | ||
6 | styleUrls: [ ] | ||
7 | }) | ||
8 | export class ModerationComponent implements OnInit { | ||
9 | autoBlockVideosEnabled = false | ||
10 | |||
11 | constructor ( | ||
12 | private serverService: ServerService | ||
13 | ) { } | ||
14 | |||
15 | ngOnInit (): void { | ||
16 | const serverConfig = this.serverService.getHTMLConfig() | ||
17 | |||
18 | this.autoBlockVideosEnabled = serverConfig.autoBlacklist.videos.ofUsers.enabled | ||
19 | } | ||
20 | } | ||
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 @@ | |||
1 | import { Routes } from '@angular/router' | 1 | import { Routes } from '@angular/router' |
2 | import { AbuseListComponent } from '@app/+admin/moderation/abuse-list' | 2 | import { AbuseListComponent } from '@app/+admin/moderation/abuse-list' |
3 | import { InstanceAccountBlocklistComponent, InstanceServerBlocklistComponent } from '@app/+admin/moderation/instance-blocklist' | 3 | import { InstanceAccountBlocklistComponent, InstanceServerBlocklistComponent } from '@app/+admin/moderation/instance-blocklist' |
4 | import { ModerationComponent } from '@app/+admin/moderation/moderation.component' | ||
5 | import { VideoBlockListComponent } from '@app/+admin/moderation/video-block-list' | 4 | import { VideoBlockListComponent } from '@app/+admin/moderation/video-block-list' |
6 | import { VideoCommentListComponent } from './video-comment-list' | 5 | import { VideoCommentListComponent } from './video-comment-list' |
7 | import { UserRightGuard } from '@app/core' | 6 | import { UserRightGuard } from '@app/core' |
@@ -10,7 +9,6 @@ import { UserRight } from '@shared/models' | |||
10 | export const ModerationRoutes: Routes = [ | 9 | export const ModerationRoutes: Routes = [ |
11 | { | 10 | { |
12 | path: 'moderation', | 11 | path: 'moderation', |
13 | component: ModerationComponent, | ||
14 | children: [ | 12 | children: [ |
15 | { | 13 | { |
16 | path: '', | 14 | 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 { | |||
5 | width: 24px; | 5 | width: 24px; |
6 | height: 24px; | 6 | height: 24px; |
7 | } | 7 | } |
8 | |||
9 | .badge { | ||
10 | @include table-badge; | ||
11 | } | ||
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 { | |||
43 | @include chip; | 43 | @include chip; |
44 | } | 44 | } |
45 | 45 | ||
46 | .badge { | ||
47 | @include table-badge; | ||
48 | } | ||
49 | |||
50 | .progress { | 46 | .progress { |
51 | @include progressbar($small: true); | 47 | @include progressbar($small: true); |
52 | 48 | ||
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 @@ | |||
1 | export * from './debug' | 1 | export * from './debug' |
2 | export * from './jobs' | 2 | export * from './jobs' |
3 | export * from './logs' | 3 | export * from './logs' |
4 | export * from './system.component' | ||
5 | export * from './system.routes' | 4 | 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 { | |||
55 | .job-error { | 55 | .job-error { |
56 | color: #ff0000; | 56 | color: #ff0000; |
57 | } | 57 | } |
58 | |||
59 | .badge { | ||
60 | @include table-badge; | ||
61 | } | ||
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 @@ | |||
1 | <router-outlet></router-outlet> | ||
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 @@ | |||
1 | import { Component } from '@angular/core' | ||
2 | |||
3 | @Component({ | ||
4 | templateUrl: './system.component.html', | ||
5 | styleUrls: [] | ||
6 | }) | ||
7 | export class SystemComponent { | ||
8 | } | ||
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' | |||
4 | import { DebugComponent } from './debug' | 4 | import { DebugComponent } from './debug' |
5 | import { JobsComponent } from './jobs/jobs.component' | 5 | import { JobsComponent } from './jobs/jobs.component' |
6 | import { LogsComponent } from './logs' | 6 | import { LogsComponent } from './logs' |
7 | import { SystemComponent } from './system.component' | ||
8 | 7 | ||
9 | export const SystemRoutes: Routes = [ | 8 | export const SystemRoutes: Routes = [ |
10 | { | 9 | { |
11 | path: 'system', | 10 | path: 'system', |
12 | component: SystemComponent, | ||
13 | children: [ | 11 | children: [ |
14 | { | 12 | { |
15 | path: '', | 13 | 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 @@ | |||
6 | @include chip; | 6 | @include chip; |
7 | } | 7 | } |
8 | 8 | ||
9 | .badge { | ||
10 | @include table-badge; | ||
11 | } | ||
12 | |||
13 | .video-table-video { | 9 | .video-table-video { |
14 | display: inline-flex; | 10 | display: inline-flex; |
15 | 11 | ||
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 { | |||
8 | .video-import-error { | 8 | .video-import-error { |
9 | color: #ff0000; | 9 | color: #ff0000; |
10 | } | 10 | } |
11 | |||
12 | .badge { | ||
13 | @include table-badge; | ||
14 | } | ||
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' | |||
4 | import { VideosListCommonPageComponent } from './video-list' | 4 | import { VideosListCommonPageComponent } from './video-list' |
5 | import { VideoOverviewComponent } from './video-list/overview/video-overview.component' | 5 | import { VideoOverviewComponent } from './video-list/overview/video-overview.component' |
6 | import { VideoUserSubscriptionsComponent } from './video-list/video-user-subscriptions.component' | 6 | import { VideoUserSubscriptionsComponent } from './video-list/video-user-subscriptions.component' |
7 | import { VideosComponent } from './videos.component' | ||
8 | 7 | ||
9 | const videosRoutes: Routes = [ | 8 | const videosRoutes: Routes = [ |
10 | { | 9 | { |
11 | path: '', | 10 | path: '', |
12 | component: VideosComponent, | ||
13 | children: [ | 11 | children: [ |
14 | { | 12 | { |
15 | path: 'overview', | 13 | 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 @@ | |||
1 | import { Component } from '@angular/core' | ||
2 | |||
3 | @Component({ | ||
4 | template: '<router-outlet></router-outlet>' | ||
5 | }) | ||
6 | 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' | |||
9 | import { VideoOverviewComponent } from './video-list/overview/video-overview.component' | 9 | import { VideoOverviewComponent } from './video-list/overview/video-overview.component' |
10 | import { VideoUserSubscriptionsComponent } from './video-list/video-user-subscriptions.component' | 10 | import { VideoUserSubscriptionsComponent } from './video-list/video-user-subscriptions.component' |
11 | import { VideosRoutingModule } from './videos-routing.module' | 11 | import { VideosRoutingModule } from './videos-routing.module' |
12 | import { VideosComponent } from './videos.component' | ||
13 | 12 | ||
14 | @NgModule({ | 13 | @NgModule({ |
15 | imports: [ | 14 | imports: [ |
@@ -24,16 +23,12 @@ import { VideosComponent } from './videos.component' | |||
24 | ], | 23 | ], |
25 | 24 | ||
26 | declarations: [ | 25 | declarations: [ |
27 | VideosComponent, | ||
28 | |||
29 | VideoUserSubscriptionsComponent, | 26 | VideoUserSubscriptionsComponent, |
30 | VideoOverviewComponent, | 27 | VideoOverviewComponent, |
31 | VideosListCommonPageComponent | 28 | VideosListCommonPageComponent |
32 | ], | 29 | ], |
33 | 30 | ||
34 | exports: [ | 31 | exports: [], |
35 | VideosComponent | ||
36 | ], | ||
37 | 32 | ||
38 | providers: [ | 33 | providers: [ |
39 | OverviewService | 34 | 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 { | |||
262 | align-items: center; | 262 | align-items: center; |
263 | margin-bottom: 30px; | 263 | margin-bottom: 30px; |
264 | 264 | ||
265 | .form-sub-title { | ||
266 | flex-grow: 1; | ||
267 | } | ||
268 | |||
269 | .admin-sub-nav a { | 265 | .admin-sub-nav a { |
270 | @include disable-default-a-behaviour; | 266 | @include disable-default-a-behaviour; |
271 | 267 | ||
@@ -289,11 +285,6 @@ my-input-toggle-hidden ::ng-deep input { | |||
289 | } | 285 | } |
290 | } | 286 | } |
291 | 287 | ||
292 | .form-sub-title { | ||
293 | font-size: 20px; | ||
294 | font-weight: bold; | ||
295 | } | ||
296 | |||
297 | // In tables, don't have a hover different background | 288 | // In tables, don't have a hover different background |
298 | table { | 289 | table { |
299 | .action-button-edit, | 290 | .action-button-edit, |
@@ -412,13 +403,6 @@ ngx-loading-bar { | |||
412 | .admin-sub-header { | 403 | .admin-sub-header { |
413 | flex-direction: column; | 404 | flex-direction: column; |
414 | 405 | ||
415 | .form-sub-title { | ||
416 | @include margin-right(0 !important); | ||
417 | |||
418 | margin-bottom: 10px; | ||
419 | text-align: center; | ||
420 | } | ||
421 | |||
422 | .admin-sub-nav { | 406 | .admin-sub-nav { |
423 | display: block; | 407 | display: block; |
424 | overflow-x: auto; | 408 | 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 { | |||
495 | border: 1px solid #a80000; | 495 | border: 1px solid #a80000; |
496 | } | 496 | } |
497 | 497 | ||
498 | // | 498 | // data table customizations |
499 | 499 | ||
500 | @mixin glyphicon-light { | 500 | @mixin glyphicon-light { |
501 | font-family: 'Glyphicons Halflings'; | 501 | font-family: 'Glyphicons Halflings'; |
@@ -504,7 +504,6 @@ body p-selectbutton.ng-dirty.ng-invalid .p-button { | |||
504 | font-display: swap; | 504 | font-display: swap; |
505 | } | 505 | } |
506 | 506 | ||
507 | // data table customizations | ||
508 | p-table { | 507 | p-table { |
509 | .p-datatable-header { | 508 | .p-datatable-header { |
510 | border: none !important; | 509 | border: none !important; |
@@ -759,6 +758,10 @@ p-table { | |||
759 | } | 758 | } |
760 | } | 759 | } |
761 | } | 760 | } |
761 | |||
762 | .badge { | ||
763 | @include table-badge; | ||
764 | } | ||
762 | } | 765 | } |
763 | 766 | ||
764 | // overflow data table | 767 | // overflow data table |