diff options
Diffstat (limited to 'client/src/app/videos/+video-edit')
15 files changed, 175 insertions, 119 deletions
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 new file mode 100644 index 000000000..b05852ff8 --- /dev/null +++ b/client/src/app/videos/+video-edit/shared/i18n-primeng-calendar.service.ts | |||
@@ -0,0 +1,94 @@ | |||
1 | import { I18n } from '@ngx-translate/i18n-polyfill' | ||
2 | import { Injectable } from '@angular/core' | ||
3 | |||
4 | @Injectable() | ||
5 | export class I18nPrimengCalendarService { | ||
6 | private readonly calendarLocale: any = {} | ||
7 | |||
8 | constructor (private i18n: I18n) { | ||
9 | this.calendarLocale = { | ||
10 | firstDayOfWeek: 0, | ||
11 | dayNames: [ | ||
12 | this.i18n('Sunday'), | ||
13 | this.i18n('Monday'), | ||
14 | this.i18n('Tuesday'), | ||
15 | this.i18n('Wednesday'), | ||
16 | this.i18n('Thursday'), | ||
17 | this.i18n('Friday'), | ||
18 | this.i18n('Saturday') | ||
19 | ], | ||
20 | |||
21 | dayNamesShort: [ | ||
22 | this.i18n({ value: 'Sun', description: 'Day name short' }), | ||
23 | this.i18n({ value: 'Mon', description: 'Day name short' }), | ||
24 | this.i18n({ value: 'Tue', description: 'Day name short' }), | ||
25 | this.i18n({ value: 'Wed', description: 'Day name short' }), | ||
26 | this.i18n({ value: 'Thu', description: 'Day name short' }), | ||
27 | this.i18n({ value: 'Fri', description: 'Day name short' }), | ||
28 | this.i18n({ value: 'Sat', description: 'Day name short' }) | ||
29 | ], | ||
30 | |||
31 | dayNamesMin: [ | ||
32 | this.i18n({ value: 'Su', description: 'Day name min' }), | ||
33 | this.i18n({ value: 'Mo', description: 'Day name min' }), | ||
34 | this.i18n({ value: 'Tu', description: 'Day name min' }), | ||
35 | this.i18n({ value: 'We', description: 'Day name min' }), | ||
36 | this.i18n({ value: 'Th', description: 'Day name min' }), | ||
37 | this.i18n({ value: 'Fr', description: 'Day name min' }), | ||
38 | this.i18n({ value: 'Sa', description: 'Day name min' }) | ||
39 | ], | ||
40 | |||
41 | monthNames: [ | ||
42 | this.i18n('January'), | ||
43 | this.i18n('February'), | ||
44 | this.i18n('March'), | ||
45 | this.i18n('April'), | ||
46 | this.i18n('May'), | ||
47 | this.i18n('June'), | ||
48 | this.i18n('July'), | ||
49 | this.i18n('August'), | ||
50 | this.i18n('September'), | ||
51 | this.i18n('October'), | ||
52 | this.i18n('November'), | ||
53 | this.i18n('December') | ||
54 | ], | ||
55 | |||
56 | monthNamesShort: [ | ||
57 | this.i18n({ value: 'Jan', description: 'Month name short' }), | ||
58 | this.i18n({ value: 'Feb', description: 'Month name short' }), | ||
59 | this.i18n({ value: 'Mar', description: 'Month name short' }), | ||
60 | this.i18n({ value: 'Apr', description: 'Month name short' }), | ||
61 | this.i18n({ value: 'May', description: 'Month name short' }), | ||
62 | this.i18n({ value: 'Jun', description: 'Month name short' }), | ||
63 | this.i18n({ value: 'Jul', description: 'Month name short' }), | ||
64 | this.i18n({ value: 'Aug', description: 'Month name short' }), | ||
65 | this.i18n({ value: 'Sep', description: 'Month name short' }), | ||
66 | this.i18n({ value: 'Oct', description: 'Month name short' }), | ||
67 | this.i18n({ value: 'Nov', description: 'Month name short' }), | ||
68 | this.i18n({ value: 'Dec', description: 'Month name short' }) | ||
69 | ], | ||
70 | |||
71 | today: this.i18n('Today'), | ||
72 | |||
73 | clear: this.i18n('Clear') | ||
74 | } | ||
75 | } | ||
76 | |||
77 | getCalendarLocale () { | ||
78 | return this.calendarLocale | ||
79 | } | ||
80 | |||
81 | getTimezone () { | ||
82 | const gmt = new Date().toString().match(/([A-Z]+[\+-][0-9]+)/)[1] | ||
83 | const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone | ||
84 | |||
85 | return `${timezone} - ${gmt}` | ||
86 | } | ||
87 | |||
88 | getDateFormat () { | ||
89 | return this.i18n({ | ||
90 | value: 'yy-mm-dd ', | ||
91 | description: 'Date format in this locale.' | ||
92 | }) | ||
93 | } | ||
94 | } | ||
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 9856aac9e..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 | |||
@@ -1,11 +1,9 @@ | |||
1 | import { Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core' | 1 | import { Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core' |
2 | import { FormReactive } from '@app/shared' | ||
3 | import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' | ||
4 | import { VideoCaptionsValidatorsService } from '@app/shared/forms/form-validators/video-captions-validators.service' | ||
5 | import { ServerService } from '@app/core' | 2 | import { ServerService } from '@app/core' |
6 | import { VideoCaptionEdit } from '@app/shared/video-caption/video-caption-edit.model' | 3 | import { FormReactive, FormValidatorService, VideoCaptionsValidatorsService } from '@app/shared/shared-forms' |
4 | import { VideoCaptionEdit } from '@app/shared/shared-main' | ||
7 | import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap' | 5 | import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap' |
8 | import { ServerConfig, VideoConstant } from '../../../../../../shared' | 6 | import { ServerConfig, VideoConstant } from '@shared/models' |
9 | 7 | ||
10 | @Component({ | 8 | @Component({ |
11 | selector: 'my-video-caption-add-modal', | 9 | selector: 'my-video-caption-add-modal', |
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 15073fc44..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 | |||
@@ -1,19 +1,13 @@ | |||
1 | import { map } from 'rxjs/operators' | ||
1 | import { Component, Input, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core' | 2 | import { Component, Input, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core' |
2 | import { FormArray, FormControl, FormGroup, ValidatorFn, Validators } from '@angular/forms' | 3 | import { FormArray, FormControl, FormGroup, ValidatorFn, Validators } from '@angular/forms' |
3 | import { ActivatedRoute, Router } from '@angular/router' | 4 | import { ServerService } from '@app/core' |
4 | import { FormReactiveValidationMessages, VideoValidatorsService } from '@app/shared' | 5 | import { removeElementFromArray } from '@app/helpers' |
5 | import { Notifier } from '@app/core' | 6 | import { FormReactiveValidationMessages, FormValidatorService, VideoValidatorsService } from '@app/shared/shared-forms' |
6 | import { ServerService } from '../../../core/server' | 7 | import { VideoCaptionEdit, VideoEdit, VideoService } from '@app/shared/shared-main' |
7 | import { VideoEdit } from '../../../shared/video/video-edit.model' | 8 | import { ServerConfig, VideoConstant, VideoPrivacy } from '@shared/models' |
8 | import { map } from 'rxjs/operators' | 9 | import { I18nPrimengCalendarService } from './i18n-primeng-calendar.service' |
9 | import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' | 10 | import { VideoCaptionAddModalComponent } from './video-caption-add-modal.component' |
10 | import { I18nPrimengCalendarService } from '@app/shared/i18n/i18n-primeng-calendar' | ||
11 | import { VideoCaptionService } from '@app/shared/video-caption' | ||
12 | import { VideoCaptionAddModalComponent } from '@app/videos/+video-edit/shared/video-caption-add-modal.component' | ||
13 | import { VideoCaptionEdit } from '@app/shared/video-caption/video-caption-edit.model' | ||
14 | import { removeElementFromArray } from '@app/shared/misc/utils' | ||
15 | import { ServerConfig, VideoConstant, VideoPrivacy } from '../../../../../../shared' | ||
16 | import { VideoService } from '@app/shared/video/video.service' | ||
17 | 11 | ||
18 | @Component({ | 12 | @Component({ |
19 | selector: 'my-video-edit', | 13 | selector: 'my-video-edit', |
@@ -60,11 +54,7 @@ export class VideoEditComponent implements OnInit, OnDestroy { | |||
60 | constructor ( | 54 | constructor ( |
61 | private formValidatorService: FormValidatorService, | 55 | private formValidatorService: FormValidatorService, |
62 | private videoValidatorsService: VideoValidatorsService, | 56 | private videoValidatorsService: VideoValidatorsService, |
63 | private videoCaptionService: VideoCaptionService, | ||
64 | private videoService: VideoService, | 57 | private videoService: VideoService, |
65 | private route: ActivatedRoute, | ||
66 | private router: Router, | ||
67 | private notifier: Notifier, | ||
68 | private serverService: ServerService, | 58 | private serverService: ServerService, |
69 | private i18nPrimengCalendarService: I18nPrimengCalendarService, | 59 | private i18nPrimengCalendarService: I18nPrimengCalendarService, |
70 | private ngZone: NgZone | 60 | private ngZone: NgZone |
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 1357d607c..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 | |||
@@ -1,16 +1,20 @@ | |||
1 | import { NgModule } from '@angular/core' | ||
2 | import { TagInputModule } from 'ngx-chips' | 1 | import { TagInputModule } from 'ngx-chips' |
3 | import { SharedModule } from '../../../shared/' | ||
4 | import { VideoEditComponent } from './video-edit.component' | ||
5 | import { CalendarModule } from 'primeng/calendar' | 2 | import { CalendarModule } from 'primeng/calendar' |
3 | import { NgModule } from '@angular/core' | ||
4 | import { SharedFormModule } from '@app/shared/shared-forms' | ||
5 | import { SharedGlobalIconModule } from '@app/shared/shared-icons' | ||
6 | import { SharedMainModule } from '@app/shared/shared-main' | ||
6 | import { VideoCaptionAddModalComponent } from './video-caption-add-modal.component' | 7 | import { VideoCaptionAddModalComponent } from './video-caption-add-modal.component' |
8 | import { VideoEditComponent } from './video-edit.component' | ||
7 | 9 | ||
8 | @NgModule({ | 10 | @NgModule({ |
9 | imports: [ | 11 | imports: [ |
10 | TagInputModule, | 12 | TagInputModule, |
11 | CalendarModule, | 13 | CalendarModule, |
12 | 14 | ||
13 | SharedModule | 15 | SharedMainModule, |
16 | SharedFormModule, | ||
17 | SharedGlobalIconModule | ||
14 | ], | 18 | ], |
15 | 19 | ||
16 | declarations: [ | 20 | declarations: [ |
@@ -22,6 +26,10 @@ import { VideoCaptionAddModalComponent } from './video-caption-add-modal.compone | |||
22 | TagInputModule, | 26 | TagInputModule, |
23 | CalendarModule, | 27 | CalendarModule, |
24 | 28 | ||
29 | SharedMainModule, | ||
30 | SharedFormModule, | ||
31 | SharedGlobalIconModule, | ||
32 | |||
25 | VideoEditComponent | 33 | VideoEditComponent |
26 | ], | 34 | ], |
27 | 35 | ||
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 4d0b0b080..5b453a1d9 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 | |||
@@ -1,17 +1,13 @@ | |||
1 | import { Component, ElementRef, EventEmitter, OnInit, Output, ViewChild } from '@angular/core' | 1 | import { Component, ElementRef, EventEmitter, OnInit, Output, ViewChild } from '@angular/core' |
2 | import { Router } from '@angular/router' | 2 | import { Router } from '@angular/router' |
3 | import { VideoPrivacy, VideoUpdate } from '../../../../../../shared/models/videos' | 3 | import { AuthService, CanComponentDeactivate, Notifier, ServerService } from '@app/core' |
4 | import { AuthService, Notifier, ServerService } from '../../../core' | 4 | import { scrollToTop } from '@app/helpers' |
5 | import { VideoService } from '../../../shared/video/video.service' | 5 | import { FormValidatorService } from '@app/shared/shared-forms' |
6 | import { I18n } from '@ngx-translate/i18n-polyfill' | 6 | import { VideoCaptionService, VideoEdit, VideoImportService, VideoService } from '@app/shared/shared-main' |
7 | import { LoadingBarService } from '@ngx-loading-bar/core' | ||
8 | import { VideoSend } from '@app/videos/+video-edit/video-add-components/video-send' | 7 | import { VideoSend } from '@app/videos/+video-edit/video-add-components/video-send' |
9 | import { CanComponentDeactivate } from '@app/shared/guards/can-deactivate-guard.service' | 8 | import { LoadingBarService } from '@ngx-loading-bar/core' |
10 | import { VideoEdit } from '@app/shared/video/video-edit.model' | 9 | import { I18n } from '@ngx-translate/i18n-polyfill' |
11 | import { FormValidatorService } from '@app/shared' | 10 | import { VideoPrivacy, VideoUpdate } from '@shared/models' |
12 | import { VideoCaptionService } from '@app/shared/video-caption' | ||
13 | import { VideoImportService } from '@app/shared/video-import' | ||
14 | import { scrollToTop } from '@app/shared/misc/utils' | ||
15 | 11 | ||
16 | @Component({ | 12 | @Component({ |
17 | selector: 'my-video-import-torrent', | 13 | selector: 'my-video-import-torrent', |
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 213c42333..d0bd1f54d 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 | |||
@@ -1,18 +1,14 @@ | |||
1 | import { map, switchMap } from 'rxjs/operators' | ||
1 | import { Component, EventEmitter, OnInit, Output } from '@angular/core' | 2 | import { Component, EventEmitter, OnInit, Output } from '@angular/core' |
2 | import { Router } from '@angular/router' | 3 | import { Router } from '@angular/router' |
3 | import { VideoPrivacy, VideoUpdate } from '../../../../../../shared/models/videos' | 4 | import { AuthService, CanComponentDeactivate, Notifier, ServerService } from '@app/core' |
4 | import { AuthService, Notifier, ServerService } from '../../../core' | 5 | import { getAbsoluteAPIUrl, scrollToTop } from '@app/helpers' |
5 | import { VideoService } from '../../../shared/video/video.service' | 6 | import { FormValidatorService } from '@app/shared/shared-forms' |
6 | import { I18n } from '@ngx-translate/i18n-polyfill' | 7 | import { VideoCaptionService, VideoEdit, VideoImportService, VideoService } from '@app/shared/shared-main' |
7 | import { LoadingBarService } from '@ngx-loading-bar/core' | ||
8 | import { VideoSend } from '@app/videos/+video-edit/video-add-components/video-send' | 8 | import { VideoSend } from '@app/videos/+video-edit/video-add-components/video-send' |
9 | import { CanComponentDeactivate } from '@app/shared/guards/can-deactivate-guard.service' | 9 | import { LoadingBarService } from '@ngx-loading-bar/core' |
10 | import { VideoEdit } from '@app/shared/video/video-edit.model' | 10 | import { I18n } from '@ngx-translate/i18n-polyfill' |
11 | import { FormValidatorService } from '@app/shared' | 11 | import { VideoPrivacy, VideoUpdate } from '@shared/models' |
12 | import { VideoCaptionService } from '@app/shared/video-caption' | ||
13 | import { VideoImportService } from '@app/shared/video-import' | ||
14 | import { scrollToTop, getAbsoluteAPIUrl } from '@app/shared/misc/utils' | ||
15 | import { switchMap, map } from 'rxjs/operators' | ||
16 | 12 | ||
17 | @Component({ | 13 | @Component({ |
18 | selector: 'my-video-import-url', | 14 | selector: 'my-video-import-url', |
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 b32f16950..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 | |||
@@ -1,15 +1,11 @@ | |||
1 | import { catchError, switchMap, tap } from 'rxjs/operators' | ||
1 | import { EventEmitter, OnInit } from '@angular/core' | 2 | import { EventEmitter, OnInit } from '@angular/core' |
3 | import { AuthService, CanComponentDeactivateResult, Notifier, ServerService } from '@app/core' | ||
4 | import { populateAsyncUserVideoChannels } from '@app/helpers' | ||
5 | import { FormReactive } from '@app/shared/shared-forms' | ||
6 | import { VideoCaptionEdit, VideoCaptionService, VideoEdit, VideoService } from '@app/shared/shared-main' | ||
2 | import { LoadingBarService } from '@ngx-loading-bar/core' | 7 | import { LoadingBarService } from '@ngx-loading-bar/core' |
3 | import { AuthService, Notifier, ServerService } from '@app/core' | 8 | import { ServerConfig, VideoConstant, VideoPrivacy } from '@shared/models' |
4 | import { catchError, switchMap, tap } from 'rxjs/operators' | ||
5 | import { FormReactive } from '@app/shared' | ||
6 | import { ServerConfig, VideoConstant, VideoPrivacy } from '../../../../../../shared' | ||
7 | import { VideoService } from '@app/shared/video/video.service' | ||
8 | import { VideoCaptionEdit } from '@app/shared/video-caption/video-caption-edit.model' | ||
9 | import { VideoCaptionService } from '@app/shared/video-caption' | ||
10 | import { VideoEdit } from '@app/shared/video/video-edit.model' | ||
11 | import { populateAsyncUserVideoChannels } from '@app/shared/misc/utils' | ||
12 | import { CanComponentDeactivateResult } from '@app/shared/guards/can-deactivate-guard.service' | ||
13 | 9 | ||
14 | export abstract class VideoSend extends FormReactive implements OnInit { | 10 | export abstract class VideoSend extends FormReactive implements OnInit { |
15 | userVideoChannels: { id: number, label: string, support: string }[] = [] | 11 | userVideoChannels: { id: number, label: string, support: string }[] = [] |
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 9ce3fbc6d..eb7ac32ae 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 | |||
@@ -1,19 +1,16 @@ | |||
1 | import { BytesPipe } from 'ngx-pipes' | ||
2 | import { Subscription } from 'rxjs' | ||
1 | import { HttpEventType, HttpResponse } from '@angular/common/http' | 3 | import { HttpEventType, HttpResponse } from '@angular/common/http' |
2 | import { Component, ElementRef, EventEmitter, OnDestroy, OnInit, Output, ViewChild } from '@angular/core' | 4 | import { Component, ElementRef, EventEmitter, OnDestroy, OnInit, Output, ViewChild } from '@angular/core' |
3 | import { Router } from '@angular/router' | 5 | import { Router } from '@angular/router' |
6 | import { AuthService, CanComponentDeactivate, Notifier, ServerService, UserService } from '@app/core' | ||
7 | import { scrollToTop } from '@app/helpers' | ||
8 | import { FormValidatorService } from '@app/shared/shared-forms' | ||
9 | import { VideoCaptionService, VideoEdit, VideoService } from '@app/shared/shared-main' | ||
10 | import { VideoSend } from '@app/videos/+video-edit/video-add-components/video-send' | ||
4 | import { LoadingBarService } from '@ngx-loading-bar/core' | 11 | import { LoadingBarService } from '@ngx-loading-bar/core' |
5 | import { BytesPipe } from 'ngx-pipes' | ||
6 | import { Subscription } from 'rxjs' | ||
7 | import { VideoPrivacy } from '../../../../../../shared/models/videos' | ||
8 | import { AuthService, Notifier, ServerService } from '../../../core' | ||
9 | import { VideoEdit } from '../../../shared/video/video-edit.model' | ||
10 | import { VideoService } from '../../../shared/video/video.service' | ||
11 | import { I18n } from '@ngx-translate/i18n-polyfill' | 12 | import { I18n } from '@ngx-translate/i18n-polyfill' |
12 | import { VideoSend } from '@app/videos/+video-edit/video-add-components/video-send' | 13 | import { VideoPrivacy } from '@shared/models' |
13 | import { CanComponentDeactivate } from '@app/shared/guards/can-deactivate-guard.service' | ||
14 | import { FormValidatorService, UserService } from '@app/shared' | ||
15 | import { VideoCaptionService } from '@app/shared/video-caption' | ||
16 | import { scrollToTop } from '@app/shared/misc/utils' | ||
17 | 14 | ||
18 | @Component({ | 15 | @Component({ |
19 | 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 e0fef7158..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 | |||
@@ -1,10 +1,7 @@ | |||
1 | import { NgModule } from '@angular/core' | 1 | import { NgModule } from '@angular/core' |
2 | import { RouterModule, Routes } from '@angular/router' | 2 | import { RouterModule, Routes } from '@angular/router' |
3 | 3 | import { CanDeactivateGuard, LoginGuard } from '@app/core' | |
4 | import { MetaGuard } from '@ngx-meta/core' | 4 | import { MetaGuard } from '@ngx-meta/core' |
5 | |||
6 | import { LoginGuard } from '../../core' | ||
7 | import { CanDeactivateGuard } from '../../shared/guards/can-deactivate-guard.service' | ||
8 | import { VideoAddComponent } from './video-add.component' | 5 | import { VideoAddComponent } from './video-add.component' |
9 | 6 | ||
10 | const videoAddRoutes: Routes = [ | 7 | const videoAddRoutes: Routes = [ |
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 30ab08ea0..5bd768809 100644 --- a/client/src/app/videos/+video-edit/video-add.component.ts +++ b/client/src/app/videos/+video-edit/video-add.component.ts | |||
@@ -1,10 +1,9 @@ | |||
1 | import { Component, HostListener, OnInit, ViewChild } from '@angular/core' | 1 | import { Component, HostListener, OnInit, ViewChild } from '@angular/core' |
2 | import { CanComponentDeactivate } from '@app/shared/guards/can-deactivate-guard.service' | 2 | import { AuthService, CanComponentDeactivate, ServerService } from '@app/core' |
3 | import { VideoImportUrlComponent } from '@app/videos/+video-edit/video-add-components/video-import-url.component' | ||
4 | import { VideoUploadComponent } from '@app/videos/+video-edit/video-add-components/video-upload.component' | ||
5 | import { AuthService, ServerService } from '@app/core' | ||
6 | import { VideoImportTorrentComponent } from '@app/videos/+video-edit/video-add-components/video-import-torrent.component' | ||
7 | import { ServerConfig } from '@shared/models' | 3 | import { ServerConfig } from '@shared/models' |
4 | import { VideoImportTorrentComponent } from './video-add-components/video-import-torrent.component' | ||
5 | import { VideoImportUrlComponent } from './video-add-components/video-import-url.component' | ||
6 | import { VideoUploadComponent } from './video-add-components/video-upload.component' | ||
8 | 7 | ||
9 | @Component({ | 8 | @Component({ |
10 | selector: 'my-videos-add', | 9 | selector: 'my-videos-add', |
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 b8f5a9a47..477c1cf5e 100644 --- a/client/src/app/videos/+video-edit/video-add.module.ts +++ b/client/src/app/videos/+video-edit/video-add.module.ts | |||
@@ -1,20 +1,20 @@ | |||
1 | import { NgModule } from '@angular/core' | 1 | import { NgModule } from '@angular/core' |
2 | import { SharedModule } from '../../shared' | 2 | import { CanDeactivateGuard } from '@app/core' |
3 | import { VideoEditModule } from './shared/video-edit.module' | 3 | import { VideoEditModule } from './shared/video-edit.module' |
4 | import { DragDropDirective } from './video-add-components/drag-drop.directive' | ||
5 | import { VideoImportTorrentComponent } from './video-add-components/video-import-torrent.component' | ||
6 | import { VideoImportUrlComponent } from './video-add-components/video-import-url.component' | ||
7 | import { VideoUploadComponent } from './video-add-components/video-upload.component' | ||
4 | import { VideoAddRoutingModule } from './video-add-routing.module' | 8 | import { VideoAddRoutingModule } from './video-add-routing.module' |
5 | import { VideoAddComponent } from './video-add.component' | 9 | import { VideoAddComponent } from './video-add.component' |
6 | import { DragDropDirective } from './video-add-components/drag-drop.directive' | ||
7 | import { CanDeactivateGuard } from '../../shared/guards/can-deactivate-guard.service' | ||
8 | import { VideoUploadComponent } from '@app/videos/+video-edit/video-add-components/video-upload.component' | ||
9 | import { VideoImportUrlComponent } from '@app/videos/+video-edit/video-add-components/video-import-url.component' | ||
10 | import { VideoImportTorrentComponent } from '@app/videos/+video-edit/video-add-components/video-import-torrent.component' | ||
11 | 10 | ||
12 | @NgModule({ | 11 | @NgModule({ |
13 | imports: [ | 12 | imports: [ |
14 | VideoAddRoutingModule, | 13 | VideoAddRoutingModule, |
15 | VideoEditModule, | 14 | |
16 | SharedModule | 15 | VideoEditModule |
17 | ], | 16 | ], |
17 | |||
18 | declarations: [ | 18 | declarations: [ |
19 | VideoAddComponent, | 19 | VideoAddComponent, |
20 | VideoUploadComponent, | 20 | VideoUploadComponent, |
@@ -22,10 +22,9 @@ import { VideoImportTorrentComponent } from '@app/videos/+video-edit/video-add-c | |||
22 | VideoImportTorrentComponent, | 22 | VideoImportTorrentComponent, |
23 | DragDropDirective | 23 | DragDropDirective |
24 | ], | 24 | ], |
25 | exports: [ | 25 | |
26 | VideoAddComponent, | 26 | exports: [ ], |
27 | DragDropDirective | 27 | |
28 | ], | ||
29 | providers: [ | 28 | providers: [ |
30 | CanDeactivateGuard | 29 | CanDeactivateGuard |
31 | ] | 30 | ] |
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 564b8fb45..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 | |||
@@ -1,12 +1,9 @@ | |||
1 | import { NgModule } from '@angular/core' | 1 | import { NgModule } from '@angular/core' |
2 | import { RouterModule, Routes } from '@angular/router' | 2 | import { RouterModule, Routes } from '@angular/router' |
3 | 3 | import { CanDeactivateGuard, LoginGuard } from '@app/core' | |
4 | import { MetaGuard } from '@ngx-meta/core' | 4 | import { MetaGuard } from '@ngx-meta/core' |
5 | |||
6 | import { LoginGuard } from '../../core' | ||
7 | import { VideoUpdateComponent } from './video-update.component' | 5 | import { VideoUpdateComponent } from './video-update.component' |
8 | import { VideoUpdateResolver } from '@app/videos/+video-edit/video-update.resolver' | 6 | import { VideoUpdateResolver } from './video-update.resolver' |
9 | import { CanDeactivateGuard } from '@app/shared/guards/can-deactivate-guard.service' | ||
10 | 7 | ||
11 | const videoUpdateRoutes: Routes = [ | 8 | const videoUpdateRoutes: Routes = [ |
12 | { | 9 | { |
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 20a607134..7bd6eb553 100644 --- a/client/src/app/videos/+video-edit/video-update.component.ts +++ b/client/src/app/videos/+video-edit/video-update.component.ts | |||
@@ -1,17 +1,11 @@ | |||
1 | import { map, switchMap } from 'rxjs/operators' | 1 | import { map, switchMap } from 'rxjs/operators' |
2 | import { Component, HostListener, OnInit } from '@angular/core' | 2 | import { Component, HostListener, OnInit } from '@angular/core' |
3 | import { ActivatedRoute, Router } from '@angular/router' | 3 | import { ActivatedRoute, Router } from '@angular/router' |
4 | import { LoadingBarService } from '@ngx-loading-bar/core' | ||
5 | import { Notifier } from '@app/core' | 4 | import { Notifier } from '@app/core' |
6 | import { ServerService } from '../../core' | 5 | import { FormReactive, FormValidatorService } from '@app/shared/shared-forms' |
7 | import { FormReactive } from '../../shared' | 6 | import { VideoCaptionEdit, VideoCaptionService, VideoDetails, VideoEdit, VideoService } from '@app/shared/shared-main' |
8 | import { VideoEdit } from '../../shared/video/video-edit.model' | 7 | import { LoadingBarService } from '@ngx-loading-bar/core' |
9 | import { VideoService } from '../../shared/video/video.service' | ||
10 | import { I18n } from '@ngx-translate/i18n-polyfill' | 8 | import { I18n } from '@ngx-translate/i18n-polyfill' |
11 | import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' | ||
12 | import { VideoCaptionService } from '@app/shared/video-caption' | ||
13 | import { VideoCaptionEdit } from '@app/shared/video-caption/video-caption-edit.model' | ||
14 | import { VideoDetails } from '@app/shared/video/video-details.model' | ||
15 | import { VideoPrivacy } from '@shared/models' | 9 | import { VideoPrivacy } from '@shared/models' |
16 | 10 | ||
17 | @Component({ | 11 | @Component({ |
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 d60aa699f..322c69629 100644 --- a/client/src/app/videos/+video-edit/video-update.module.ts +++ b/client/src/app/videos/+video-edit/video-update.module.ts | |||
@@ -1,25 +1,22 @@ | |||
1 | import { NgModule } from '@angular/core' | 1 | import { NgModule } from '@angular/core' |
2 | import { SharedModule } from '../../shared' | 2 | import { CanDeactivateGuard } from '@app/core' |
3 | import { VideoUpdateResolver } from '@app/videos/+video-edit/video-update.resolver' | ||
3 | import { VideoEditModule } from './shared/video-edit.module' | 4 | import { VideoEditModule } from './shared/video-edit.module' |
4 | import { VideoUpdateRoutingModule } from './video-update-routing.module' | 5 | import { VideoUpdateRoutingModule } from './video-update-routing.module' |
5 | import { VideoUpdateComponent } from './video-update.component' | 6 | import { VideoUpdateComponent } from './video-update.component' |
6 | import { VideoUpdateResolver } from '@app/videos/+video-edit/video-update.resolver' | ||
7 | import { CanDeactivateGuard } from '@app/shared/guards/can-deactivate-guard.service' | ||
8 | 7 | ||
9 | @NgModule({ | 8 | @NgModule({ |
10 | imports: [ | 9 | imports: [ |
11 | VideoUpdateRoutingModule, | 10 | VideoUpdateRoutingModule, |
12 | VideoEditModule, | 11 | |
13 | SharedModule | 12 | VideoEditModule |
14 | ], | 13 | ], |
15 | 14 | ||
16 | declarations: [ | 15 | declarations: [ |
17 | VideoUpdateComponent | 16 | VideoUpdateComponent |
18 | ], | 17 | ], |
19 | 18 | ||
20 | exports: [ | 19 | exports: [ ], |
21 | VideoUpdateComponent | ||
22 | ], | ||
23 | 20 | ||
24 | providers: [ | 21 | providers: [ |
25 | VideoUpdateResolver, | 22 | VideoUpdateResolver, |
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 4ac517d96..30bcf4d74 100644 --- a/client/src/app/videos/+video-edit/video-update.resolver.ts +++ b/client/src/app/videos/+video-edit/video-update.resolver.ts | |||
@@ -1,10 +1,8 @@ | |||
1 | import { forkJoin } from 'rxjs' | ||
2 | import { map, switchMap } from 'rxjs/operators' | ||
1 | import { Injectable } from '@angular/core' | 3 | import { Injectable } from '@angular/core' |
2 | import { VideoService } from '@app/shared/video/video.service' | ||
3 | import { ActivatedRouteSnapshot, Resolve } from '@angular/router' | 4 | import { ActivatedRouteSnapshot, Resolve } from '@angular/router' |
4 | import { map, switchMap } from 'rxjs/operators' | 5 | import { VideoCaptionService, VideoChannelService, VideoService } from '@app/shared/shared-main' |
5 | import { VideoChannelService } from '@app/shared/video-channel/video-channel.service' | ||
6 | import { VideoCaptionService } from '@app/shared/video-caption' | ||
7 | import { forkJoin } from 'rxjs' | ||
8 | 6 | ||
9 | @Injectable() | 7 | @Injectable() |
10 | export class VideoUpdateResolver implements Resolve<any> { | 8 | export class VideoUpdateResolver implements Resolve<any> { |