From e63dbd426e67672b4014c2a3ac3a227fbe26e886 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 14 Aug 2018 15:47:56 +0200 Subject: Update client according to new model paths --- .../src/app/shared/video-caption/video-caption.service.ts | 2 +- client/src/app/shared/video-channel/video-channel.model.ts | 2 +- client/src/app/shared/video-import/video-import.service.ts | 2 +- client/src/app/shared/video/video.service.ts | 14 ++++++++------ 4 files changed, 11 insertions(+), 9 deletions(-) (limited to 'client/src/app/shared') diff --git a/client/src/app/shared/video-caption/video-caption.service.ts b/client/src/app/shared/video-caption/video-caption.service.ts index 0ff094d1f..9c29bc052 100644 --- a/client/src/app/shared/video-caption/video-caption.service.ts +++ b/client/src/app/shared/video-caption/video-caption.service.ts @@ -4,10 +4,10 @@ import { Injectable } from '@angular/core' import { forkJoin, Observable, of } from 'rxjs' import { ResultList } from '../../../../../shared' import { RestExtractor, RestService } from '../rest' -import { VideoCaption } from '../../../../../shared/models/videos/video-caption.model' import { VideoService } from '@app/shared/video/video.service' import { objectToFormData, sortBy } from '@app/shared/misc/utils' import { VideoCaptionEdit } from '@app/shared/video-caption/video-caption-edit.model' +import { VideoCaption } from '../../../../../shared/models/videos/caption/video-caption.model' @Injectable() export class VideoCaptionService { diff --git a/client/src/app/shared/video-channel/video-channel.model.ts b/client/src/app/shared/video-channel/video-channel.model.ts index 199c1d3b8..b6862b681 100644 --- a/client/src/app/shared/video-channel/video-channel.model.ts +++ b/client/src/app/shared/video-channel/video-channel.model.ts @@ -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 { Account } from '../../../../../shared/models/actors' diff --git a/client/src/app/shared/video-import/video-import.service.ts b/client/src/app/shared/video-import/video-import.service.ts index 002412bd7..f63bfb2b1 100644 --- a/client/src/app/shared/video-import/video-import.service.ts +++ b/client/src/app/shared/video-import/video-import.service.ts @@ -5,7 +5,7 @@ import { Observable } from 'rxjs' import { VideoImport } from '../../../../../shared' import { environment } from '../../../environments/environment' 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 { VideoUpdate } from '../../../../../shared/models/videos' import { ResultList } from '../../../../../shared/models/result-list.model' diff --git a/client/src/app/shared/video/video.service.ts b/client/src/app/shared/video/video.service.ts index ddf365959..e2a62c701 100644 --- a/client/src/app/shared/video/video.service.ts +++ b/client/src/app/shared/video/video.service.ts @@ -4,12 +4,15 @@ import { Injectable } from '@angular/core' import { Observable } from 'rxjs' import { Video as VideoServerModel, VideoDetails as VideoDetailsServerModel } from '../../../../../shared' import { ResultList } from '../../../../../shared/models/result-list.model' -import { UserVideoRateUpdate } from '../../../../../shared/models/videos/user-video-rate-update.model' -import { UserVideoRate } from '../../../../../shared/models/videos/user-video-rate.model' -import { VideoFilter } from '../../../../../shared/models/videos/video-query.type' +import { + UserVideoRate, + UserVideoRateUpdate, + VideoChannel, + VideoFilter, + VideoRateType, + VideoUpdate +} from '../../../../../shared/models/videos' 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 { ComponentPagination } from '../rest/component-pagination.model' import { RestExtractor } from '../rest/rest-extractor.service' @@ -22,7 +25,6 @@ import { Video } from './video.model' import { objectToFormData } from '@app/shared/misc/utils' import { Account } from '@app/shared/account/account.model' 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 { ServerService } from '@app/core' -- cgit v1.2.3