aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src
diff options
context:
space:
mode:
Diffstat (limited to 'client/src')
-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-import-url.component.html)0
-rw-r--r--client/src/app/videos/+video-edit/video-add-components/video-import-url.component.scss (renamed from client/src/app/videos/+video-edit/video-import-url.component.scss)6
-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-import-url.component.ts)18
-rw-r--r--client/src/app/videos/+video-edit/video-add-components/video-send.ts (renamed from client/src/app/videos/+video-edit/shared/video-send.ts)15
-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-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-upload.component.scss)6
-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-upload.component.ts)17
-rw-r--r--client/src/app/videos/+video-edit/video-add.component.ts4
-rw-r--r--client/src/app/videos/+video-edit/video-add.module.ts4
9 files changed, 35 insertions, 35 deletions
diff --git a/client/src/app/videos/+video-edit/video-import-url.component.html b/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.html
index 6b431f6f6..6b431f6f6 100644
--- a/client/src/app/videos/+video-edit/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-import-url.component.scss b/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.scss
index 9ada9db19..5e713ab97 100644
--- a/client/src/app/videos/+video-edit/video-import-url.component.scss
+++ b/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.scss
@@ -1,5 +1,5 @@
1@import '_variables'; 1@import 'variables';
2@import '_mixins'; 2@import 'mixins';
3 3
4$width-size: 190px; 4$width-size: 190px;
5 5
@@ -17,7 +17,7 @@ $width-size: 190px;
17 margin-bottom: 25px; 17 margin-bottom: 25px;
18 cursor: default; 18 cursor: default;
19 19
20 background-image: url('../../../assets/images/video/upload.svg'); 20 background-image: url('../../../../assets/images/video/upload.svg');
21 } 21 }
22 22
23 input[type=text] { 23 input[type=text] {
diff --git a/client/src/app/videos/+video-edit/video-import-url.component.ts b/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts
index 99fcb6f00..dbe69409f 100644
--- a/client/src/app/videos/+video-edit/video-import-url.component.ts
+++ b/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts
@@ -1,23 +1,23 @@
1import { Component, EventEmitter, OnInit, Output } from '@angular/core' 1import { Component, EventEmitter, OnInit, Output } from '@angular/core'
2import { Router } from '@angular/router' 2import { Router } from '@angular/router'
3import { CanComponentDeactivate } from '@app/shared/guards/can-deactivate-guard.service'
4import { NotificationsService } from 'angular2-notifications' 3import { NotificationsService } from 'angular2-notifications'
5import { VideoPrivacy, VideoUpdate } from '../../../../../shared/models/videos' 4import { VideoPrivacy, VideoUpdate } from '../../../../../../shared/models/videos'
6import { AuthService, ServerService } from '../../core' 5import { AuthService, ServerService } from '../../../core'
7import { VideoService } from '../../shared/video/video.service' 6import { VideoService } from '../../../shared/video/video.service'
8import { I18n } from '@ngx-translate/i18n-polyfill' 7import { I18n } from '@ngx-translate/i18n-polyfill'
9import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
10import { VideoImportService } from '@app/shared/video-import'
11import { VideoEdit } from '@app/shared/video/video-edit.model'
12import { LoadingBarService } from '@ngx-loading-bar/core' 8import { LoadingBarService } from '@ngx-loading-bar/core'
9import { VideoSend } from '@app/videos/+video-edit/video-add-components/video-send'
10import { CanComponentDeactivate } from '@app/shared/guards/can-deactivate-guard.service'
11import { VideoEdit } from '@app/shared/video/video-edit.model'
12import { FormValidatorService } from '@app/shared'
13import { VideoCaptionService } from '@app/shared/video-caption' 13import { VideoCaptionService } from '@app/shared/video-caption'
14import { VideoSend } from '@app/videos/+video-edit/shared/video-send' 14import { VideoImportService } from '@app/shared/video-import'
15 15
16@Component({ 16@Component({
17 selector: 'my-video-import-url', 17 selector: 'my-video-import-url',
18 templateUrl: './video-import-url.component.html', 18 templateUrl: './video-import-url.component.html',
19 styleUrls: [ 19 styleUrls: [
20 './shared/video-edit.component.scss', 20 '../shared/video-edit.component.scss',
21 './video-import-url.component.scss' 21 './video-import-url.component.scss'
22 ] 22 ]
23}) 23})
diff --git a/client/src/app/videos/+video-edit/shared/video-send.ts b/client/src/app/videos/+video-edit/video-add-components/video-send.ts
index bc1c7a45b..efd182269 100644
--- a/client/src/app/videos/+video-edit/shared/video-send.ts
+++ b/client/src/app/videos/+video-edit/video-add-components/video-send.ts
@@ -1,16 +1,16 @@
1import { FormReactive } from '@app/shared' 1import { EventEmitter, OnInit } from '@angular/core'
2import { OnInit } from '@angular/core'
3import { CanComponentDeactivate } from '@app/shared/guards/can-deactivate-guard.service'
4import { populateAsyncUserVideoChannels } from '@app/shared/misc/utils'
5import { VideoConstant, VideoPrivacy } from '../../../../../../shared/models/videos'
6import { VideoCaptionEdit } from '@app/shared/video-caption/video-caption-edit.model'
7import { LoadingBarService } from '@ngx-loading-bar/core' 2import { LoadingBarService } from '@ngx-loading-bar/core'
8import { NotificationsService } from 'angular2-notifications' 3import { NotificationsService } from 'angular2-notifications'
4import { catchError, switchMap, tap } from 'rxjs/operators'
5import { FormReactive } from '@app/shared'
6import { CanComponentDeactivate } from '@app/shared/guards/can-deactivate-guard.service'
7import { VideoConstant, VideoPrivacy } from '../../../../../../shared'
9import { AuthService, ServerService } from '@app/core' 8import { AuthService, ServerService } from '@app/core'
10import { VideoService } from '@app/shared/video/video.service' 9import { VideoService } from '@app/shared/video/video.service'
10import { VideoCaptionEdit } from '@app/shared/video-caption/video-caption-edit.model'
11import { VideoCaptionService } from '@app/shared/video-caption' 11import { VideoCaptionService } from '@app/shared/video-caption'
12import { catchError, switchMap, tap } from 'rxjs/operators'
13import { VideoEdit } from '@app/shared/video/video-edit.model' 12import { VideoEdit } from '@app/shared/video/video-edit.model'
13import { populateAsyncUserVideoChannels } from '@app/shared/misc/utils'
14 14
15export abstract class VideoSend extends FormReactive implements OnInit, CanComponentDeactivate { 15export abstract class VideoSend extends FormReactive implements OnInit, CanComponentDeactivate {
16 16
@@ -21,6 +21,7 @@ export abstract class VideoSend extends FormReactive implements OnInit, CanCompo
21 firstStepPrivacyId = 0 21 firstStepPrivacyId = 0
22 firstStepChannelId = 0 22 firstStepChannelId = 0
23 23
24 abstract firstStepDone: EventEmitter<string>
24 protected abstract readonly DEFAULT_VIDEO_PRIVACY: VideoPrivacy 25 protected abstract readonly DEFAULT_VIDEO_PRIVACY: VideoPrivacy
25 26
26 protected loadingBar: LoadingBarService 27 protected loadingBar: LoadingBarService
diff --git a/client/src/app/videos/+video-edit/video-upload.component.html b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.html
index 8c0723155..8c0723155 100644
--- a/client/src/app/videos/+video-edit/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-upload.component.scss b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.scss
index 015835672..dbae5230d 100644
--- a/client/src/app/videos/+video-edit/video-upload.component.scss
+++ b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.scss
@@ -1,5 +1,5 @@
1@import '_variables'; 1@import 'variables';
2@import '_mixins'; 2@import 'mixins';
3 3
4.peertube-select-container { 4.peertube-select-container {
5 @include peertube-select-container(190px); 5 @include peertube-select-container(190px);
@@ -20,7 +20,7 @@
20 margin-bottom: 25px; 20 margin-bottom: 25px;
21 cursor: default; 21 cursor: default;
22 22
23 background-image: url('../../../assets/images/video/upload.svg'); 23 background-image: url('../../../../assets/images/video/upload.svg');
24 } 24 }
25 25
26 .button-file { 26 .button-file {
diff --git a/client/src/app/videos/+video-edit/video-upload.component.ts b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts
index 983af60ce..3ec89ff62 100644
--- a/client/src/app/videos/+video-edit/video-upload.component.ts
+++ b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts
@@ -1,26 +1,25 @@
1import { HttpEventType, HttpResponse } from '@angular/common/http' 1import { HttpEventType, HttpResponse } from '@angular/common/http'
2import { Component, EventEmitter, OnDestroy, OnInit, Output, ViewChild } from '@angular/core' 2import { Component, EventEmitter, OnDestroy, OnInit, Output, ViewChild } from '@angular/core'
3import { Router } from '@angular/router' 3import { Router } from '@angular/router'
4import { UserService } from '@app/shared'
5import { CanComponentDeactivate } from '@app/shared/guards/can-deactivate-guard.service'
6import { LoadingBarService } from '@ngx-loading-bar/core' 4import { LoadingBarService } from '@ngx-loading-bar/core'
7import { NotificationsService } from 'angular2-notifications' 5import { NotificationsService } from 'angular2-notifications'
8import { BytesPipe } from 'ngx-pipes' 6import { BytesPipe } from 'ngx-pipes'
9import { Subscription } from 'rxjs' 7import { Subscription } from 'rxjs'
10import { VideoPrivacy } from '../../../../../shared/models/videos' 8import { VideoPrivacy } from '../../../../../../shared/models/videos'
11import { AuthService, ServerService } from '../../core' 9import { AuthService, ServerService } from '../../../core'
12import { VideoEdit } from '../../shared/video/video-edit.model' 10import { VideoEdit } from '../../../shared/video/video-edit.model'
13import { VideoService } from '../../shared/video/video.service' 11import { VideoService } from '../../../shared/video/video.service'
14import { I18n } from '@ngx-translate/i18n-polyfill' 12import { I18n } from '@ngx-translate/i18n-polyfill'
15import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' 13import { VideoSend } from '@app/videos/+video-edit/video-add-components/video-send'
14import { CanComponentDeactivate } from '@app/shared/guards/can-deactivate-guard.service'
15import { FormValidatorService, UserService } from '@app/shared'
16import { VideoCaptionService } from '@app/shared/video-caption' 16import { VideoCaptionService } from '@app/shared/video-caption'
17import { VideoSend } from '@app/videos/+video-edit/shared/video-send'
18 17
19@Component({ 18@Component({
20 selector: 'my-video-upload', 19 selector: 'my-video-upload',
21 templateUrl: './video-upload.component.html', 20 templateUrl: './video-upload.component.html',
22 styleUrls: [ 21 styleUrls: [
23 './shared/video-edit.component.scss', 22 '../shared/video-edit.component.scss',
24 './video-upload.component.scss' 23 './video-upload.component.scss'
25 ] 24 ]
26}) 25})
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 377ea5dd2..e74fa1f15 100644
--- a/client/src/app/videos/+video-edit/video-add.component.ts
+++ b/client/src/app/videos/+video-edit/video-add.component.ts
@@ -1,7 +1,7 @@
1import { Component, ViewChild } from '@angular/core' 1import { Component, ViewChild } from '@angular/core'
2import { CanComponentDeactivate } from '@app/shared/guards/can-deactivate-guard.service' 2import { CanComponentDeactivate } from '@app/shared/guards/can-deactivate-guard.service'
3import { VideoImportUrlComponent } from '@app/videos/+video-edit/video-import-url.component' 3import { VideoImportUrlComponent } from '@app/videos/+video-edit/video-add-components/video-import-url.component'
4import { VideoUploadComponent } from '@app/videos/+video-edit/video-upload.component' 4import { VideoUploadComponent } from '@app/videos/+video-edit/video-add-components/video-upload.component'
5import { ServerService } from '@app/core' 5import { ServerService } from '@app/core'
6 6
7@Component({ 7@Component({
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 dd1a3875d..a1324b397 100644
--- a/client/src/app/videos/+video-edit/video-add.module.ts
+++ b/client/src/app/videos/+video-edit/video-add.module.ts
@@ -5,8 +5,8 @@ import { VideoEditModule } from './shared/video-edit.module'
5import { VideoAddRoutingModule } from './video-add-routing.module' 5import { VideoAddRoutingModule } from './video-add-routing.module'
6import { VideoAddComponent } from './video-add.component' 6import { VideoAddComponent } from './video-add.component'
7import { CanDeactivateGuard } from '../../shared/guards/can-deactivate-guard.service' 7import { CanDeactivateGuard } from '../../shared/guards/can-deactivate-guard.service'
8import { VideoUploadComponent } from '@app/videos/+video-edit/video-upload.component' 8import { VideoUploadComponent } from '@app/videos/+video-edit/video-add-components/video-upload.component'
9import { VideoImportUrlComponent } from '@app/videos/+video-edit/video-import-url.component' 9import { VideoImportUrlComponent } from '@app/videos/+video-edit/video-add-components/video-import-url.component'
10 10
11@NgModule({ 11@NgModule({
12 imports: [ 12 imports: [