diff options
author | Chocobozzz <me@florianbigard.com> | 2018-08-14 15:47:56 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-08-14 15:47:56 +0200 |
commit | e63dbd426e67672b4014c2a3ac3a227fbe26e886 (patch) | |
tree | a7c9a23faf764ed81a7373a01d432932912e4111 /client/src/app/shared | |
parent | 06215f15e0a9fea2ef95b8b49cb2b5868fb64017 (diff) | |
download | PeerTube-e63dbd426e67672b4014c2a3ac3a227fbe26e886.tar.gz PeerTube-e63dbd426e67672b4014c2a3ac3a227fbe26e886.tar.zst PeerTube-e63dbd426e67672b4014c2a3ac3a227fbe26e886.zip |
Update client according to new model paths
Diffstat (limited to 'client/src/app/shared')
4 files changed, 11 insertions, 9 deletions
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' | |||
4 | import { forkJoin, Observable, of } from 'rxjs' | 4 | import { forkJoin, Observable, of } from 'rxjs' |
5 | import { ResultList } from '../../../../../shared' | 5 | import { ResultList } from '../../../../../shared' |
6 | import { RestExtractor, RestService } from '../rest' | 6 | import { RestExtractor, RestService } from '../rest' |
7 | import { VideoCaption } from '../../../../../shared/models/videos/video-caption.model' | ||
8 | import { VideoService } from '@app/shared/video/video.service' | 7 | import { VideoService } from '@app/shared/video/video.service' |
9 | import { objectToFormData, sortBy } from '@app/shared/misc/utils' | 8 | import { objectToFormData, sortBy } from '@app/shared/misc/utils' |
10 | import { VideoCaptionEdit } from '@app/shared/video-caption/video-caption-edit.model' | 9 | import { VideoCaptionEdit } from '@app/shared/video-caption/video-caption-edit.model' |
10 | import { VideoCaption } from '../../../../../shared/models/videos/caption/video-caption.model' | ||
11 | 11 | ||
12 | @Injectable() | 12 | @Injectable() |
13 | export class VideoCaptionService { | 13 | 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 @@ | |||
1 | import { VideoChannel as ServerVideoChannel } from '../../../../../shared/models/videos/video-channel.model' | 1 | import { VideoChannel as ServerVideoChannel } from '../../../../../shared/models/videos' |
2 | import { Actor } from '../actor/actor.model' | 2 | import { Actor } from '../actor/actor.model' |
3 | import { Account } from '../../../../../shared/models/actors' | 3 | import { Account } from '../../../../../shared/models/actors' |
4 | 4 | ||
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' | |||
5 | import { VideoImport } from '../../../../../shared' | 5 | import { VideoImport } from '../../../../../shared' |
6 | import { environment } from '../../../environments/environment' | 6 | import { environment } from '../../../environments/environment' |
7 | import { RestExtractor, RestService } from '../rest' | 7 | import { RestExtractor, RestService } from '../rest' |
8 | import { VideoImportCreate } from '../../../../../shared/models/videos/video-import-create.model' | 8 | import { VideoImportCreate } from '../../../../../shared/models/videos' |
9 | import { objectToFormData } from '@app/shared/misc/utils' | 9 | import { objectToFormData } from '@app/shared/misc/utils' |
10 | import { VideoUpdate } from '../../../../../shared/models/videos' | 10 | import { VideoUpdate } from '../../../../../shared/models/videos' |
11 | import { ResultList } from '../../../../../shared/models/result-list.model' | 11 | 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' | |||
4 | import { Observable } from 'rxjs' | 4 | import { Observable } from 'rxjs' |
5 | import { Video as VideoServerModel, VideoDetails as VideoDetailsServerModel } from '../../../../../shared' | 5 | import { Video as VideoServerModel, VideoDetails as VideoDetailsServerModel } from '../../../../../shared' |
6 | import { ResultList } from '../../../../../shared/models/result-list.model' | 6 | import { ResultList } from '../../../../../shared/models/result-list.model' |
7 | import { UserVideoRateUpdate } from '../../../../../shared/models/videos/user-video-rate-update.model' | 7 | import { |
8 | import { UserVideoRate } from '../../../../../shared/models/videos/user-video-rate.model' | 8 | UserVideoRate, |
9 | import { VideoFilter } from '../../../../../shared/models/videos/video-query.type' | 9 | UserVideoRateUpdate, |
10 | VideoChannel, | ||
11 | VideoFilter, | ||
12 | VideoRateType, | ||
13 | VideoUpdate | ||
14 | } from '../../../../../shared/models/videos' | ||
10 | import { FeedFormat } from '../../../../../shared/models/feeds/feed-format.enum' | 15 | import { FeedFormat } from '../../../../../shared/models/feeds/feed-format.enum' |
11 | import { VideoRateType } from '../../../../../shared/models/videos/video-rate.type' | ||
12 | import { VideoUpdate } from '../../../../../shared/models/videos/video-update.model' | ||
13 | import { environment } from '../../../environments/environment' | 16 | import { environment } from '../../../environments/environment' |
14 | import { ComponentPagination } from '../rest/component-pagination.model' | 17 | import { ComponentPagination } from '../rest/component-pagination.model' |
15 | import { RestExtractor } from '../rest/rest-extractor.service' | 18 | import { RestExtractor } from '../rest/rest-extractor.service' |
@@ -22,7 +25,6 @@ import { Video } from './video.model' | |||
22 | import { objectToFormData } from '@app/shared/misc/utils' | 25 | import { objectToFormData } from '@app/shared/misc/utils' |
23 | import { Account } from '@app/shared/account/account.model' | 26 | import { Account } from '@app/shared/account/account.model' |
24 | import { AccountService } from '@app/shared/account/account.service' | 27 | import { AccountService } from '@app/shared/account/account.service' |
25 | import { VideoChannel } from '../../../../../shared/models/videos' | ||
26 | import { VideoChannelService } from '@app/shared/video-channel/video-channel.service' | 28 | import { VideoChannelService } from '@app/shared/video-channel/video-channel.service' |
27 | import { ServerService } from '@app/core' | 29 | import { ServerService } from '@app/core' |
28 | 30 | ||