interesting
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move send video components inside a dedicated directory

This commit is contained in:
Chocobozzz 2018-08-06 15:30:24 +02:00
parent 047559af6e
commit 788487140c
9 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
client/src/app/videos/+video-edit/video-import-url.component.html → client/src/app/videos/+video-edit/video-add-components/video-import-url.component.html
View File

6
client/src/app/videos/+video-edit/video-import-url.component.scss → client/src/app/videos/+video-edit/video-add-components/video-import-url.component.scss
View File

@ -1,5 +1,5 @@
@import '_variables'; @import 'variables';
@import '_mixins'; @import 'mixins';
$width-size: 190px; $width-size: 190px;
@ -17,7 +17,7 @@ $width-size: 190px;
margin-bottom: 25px; margin-bottom: 25px;
cursor: default; cursor: default;
background-image: url('../../../assets/images/video/upload.svg'); background-image: url('../../../../assets/images/video/upload.svg');
} }
input[type=text] { input[type=text] {

18
client/src/app/videos/+video-edit/video-import-url.component.ts → client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts
View File

@ -1,23 +1,23 @@
import { Component, EventEmitter, OnInit, Output } from '@angular/core' import { Component, EventEmitter, OnInit, Output } from '@angular/core'
import { Router } from '@angular/router' import { Router } from '@angular/router'
import { CanComponentDeactivate } from '@app/shared/guards/can-deactivate-guard.service'
import { NotificationsService } from 'angular2-notifications' import { NotificationsService } from 'angular2-notifications'
import { VideoPrivacy, VideoUpdate } from '../../../../../shared/models/videos' import { VideoPrivacy, VideoUpdate } from '../../../../../../shared/models/videos'
import { AuthService, ServerService } from '../../core' import { AuthService, ServerService } from '../../../core'
import { VideoService } from '../../shared/video/video.service' import { VideoService } from '../../../shared/video/video.service'
import { I18n } from '@ngx-translate/i18n-polyfill' import { I18n } from '@ngx-translate/i18n-polyfill'
import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
import { VideoImportService } from '@app/shared/video-import'
import { VideoEdit } from '@app/shared/video/video-edit.model'
import { LoadingBarService } from '@ngx-loading-bar/core' import { LoadingBarService } from '@ngx-loading-bar/core'
import { VideoSend } from '@app/videos/+video-edit/video-add-components/video-send'
import { CanComponentDeactivate } from '@app/shared/guards/can-deactivate-guard.service'
import { VideoEdit } from '@app/shared/video/video-edit.model'
import { FormValidatorService } from '@app/shared'
import { VideoCaptionService } from '@app/shared/video-caption' import { VideoCaptionService } from '@app/shared/video-caption'
import { VideoSend } from '@app/videos/+video-edit/shared/video-send' import { VideoImportService } from '@app/shared/video-import'
@Component({ @Component({
selector: 'my-video-import-url', selector: 'my-video-import-url',
templateUrl: './video-import-url.component.html', templateUrl: './video-import-url.component.html',
styleUrls: [ styleUrls: [
'./shared/video-edit.component.scss', '../shared/video-edit.component.scss',
'./video-import-url.component.scss' './video-import-url.component.scss'
] ]
}) })

15
client/src/app/videos/+video-edit/shared/video-send.ts → client/src/app/videos/+video-edit/video-add-components/video-send.ts
View File

@ -1,16 +1,16 @@
import { FormReactive } from '@app/shared' import { EventEmitter, OnInit } from '@angular/core'
import { OnInit } from '@angular/core'
import { CanComponentDeactivate } from '@app/shared/guards/can-deactivate-guard.service'
import { populateAsyncUserVideoChannels } from '@app/shared/misc/utils'
import { VideoConstant, VideoPrivacy } from '../../../../../../shared/models/videos'
import { VideoCaptionEdit } from '@app/shared/video-caption/video-caption-edit.model'
import { LoadingBarService } from '@ngx-loading-bar/core' import { LoadingBarService } from '@ngx-loading-bar/core'
import { NotificationsService } from 'angular2-notifications' import { NotificationsService } from 'angular2-notifications'
import { catchError, switchMap, tap } from 'rxjs/operators'
import { FormReactive } from '@app/shared'
import { CanComponentDeactivate } from '@app/shared/guards/can-deactivate-guard.service'
import { VideoConstant, VideoPrivacy } from '../../../../../../shared'
import { AuthService, ServerService } from '@app/core' import { AuthService, ServerService } from '@app/core'
import { VideoService } from '@app/shared/video/video.service' import { VideoService } from '@app/shared/video/video.service'
import { VideoCaptionEdit } from '@app/shared/video-caption/video-caption-edit.model'
import { VideoCaptionService } from '@app/shared/video-caption' import { VideoCaptionService } from '@app/shared/video-caption'
import { catchError, switchMap, tap } from 'rxjs/operators'
import { VideoEdit } from '@app/shared/video/video-edit.model' import { VideoEdit } from '@app/shared/video/video-edit.model'
import { populateAsyncUserVideoChannels } from '@app/shared/misc/utils'
export abstract class VideoSend extends FormReactive implements OnInit, CanComponentDeactivate { export abstract class VideoSend extends FormReactive implements OnInit, CanComponentDeactivate {
@ -21,6 +21,7 @@ export abstract class VideoSend extends FormReactive implements OnInit, CanCompo
firstStepPrivacyId = 0 firstStepPrivacyId = 0
firstStepChannelId = 0 firstStepChannelId = 0
abstract firstStepDone: EventEmitter<string>
protected abstract readonly DEFAULT_VIDEO_PRIVACY: VideoPrivacy protected abstract readonly DEFAULT_VIDEO_PRIVACY: VideoPrivacy
protected loadingBar: LoadingBarService protected loadingBar: LoadingBarService

0
client/src/app/videos/+video-edit/video-upload.component.html → client/src/app/videos/+video-edit/video-add-components/video-upload.component.html
View File

6
client/src/app/videos/+video-edit/video-upload.component.scss → client/src/app/videos/+video-edit/video-add-components/video-upload.component.scss
View File

@ -1,5 +1,5 @@
@import '_variables'; @import 'variables';
@import '_mixins'; @import 'mixins';
.peertube-select-container { .peertube-select-container {
@include peertube-select-container(190px); @include peertube-select-container(190px);
@ -20,7 +20,7 @@
margin-bottom: 25px; margin-bottom: 25px;
cursor: default; cursor: default;
background-image: url('../../../assets/images/video/upload.svg'); background-image: url('../../../../assets/images/video/upload.svg');
} }
.button-file { .button-file {

17
client/src/app/videos/+video-edit/video-upload.component.ts → client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts
View File

@ -1,26 +1,25 @@
import { HttpEventType, HttpResponse } from '@angular/common/http' import { HttpEventType, HttpResponse } from '@angular/common/http'
import { Component, EventEmitter, OnDestroy, OnInit, Output, ViewChild } from '@angular/core' import { Component, EventEmitter, OnDestroy, OnInit, Output, ViewChild } from '@angular/core'
import { Router } from '@angular/router' import { Router } from '@angular/router'
import { UserService } from '@app/shared'
import { CanComponentDeactivate } from '@app/shared/guards/can-deactivate-guard.service'
import { LoadingBarService } from '@ngx-loading-bar/core' import { LoadingBarService } from '@ngx-loading-bar/core'
import { NotificationsService } from 'angular2-notifications' import { NotificationsService } from 'angular2-notifications'
import { BytesPipe } from 'ngx-pipes' import { BytesPipe } from 'ngx-pipes'
import { Subscription } from 'rxjs' import { Subscription } from 'rxjs'
import { VideoPrivacy } from '../../../../../shared/models/videos' import { VideoPrivacy } from '../../../../../../shared/models/videos'
import { AuthService, ServerService } from '../../core' import { AuthService, ServerService } from '../../../core'
import { VideoEdit } from '../../shared/video/video-edit.model' import { VideoEdit } from '../../../shared/video/video-edit.model'
import { VideoService } from '../../shared/video/video.service' import { VideoService } from '../../../shared/video/video.service'
import { I18n } from '@ngx-translate/i18n-polyfill' import { I18n } from '@ngx-translate/i18n-polyfill'
import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' import { VideoSend } from '@app/videos/+video-edit/video-add-components/video-send'
import { CanComponentDeactivate } from '@app/shared/guards/can-deactivate-guard.service'
import { FormValidatorService, UserService } from '@app/shared'
import { VideoCaptionService } from '@app/shared/video-caption' import { VideoCaptionService } from '@app/shared/video-caption'
import { VideoSend } from '@app/videos/+video-edit/shared/video-send'
@Component({ @Component({
selector: 'my-video-upload', selector: 'my-video-upload',
templateUrl: './video-upload.component.html', templateUrl: './video-upload.component.html',
styleUrls: [ styleUrls: [
'./shared/video-edit.component.scss', '../shared/video-edit.component.scss',
'./video-upload.component.scss' './video-upload.component.scss'
] ]
}) })

4
client/src/app/videos/+video-edit/video-add.component.ts
View File

@ -1,7 +1,7 @@
import { Component, ViewChild } from '@angular/core' import { Component, ViewChild } from '@angular/core'
import { CanComponentDeactivate } from '@app/shared/guards/can-deactivate-guard.service' import { CanComponentDeactivate } from '@app/shared/guards/can-deactivate-guard.service'
import { VideoImportUrlComponent } from '@app/videos/+video-edit/video-import-url.component' import { VideoImportUrlComponent } from '@app/videos/+video-edit/video-add-components/video-import-url.component'
import { VideoUploadComponent } from '@app/videos/+video-edit/video-upload.component' import { VideoUploadComponent } from '@app/videos/+video-edit/video-add-components/video-upload.component'
import { ServerService } from '@app/core' import { ServerService } from '@app/core'
@Component({ @Component({

4
client/src/app/videos/+video-edit/video-add.module.ts
View File

@ -5,8 +5,8 @@ import { VideoEditModule } from './shared/video-edit.module'
import { VideoAddRoutingModule } from './video-add-routing.module' import { VideoAddRoutingModule } from './video-add-routing.module'
import { VideoAddComponent } from './video-add.component' import { VideoAddComponent } from './video-add.component'
import { CanDeactivateGuard } from '../../shared/guards/can-deactivate-guard.service' import { CanDeactivateGuard } from '../../shared/guards/can-deactivate-guard.service'
import { VideoUploadComponent } from '@app/videos/+video-edit/video-upload.component' import { VideoUploadComponent } from '@app/videos/+video-edit/video-add-components/video-upload.component'
import { VideoImportUrlComponent } from '@app/videos/+video-edit/video-import-url.component' import { VideoImportUrlComponent } from '@app/videos/+video-edit/video-add-components/video-import-url.component'
@NgModule({ @NgModule({
imports: [ imports: [