aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/videos
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2017-12-11 17:36:46 +0100
committerChocobozzz <me@florianbigard.com>2017-12-12 10:58:16 +0100
commit63c4db6d71b98523753c51747e308682d9a2e8a0 (patch)
treed26c0d092ce016f2afe56bf71b08ca4698fe673f /client/src/app/videos
parent908f6e5e38e85cc0debab0051b7fa34b13025f96 (diff)
downloadPeerTube-63c4db6d71b98523753c51747e308682d9a2e8a0.tar.gz
PeerTube-63c4db6d71b98523753c51747e308682d9a2e8a0.tar.zst
PeerTube-63c4db6d71b98523753c51747e308682d9a2e8a0.zip
Move to angular cli
Diffstat (limited to 'client/src/app/videos')
-rw-r--r--client/src/app/videos/+video-edit/index.ts2
-rw-r--r--client/src/app/videos/+video-edit/shared/video-description.component.scss3
-rw-r--r--client/src/app/videos/+video-edit/shared/video-edit.component.scss3
-rw-r--r--client/src/app/videos/+video-edit/shared/video-edit.component.ts9
-rw-r--r--client/src/app/videos/+video-edit/video-add.component.scss3
-rw-r--r--client/src/app/videos/+video-edit/video-add.component.ts5
-rw-r--r--client/src/app/videos/+video-edit/video-update.component.ts6
-rw-r--r--client/src/app/videos/+video-watch/index.ts1
-rw-r--r--client/src/app/videos/+video-watch/video-download.component.scss3
-rw-r--r--client/src/app/videos/+video-watch/video-watch.component.scss3
-rw-r--r--client/src/app/videos/+video-watch/video-watch.component.ts4
-rw-r--r--client/src/app/videos/videos-routing.module.ts6
12 files changed, 28 insertions, 20 deletions
diff --git a/client/src/app/videos/+video-edit/index.ts b/client/src/app/videos/+video-edit/index.ts
deleted file mode 100644
index 63e0414dd..000000000
--- a/client/src/app/videos/+video-edit/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
1export * from './video-add.module'
2export * from './video-update.module'
diff --git a/client/src/app/videos/+video-edit/shared/video-description.component.scss b/client/src/app/videos/+video-edit/shared/video-description.component.scss
index 2a4c8d189..d6a5190c5 100644
--- a/client/src/app/videos/+video-edit/shared/video-description.component.scss
+++ b/client/src/app/videos/+video-edit/shared/video-description.component.scss
@@ -1,3 +1,6 @@
1@import '_variables';
2@import '_mixins';
3
1textarea { 4textarea {
2 @include peertube-input-text(100%); 5 @include peertube-input-text(100%);
3 6
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 d363499ce..f4466bdde 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
@@ -1,3 +1,6 @@
1@import '_variables';
2@import '_mixins';
3
1.video-edit { 4.video-edit {
2 height: 100%; 5 height: 100%;
3 6
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 5b1cc3f9c..28c9134a7 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
@@ -2,12 +2,10 @@ import { Component, Input, OnInit } from '@angular/core'
2import { FormBuilder, FormControl, FormGroup } from '@angular/forms' 2import { FormBuilder, FormControl, FormGroup } from '@angular/forms'
3import { ActivatedRoute, Router } from '@angular/router' 3import { ActivatedRoute, Router } from '@angular/router'
4import { NotificationsService } from 'angular2-notifications' 4import { NotificationsService } from 'angular2-notifications'
5import { ServerService } from 'app/core'
6import { VideoEdit } from 'app/shared/video/video-edit.model'
7import 'rxjs/add/observable/forkJoin' 5import 'rxjs/add/observable/forkJoin'
8import { VideoPrivacy } from '../../../../../shared/models/videos/video-privacy.enum' 6import { ServerService } from '../../../core/server'
7import { ValidatorMessage } from '../../../shared/forms/form-validators/validator-message'
9import { 8import {
10 ValidatorMessage,
11 VIDEO_CATEGORY, 9 VIDEO_CATEGORY,
12 VIDEO_DESCRIPTION, 10 VIDEO_DESCRIPTION,
13 VIDEO_LANGUAGE, 11 VIDEO_LANGUAGE,
@@ -15,7 +13,8 @@ import {
15 VIDEO_NAME, 13 VIDEO_NAME,
16 VIDEO_PRIVACY, 14 VIDEO_PRIVACY,
17 VIDEO_TAGS 15 VIDEO_TAGS
18} from '../../../shared/forms/form-validators' 16} from '../../../shared/forms/form-validators/video'
17import { VideoEdit } from '../../../shared/video/video-edit.model'
19 18
20@Component({ 19@Component({
21 selector: 'my-video-edit', 20 selector: 'my-video-edit',
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 39673b4b7..78140e0e9 100644
--- a/client/src/app/videos/+video-edit/video-add.component.scss
+++ b/client/src/app/videos/+video-edit/video-add.component.scss
@@ -1,3 +1,6 @@
1@import '_variables';
2@import '_mixins';
3
1.upload-video-container { 4.upload-video-container {
2 border-radius: 3px; 5 border-radius: 3px;
3 background-color: #F7F7F7; 6 background-color: #F7F7F7;
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 2bbc3de17..503f705db 100644
--- a/client/src/app/videos/+video-edit/video-add.component.ts
+++ b/client/src/app/videos/+video-edit/video-add.component.ts
@@ -3,13 +3,12 @@ import { Component, OnInit, ViewChild } from '@angular/core'
3import { FormBuilder, FormGroup } from '@angular/forms' 3import { FormBuilder, FormGroup } from '@angular/forms'
4import { Router } from '@angular/router' 4import { Router } from '@angular/router'
5import { NotificationsService } from 'angular2-notifications' 5import { NotificationsService } from 'angular2-notifications'
6import { VideoService } from 'app/shared/video/video.service'
7import { VideoCreate } from '../../../../../shared'
8import { VideoPrivacy } from '../../../../../shared/models/videos' 6import { VideoPrivacy } from '../../../../../shared/models/videos'
9import { AuthService, ServerService } from '../../core' 7import { AuthService, ServerService } from '../../core'
10import { FormReactive } from '../../shared' 8import { FormReactive } from '../../shared'
11import { ValidatorMessage } from '../../shared/forms/form-validators' 9import { ValidatorMessage } from '../../shared/forms/form-validators/validator-message'
12import { VideoEdit } from '../../shared/video/video-edit.model' 10import { VideoEdit } from '../../shared/video/video-edit.model'
11import { VideoService } from '../../shared/video/video.service'
13 12
14@Component({ 13@Component({
15 selector: 'my-videos-add', 14 selector: 'my-videos-add',
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 d1da8b6d8..08b74f4c3 100644
--- a/client/src/app/videos/+video-edit/video-update.component.ts
+++ b/client/src/app/videos/+video-edit/video-update.component.ts
@@ -3,10 +3,10 @@ import { FormBuilder, FormGroup } from '@angular/forms'
3import { ActivatedRoute, Router } from '@angular/router' 3import { ActivatedRoute, Router } from '@angular/router'
4import { NotificationsService } from 'angular2-notifications' 4import { NotificationsService } from 'angular2-notifications'
5import 'rxjs/add/observable/forkJoin' 5import 'rxjs/add/observable/forkJoin'
6import { VideoPrivacy } from '../../../../../shared/models/videos/video-privacy.enum' 6import { VideoPrivacy } from '../../../../../shared/models/videos'
7import { ServerService } from '../../core' 7import { ServerService } from '../../core'
8import { FormReactive } from '../../shared' 8import { FormReactive } from '../../shared'
9import { ValidatorMessage } from '../../shared/forms/form-validators' 9import { ValidatorMessage } from '../../shared/forms/form-validators/validator-message'
10import { VideoEdit } from '../../shared/video/video-edit.model' 10import { VideoEdit } from '../../shared/video/video-edit.model'
11import { VideoService } from '../../shared/video/video.service' 11import { VideoService } from '../../shared/video/video.service'
12 12
@@ -25,8 +25,6 @@ export class VideoUpdateComponent extends FormReactive implements OnInit {
25 validationMessages: ValidatorMessage = {} 25 validationMessages: ValidatorMessage = {}
26 videoPrivacies = [] 26 videoPrivacies = []
27 27
28 fileError = ''
29
30 constructor ( 28 constructor (
31 private formBuilder: FormBuilder, 29 private formBuilder: FormBuilder,
32 private route: ActivatedRoute, 30 private route: ActivatedRoute,
diff --git a/client/src/app/videos/+video-watch/index.ts b/client/src/app/videos/+video-watch/index.ts
deleted file mode 100644
index b19bfdb1e..000000000
--- a/client/src/app/videos/+video-watch/index.ts
+++ /dev/null
@@ -1 +0,0 @@
1export * from './video-watch.module'
diff --git a/client/src/app/videos/+video-watch/video-download.component.scss b/client/src/app/videos/+video-watch/video-download.component.scss
index c9d5af9c1..7eac3d1c9 100644
--- a/client/src/app/videos/+video-watch/video-download.component.scss
+++ b/client/src/app/videos/+video-watch/video-download.component.scss
@@ -1,3 +1,6 @@
1@import '_variables';
2@import '_mixins';
3
1.resolution-block:not(:first-child) { 4.resolution-block:not(:first-child) {
2 margin-top: 30px; 5 margin-top: 30px;
3} 6}
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 9daa757b4..52082944a 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.scss
+++ b/client/src/app/videos/+video-watch/video-watch.component.scss
@@ -1,3 +1,6 @@
1@import '_variables';
2@import '_mixins';
3
1#video-container { 4#video-container {
2 background-color: #000; 5 background-color: #000;
3 display: flex; 6 display: flex;
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 bec6932ae..3825e8449 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/videos/+video-watch/video-watch.component.ts
@@ -2,10 +2,9 @@ import { Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/co
2import { ActivatedRoute, Router } from '@angular/router' 2import { ActivatedRoute, Router } from '@angular/router'
3import { MetaService } from '@ngx-meta/core' 3import { MetaService } from '@ngx-meta/core'
4import { NotificationsService } from 'angular2-notifications' 4import { NotificationsService } from 'angular2-notifications'
5import { VideoService } from 'app/shared/video/video.service'
6import { Observable } from 'rxjs/Observable' 5import { Observable } from 'rxjs/Observable'
7import { Subscription } from 'rxjs/Subscription' 6import { Subscription } from 'rxjs/Subscription'
8import videojs from 'video.js' 7import * as videojs from 'video.js'
9import { UserVideoRateType, VideoRateType } from '../../../../../shared' 8import { UserVideoRateType, VideoRateType } from '../../../../../shared'
10import '../../../assets/player/peertube-videojs-plugin' 9import '../../../assets/player/peertube-videojs-plugin'
11import { AuthService, ConfirmService } from '../../core' 10import { AuthService, ConfirmService } from '../../core'
@@ -13,6 +12,7 @@ import { VideoBlacklistService } from '../../shared'
13import { Account } from '../../shared/account/account.model' 12import { Account } from '../../shared/account/account.model'
14import { VideoDetails } from '../../shared/video/video-details.model' 13import { VideoDetails } from '../../shared/video/video-details.model'
15import { Video } from '../../shared/video/video.model' 14import { Video } from '../../shared/video/video.model'
15import { VideoService } from '../../shared/video/video.service'
16import { MarkdownService } from '../shared' 16import { MarkdownService } from '../shared'
17import { VideoDownloadComponent } from './video-download.component' 17import { VideoDownloadComponent } from './video-download.component'
18import { VideoReportComponent } from './video-report.component' 18import { VideoReportComponent } from './video-report.component'
diff --git a/client/src/app/videos/videos-routing.module.ts b/client/src/app/videos/videos-routing.module.ts
index 6910421b7..29ec5fd4f 100644
--- a/client/src/app/videos/videos-routing.module.ts
+++ b/client/src/app/videos/videos-routing.module.ts
@@ -46,7 +46,7 @@ const videosRoutes: Routes = [
46 }, 46 },
47 { 47 {
48 path: 'upload', 48 path: 'upload',
49 loadChildren: 'app/videos/+video-edit#VideoAddModule', 49 loadChildren: 'app/videos/+video-edit/video-add.module#VideoAddModule',
50 data: { 50 data: {
51 meta: { 51 meta: {
52 title: 'Upload a video' 52 title: 'Upload a video'
@@ -55,7 +55,7 @@ const videosRoutes: Routes = [
55 }, 55 },
56 { 56 {
57 path: 'edit/:uuid', 57 path: 'edit/:uuid',
58 loadChildren: 'app/videos/+video-edit#VideoUpdateModule', 58 loadChildren: 'app/videos/+video-edit/video-update.module#VideoUpdateModule',
59 data: { 59 data: {
60 meta: { 60 meta: {
61 title: 'Edit a video' 61 title: 'Edit a video'
@@ -69,7 +69,7 @@ const videosRoutes: Routes = [
69 }, 69 },
70 { 70 {
71 path: 'watch/:uuid', 71 path: 'watch/:uuid',
72 loadChildren: 'app/videos/+video-watch#VideoWatchModule', 72 loadChildren: 'app/videos/+video-watch/video-watch.module#VideoWatchModule',
73 data: { 73 data: {
74 preload: 3000 74 preload: 3000
75 } 75 }