From 63c4db6d71b98523753c51747e308682d9a2e8a0 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 11 Dec 2017 17:36:46 +0100 Subject: Move to angular cli --- client/src/app/videos/+video-edit/index.ts | 2 -- .../videos/+video-edit/shared/video-description.component.scss | 3 +++ .../src/app/videos/+video-edit/shared/video-edit.component.scss | 3 +++ client/src/app/videos/+video-edit/shared/video-edit.component.ts | 9 ++++----- client/src/app/videos/+video-edit/video-add.component.scss | 3 +++ client/src/app/videos/+video-edit/video-add.component.ts | 5 ++--- client/src/app/videos/+video-edit/video-update.component.ts | 6 ++---- 7 files changed, 17 insertions(+), 14 deletions(-) delete mode 100644 client/src/app/videos/+video-edit/index.ts (limited to 'client/src/app/videos/+video-edit') 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 @@ -export * from './video-add.module' -export * 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 @@ +@import '_variables'; +@import '_mixins'; + textarea { @include peertube-input-text(100%); 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 @@ +@import '_variables'; +@import '_mixins'; + .video-edit { height: 100%; 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' import { FormBuilder, FormControl, FormGroup } from '@angular/forms' import { ActivatedRoute, Router } from '@angular/router' import { NotificationsService } from 'angular2-notifications' -import { ServerService } from 'app/core' -import { VideoEdit } from 'app/shared/video/video-edit.model' import 'rxjs/add/observable/forkJoin' -import { VideoPrivacy } from '../../../../../shared/models/videos/video-privacy.enum' +import { ServerService } from '../../../core/server' +import { ValidatorMessage } from '../../../shared/forms/form-validators/validator-message' import { - ValidatorMessage, VIDEO_CATEGORY, VIDEO_DESCRIPTION, VIDEO_LANGUAGE, @@ -15,7 +13,8 @@ import { VIDEO_NAME, VIDEO_PRIVACY, VIDEO_TAGS -} from '../../../shared/forms/form-validators' +} from '../../../shared/forms/form-validators/video' +import { VideoEdit } from '../../../shared/video/video-edit.model' @Component({ 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 @@ +@import '_variables'; +@import '_mixins'; + .upload-video-container { border-radius: 3px; 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' import { FormBuilder, FormGroup } from '@angular/forms' import { Router } from '@angular/router' import { NotificationsService } from 'angular2-notifications' -import { VideoService } from 'app/shared/video/video.service' -import { VideoCreate } from '../../../../../shared' import { VideoPrivacy } from '../../../../../shared/models/videos' import { AuthService, ServerService } from '../../core' import { FormReactive } from '../../shared' -import { ValidatorMessage } from '../../shared/forms/form-validators' +import { ValidatorMessage } from '../../shared/forms/form-validators/validator-message' import { VideoEdit } from '../../shared/video/video-edit.model' +import { VideoService } from '../../shared/video/video.service' @Component({ 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' import { ActivatedRoute, Router } from '@angular/router' import { NotificationsService } from 'angular2-notifications' import 'rxjs/add/observable/forkJoin' -import { VideoPrivacy } from '../../../../../shared/models/videos/video-privacy.enum' +import { VideoPrivacy } from '../../../../../shared/models/videos' import { ServerService } from '../../core' import { FormReactive } from '../../shared' -import { ValidatorMessage } from '../../shared/forms/form-validators' +import { ValidatorMessage } from '../../shared/forms/form-validators/validator-message' import { VideoEdit } from '../../shared/video/video-edit.model' import { VideoService } from '../../shared/video/video.service' @@ -25,8 +25,6 @@ export class VideoUpdateComponent extends FormReactive implements OnInit { validationMessages: ValidatorMessage = {} videoPrivacies = [] - fileError = '' - constructor ( private formBuilder: FormBuilder, private route: ActivatedRoute, -- cgit v1.2.3