diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2017-06-11 15:19:43 +0200 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2017-06-11 15:19:43 +0200 |
commit | 1840c2f7c91f5f89602a3683d85b0a9df1454855 (patch) | |
tree | 7efc223222e2d318abfaef0839a79e23be727cea /client/src/app/videos | |
parent | 8635a2c70cc24a4c52558162ac058de95750271f (diff) | |
download | PeerTube-1840c2f7c91f5f89602a3683d85b0a9df1454855.tar.gz PeerTube-1840c2f7c91f5f89602a3683d85b0a9df1454855.tar.zst PeerTube-1840c2f7c91f5f89602a3683d85b0a9df1454855.zip |
Update webpack stack
Diffstat (limited to 'client/src/app/videos')
4 files changed, 5 insertions, 3 deletions
diff --git a/client/src/app/videos/shared/video.model.ts b/client/src/app/videos/shared/video.model.ts index 0cf4039df..e897eb175 100644 --- a/client/src/app/videos/shared/video.model.ts +++ b/client/src/app/videos/shared/video.model.ts | |||
@@ -21,6 +21,7 @@ export class Video implements VideoServerModel { | |||
21 | podHost: string; | 21 | podHost: string; |
22 | tags: string[]; | 22 | tags: string[]; |
23 | thumbnailPath: string; | 23 | thumbnailPath: string; |
24 | thumbnailUrl: string; | ||
24 | views: number; | 25 | views: number; |
25 | likes: number; | 26 | likes: number; |
26 | dislikes: number; | 27 | dislikes: number; |
@@ -80,6 +81,7 @@ export class Video implements VideoServerModel { | |||
80 | this.podHost = hash.podHost; | 81 | this.podHost = hash.podHost; |
81 | this.tags = hash.tags; | 82 | this.tags = hash.tags; |
82 | this.thumbnailPath = hash.thumbnailPath; | 83 | this.thumbnailPath = hash.thumbnailPath; |
84 | this.thumbnailUrl = API_URL + hash.thumbnailPath; | ||
83 | this.views = hash.views; | 85 | this.views = hash.views; |
84 | this.likes = hash.likes; | 86 | this.likes = hash.likes; |
85 | this.dislikes = hash.dislikes; | 87 | this.dislikes = hash.dislikes; |
diff --git a/client/src/app/videos/shared/video.service.ts b/client/src/app/videos/shared/video.service.ts index ef683dea6..a53ea1064 100644 --- a/client/src/app/videos/shared/video.service.ts +++ b/client/src/app/videos/shared/video.service.ts | |||
@@ -20,7 +20,7 @@ import { Video } from './video.model'; | |||
20 | 20 | ||
21 | @Injectable() | 21 | @Injectable() |
22 | export class VideoService { | 22 | export class VideoService { |
23 | private static BASE_VIDEO_URL = '/api/v1/videos/'; | 23 | private static BASE_VIDEO_URL = API_URL + '/api/v1/videos/'; |
24 | 24 | ||
25 | videoCategories: Array<{ id: number, label: string }> = []; | 25 | videoCategories: Array<{ id: number, label: string }> = []; |
26 | videoLicences: Array<{ id: number, label: string }> = []; | 26 | videoLicences: Array<{ id: number, label: string }> = []; |
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 21343880d..e5eb9a9f4 100644 --- a/client/src/app/videos/video-edit/video-add.component.ts +++ b/client/src/app/videos/video-edit/video-add.component.ts | |||
@@ -94,7 +94,7 @@ export class VideoAddComponent extends FormReactive implements OnInit { | |||
94 | this.uploader = new FileUploader({ | 94 | this.uploader = new FileUploader({ |
95 | authToken: this.authService.getRequestHeaderValue(), | 95 | authToken: this.authService.getRequestHeaderValue(), |
96 | queueLimit: 1, | 96 | queueLimit: 1, |
97 | url: '/api/v1/videos', | 97 | url: API_URL + '/api/v1/videos', |
98 | removeAfterUpload: true | 98 | removeAfterUpload: true |
99 | }); | 99 | }); |
100 | 100 | ||
diff --git a/client/src/app/videos/video-list/video-miniature.component.html b/client/src/app/videos/video-list/video-miniature.component.html index b1b881fea..db6c4d6fb 100644 --- a/client/src/app/videos/video-list/video-miniature.component.html +++ b/client/src/app/videos/video-list/video-miniature.component.html | |||
@@ -3,7 +3,7 @@ | |||
3 | [routerLink]="['/videos/watch', video.id]" [attr.title]="video.description" | 3 | [routerLink]="['/videos/watch', video.id]" [attr.title]="video.description" |
4 | class="video-miniature-thumbnail" | 4 | class="video-miniature-thumbnail" |
5 | > | 5 | > |
6 | <img *ngIf="isVideoNSFWForThisUser() === false" [attr.src]="video.thumbnailPath" alt="video thumbnail" /> | 6 | <img *ngIf="isVideoNSFWForThisUser() === false" [attr.src]="video.thumbnailUrl" alt="video thumbnail" /> |
7 | <div *ngIf="isVideoNSFWForThisUser()" class="thumbnail-nsfw"> | 7 | <div *ngIf="isVideoNSFWForThisUser()" class="thumbnail-nsfw"> |
8 | NSFW | 8 | NSFW |
9 | </div> | 9 | </div> |