aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2017-06-11 15:19:43 +0200
committerChocobozzz <florian.bigard@gmail.com>2017-06-11 15:19:43 +0200
commit1840c2f7c91f5f89602a3683d85b0a9df1454855 (patch)
tree7efc223222e2d318abfaef0839a79e23be727cea /client/src/app
parent8635a2c70cc24a4c52558162ac058de95750271f (diff)
downloadPeerTube-1840c2f7c91f5f89602a3683d85b0a9df1454855.tar.gz
PeerTube-1840c2f7c91f5f89602a3683d85b0a9df1454855.tar.zst
PeerTube-1840c2f7c91f5f89602a3683d85b0a9df1454855.zip
Update webpack stack
Diffstat (limited to 'client/src/app')
-rw-r--r--client/src/app/+admin/friends/shared/friend.service.ts2
-rw-r--r--client/src/app/+admin/requests/shared/request.service.ts2
-rw-r--r--client/src/app/+admin/users/shared/user.service.ts2
-rw-r--r--client/src/app/app.component.scss2
-rw-r--r--client/src/app/core/auth/auth.service.ts6
-rw-r--r--client/src/app/core/config/config.service.ts2
-rw-r--r--client/src/app/shared/users/user.service.ts2
-rw-r--r--client/src/app/shared/video-abuse/video-abuse.service.ts2
-rw-r--r--client/src/app/videos/shared/video.model.ts2
-rw-r--r--client/src/app/videos/shared/video.service.ts2
-rw-r--r--client/src/app/videos/video-edit/video-add.component.ts2
-rw-r--r--client/src/app/videos/video-list/video-miniature.component.html2
12 files changed, 15 insertions, 13 deletions
diff --git a/client/src/app/+admin/friends/shared/friend.service.ts b/client/src/app/+admin/friends/shared/friend.service.ts
index 6cb84f5cd..6e51c954f 100644
--- a/client/src/app/+admin/friends/shared/friend.service.ts
+++ b/client/src/app/+admin/friends/shared/friend.service.ts
@@ -10,7 +10,7 @@ import { AuthHttp, RestExtractor, RestDataSource, ResultList } from '../../../sh
10 10
11@Injectable() 11@Injectable()
12export class FriendService { 12export class FriendService {
13 private static BASE_FRIEND_URL: string = '/api/v1/pods/'; 13 private static BASE_FRIEND_URL = API_URL + '/api/v1/pods/';
14 14
15 constructor ( 15 constructor (
16 private authHttp: AuthHttp, 16 private authHttp: AuthHttp,
diff --git a/client/src/app/+admin/requests/shared/request.service.ts b/client/src/app/+admin/requests/shared/request.service.ts
index 915d192a6..0872ba0b8 100644
--- a/client/src/app/+admin/requests/shared/request.service.ts
+++ b/client/src/app/+admin/requests/shared/request.service.ts
@@ -8,7 +8,7 @@ import { AuthHttp, RestExtractor } from '../../../shared';
8 8
9@Injectable() 9@Injectable()
10export class RequestService { 10export class RequestService {
11 private static BASE_REQUEST_URL: string = '/api/v1/requests/'; 11 private static BASE_REQUEST_URL = API_URL + '/api/v1/requests/';
12 12
13 constructor ( 13 constructor (
14 private authHttp: AuthHttp, 14 private authHttp: AuthHttp,
diff --git a/client/src/app/+admin/users/shared/user.service.ts b/client/src/app/+admin/users/shared/user.service.ts
index da540bf9f..9c7176d39 100644
--- a/client/src/app/+admin/users/shared/user.service.ts
+++ b/client/src/app/+admin/users/shared/user.service.ts
@@ -6,7 +6,7 @@ import { AuthHttp, RestExtractor, RestDataSource, User } from '../../../shared';
6 6
7@Injectable() 7@Injectable()
8export class UserService { 8export class UserService {
9 private static BASE_USERS_URL = '/api/v1/users/'; 9 private static BASE_USERS_URL = API_URL + '/api/v1/users/';
10 10
11 constructor( 11 constructor(
12 private authHttp: AuthHttp, 12 private authHttp: AuthHttp,
diff --git a/client/src/app/app.component.scss b/client/src/app/app.component.scss
index 68fadbe7c..a98e57cc3 100644
--- a/client/src/app/app.component.scss
+++ b/client/src/app/app.component.scss
@@ -51,7 +51,7 @@
51 a { 51 a {
52 color: inherit !important; 52 color: inherit !important;
53 display: block; 53 display: block;
54 background: url(/client/assets/logo.png) no-repeat; 54 background: url(/assets/logo.png) no-repeat;
55 background-size: contain; 55 background-size: contain;
56 background-position: center; 56 background-position: center;
57 height: 100%; 57 height: 100%;
diff --git a/client/src/app/core/auth/auth.service.ts b/client/src/app/core/auth/auth.service.ts
index caf765b42..4c75df1ca 100644
--- a/client/src/app/core/auth/auth.service.ts
+++ b/client/src/app/core/auth/auth.service.ts
@@ -16,9 +16,9 @@ import { RestExtractor } from '../../shared/rest';
16 16
17@Injectable() 17@Injectable()
18export class AuthService { 18export class AuthService {
19 private static BASE_CLIENT_URL = '/api/v1/clients/local'; 19 private static BASE_CLIENT_URL = API_URL + '/api/v1/clients/local';
20 private static BASE_TOKEN_URL = '/api/v1/users/token'; 20 private static BASE_TOKEN_URL = API_URL + '/api/v1/users/token';
21 private static BASE_USER_INFORMATIONS_URL = '/api/v1/users/me'; 21 private static BASE_USER_INFORMATIONS_URL = API_URL + '/api/v1/users/me';
22 22
23 loginChangedSource: Observable<AuthStatus>; 23 loginChangedSource: Observable<AuthStatus>;
24 24
diff --git a/client/src/app/core/config/config.service.ts b/client/src/app/core/config/config.service.ts
index 295e68c36..407dca083 100644
--- a/client/src/app/core/config/config.service.ts
+++ b/client/src/app/core/config/config.service.ts
@@ -5,7 +5,7 @@ import { RestExtractor } from '../../shared/rest';
5 5
6@Injectable() 6@Injectable()
7export class ConfigService { 7export class ConfigService {
8 private static BASE_CONFIG_URL = '/api/v1/config/'; 8 private static BASE_CONFIG_URL = API_URL + '/api/v1/config/';
9 9
10 private config: { 10 private config: {
11 signup: { 11 signup: {
diff --git a/client/src/app/shared/users/user.service.ts b/client/src/app/shared/users/user.service.ts
index 0727b76fd..f1265be0a 100644
--- a/client/src/app/shared/users/user.service.ts
+++ b/client/src/app/shared/users/user.service.ts
@@ -9,7 +9,7 @@ import { RestExtractor } from '../rest';
9 9
10@Injectable() 10@Injectable()
11export class UserService { 11export class UserService {
12 static BASE_USERS_URL = '/api/v1/users/'; 12 static BASE_USERS_URL = API_URL + '/api/v1/users/';
13 13
14 constructor( 14 constructor(
15 private http: Http, 15 private http: Http,
diff --git a/client/src/app/shared/video-abuse/video-abuse.service.ts b/client/src/app/shared/video-abuse/video-abuse.service.ts
index f23c36f05..da7b2ef8a 100644
--- a/client/src/app/shared/video-abuse/video-abuse.service.ts
+++ b/client/src/app/shared/video-abuse/video-abuse.service.ts
@@ -11,7 +11,7 @@ import { VideoAbuse } from './video-abuse.model';
11 11
12@Injectable() 12@Injectable()
13export class VideoAbuseService { 13export class VideoAbuseService {
14 private static BASE_VIDEO_ABUSE_URL = '/api/v1/videos/'; 14 private static BASE_VIDEO_ABUSE_URL = API_URL + '/api/v1/videos/';
15 15
16 constructor( 16 constructor(
17 private authHttp: AuthHttp, 17 private authHttp: AuthHttp,
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()
22export class VideoService { 22export 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>