borekon/PeerTube_original
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update client according to new model paths

Browse Source
This commit is contained in:
Chocobozzz 2018-08-14 15:47:56 +02:00
parent 06215f15e0
commit e63dbd426e
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
6 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/app/shared/video-caption/video-caption.service.ts
View File

@ -4,10 +4,10 @@ import { Injectable } from '@angular/core'
import { forkJoin, Observable, of } from 'rxjs' import { forkJoin, Observable, of } from 'rxjs'
import { ResultList } from '../../../../../shared' import { ResultList } from '../../../../../shared'
import { RestExtractor, RestService } from '../rest' import { RestExtractor, RestService } from '../rest'
import { VideoCaption } from '../../../../../shared/models/videos/video-caption.model'
import { VideoService } from '@app/shared/video/video.service' import { VideoService } from '@app/shared/video/video.service'
import { objectToFormData, sortBy } from '@app/shared/misc/utils' import { objectToFormData, sortBy } from '@app/shared/misc/utils'
import { VideoCaptionEdit } from '@app/shared/video-caption/video-caption-edit.model' import { VideoCaptionEdit } from '@app/shared/video-caption/video-caption-edit.model'
import { VideoCaption } from '../../../../../shared/models/videos/caption/video-caption.model'
@Injectable() @Injectable()
export class VideoCaptionService { export class VideoCaptionService {

2
client/src/app/shared/video-channel/video-channel.model.ts
View File

@ -1,4 +1,4 @@
import { VideoChannel as ServerVideoChannel } from '../../../../../shared/models/videos/video-channel.model' import { VideoChannel as ServerVideoChannel } from '../../../../../shared/models/videos'
import { Actor } from '../actor/actor.model' import { Actor } from '../actor/actor.model'
import { Account } from '../../../../../shared/models/actors' import { Account } from '../../../../../shared/models/actors'

2
client/src/app/shared/video-import/video-import.service.ts
View File

@ -5,7 +5,7 @@ import { Observable } from 'rxjs'
import { VideoImport } from '../../../../../shared' import { VideoImport } from '../../../../../shared'
import { environment } from '../../../environments/environment' import { environment } from '../../../environments/environment'
import { RestExtractor, RestService } from '../rest' import { RestExtractor, RestService } from '../rest'
import { VideoImportCreate } from '../../../../../shared/models/videos/video-import-create.model' import { VideoImportCreate } from '../../../../../shared/models/videos'
import { objectToFormData } from '@app/shared/misc/utils' import { objectToFormData } from '@app/shared/misc/utils'
import { VideoUpdate } from '../../../../../shared/models/videos' import { VideoUpdate } from '../../../../../shared/models/videos'
import { ResultList } from '../../../../../shared/models/result-list.model' import { ResultList } from '../../../../../shared/models/result-list.model'

14
client/src/app/shared/video/video.service.ts
View File

@ -4,12 +4,15 @@ import { Injectable } from '@angular/core'
import { Observable } from 'rxjs' import { Observable } from 'rxjs'
import { Video as VideoServerModel, VideoDetails as VideoDetailsServerModel } from '../../../../../shared' import { Video as VideoServerModel, VideoDetails as VideoDetailsServerModel } from '../../../../../shared'
import { ResultList } from '../../../../../shared/models/result-list.model' import { ResultList } from '../../../../../shared/models/result-list.model'
import { UserVideoRateUpdate } from '../../../../../shared/models/videos/user-video-rate-update.model' import {
import { UserVideoRate } from '../../../../../shared/models/videos/user-video-rate.model' UserVideoRate,
import { VideoFilter } from '../../../../../shared/models/videos/video-query.type' UserVideoRateUpdate,
VideoChannel,
VideoFilter,
VideoRateType,
VideoUpdate
} from '../../../../../shared/models/videos'
import { FeedFormat } from '../../../../../shared/models/feeds/feed-format.enum' import { FeedFormat } from '../../../../../shared/models/feeds/feed-format.enum'
import { VideoRateType } from '../../../../../shared/models/videos/video-rate.type'
import { VideoUpdate } from '../../../../../shared/models/videos/video-update.model'
import { environment } from '../../../environments/environment' import { environment } from '../../../environments/environment'
import { ComponentPagination } from '../rest/component-pagination.model' import { ComponentPagination } from '../rest/component-pagination.model'
import { RestExtractor } from '../rest/rest-extractor.service' import { RestExtractor } from '../rest/rest-extractor.service'
@ -22,7 +25,6 @@ import { Video } from './video.model'
import { objectToFormData } from '@app/shared/misc/utils' import { objectToFormData } from '@app/shared/misc/utils'
import { Account } from '@app/shared/account/account.model' import { Account } from '@app/shared/account/account.model'
import { AccountService } from '@app/shared/account/account.service' import { AccountService } from '@app/shared/account/account.service'
import { VideoChannel } from '../../../../../shared/models/videos'
import { VideoChannelService } from '@app/shared/video-channel/video-channel.service' import { VideoChannelService } from '@app/shared/video-channel/video-channel.service'
import { ServerService } from '@app/core' import { ServerService } from '@app/core'

3
client/src/app/videos/+video-watch/video-watch.component.ts
View File

@ -10,7 +10,7 @@ import { forkJoin, Subscription } from 'rxjs'
import * as videojs from 'video.js' import * as videojs from 'video.js'
import 'videojs-hotkeys' import 'videojs-hotkeys'
import * as WebTorrent from 'webtorrent' import * as WebTorrent from 'webtorrent'
import { UserVideoRateType, VideoPrivacy, VideoRateType, VideoState } from '../../../../../shared' import { UserVideoRateType, VideoCaption, VideoPrivacy, VideoRateType, VideoState } from '../../../../../shared'
import '../../../assets/player/peertube-videojs-plugin' import '../../../assets/player/peertube-videojs-plugin'
import { AuthService, ConfirmService } from '../../core' import { AuthService, ConfirmService } from '../../core'
import { RestExtractor, VideoBlacklistService } from '../../shared' import { RestExtractor, VideoBlacklistService } from '../../shared'
@ -28,7 +28,6 @@ import { I18n } from '@ngx-translate/i18n-polyfill'
import { environment } from '../../../environments/environment' import { environment } from '../../../environments/environment'
import { getDevLocale, isOnDevLocale } from '@app/shared/i18n/i18n-utils' import { getDevLocale, isOnDevLocale } from '@app/shared/i18n/i18n-utils'
import { VideoCaptionService } from '@app/shared/video-caption' import { VideoCaptionService } from '@app/shared/video-caption'
import { VideoCaption } from '../../../../../shared/models/videos/video-caption.model'
@Component({ @Component({
selector: 'my-video-watch', selector: 'my-video-watch',

2
shared/models/videos/index.ts
View File

@ -17,7 +17,9 @@ export * from './video-rate.type'
export * from './video-resolution.enum' export * from './video-resolution.enum'
export * from './video-update.model' export * from './video-update.model'
export * from './video.model' export * from './video.model'
export * from './video-query.type'
export * from './video-state.enum' export * from './video-state.enum'
export * from './caption/video-caption.model'
export * from './caption/video-caption-update.model' export * from './caption/video-caption-update.model'
export * from './import/video-import-create.model' export * from './import/video-import-create.model'
export * from './import/video-import-state.enum' export * from './import/video-import-state.enum'