aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.ts1
-rw-r--r--client/src/app/+login/login-routing.module.ts (renamed from client/src/app/login/login-routing.module.ts)2
-rw-r--r--client/src/app/+login/login.component.html (renamed from client/src/app/login/login.component.html)0
-rw-r--r--client/src/app/+login/login.component.scss (renamed from client/src/app/login/login.component.scss)0
-rw-r--r--client/src/app/+login/login.component.ts (renamed from client/src/app/login/login.component.ts)0
-rw-r--r--client/src/app/+login/login.module.ts (renamed from client/src/app/login/login.module.ts)0
-rw-r--r--client/src/app/+reset-password/reset-password-routing.module.ts (renamed from client/src/app/reset-password/reset-password-routing.module.ts)2
-rw-r--r--client/src/app/+reset-password/reset-password.component.html (renamed from client/src/app/reset-password/reset-password.component.html)0
-rw-r--r--client/src/app/+reset-password/reset-password.component.scss (renamed from client/src/app/reset-password/reset-password.component.scss)0
-rw-r--r--client/src/app/+reset-password/reset-password.component.ts (renamed from client/src/app/reset-password/reset-password.component.ts)0
-rw-r--r--client/src/app/+reset-password/reset-password.module.ts (renamed from client/src/app/reset-password/reset-password.module.ts)0
-rw-r--r--client/src/app/+search/channel-lazy-load.resolver.ts (renamed from client/src/app/search/channel-lazy-load.resolver.ts)2
-rw-r--r--client/src/app/+search/search-filters.component.html (renamed from client/src/app/search/search-filters.component.html)0
-rw-r--r--client/src/app/+search/search-filters.component.scss (renamed from client/src/app/search/search-filters.component.scss)0
-rw-r--r--client/src/app/+search/search-filters.component.ts (renamed from client/src/app/search/search-filters.component.ts)2
-rw-r--r--client/src/app/+search/search-routing.module.ts (renamed from client/src/app/search/search-routing.module.ts)10
-rw-r--r--client/src/app/+search/search.component.html (renamed from client/src/app/search/search.component.html)0
-rw-r--r--client/src/app/+search/search.component.scss (renamed from client/src/app/search/search.component.scss)0
-rw-r--r--client/src/app/+search/search.component.ts (renamed from client/src/app/search/search.component.ts)3
-rw-r--r--client/src/app/+search/search.module.ts (renamed from client/src/app/search/search.module.ts)9
-rw-r--r--client/src/app/+search/video-lazy-load.resolver.ts (renamed from client/src/app/search/video-lazy-load.resolver.ts)2
-rw-r--r--client/src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts (renamed from client/src/app/videos/+video-edit/shared/i18n-primeng-calendar.service.ts)0
-rw-r--r--client/src/app/+videos/+video-edit/shared/video-caption-add-modal.component.html (renamed from client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.html)0
-rw-r--r--client/src/app/+videos/+video-edit/shared/video-caption-add-modal.component.scss (renamed from client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.scss)0
-rw-r--r--client/src/app/+videos/+video-edit/shared/video-caption-add-modal.component.ts (renamed from client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.ts)0
-rw-r--r--client/src/app/+videos/+video-edit/shared/video-edit.component.html (renamed from client/src/app/videos/+video-edit/shared/video-edit.component.html)0
-rw-r--r--client/src/app/+videos/+video-edit/shared/video-edit.component.scss (renamed from client/src/app/videos/+video-edit/shared/video-edit.component.scss)0
-rw-r--r--client/src/app/+videos/+video-edit/shared/video-edit.component.ts (renamed from client/src/app/videos/+video-edit/shared/video-edit.component.ts)0
-rw-r--r--client/src/app/+videos/+video-edit/shared/video-edit.module.ts (renamed from client/src/app/videos/+video-edit/shared/video-edit.module.ts)0
-rw-r--r--client/src/app/+videos/+video-edit/video-add-components/drag-drop.directive.ts (renamed from client/src/app/videos/+video-edit/video-add-components/drag-drop.directive.ts)0
-rw-r--r--client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html (renamed from client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.html)0
-rw-r--r--client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.scss (renamed from client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.scss)0
-rw-r--r--client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.ts (renamed from client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.ts)2
-rw-r--r--client/src/app/+videos/+video-edit/video-add-components/video-import-url.component.html (renamed from client/src/app/videos/+video-edit/video-add-components/video-import-url.component.html)0
-rw-r--r--client/src/app/+videos/+video-edit/video-add-components/video-import-url.component.ts (renamed from client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts)2
-rw-r--r--client/src/app/+videos/+video-edit/video-add-components/video-send.scss (renamed from client/src/app/videos/+video-edit/video-add-components/video-send.scss)0
-rw-r--r--client/src/app/+videos/+video-edit/video-add-components/video-send.ts (renamed from client/src/app/videos/+video-edit/video-add-components/video-send.ts)0
-rw-r--r--client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html (renamed from client/src/app/videos/+video-edit/video-add-components/video-upload.component.html)0
-rw-r--r--client/src/app/+videos/+video-edit/video-add-components/video-upload.component.scss (renamed from client/src/app/videos/+video-edit/video-add-components/video-upload.component.scss)0
-rw-r--r--client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts (renamed from client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts)2
-rw-r--r--client/src/app/+videos/+video-edit/video-add-routing.module.ts (renamed from client/src/app/videos/+video-edit/video-add-routing.module.ts)0
-rw-r--r--client/src/app/+videos/+video-edit/video-add.component.html (renamed from client/src/app/videos/+video-edit/video-add.component.html)0
-rw-r--r--client/src/app/+videos/+video-edit/video-add.component.scss (renamed from client/src/app/videos/+video-edit/video-add.component.scss)0
-rw-r--r--client/src/app/+videos/+video-edit/video-add.component.ts (renamed from client/src/app/videos/+video-edit/video-add.component.ts)0
-rw-r--r--client/src/app/+videos/+video-edit/video-add.module.ts (renamed from client/src/app/videos/+video-edit/video-add.module.ts)0
-rw-r--r--client/src/app/+videos/+video-edit/video-update-routing.module.ts (renamed from client/src/app/videos/+video-edit/video-update-routing.module.ts)0
-rw-r--r--client/src/app/+videos/+video-edit/video-update.component.html (renamed from client/src/app/videos/+video-edit/video-update.component.html)0
-rw-r--r--client/src/app/+videos/+video-edit/video-update.component.ts (renamed from client/src/app/videos/+video-edit/video-update.component.ts)0
-rw-r--r--client/src/app/+videos/+video-edit/video-update.module.ts (renamed from client/src/app/videos/+video-edit/video-update.module.ts)2
-rw-r--r--client/src/app/+videos/+video-edit/video-update.resolver.ts (renamed from client/src/app/videos/+video-edit/video-update.resolver.ts)0
-rw-r--r--client/src/app/+videos/+video-watch/comment/video-comment-add.component.html (renamed from client/src/app/videos/+video-watch/comment/video-comment-add.component.html)0
-rw-r--r--client/src/app/+videos/+video-watch/comment/video-comment-add.component.scss (renamed from client/src/app/videos/+video-watch/comment/video-comment-add.component.scss)0
-rw-r--r--client/src/app/+videos/+video-watch/comment/video-comment-add.component.ts (renamed from client/src/app/videos/+video-watch/comment/video-comment-add.component.ts)0
-rw-r--r--client/src/app/+videos/+video-watch/comment/video-comment-thread-tree.model.ts (renamed from client/src/app/videos/+video-watch/comment/video-comment-thread-tree.model.ts)0
-rw-r--r--client/src/app/+videos/+video-watch/comment/video-comment.component.html (renamed from client/src/app/videos/+video-watch/comment/video-comment.component.html)0
-rw-r--r--client/src/app/+videos/+video-watch/comment/video-comment.component.scss (renamed from client/src/app/videos/+video-watch/comment/video-comment.component.scss)0
-rw-r--r--client/src/app/+videos/+video-watch/comment/video-comment.component.ts (renamed from client/src/app/videos/+video-watch/comment/video-comment.component.ts)0
-rw-r--r--client/src/app/+videos/+video-watch/comment/video-comment.model.ts (renamed from client/src/app/videos/+video-watch/comment/video-comment.model.ts)0
-rw-r--r--client/src/app/+videos/+video-watch/comment/video-comment.service.ts (renamed from client/src/app/videos/+video-watch/comment/video-comment.service.ts)0
-rw-r--r--client/src/app/+videos/+video-watch/comment/video-comments.component.html (renamed from client/src/app/videos/+video-watch/comment/video-comments.component.html)0
-rw-r--r--client/src/app/+videos/+video-watch/comment/video-comments.component.scss (renamed from client/src/app/videos/+video-watch/comment/video-comments.component.scss)0
-rw-r--r--client/src/app/+videos/+video-watch/comment/video-comments.component.ts (renamed from client/src/app/videos/+video-watch/comment/video-comments.component.ts)0
-rw-r--r--client/src/app/+videos/+video-watch/modal/video-share.component.html (renamed from client/src/app/videos/+video-watch/modal/video-share.component.html)0
-rw-r--r--client/src/app/+videos/+video-watch/modal/video-share.component.scss (renamed from client/src/app/videos/+video-watch/modal/video-share.component.scss)0
-rw-r--r--client/src/app/+videos/+video-watch/modal/video-share.component.ts (renamed from client/src/app/videos/+video-watch/modal/video-share.component.ts)0
-rw-r--r--client/src/app/+videos/+video-watch/modal/video-support.component.html (renamed from client/src/app/videos/+video-watch/modal/video-support.component.html)0
-rw-r--r--client/src/app/+videos/+video-watch/modal/video-support.component.scss (renamed from client/src/app/videos/+video-watch/modal/video-support.component.scss)0
-rw-r--r--client/src/app/+videos/+video-watch/modal/video-support.component.ts (renamed from client/src/app/videos/+video-watch/modal/video-support.component.ts)0
-rw-r--r--client/src/app/+videos/+video-watch/recommendations/recent-videos-recommendation.service.ts (renamed from client/src/app/videos/recommendations/recent-videos-recommendation.service.ts)3
-rw-r--r--client/src/app/+videos/+video-watch/recommendations/recommendation-info.model.ts (renamed from client/src/app/videos/recommendations/recommendation-info.model.ts)0
-rw-r--r--client/src/app/+videos/+video-watch/recommendations/recommendations.module.ts (renamed from client/src/app/videos/recommendations/recommendations.module.ts)2
-rw-r--r--client/src/app/+videos/+video-watch/recommendations/recommendations.service.ts (renamed from client/src/app/videos/recommendations/recommendations.service.ts)0
-rw-r--r--client/src/app/+videos/+video-watch/recommendations/recommended-videos.component.html (renamed from client/src/app/videos/recommendations/recommended-videos.component.html)0
-rw-r--r--client/src/app/+videos/+video-watch/recommendations/recommended-videos.component.scss (renamed from client/src/app/videos/recommendations/recommended-videos.component.scss)0
-rw-r--r--client/src/app/+videos/+video-watch/recommendations/recommended-videos.component.ts (renamed from client/src/app/videos/recommendations/recommended-videos.component.ts)0
-rw-r--r--client/src/app/+videos/+video-watch/recommendations/recommended-videos.store.ts (renamed from client/src/app/videos/recommendations/recommended-videos.store.ts)0
-rw-r--r--client/src/app/+videos/+video-watch/timestamp-route-transformer.directive.ts (renamed from client/src/app/videos/+video-watch/timestamp-route-transformer.directive.ts)0
-rw-r--r--client/src/app/+videos/+video-watch/video-duration-formatter.pipe.ts (renamed from client/src/app/videos/+video-watch/video-duration-formatter.pipe.ts)0
-rw-r--r--client/src/app/+videos/+video-watch/video-watch-playlist.component.html (renamed from client/src/app/videos/+video-watch/video-watch-playlist.component.html)0
-rw-r--r--client/src/app/+videos/+video-watch/video-watch-playlist.component.scss (renamed from client/src/app/videos/+video-watch/video-watch-playlist.component.scss)0
-rw-r--r--client/src/app/+videos/+video-watch/video-watch-playlist.component.ts (renamed from client/src/app/videos/+video-watch/video-watch-playlist.component.ts)0
-rw-r--r--client/src/app/+videos/+video-watch/video-watch-routing.module.ts (renamed from client/src/app/videos/+video-watch/video-watch-routing.module.ts)0
-rw-r--r--client/src/app/+videos/+video-watch/video-watch.component.html (renamed from client/src/app/videos/+video-watch/video-watch.component.html)0
-rw-r--r--client/src/app/+videos/+video-watch/video-watch.component.scss (renamed from client/src/app/videos/+video-watch/video-watch.component.scss)0
-rw-r--r--client/src/app/+videos/+video-watch/video-watch.component.ts (renamed from client/src/app/videos/+video-watch/video-watch.component.ts)0
-rw-r--r--client/src/app/+videos/+video-watch/video-watch.module.ts (renamed from client/src/app/videos/+video-watch/video-watch.module.ts)2
-rw-r--r--client/src/app/+videos/index.ts (renamed from client/src/app/videos/index.ts)0
-rw-r--r--client/src/app/+videos/video-list/index.ts (renamed from client/src/app/videos/video-list/index.ts)0
-rw-r--r--client/src/app/+videos/video-list/overview/index.ts (renamed from client/src/app/videos/video-list/overview/index.ts)0
-rw-r--r--client/src/app/+videos/video-list/overview/overview.service.ts (renamed from client/src/app/videos/video-list/overview/overview.service.ts)0
-rw-r--r--client/src/app/+videos/video-list/overview/video-overview.component.html (renamed from client/src/app/videos/video-list/overview/video-overview.component.html)0
-rw-r--r--client/src/app/+videos/video-list/overview/video-overview.component.scss (renamed from client/src/app/videos/video-list/overview/video-overview.component.scss)0
-rw-r--r--client/src/app/+videos/video-list/overview/video-overview.component.ts (renamed from client/src/app/videos/video-list/overview/video-overview.component.ts)0
-rw-r--r--client/src/app/+videos/video-list/overview/videos-overview.model.ts (renamed from client/src/app/videos/video-list/overview/videos-overview.model.ts)0
-rw-r--r--client/src/app/+videos/video-list/video-local.component.ts (renamed from client/src/app/videos/video-list/video-local.component.ts)0
-rw-r--r--client/src/app/+videos/video-list/video-most-liked.component.ts (renamed from client/src/app/videos/video-list/video-most-liked.component.ts)0
-rw-r--r--client/src/app/+videos/video-list/video-recently-added.component.ts (renamed from client/src/app/videos/video-list/video-recently-added.component.ts)0
-rw-r--r--client/src/app/+videos/video-list/video-trending.component.ts (renamed from client/src/app/videos/video-list/video-trending.component.ts)0
-rw-r--r--client/src/app/+videos/video-list/video-user-subscriptions.component.ts (renamed from client/src/app/videos/video-list/video-user-subscriptions.component.ts)0
-rw-r--r--client/src/app/+videos/videos-routing.module.ts (renamed from client/src/app/videos/videos-routing.module.ts)16
-rw-r--r--client/src/app/+videos/videos.component.ts (renamed from client/src/app/videos/videos.component.ts)0
-rw-r--r--client/src/app/+videos/videos.module.ts (renamed from client/src/app/videos/videos.module.ts)5
-rw-r--r--client/src/app/app-routing.module.ts19
-rw-r--r--client/src/app/app.module.ts12
-rw-r--r--client/src/app/empty.component.ts10
-rw-r--r--client/src/app/header/highlight.pipe.ts (renamed from client/src/app/search/highlight.pipe.ts)0
-rw-r--r--client/src/app/login/index.ts3
-rw-r--r--client/src/app/reset-password/index.ts3
-rw-r--r--client/src/app/search/index.ts3
-rw-r--r--client/src/app/shared/shared-search/advanced-search.model.ts (renamed from client/src/app/search/advanced-search.model.ts)0
-rw-r--r--client/src/app/shared/shared-search/index.ts3
-rw-r--r--client/src/app/shared/shared-search/search.service.ts (renamed from client/src/app/search/search.service.ts)7
-rw-r--r--client/src/app/shared/shared-search/shared-search.module.ts20
-rw-r--r--shared/models/videos/abuse/index.ts1
114 files changed, 94 insertions, 56 deletions
diff --git a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.ts b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.ts
index 9aa70288d..5db2887fa 100644
--- a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.ts
+++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.ts
@@ -3,6 +3,7 @@ import { Actor } from '@app/shared/shared-main'
3import { I18n } from '@ngx-translate/i18n-polyfill' 3import { I18n } from '@ngx-translate/i18n-polyfill'
4import { VideoAbusePredefinedReasonsString } from '../../../../../../shared/models/videos/abuse/video-abuse-reason.model' 4import { VideoAbusePredefinedReasonsString } from '../../../../../../shared/models/videos/abuse/video-abuse-reason.model'
5import { ProcessedVideoAbuse } from './video-abuse-list.component' 5import { ProcessedVideoAbuse } from './video-abuse-list.component'
6import { durationToString } from '@app/helpers'
6 7
7@Component({ 8@Component({
8 selector: 'my-video-abuse-details', 9 selector: 'my-video-abuse-details',
diff --git a/client/src/app/login/login-routing.module.ts b/client/src/app/+login/login-routing.module.ts
index 22f59b4d9..aad55eac8 100644
--- a/client/src/app/login/login-routing.module.ts
+++ b/client/src/app/+login/login-routing.module.ts
@@ -6,7 +6,7 @@ import { ServerConfigResolver } from '@app/core/routing/server-config-resolver.s
6 6
7const loginRoutes: Routes = [ 7const loginRoutes: Routes = [
8 { 8 {
9 path: 'login', 9 path: '',
10 component: LoginComponent, 10 component: LoginComponent,
11 canActivate: [ MetaGuard ], 11 canActivate: [ MetaGuard ],
12 data: { 12 data: {
diff --git a/client/src/app/login/login.component.html b/client/src/app/+login/login.component.html
index 599b203ae..599b203ae 100644
--- a/client/src/app/login/login.component.html
+++ b/client/src/app/+login/login.component.html
diff --git a/client/src/app/login/login.component.scss b/client/src/app/+login/login.component.scss
index fde6cc15e..fde6cc15e 100644
--- a/client/src/app/login/login.component.scss
+++ b/client/src/app/+login/login.component.scss
diff --git a/client/src/app/login/login.component.ts b/client/src/app/+login/login.component.ts
index cbc51ee21..cbc51ee21 100644
--- a/client/src/app/login/login.component.ts
+++ b/client/src/app/+login/login.component.ts
diff --git a/client/src/app/login/login.module.ts b/client/src/app/+login/login.module.ts
index c41902426..c41902426 100644
--- a/client/src/app/login/login.module.ts
+++ b/client/src/app/+login/login.module.ts
diff --git a/client/src/app/reset-password/reset-password-routing.module.ts b/client/src/app/+reset-password/reset-password-routing.module.ts
index d443b51d6..31bc08709 100644
--- a/client/src/app/reset-password/reset-password-routing.module.ts
+++ b/client/src/app/+reset-password/reset-password-routing.module.ts
@@ -5,7 +5,7 @@ import { ResetPasswordComponent } from './reset-password.component'
5 5
6const resetPasswordRoutes: Routes = [ 6const resetPasswordRoutes: Routes = [
7 { 7 {
8 path: 'reset-password', 8 path: '',
9 component: ResetPasswordComponent, 9 component: ResetPasswordComponent,
10 canActivate: [ MetaGuard ], 10 canActivate: [ MetaGuard ],
11 data: { 11 data: {
diff --git a/client/src/app/reset-password/reset-password.component.html b/client/src/app/+reset-password/reset-password.component.html
index af30af4a0..af30af4a0 100644
--- a/client/src/app/reset-password/reset-password.component.html
+++ b/client/src/app/+reset-password/reset-password.component.html
diff --git a/client/src/app/reset-password/reset-password.component.scss b/client/src/app/+reset-password/reset-password.component.scss
index efec6b706..efec6b706 100644
--- a/client/src/app/reset-password/reset-password.component.scss
+++ b/client/src/app/+reset-password/reset-password.component.scss
diff --git a/client/src/app/reset-password/reset-password.component.ts b/client/src/app/+reset-password/reset-password.component.ts
index 8d50e9839..8d50e9839 100644
--- a/client/src/app/reset-password/reset-password.component.ts
+++ b/client/src/app/+reset-password/reset-password.component.ts
diff --git a/client/src/app/reset-password/reset-password.module.ts b/client/src/app/+reset-password/reset-password.module.ts
index c77f1c4b0..c77f1c4b0 100644
--- a/client/src/app/reset-password/reset-password.module.ts
+++ b/client/src/app/+reset-password/reset-password.module.ts
diff --git a/client/src/app/search/channel-lazy-load.resolver.ts b/client/src/app/+search/channel-lazy-load.resolver.ts
index 5b6961e98..17a212829 100644
--- a/client/src/app/search/channel-lazy-load.resolver.ts
+++ b/client/src/app/+search/channel-lazy-load.resolver.ts
@@ -1,7 +1,7 @@
1import { map } from 'rxjs/operators' 1import { map } from 'rxjs/operators'
2import { Injectable } from '@angular/core' 2import { Injectable } from '@angular/core'
3import { ActivatedRouteSnapshot, Resolve, Router } from '@angular/router' 3import { ActivatedRouteSnapshot, Resolve, Router } from '@angular/router'
4import { SearchService } from './search.service' 4import { SearchService } from '@app/shared/shared-search'
5 5
6@Injectable() 6@Injectable()
7export class ChannelLazyLoadResolver implements Resolve<any> { 7export class ChannelLazyLoadResolver implements Resolve<any> {
diff --git a/client/src/app/search/search-filters.component.html b/client/src/app/+search/search-filters.component.html
index e20aef8fb..e20aef8fb 100644
--- a/client/src/app/search/search-filters.component.html
+++ b/client/src/app/+search/search-filters.component.html
diff --git a/client/src/app/search/search-filters.component.scss b/client/src/app/+search/search-filters.component.scss
index a88a1c0b0..a88a1c0b0 100644
--- a/client/src/app/search/search-filters.component.scss
+++ b/client/src/app/+search/search-filters.component.scss
diff --git a/client/src/app/search/search-filters.component.ts b/client/src/app/+search/search-filters.component.ts
index 14a5d0484..fc1db3258 100644
--- a/client/src/app/search/search-filters.component.ts
+++ b/client/src/app/+search/search-filters.component.ts
@@ -1,8 +1,8 @@
1import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core' 1import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'
2import { ValidatorFn } from '@angular/forms' 2import { ValidatorFn } from '@angular/forms'
3import { ServerService } from '@app/core' 3import { ServerService } from '@app/core'
4import { AdvancedSearch } from '@app/search/advanced-search.model'
5import { VideoValidatorsService } from '@app/shared/shared-forms' 4import { VideoValidatorsService } from '@app/shared/shared-forms'
5import { AdvancedSearch } from '@app/shared/shared-search'
6import { I18n } from '@ngx-translate/i18n-polyfill' 6import { I18n } from '@ngx-translate/i18n-polyfill'
7import { ServerConfig, VideoConstant } from '@shared/models' 7import { ServerConfig, VideoConstant } from '@shared/models'
8 8
diff --git a/client/src/app/search/search-routing.module.ts b/client/src/app/+search/search-routing.module.ts
index 9da900e9a..14a0d0a13 100644
--- a/client/src/app/search/search-routing.module.ts
+++ b/client/src/app/+search/search-routing.module.ts
@@ -1,13 +1,13 @@
1import { NgModule } from '@angular/core' 1import { NgModule } from '@angular/core'
2import { RouterModule, Routes } from '@angular/router' 2import { RouterModule, Routes } from '@angular/router'
3import { SearchComponent } from '@app/search/search.component'
4import { MetaGuard } from '@ngx-meta/core' 3import { MetaGuard } from '@ngx-meta/core'
5import { VideoLazyLoadResolver } from './video-lazy-load.resolver'
6import { ChannelLazyLoadResolver } from './channel-lazy-load.resolver' 4import { ChannelLazyLoadResolver } from './channel-lazy-load.resolver'
5import { SearchComponent } from './search.component'
6import { VideoLazyLoadResolver } from './video-lazy-load.resolver'
7 7
8const searchRoutes: Routes = [ 8const searchRoutes: Routes = [
9 { 9 {
10 path: 'search', 10 path: '',
11 component: SearchComponent, 11 component: SearchComponent,
12 canActivate: [ MetaGuard ], 12 canActivate: [ MetaGuard ],
13 data: { 13 data: {
@@ -17,7 +17,7 @@ const searchRoutes: Routes = [
17 } 17 }
18 }, 18 },
19 { 19 {
20 path: 'search/lazy-load-video', 20 path: 'lazy-load-video',
21 component: SearchComponent, 21 component: SearchComponent,
22 canActivate: [ MetaGuard ], 22 canActivate: [ MetaGuard ],
23 resolve: { 23 resolve: {
@@ -25,7 +25,7 @@ const searchRoutes: Routes = [
25 } 25 }
26 }, 26 },
27 { 27 {
28 path: 'search/lazy-load-channel', 28 path: 'lazy-load-channel',
29 component: SearchComponent, 29 component: SearchComponent,
30 canActivate: [ MetaGuard ], 30 canActivate: [ MetaGuard ],
31 resolve: { 31 resolve: {
diff --git a/client/src/app/search/search.component.html b/client/src/app/+search/search.component.html
index 9bff024ad..9bff024ad 100644
--- a/client/src/app/search/search.component.html
+++ b/client/src/app/+search/search.component.html
diff --git a/client/src/app/search/search.component.scss b/client/src/app/+search/search.component.scss
index 6e59adb60..6e59adb60 100644
--- a/client/src/app/search/search.component.scss
+++ b/client/src/app/+search/search.component.scss
diff --git a/client/src/app/search/search.component.ts b/client/src/app/+search/search.component.ts
index 83b06e0ce..1ed54937b 100644
--- a/client/src/app/search/search.component.ts
+++ b/client/src/app/+search/search.component.ts
@@ -4,12 +4,11 @@ import { ActivatedRoute, Router } from '@angular/router'
4import { AuthService, ComponentPagination, HooksService, Notifier, ServerService, User, UserService } from '@app/core' 4import { AuthService, ComponentPagination, HooksService, Notifier, ServerService, User, UserService } from '@app/core'
5import { immutableAssign } from '@app/helpers' 5import { immutableAssign } from '@app/helpers'
6import { Video, VideoChannel } from '@app/shared/shared-main' 6import { Video, VideoChannel } from '@app/shared/shared-main'
7import { AdvancedSearch, SearchService } from '@app/shared/shared-search'
7import { MiniatureDisplayOptions } from '@app/shared/shared-video-miniature' 8import { MiniatureDisplayOptions } from '@app/shared/shared-video-miniature'
8import { MetaService } from '@ngx-meta/core' 9import { MetaService } from '@ngx-meta/core'
9import { I18n } from '@ngx-translate/i18n-polyfill' 10import { I18n } from '@ngx-translate/i18n-polyfill'
10import { SearchTargetType, ServerConfig } from '@shared/models' 11import { SearchTargetType, ServerConfig } from '@shared/models'
11import { AdvancedSearch } from './advanced-search.model'
12import { SearchService } from './search.service'
13 12
14@Component({ 13@Component({
15 selector: 'my-search', 14 selector: 'my-search',
diff --git a/client/src/app/search/search.module.ts b/client/src/app/+search/search.module.ts
index 65c954de8..ee4f07ad1 100644
--- a/client/src/app/search/search.module.ts
+++ b/client/src/app/+search/search.module.ts
@@ -2,14 +2,14 @@ import { TagInputModule } from 'ngx-chips'
2import { NgModule } from '@angular/core' 2import { NgModule } from '@angular/core'
3import { SharedFormModule } from '@app/shared/shared-forms' 3import { SharedFormModule } from '@app/shared/shared-forms'
4import { SharedMainModule } from '@app/shared/shared-main' 4import { SharedMainModule } from '@app/shared/shared-main'
5import { SharedSearchModule } from '@app/shared/shared-search'
5import { SharedUserSubscriptionModule } from '@app/shared/shared-user-subscription' 6import { SharedUserSubscriptionModule } from '@app/shared/shared-user-subscription'
6import { SharedVideoMiniatureModule } from '@app/shared/shared-video-miniature' 7import { SharedVideoMiniatureModule } from '@app/shared/shared-video-miniature'
8import { SearchService } from '../shared/shared-search/search.service'
7import { ChannelLazyLoadResolver } from './channel-lazy-load.resolver' 9import { ChannelLazyLoadResolver } from './channel-lazy-load.resolver'
8import { HighlightPipe } from './highlight.pipe'
9import { SearchFiltersComponent } from './search-filters.component' 10import { SearchFiltersComponent } from './search-filters.component'
10import { SearchRoutingModule } from './search-routing.module' 11import { SearchRoutingModule } from './search-routing.module'
11import { SearchComponent } from './search.component' 12import { SearchComponent } from './search.component'
12import { SearchService } from './search.service'
13import { VideoLazyLoadResolver } from './video-lazy-load.resolver' 13import { VideoLazyLoadResolver } from './video-lazy-load.resolver'
14 14
15@NgModule({ 15@NgModule({
@@ -17,7 +17,9 @@ import { VideoLazyLoadResolver } from './video-lazy-load.resolver'
17 TagInputModule, 17 TagInputModule,
18 18
19 SearchRoutingModule, 19 SearchRoutingModule,
20
20 SharedMainModule, 21 SharedMainModule,
22 SharedSearchModule,
21 SharedFormModule, 23 SharedFormModule,
22 SharedUserSubscriptionModule, 24 SharedUserSubscriptionModule,
23 SharedVideoMiniatureModule 25 SharedVideoMiniatureModule
@@ -36,8 +38,7 @@ import { VideoLazyLoadResolver } from './video-lazy-load.resolver'
36 providers: [ 38 providers: [
37 SearchService, 39 SearchService,
38 VideoLazyLoadResolver, 40 VideoLazyLoadResolver,
39 ChannelLazyLoadResolver, 41 ChannelLazyLoadResolver
40 HighlightPipe
41 ] 42 ]
42}) 43})
43export class SearchModule { } 44export class SearchModule { }
diff --git a/client/src/app/search/video-lazy-load.resolver.ts b/client/src/app/+search/video-lazy-load.resolver.ts
index 8d846d367..e8b2b8c74 100644
--- a/client/src/app/search/video-lazy-load.resolver.ts
+++ b/client/src/app/+search/video-lazy-load.resolver.ts
@@ -1,7 +1,7 @@
1import { map } from 'rxjs/operators' 1import { map } from 'rxjs/operators'
2import { Injectable } from '@angular/core' 2import { Injectable } from '@angular/core'
3import { ActivatedRouteSnapshot, Resolve, Router } from '@angular/router' 3import { ActivatedRouteSnapshot, Resolve, Router } from '@angular/router'
4import { SearchService } from './search.service' 4import { SearchService } from '@app/shared/shared-search'
5 5
6@Injectable() 6@Injectable()
7export class VideoLazyLoadResolver implements Resolve<any> { 7export class VideoLazyLoadResolver implements Resolve<any> {
diff --git a/client/src/app/videos/+video-edit/shared/i18n-primeng-calendar.service.ts b/client/src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts
index b05852ff8..b05852ff8 100644
--- a/client/src/app/videos/+video-edit/shared/i18n-primeng-calendar.service.ts
+++ b/client/src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts
diff --git a/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.html b/client/src/app/+videos/+video-edit/shared/video-caption-add-modal.component.html
index 6a9e31b5a..6a9e31b5a 100644
--- a/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.html
+++ b/client/src/app/+videos/+video-edit/shared/video-caption-add-modal.component.html
diff --git a/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.scss b/client/src/app/+videos/+video-edit/shared/video-caption-add-modal.component.scss
index b257a16a9..b257a16a9 100644
--- a/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.scss
+++ b/client/src/app/+videos/+video-edit/shared/video-caption-add-modal.component.scss
diff --git a/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.ts b/client/src/app/+videos/+video-edit/shared/video-caption-add-modal.component.ts
index a90d04ce8..a90d04ce8 100644
--- a/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.ts
+++ b/client/src/app/+videos/+video-edit/shared/video-caption-add-modal.component.ts
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.html b/client/src/app/+videos/+video-edit/shared/video-edit.component.html
index c11a60dce..c11a60dce 100644
--- a/client/src/app/videos/+video-edit/shared/video-edit.component.html
+++ b/client/src/app/+videos/+video-edit/shared/video-edit.component.html
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.scss b/client/src/app/+videos/+video-edit/shared/video-edit.component.scss
index 69b907288..69b907288 100644
--- a/client/src/app/videos/+video-edit/shared/video-edit.component.scss
+++ b/client/src/app/+videos/+video-edit/shared/video-edit.component.scss
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.ts b/client/src/app/+videos/+video-edit/shared/video-edit.component.ts
index 239e453ad..239e453ad 100644
--- a/client/src/app/videos/+video-edit/shared/video-edit.component.ts
+++ b/client/src/app/+videos/+video-edit/shared/video-edit.component.ts
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.module.ts b/client/src/app/+videos/+video-edit/shared/video-edit.module.ts
index 96061a300..96061a300 100644
--- a/client/src/app/videos/+video-edit/shared/video-edit.module.ts
+++ b/client/src/app/+videos/+video-edit/shared/video-edit.module.ts
diff --git a/client/src/app/videos/+video-edit/video-add-components/drag-drop.directive.ts b/client/src/app/+videos/+video-edit/video-add-components/drag-drop.directive.ts
index 7b1a38c62..7b1a38c62 100644
--- a/client/src/app/videos/+video-edit/video-add-components/drag-drop.directive.ts
+++ b/client/src/app/+videos/+video-edit/video-add-components/drag-drop.directive.ts
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.html b/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html
index 7287f799d..7287f799d 100644
--- a/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.html
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.scss b/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.scss
index 1fef74994..1fef74994 100644
--- a/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.scss
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.scss
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.ts b/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.ts
index 5b453a1d9..538a187a8 100644
--- a/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.ts
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.ts
@@ -4,7 +4,7 @@ import { AuthService, CanComponentDeactivate, Notifier, ServerService } from '@a
4import { scrollToTop } from '@app/helpers' 4import { scrollToTop } from '@app/helpers'
5import { FormValidatorService } from '@app/shared/shared-forms' 5import { FormValidatorService } from '@app/shared/shared-forms'
6import { VideoCaptionService, VideoEdit, VideoImportService, VideoService } from '@app/shared/shared-main' 6import { VideoCaptionService, VideoEdit, VideoImportService, VideoService } from '@app/shared/shared-main'
7import { VideoSend } from '@app/videos/+video-edit/video-add-components/video-send' 7import { VideoSend } from './video-send'
8import { LoadingBarService } from '@ngx-loading-bar/core' 8import { LoadingBarService } from '@ngx-loading-bar/core'
9import { I18n } from '@ngx-translate/i18n-polyfill' 9import { I18n } from '@ngx-translate/i18n-polyfill'
10import { VideoPrivacy, VideoUpdate } from '@shared/models' 10import { VideoPrivacy, VideoUpdate } from '@shared/models'
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.html b/client/src/app/+videos/+video-edit/video-add-components/video-import-url.component.html
index 1910da403..1910da403 100644
--- a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.html
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-import-url.component.html
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts b/client/src/app/+videos/+video-edit/video-add-components/video-import-url.component.ts
index d0bd1f54d..6508eef7e 100644
--- a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-import-url.component.ts
@@ -5,7 +5,7 @@ import { AuthService, CanComponentDeactivate, Notifier, ServerService } from '@a
5import { getAbsoluteAPIUrl, scrollToTop } from '@app/helpers' 5import { getAbsoluteAPIUrl, scrollToTop } from '@app/helpers'
6import { FormValidatorService } from '@app/shared/shared-forms' 6import { FormValidatorService } from '@app/shared/shared-forms'
7import { VideoCaptionService, VideoEdit, VideoImportService, VideoService } from '@app/shared/shared-main' 7import { VideoCaptionService, VideoEdit, VideoImportService, VideoService } from '@app/shared/shared-main'
8import { VideoSend } from '@app/videos/+video-edit/video-add-components/video-send' 8import { VideoSend } from './video-send'
9import { LoadingBarService } from '@ngx-loading-bar/core' 9import { LoadingBarService } from '@ngx-loading-bar/core'
10import { I18n } from '@ngx-translate/i18n-polyfill' 10import { I18n } from '@ngx-translate/i18n-polyfill'
11import { VideoPrivacy, VideoUpdate } from '@shared/models' 11import { VideoPrivacy, VideoUpdate } from '@shared/models'
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-send.scss b/client/src/app/+videos/+video-edit/video-add-components/video-send.scss
index ebe14c59e..ebe14c59e 100644
--- a/client/src/app/videos/+video-edit/video-add-components/video-send.scss
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-send.scss
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-send.ts b/client/src/app/+videos/+video-edit/video-add-components/video-send.ts
index 94479321d..94479321d 100644
--- a/client/src/app/videos/+video-edit/video-add-components/video-send.ts
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-send.ts
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.html b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html
index dad88a661..dad88a661 100644
--- a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.html
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.scss b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.scss
index a4f87b0b8..a4f87b0b8 100644
--- a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.scss
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.scss
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts
index eb7ac32ae..e46ce6599 100644
--- a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts
@@ -7,10 +7,10 @@ import { AuthService, CanComponentDeactivate, Notifier, ServerService, UserServi
7import { scrollToTop } from '@app/helpers' 7import { scrollToTop } from '@app/helpers'
8import { FormValidatorService } from '@app/shared/shared-forms' 8import { FormValidatorService } from '@app/shared/shared-forms'
9import { VideoCaptionService, VideoEdit, VideoService } from '@app/shared/shared-main' 9import { VideoCaptionService, VideoEdit, VideoService } from '@app/shared/shared-main'
10import { VideoSend } from '@app/videos/+video-edit/video-add-components/video-send'
11import { LoadingBarService } from '@ngx-loading-bar/core' 10import { LoadingBarService } from '@ngx-loading-bar/core'
12import { I18n } from '@ngx-translate/i18n-polyfill' 11import { I18n } from '@ngx-translate/i18n-polyfill'
13import { VideoPrivacy } from '@shared/models' 12import { VideoPrivacy } from '@shared/models'
13import { VideoSend } from './video-send'
14 14
15@Component({ 15@Component({
16 selector: 'my-video-upload', 16 selector: 'my-video-upload',
diff --git a/client/src/app/videos/+video-edit/video-add-routing.module.ts b/client/src/app/+videos/+video-edit/video-add-routing.module.ts
index 9ff66bea0..9ff66bea0 100644
--- a/client/src/app/videos/+video-edit/video-add-routing.module.ts
+++ b/client/src/app/+videos/+video-edit/video-add-routing.module.ts
diff --git a/client/src/app/videos/+video-edit/video-add.component.html b/client/src/app/+videos/+video-edit/video-add.component.html
index 79bfc6e5c..79bfc6e5c 100644
--- a/client/src/app/videos/+video-edit/video-add.component.html
+++ b/client/src/app/+videos/+video-edit/video-add.component.html
diff --git a/client/src/app/videos/+video-edit/video-add.component.scss b/client/src/app/+videos/+video-edit/video-add.component.scss
index 0ad57d897..0ad57d897 100644
--- a/client/src/app/videos/+video-edit/video-add.component.scss
+++ b/client/src/app/+videos/+video-edit/video-add.component.scss
diff --git a/client/src/app/videos/+video-edit/video-add.component.ts b/client/src/app/+videos/+video-edit/video-add.component.ts
index 5bd768809..5bd768809 100644
--- a/client/src/app/videos/+video-edit/video-add.component.ts
+++ b/client/src/app/+videos/+video-edit/video-add.component.ts
diff --git a/client/src/app/videos/+video-edit/video-add.module.ts b/client/src/app/+videos/+video-edit/video-add.module.ts
index 477c1cf5e..477c1cf5e 100644
--- a/client/src/app/videos/+video-edit/video-add.module.ts
+++ b/client/src/app/+videos/+video-edit/video-add.module.ts
diff --git a/client/src/app/videos/+video-edit/video-update-routing.module.ts b/client/src/app/+videos/+video-edit/video-update-routing.module.ts
index a04351b05..a04351b05 100644
--- a/client/src/app/videos/+video-edit/video-update-routing.module.ts
+++ b/client/src/app/+videos/+video-edit/video-update-routing.module.ts
diff --git a/client/src/app/videos/+video-edit/video-update.component.html b/client/src/app/+videos/+video-edit/video-update.component.html
index fbc642db9..fbc642db9 100644
--- a/client/src/app/videos/+video-edit/video-update.component.html
+++ b/client/src/app/+videos/+video-edit/video-update.component.html
diff --git a/client/src/app/videos/+video-edit/video-update.component.ts b/client/src/app/+videos/+video-edit/video-update.component.ts
index 7bd6eb553..7bd6eb553 100644
--- a/client/src/app/videos/+video-edit/video-update.component.ts
+++ b/client/src/app/+videos/+video-edit/video-update.component.ts
diff --git a/client/src/app/videos/+video-edit/video-update.module.ts b/client/src/app/+videos/+video-edit/video-update.module.ts
index 322c69629..99cd8bea1 100644
--- a/client/src/app/videos/+video-edit/video-update.module.ts
+++ b/client/src/app/+videos/+video-edit/video-update.module.ts
@@ -1,9 +1,9 @@
1import { NgModule } from '@angular/core' 1import { NgModule } from '@angular/core'
2import { CanDeactivateGuard } from '@app/core' 2import { CanDeactivateGuard } from '@app/core'
3import { VideoUpdateResolver } from '@app/videos/+video-edit/video-update.resolver'
4import { VideoEditModule } from './shared/video-edit.module' 3import { VideoEditModule } from './shared/video-edit.module'
5import { VideoUpdateRoutingModule } from './video-update-routing.module' 4import { VideoUpdateRoutingModule } from './video-update-routing.module'
6import { VideoUpdateComponent } from './video-update.component' 5import { VideoUpdateComponent } from './video-update.component'
6import { VideoUpdateResolver } from './video-update.resolver'
7 7
8@NgModule({ 8@NgModule({
9 imports: [ 9 imports: [
diff --git a/client/src/app/videos/+video-edit/video-update.resolver.ts b/client/src/app/+videos/+video-edit/video-update.resolver.ts
index 30bcf4d74..30bcf4d74 100644
--- a/client/src/app/videos/+video-edit/video-update.resolver.ts
+++ b/client/src/app/+videos/+video-edit/video-update.resolver.ts
diff --git a/client/src/app/videos/+video-watch/comment/video-comment-add.component.html b/client/src/app/+videos/+video-watch/comment/video-comment-add.component.html
index 9b43d91da..9b43d91da 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment-add.component.html
+++ b/client/src/app/+videos/+video-watch/comment/video-comment-add.component.html
diff --git a/client/src/app/videos/+video-watch/comment/video-comment-add.component.scss b/client/src/app/+videos/+video-watch/comment/video-comment-add.component.scss
index b3725ab94..b3725ab94 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment-add.component.scss
+++ b/client/src/app/+videos/+video-watch/comment/video-comment-add.component.scss
diff --git a/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts b/client/src/app/+videos/+video-watch/comment/video-comment-add.component.ts
index 79505c779..79505c779 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts
+++ b/client/src/app/+videos/+video-watch/comment/video-comment-add.component.ts
diff --git a/client/src/app/videos/+video-watch/comment/video-comment-thread-tree.model.ts b/client/src/app/+videos/+video-watch/comment/video-comment-thread-tree.model.ts
index 7c2aaeadd..7c2aaeadd 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment-thread-tree.model.ts
+++ b/client/src/app/+videos/+video-watch/comment/video-comment-thread-tree.model.ts
diff --git a/client/src/app/videos/+video-watch/comment/video-comment.component.html b/client/src/app/+videos/+video-watch/comment/video-comment.component.html
index 002de57e4..002de57e4 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment.component.html
+++ b/client/src/app/+videos/+video-watch/comment/video-comment.component.html
diff --git a/client/src/app/videos/+video-watch/comment/video-comment.component.scss b/client/src/app/+videos/+video-watch/comment/video-comment.component.scss
index e7ef79561..e7ef79561 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment.component.scss
+++ b/client/src/app/+videos/+video-watch/comment/video-comment.component.scss
diff --git a/client/src/app/videos/+video-watch/comment/video-comment.component.ts b/client/src/app/+videos/+video-watch/comment/video-comment.component.ts
index 27846c1ad..27846c1ad 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment.component.ts
+++ b/client/src/app/+videos/+video-watch/comment/video-comment.component.ts
diff --git a/client/src/app/videos/+video-watch/comment/video-comment.model.ts b/client/src/app/+videos/+video-watch/comment/video-comment.model.ts
index e85443196..e85443196 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment.model.ts
+++ b/client/src/app/+videos/+video-watch/comment/video-comment.model.ts
diff --git a/client/src/app/videos/+video-watch/comment/video-comment.service.ts b/client/src/app/+videos/+video-watch/comment/video-comment.service.ts
index a73fb9ca8..a73fb9ca8 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment.service.ts
+++ b/client/src/app/+videos/+video-watch/comment/video-comment.service.ts
diff --git a/client/src/app/videos/+video-watch/comment/video-comments.component.html b/client/src/app/+videos/+video-watch/comment/video-comments.component.html
index dd1d43560..dd1d43560 100644
--- a/client/src/app/videos/+video-watch/comment/video-comments.component.html
+++ b/client/src/app/+videos/+video-watch/comment/video-comments.component.html
diff --git a/client/src/app/videos/+video-watch/comment/video-comments.component.scss b/client/src/app/+videos/+video-watch/comment/video-comments.component.scss
index df42fae73..df42fae73 100644
--- a/client/src/app/videos/+video-watch/comment/video-comments.component.scss
+++ b/client/src/app/+videos/+video-watch/comment/video-comments.component.scss
diff --git a/client/src/app/videos/+video-watch/comment/video-comments.component.ts b/client/src/app/+videos/+video-watch/comment/video-comments.component.ts
index df0018ec6..df0018ec6 100644
--- a/client/src/app/videos/+video-watch/comment/video-comments.component.ts
+++ b/client/src/app/+videos/+video-watch/comment/video-comments.component.ts
diff --git a/client/src/app/videos/+video-watch/modal/video-share.component.html b/client/src/app/+videos/+video-watch/modal/video-share.component.html
index 5e6a2d518..5e6a2d518 100644
--- a/client/src/app/videos/+video-watch/modal/video-share.component.html
+++ b/client/src/app/+videos/+video-watch/modal/video-share.component.html
diff --git a/client/src/app/videos/+video-watch/modal/video-share.component.scss b/client/src/app/+videos/+video-watch/modal/video-share.component.scss
index 091d4dc3b..091d4dc3b 100644
--- a/client/src/app/videos/+video-watch/modal/video-share.component.scss
+++ b/client/src/app/+videos/+video-watch/modal/video-share.component.scss
diff --git a/client/src/app/videos/+video-watch/modal/video-share.component.ts b/client/src/app/+videos/+video-watch/modal/video-share.component.ts
index b42b775c1..b42b775c1 100644
--- a/client/src/app/videos/+video-watch/modal/video-share.component.ts
+++ b/client/src/app/+videos/+video-watch/modal/video-share.component.ts
diff --git a/client/src/app/videos/+video-watch/modal/video-support.component.html b/client/src/app/+videos/+video-watch/modal/video-support.component.html
index 935656d23..935656d23 100644
--- a/client/src/app/videos/+video-watch/modal/video-support.component.html
+++ b/client/src/app/+videos/+video-watch/modal/video-support.component.html
diff --git a/client/src/app/videos/+video-watch/modal/video-support.component.scss b/client/src/app/+videos/+video-watch/modal/video-support.component.scss
index 184e09027..184e09027 100644
--- a/client/src/app/videos/+video-watch/modal/video-support.component.scss
+++ b/client/src/app/+videos/+video-watch/modal/video-support.component.scss
diff --git a/client/src/app/videos/+video-watch/modal/video-support.component.ts b/client/src/app/+videos/+video-watch/modal/video-support.component.ts
index 48d5f2948..48d5f2948 100644
--- a/client/src/app/videos/+video-watch/modal/video-support.component.ts
+++ b/client/src/app/+videos/+video-watch/modal/video-support.component.ts
diff --git a/client/src/app/videos/recommendations/recent-videos-recommendation.service.ts b/client/src/app/+videos/+video-watch/recommendations/recent-videos-recommendation.service.ts
index a376453bf..29fa268f4 100644
--- a/client/src/app/videos/recommendations/recent-videos-recommendation.service.ts
+++ b/client/src/app/+videos/+video-watch/recommendations/recent-videos-recommendation.service.ts
@@ -2,9 +2,8 @@ import { Observable, of } from 'rxjs'
2import { map, switchMap } from 'rxjs/operators' 2import { map, switchMap } from 'rxjs/operators'
3import { Injectable } from '@angular/core' 3import { Injectable } from '@angular/core'
4import { ServerService, UserService } from '@app/core' 4import { ServerService, UserService } from '@app/core'
5import { AdvancedSearch } from '@app/search/advanced-search.model'
6import { SearchService } from '@app/search/search.service'
7import { Video, VideoService } from '@app/shared/shared-main' 5import { Video, VideoService } from '@app/shared/shared-main'
6import { AdvancedSearch, SearchService } from '@app/shared/shared-search'
8import { ServerConfig } from '@shared/models' 7import { ServerConfig } from '@shared/models'
9import { RecommendationInfo } from './recommendation-info.model' 8import { RecommendationInfo } from './recommendation-info.model'
10import { RecommendationService } from './recommendations.service' 9import { RecommendationService } from './recommendations.service'
diff --git a/client/src/app/videos/recommendations/recommendation-info.model.ts b/client/src/app/+videos/+video-watch/recommendations/recommendation-info.model.ts
index 0233563bb..0233563bb 100644
--- a/client/src/app/videos/recommendations/recommendation-info.model.ts
+++ b/client/src/app/+videos/+video-watch/recommendations/recommendation-info.model.ts
diff --git a/client/src/app/videos/recommendations/recommendations.module.ts b/client/src/app/+videos/+video-watch/recommendations/recommendations.module.ts
index 03cc272ca..259afb196 100644
--- a/client/src/app/videos/recommendations/recommendations.module.ts
+++ b/client/src/app/+videos/+video-watch/recommendations/recommendations.module.ts
@@ -2,6 +2,7 @@ import { InputSwitchModule } from 'primeng/inputswitch'
2import { CommonModule } from '@angular/common' 2import { CommonModule } from '@angular/common'
3import { NgModule } from '@angular/core' 3import { NgModule } from '@angular/core'
4import { SharedMainModule } from '@app/shared/shared-main' 4import { SharedMainModule } from '@app/shared/shared-main'
5import { SharedSearchModule } from '@app/shared/shared-search'
5import { SharedVideoMiniatureModule } from '@app/shared/shared-video-miniature' 6import { SharedVideoMiniatureModule } from '@app/shared/shared-video-miniature'
6import { SharedVideoPlaylistModule } from '@app/shared/shared-video-playlist' 7import { SharedVideoPlaylistModule } from '@app/shared/shared-video-playlist'
7import { RecentVideosRecommendationService } from './recent-videos-recommendation.service' 8import { RecentVideosRecommendationService } from './recent-videos-recommendation.service'
@@ -14,6 +15,7 @@ import { RecommendedVideosStore } from './recommended-videos.store'
14 InputSwitchModule, 15 InputSwitchModule,
15 16
16 SharedMainModule, 17 SharedMainModule,
18 SharedSearchModule,
17 SharedVideoPlaylistModule, 19 SharedVideoPlaylistModule,
18 SharedVideoMiniatureModule 20 SharedVideoMiniatureModule
19 ], 21 ],
diff --git a/client/src/app/videos/recommendations/recommendations.service.ts b/client/src/app/+videos/+video-watch/recommendations/recommendations.service.ts
index 1d79d35f6..1d79d35f6 100644
--- a/client/src/app/videos/recommendations/recommendations.service.ts
+++ b/client/src/app/+videos/+video-watch/recommendations/recommendations.service.ts
diff --git a/client/src/app/videos/recommendations/recommended-videos.component.html b/client/src/app/+videos/+video-watch/recommendations/recommended-videos.component.html
index 0467cabf5..0467cabf5 100644
--- a/client/src/app/videos/recommendations/recommended-videos.component.html
+++ b/client/src/app/+videos/+video-watch/recommendations/recommended-videos.component.html
diff --git a/client/src/app/videos/recommendations/recommended-videos.component.scss b/client/src/app/+videos/+video-watch/recommendations/recommended-videos.component.scss
index b278c9654..b278c9654 100644
--- a/client/src/app/videos/recommendations/recommended-videos.component.scss
+++ b/client/src/app/+videos/+video-watch/recommendations/recommended-videos.component.scss
diff --git a/client/src/app/videos/recommendations/recommended-videos.component.ts b/client/src/app/+videos/+video-watch/recommendations/recommended-videos.component.ts
index 016975341..016975341 100644
--- a/client/src/app/videos/recommendations/recommended-videos.component.ts
+++ b/client/src/app/+videos/+video-watch/recommendations/recommended-videos.component.ts
diff --git a/client/src/app/videos/recommendations/recommended-videos.store.ts b/client/src/app/+videos/+video-watch/recommendations/recommended-videos.store.ts
index 8c3fb6480..8c3fb6480 100644
--- a/client/src/app/videos/recommendations/recommended-videos.store.ts
+++ b/client/src/app/+videos/+video-watch/recommendations/recommended-videos.store.ts
diff --git a/client/src/app/videos/+video-watch/timestamp-route-transformer.directive.ts b/client/src/app/+videos/+video-watch/timestamp-route-transformer.directive.ts
index 45e023695..45e023695 100644
--- a/client/src/app/videos/+video-watch/timestamp-route-transformer.directive.ts
+++ b/client/src/app/+videos/+video-watch/timestamp-route-transformer.directive.ts
diff --git a/client/src/app/videos/+video-watch/video-duration-formatter.pipe.ts b/client/src/app/+videos/+video-watch/video-duration-formatter.pipe.ts
index 4b6767415..4b6767415 100644
--- a/client/src/app/videos/+video-watch/video-duration-formatter.pipe.ts
+++ b/client/src/app/+videos/+video-watch/video-duration-formatter.pipe.ts
diff --git a/client/src/app/videos/+video-watch/video-watch-playlist.component.html b/client/src/app/+videos/+video-watch/video-watch-playlist.component.html
index 246ef83cf..246ef83cf 100644
--- a/client/src/app/videos/+video-watch/video-watch-playlist.component.html
+++ b/client/src/app/+videos/+video-watch/video-watch-playlist.component.html
diff --git a/client/src/app/videos/+video-watch/video-watch-playlist.component.scss b/client/src/app/+videos/+video-watch/video-watch-playlist.component.scss
index 0b0a2a899..0b0a2a899 100644
--- a/client/src/app/videos/+video-watch/video-watch-playlist.component.scss
+++ b/client/src/app/+videos/+video-watch/video-watch-playlist.component.scss
diff --git a/client/src/app/videos/+video-watch/video-watch-playlist.component.ts b/client/src/app/+videos/+video-watch/video-watch-playlist.component.ts
index 2c21be643..2c21be643 100644
--- a/client/src/app/videos/+video-watch/video-watch-playlist.component.ts
+++ b/client/src/app/+videos/+video-watch/video-watch-playlist.component.ts
diff --git a/client/src/app/videos/+video-watch/video-watch-routing.module.ts b/client/src/app/+videos/+video-watch/video-watch-routing.module.ts
index d8fecb87d..d8fecb87d 100644
--- a/client/src/app/videos/+video-watch/video-watch-routing.module.ts
+++ b/client/src/app/+videos/+video-watch/video-watch-routing.module.ts
diff --git a/client/src/app/videos/+video-watch/video-watch.component.html b/client/src/app/+videos/+video-watch/video-watch.component.html
index 0447268f0..0447268f0 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.html
+++ b/client/src/app/+videos/+video-watch/video-watch.component.html
diff --git a/client/src/app/videos/+video-watch/video-watch.component.scss b/client/src/app/+videos/+video-watch/video-watch.component.scss
index 2e083982e..2e083982e 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.scss
+++ b/client/src/app/+videos/+video-watch/video-watch.component.scss
diff --git a/client/src/app/videos/+video-watch/video-watch.component.ts b/client/src/app/+videos/+video-watch/video-watch.component.ts
index 5b0b34c80..5b0b34c80 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/+videos/+video-watch/video-watch.component.ts
diff --git a/client/src/app/videos/+video-watch/video-watch.module.ts b/client/src/app/+videos/+video-watch/video-watch.module.ts
index a1c54f065..421170d81 100644
--- a/client/src/app/videos/+video-watch/video-watch.module.ts
+++ b/client/src/app/+videos/+video-watch/video-watch.module.ts
@@ -7,7 +7,7 @@ import { SharedModerationModule } from '@app/shared/shared-moderation'
7import { SharedUserSubscriptionModule } from '@app/shared/shared-user-subscription' 7import { SharedUserSubscriptionModule } from '@app/shared/shared-user-subscription'
8import { SharedVideoMiniatureModule } from '@app/shared/shared-video-miniature' 8import { SharedVideoMiniatureModule } from '@app/shared/shared-video-miniature'
9import { SharedVideoPlaylistModule } from '@app/shared/shared-video-playlist' 9import { SharedVideoPlaylistModule } from '@app/shared/shared-video-playlist'
10import { RecommendationsModule } from '@app/videos/recommendations/recommendations.module' 10import { RecommendationsModule } from './recommendations/recommendations.module'
11import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap' 11import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'
12import { VideoCommentAddComponent } from './comment/video-comment-add.component' 12import { VideoCommentAddComponent } from './comment/video-comment-add.component'
13import { VideoCommentComponent } from './comment/video-comment.component' 13import { VideoCommentComponent } from './comment/video-comment.component'
diff --git a/client/src/app/videos/index.ts b/client/src/app/+videos/index.ts
index 028a5854b..028a5854b 100644
--- a/client/src/app/videos/index.ts
+++ b/client/src/app/+videos/index.ts
diff --git a/client/src/app/videos/video-list/index.ts b/client/src/app/+videos/video-list/index.ts
index af1bd58b7..af1bd58b7 100644
--- a/client/src/app/videos/video-list/index.ts
+++ b/client/src/app/+videos/video-list/index.ts
diff --git a/client/src/app/videos/video-list/overview/index.ts b/client/src/app/+videos/video-list/overview/index.ts
index e6cfa4802..e6cfa4802 100644
--- a/client/src/app/videos/video-list/overview/index.ts
+++ b/client/src/app/+videos/video-list/overview/index.ts
diff --git a/client/src/app/videos/video-list/overview/overview.service.ts b/client/src/app/+videos/video-list/overview/overview.service.ts
index 4458454d5..4458454d5 100644
--- a/client/src/app/videos/video-list/overview/overview.service.ts
+++ b/client/src/app/+videos/video-list/overview/overview.service.ts
diff --git a/client/src/app/videos/video-list/overview/video-overview.component.html b/client/src/app/+videos/video-list/overview/video-overview.component.html
index ca986c634..ca986c634 100644
--- a/client/src/app/videos/video-list/overview/video-overview.component.html
+++ b/client/src/app/+videos/video-list/overview/video-overview.component.html
diff --git a/client/src/app/videos/video-list/overview/video-overview.component.scss b/client/src/app/+videos/video-list/overview/video-overview.component.scss
index c1d10188a..c1d10188a 100644
--- a/client/src/app/videos/video-list/overview/video-overview.component.scss
+++ b/client/src/app/+videos/video-list/overview/video-overview.component.scss
diff --git a/client/src/app/videos/video-list/overview/video-overview.component.ts b/client/src/app/+videos/video-list/overview/video-overview.component.ts
index b3be1d7b5..b3be1d7b5 100644
--- a/client/src/app/videos/video-list/overview/video-overview.component.ts
+++ b/client/src/app/+videos/video-list/overview/video-overview.component.ts
diff --git a/client/src/app/videos/video-list/overview/videos-overview.model.ts b/client/src/app/+videos/video-list/overview/videos-overview.model.ts
index 6765ad9b7..6765ad9b7 100644
--- a/client/src/app/videos/video-list/overview/videos-overview.model.ts
+++ b/client/src/app/+videos/video-list/overview/videos-overview.model.ts
diff --git a/client/src/app/videos/video-list/video-local.component.ts b/client/src/app/+videos/video-list/video-local.component.ts
index b4c71ac49..b4c71ac49 100644
--- a/client/src/app/videos/video-list/video-local.component.ts
+++ b/client/src/app/+videos/video-list/video-local.component.ts
diff --git a/client/src/app/videos/video-list/video-most-liked.component.ts b/client/src/app/+videos/video-list/video-most-liked.component.ts
index ca14851bb..ca14851bb 100644
--- a/client/src/app/videos/video-list/video-most-liked.component.ts
+++ b/client/src/app/+videos/video-list/video-most-liked.component.ts
diff --git a/client/src/app/videos/video-list/video-recently-added.component.ts b/client/src/app/+videos/video-list/video-recently-added.component.ts
index c9395133f..c9395133f 100644
--- a/client/src/app/videos/video-list/video-recently-added.component.ts
+++ b/client/src/app/+videos/video-list/video-recently-added.component.ts
diff --git a/client/src/app/videos/video-list/video-trending.component.ts b/client/src/app/+videos/video-list/video-trending.component.ts
index 10eab18de..10eab18de 100644
--- a/client/src/app/videos/video-list/video-trending.component.ts
+++ b/client/src/app/+videos/video-list/video-trending.component.ts
diff --git a/client/src/app/videos/video-list/video-user-subscriptions.component.ts b/client/src/app/+videos/video-list/video-user-subscriptions.component.ts
index 41ad9b277..41ad9b277 100644
--- a/client/src/app/videos/video-list/video-user-subscriptions.component.ts
+++ b/client/src/app/+videos/video-list/video-user-subscriptions.component.ts
diff --git a/client/src/app/videos/videos-routing.module.ts b/client/src/app/+videos/videos-routing.module.ts
index 16b65be63..e0e877fc6 100644
--- a/client/src/app/videos/videos-routing.module.ts
+++ b/client/src/app/+videos/videos-routing.module.ts
@@ -1,17 +1,17 @@
1import { NgModule } from '@angular/core' 1import { NgModule } from '@angular/core'
2import { RouterModule, Routes } from '@angular/router' 2import { RouterModule, Routes } from '@angular/router'
3import { VideoLocalComponent } from '@app/videos/video-list/video-local.component'
4import { MetaGuard } from '@ngx-meta/core' 3import { MetaGuard } from '@ngx-meta/core'
4import { VideoOverviewComponent } from './video-list/overview/video-overview.component'
5import { VideoLocalComponent } from './video-list/video-local.component'
6import { VideoMostLikedComponent } from './video-list/video-most-liked.component'
5import { VideoRecentlyAddedComponent } from './video-list/video-recently-added.component' 7import { VideoRecentlyAddedComponent } from './video-list/video-recently-added.component'
6import { VideoTrendingComponent } from './video-list/video-trending.component' 8import { VideoTrendingComponent } from './video-list/video-trending.component'
7import { VideoMostLikedComponent } from './video-list/video-most-liked.component'
8import { VideosComponent } from './videos.component'
9import { VideoUserSubscriptionsComponent } from './video-list/video-user-subscriptions.component' 9import { VideoUserSubscriptionsComponent } from './video-list/video-user-subscriptions.component'
10import { VideoOverviewComponent } from './video-list/overview/video-overview.component' 10import { VideosComponent } from './videos.component'
11 11
12const videosRoutes: Routes = [ 12const videosRoutes: Routes = [
13 { 13 {
14 path: 'videos', 14 path: '',
15 component: VideosComponent, 15 component: VideosComponent,
16 canActivateChild: [ MetaGuard ], 16 canActivateChild: [ MetaGuard ],
17 children: [ 17 children: [
@@ -91,7 +91,7 @@ const videosRoutes: Routes = [
91 }, 91 },
92 { 92 {
93 path: 'upload', 93 path: 'upload',
94 loadChildren: () => import('@app/videos/+video-edit/video-add.module').then(m => m.VideoAddModule), 94 loadChildren: () => import('@app/+videos/+video-edit/video-add.module').then(m => m.VideoAddModule),
95 data: { 95 data: {
96 meta: { 96 meta: {
97 title: 'Upload a video' 97 title: 'Upload a video'
@@ -100,7 +100,7 @@ const videosRoutes: Routes = [
100 }, 100 },
101 { 101 {
102 path: 'update/:uuid', 102 path: 'update/:uuid',
103 loadChildren: () => import('@app/videos/+video-edit/video-update.module').then(m => m.VideoUpdateModule), 103 loadChildren: () => import('@app/+videos/+video-edit/video-update.module').then(m => m.VideoUpdateModule),
104 data: { 104 data: {
105 meta: { 105 meta: {
106 title: 'Edit a video' 106 title: 'Edit a video'
@@ -109,7 +109,7 @@ const videosRoutes: Routes = [
109 }, 109 },
110 { 110 {
111 path: 'watch', 111 path: 'watch',
112 loadChildren: () => import('@app/videos/+video-watch/video-watch.module').then(m => m.VideoWatchModule), 112 loadChildren: () => import('@app/+videos/+video-watch/video-watch.module').then(m => m.VideoWatchModule),
113 data: { 113 data: {
114 preload: 3000 114 preload: 3000
115 } 115 }
diff --git a/client/src/app/videos/videos.component.ts b/client/src/app/+videos/videos.component.ts
index 585a3ad9a..585a3ad9a 100644
--- a/client/src/app/videos/videos.component.ts
+++ b/client/src/app/+videos/videos.component.ts
diff --git a/client/src/app/videos/videos.module.ts b/client/src/app/+videos/videos.module.ts
index 217e5bb50..1cf68bf83 100644
--- a/client/src/app/videos/videos.module.ts
+++ b/client/src/app/+videos/videos.module.ts
@@ -4,6 +4,7 @@ import { SharedGlobalIconModule } from '@app/shared/shared-icons'
4import { SharedMainModule } from '@app/shared/shared-main' 4import { SharedMainModule } from '@app/shared/shared-main'
5import { SharedUserSubscriptionModule } from '@app/shared/shared-user-subscription' 5import { SharedUserSubscriptionModule } from '@app/shared/shared-user-subscription'
6import { SharedVideoMiniatureModule } from '@app/shared/shared-video-miniature' 6import { SharedVideoMiniatureModule } from '@app/shared/shared-video-miniature'
7import { OverviewService } from './video-list'
7import { VideoOverviewComponent } from './video-list/overview/video-overview.component' 8import { VideoOverviewComponent } from './video-list/overview/video-overview.component'
8import { VideoLocalComponent } from './video-list/video-local.component' 9import { VideoLocalComponent } from './video-list/video-local.component'
9import { VideoMostLikedComponent } from './video-list/video-most-liked.component' 10import { VideoMostLikedComponent } from './video-list/video-most-liked.component'
@@ -39,6 +40,8 @@ import { VideosComponent } from './videos.component'
39 VideosComponent 40 VideosComponent
40 ], 41 ],
41 42
42 providers: [] 43 providers: [
44 OverviewService
45 ]
43}) 46})
44export class VideosModule { } 47export class VideosModule { }
diff --git a/client/src/app/app-routing.module.ts b/client/src/app/app-routing.module.ts
index ceda41415..a39be17dc 100644
--- a/client/src/app/app-routing.module.ts
+++ b/client/src/app/app-routing.module.ts
@@ -4,6 +4,7 @@ import { AppComponent } from '@app/app.component'
4import { CustomReuseStrategy } from '@app/core/routing/custom-reuse-strategy' 4import { CustomReuseStrategy } from '@app/core/routing/custom-reuse-strategy'
5import { MenuGuards } from '@app/core/routing/menu-guard.service' 5import { MenuGuards } from '@app/core/routing/menu-guard.service'
6import { PreloadSelectedModulesList } from './core' 6import { PreloadSelectedModulesList } from './core'
7import { EmptyComponent } from './empty.component'
7 8
8const routes: Routes = [ 9const routes: Routes = [
9 { 10 {
@@ -37,8 +38,24 @@ const routes: Routes = [
37 loadChildren: () => import('./+signup/+register/register.module').then(m => m.RegisterModule) 38 loadChildren: () => import('./+signup/+register/register.module').then(m => m.RegisterModule)
38 }, 39 },
39 { 40 {
41 path: 'reset-password',
42 loadChildren: () => import('./+reset-password/reset-password.module').then(m => m.ResetPasswordModule)
43 },
44 {
45 path: 'login',
46 loadChildren: () => import('./+login/login.module').then(m => m.LoginModule)
47 },
48 {
49 path: 'search',
50 loadChildren: () => import('./+search/search.module').then(m => m.SearchModule)
51 },
52 {
53 path: 'videos',
54 loadChildren: () => import('./+videos/videos.module').then(m => m.VideosModule)
55 },
56 {
40 path: '', 57 path: '',
41 component: AppComponent // Avoid 404, app component will redirect dynamically 58 component: EmptyComponent // Avoid 404, app component will redirect dynamically
42 }, 59 },
43 { 60 {
44 path: '**', 61 path: '**',
diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index 7fbc6463b..c6e9d7315 100644
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -4,15 +4,13 @@ import { LOCALE_ID, NgModule, TRANSLATIONS, TRANSLATIONS_FORMAT } from '@angular
4import { BrowserModule } from '@angular/platform-browser' 4import { BrowserModule } from '@angular/platform-browser'
5import { ServerService } from '@app/core' 5import { ServerService } from '@app/core'
6import localeOc from '@app/helpers/locales/oc' 6import localeOc from '@app/helpers/locales/oc'
7import { ResetPasswordModule } from '@app/reset-password'
8import { SearchModule } from '@app/search'
9import { MetaLoader, MetaModule, MetaStaticLoader, PageTitlePositioning } from '@ngx-meta/core' 7import { MetaLoader, MetaModule, MetaStaticLoader, PageTitlePositioning } from '@ngx-meta/core'
10import { buildFileLocale, getCompleteLocale, isDefaultLocale } from '@shared/models' 8import { buildFileLocale, getCompleteLocale, isDefaultLocale } from '@shared/models'
11import { AppRoutingModule } from './app-routing.module' 9import { AppRoutingModule } from './app-routing.module'
12import { AppComponent } from './app.component' 10import { AppComponent } from './app.component'
13import { CoreModule } from './core' 11import { CoreModule } from './core'
14import { HeaderComponent, SearchTypeaheadComponent, SuggestionComponent } from './header' 12import { HeaderComponent, SearchTypeaheadComponent, SuggestionComponent } from './header'
15import { LoginModule } from './login' 13import { HighlightPipe } from './header/highlight.pipe'
16import { AvatarNotificationComponent, LanguageChooserComponent, MenuComponent } from './menu' 14import { AvatarNotificationComponent, LanguageChooserComponent, MenuComponent } from './menu'
17import { ConfirmComponent } from './modal/confirm.component' 15import { ConfirmComponent } from './modal/confirm.component'
18import { CustomModalComponent } from './modal/custom-modal.component' 16import { CustomModalComponent } from './modal/custom-modal.component'
@@ -24,7 +22,6 @@ import { SharedGlobalIconModule } from './shared/shared-icons'
24import { SharedInstanceModule } from './shared/shared-instance' 22import { SharedInstanceModule } from './shared/shared-instance'
25import { SharedMainModule } from './shared/shared-main' 23import { SharedMainModule } from './shared/shared-main'
26import { SharedUserInterfaceSettingsModule } from './shared/shared-user-settings' 24import { SharedUserInterfaceSettingsModule } from './shared/shared-user-settings'
27import { VideosModule } from './videos'
28 25
29registerLocaleData(localeOc, 'oc') 26registerLocaleData(localeOc, 'oc')
30 27
@@ -41,6 +38,7 @@ registerLocaleData(localeOc, 'oc')
41 HeaderComponent, 38 HeaderComponent,
42 SearchTypeaheadComponent, 39 SearchTypeaheadComponent,
43 SuggestionComponent, 40 SuggestionComponent,
41 HighlightPipe,
44 42
45 CustomModalComponent, 43 CustomModalComponent,
46 WelcomeModalComponent, 44 WelcomeModalComponent,
@@ -58,12 +56,6 @@ registerLocaleData(localeOc, 'oc')
58 SharedGlobalIconModule, 56 SharedGlobalIconModule,
59 SharedInstanceModule, 57 SharedInstanceModule,
60 58
61 LoginModule,
62 ResetPasswordModule,
63 SearchModule,
64
65 VideosModule,
66
67 MetaModule.forRoot({ 59 MetaModule.forRoot({
68 provide: MetaLoader, 60 provide: MetaLoader,
69 useFactory: (serverService: ServerService) => { 61 useFactory: (serverService: ServerService) => {
diff --git a/client/src/app/empty.component.ts b/client/src/app/empty.component.ts
new file mode 100644
index 000000000..5cde05a32
--- /dev/null
+++ b/client/src/app/empty.component.ts
@@ -0,0 +1,10 @@
1
2import { Component } from '@angular/core'
3
4@Component({
5 selector: 'my-empty',
6 template: ''
7})
8export class EmptyComponent {
9
10}
diff --git a/client/src/app/search/highlight.pipe.ts b/client/src/app/header/highlight.pipe.ts
index 50ee5c1bd..50ee5c1bd 100644
--- a/client/src/app/search/highlight.pipe.ts
+++ b/client/src/app/header/highlight.pipe.ts
diff --git a/client/src/app/login/index.ts b/client/src/app/login/index.ts
deleted file mode 100644
index f1301d8b5..000000000
--- a/client/src/app/login/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
1export * from './login-routing.module'
2export * from './login.component'
3export * from './login.module'
diff --git a/client/src/app/reset-password/index.ts b/client/src/app/reset-password/index.ts
deleted file mode 100644
index 438dc576a..000000000
--- a/client/src/app/reset-password/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
1export * from './reset-password-routing.module'
2export * from './reset-password.component'
3export * from './reset-password.module'
diff --git a/client/src/app/search/index.ts b/client/src/app/search/index.ts
deleted file mode 100644
index 40f4e021f..000000000
--- a/client/src/app/search/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
1export * from './search-routing.module'
2export * from './search.component'
3export * from './search.module'
diff --git a/client/src/app/search/advanced-search.model.ts b/client/src/app/shared/shared-search/advanced-search.model.ts
index 516854a8c..516854a8c 100644
--- a/client/src/app/search/advanced-search.model.ts
+++ b/client/src/app/shared/shared-search/advanced-search.model.ts
diff --git a/client/src/app/shared/shared-search/index.ts b/client/src/app/shared/shared-search/index.ts
new file mode 100644
index 000000000..f687f6767
--- /dev/null
+++ b/client/src/app/shared/shared-search/index.ts
@@ -0,0 +1,3 @@
1export * from './advanced-search.model'
2export * from './search.service'
3export * from './shared-search.module'
diff --git a/client/src/app/search/search.service.ts b/client/src/app/shared/shared-search/search.service.ts
index 36342034f..96b954c99 100644
--- a/client/src/app/search/search.service.ts
+++ b/client/src/app/shared/shared-search/search.service.ts
@@ -4,11 +4,10 @@ import { HttpClient, HttpParams } from '@angular/common/http'
4import { Injectable } from '@angular/core' 4import { Injectable } from '@angular/core'
5import { ComponentPaginationLight, RestExtractor, RestPagination, RestService } from '@app/core' 5import { ComponentPaginationLight, RestExtractor, RestPagination, RestService } from '@app/core'
6import { peertubeLocalStorage } from '@app/helpers' 6import { peertubeLocalStorage } from '@app/helpers'
7import { AdvancedSearch } from '@app/search/advanced-search.model'
8import { Video, VideoChannel, VideoChannelService, VideoService } from '@app/shared/shared-main' 7import { Video, VideoChannel, VideoChannelService, VideoService } from '@app/shared/shared-main'
9import { ResultList, Video as VideoServerModel, VideoChannel as VideoChannelServerModel } from '@shared/models' 8import { ResultList, SearchTargetType, Video as VideoServerModel, VideoChannel as VideoChannelServerModel } from '@shared/models'
10import { SearchTargetType } from '@shared/models/search/search-target-query.model' 9import { environment } from '../../../environments/environment'
11import { environment } from '../../environments/environment' 10import { AdvancedSearch } from './advanced-search.model'
12 11
13@Injectable() 12@Injectable()
14export class SearchService { 13export class SearchService {
diff --git a/client/src/app/shared/shared-search/shared-search.module.ts b/client/src/app/shared/shared-search/shared-search.module.ts
new file mode 100644
index 000000000..134300d88
--- /dev/null
+++ b/client/src/app/shared/shared-search/shared-search.module.ts
@@ -0,0 +1,20 @@
1import { NgModule } from '@angular/core'
2import { SharedMainModule } from '../shared-main'
3import { SearchService } from './search.service'
4
5@NgModule({
6 imports: [
7 SharedMainModule
8 ],
9
10 declarations: [
11 ],
12
13 exports: [
14 ],
15
16 providers: [
17 SearchService
18 ]
19})
20export class SharedSearchModule { }
diff --git a/shared/models/videos/abuse/index.ts b/shared/models/videos/abuse/index.ts
index bdeef1dad..f70bc736f 100644
--- a/shared/models/videos/abuse/index.ts
+++ b/shared/models/videos/abuse/index.ts
@@ -1,4 +1,5 @@
1export * from './video-abuse-create.model' 1export * from './video-abuse-create.model'
2export * from './video-abuse-reason.model'
2export * from './video-abuse-state.model' 3export * from './video-abuse-state.model'
3export * from './video-abuse-update.model' 4export * from './video-abuse-update.model'
4export * from './video-abuse-video-is.type' 5export * from './video-abuse-video-is.type'