14 files changed, 18 insertions, 14 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
 
 @Injectable()
 export class FriendService {
-  private static BASE_FRIEND_URL: string = '/api/v1/pods/';
+  private static BASE_FRIEND_URL = API_URL + '/api/v1/pods/';
 
   constructor (
     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';
 
 @Injectable()
 export class RequestService {
-  private static BASE_REQUEST_URL: string = '/api/v1/requests/';
+  private static BASE_REQUEST_URL = API_URL + '/api/v1/requests/';
 
   constructor (
     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';
 
 @Injectable()
 export class UserService {
-  private static BASE_USERS_URL = '/api/v1/users/';
+  private static BASE_USERS_URL = API_URL + '/api/v1/users/';
 
   constructor(
     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 @@
       a {
         color: inherit !important;
         display: block;
-        background: url(/client/assets/logo.png) no-repeat;
+        background: url(/assets/logo.png) no-repeat;
         background-size: contain;
         background-position: center;
         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';
 
 @Injectable()
 export class AuthService {
-  private static BASE_CLIENT_URL = '/api/v1/clients/local';
-  private static BASE_TOKEN_URL = '/api/v1/users/token';
-  private static BASE_USER_INFORMATIONS_URL = '/api/v1/users/me';
+  private static BASE_CLIENT_URL = API_URL + '/api/v1/clients/local';
+  private static BASE_TOKEN_URL = API_URL + '/api/v1/users/token';
+  private static BASE_USER_INFORMATIONS_URL = API_URL + '/api/v1/users/me';
 
   loginChangedSource: Observable<AuthStatus>;
 
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';
 
 @Injectable()
 export class ConfigService {
-  private static BASE_CONFIG_URL = '/api/v1/config/';
+  private static BASE_CONFIG_URL = API_URL + '/api/v1/config/';
 
   private config: {
     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';
 
 @Injectable()
 export class UserService {
-  static BASE_USERS_URL = '/api/v1/users/';
+  static BASE_USERS_URL = API_URL + '/api/v1/users/';
 
   constructor(
     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';
 
 @Injectable()
 export class VideoAbuseService {
-  private static BASE_VIDEO_ABUSE_URL = '/api/v1/videos/';
+  private static BASE_VIDEO_ABUSE_URL = API_URL + '/api/v1/videos/';
 
   constructor(
     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 {
   podHost: string;
   tags: string[];
   thumbnailPath: string;
+  thumbnailUrl: string;
   views: number;
   likes: number;
   dislikes: number;
@@ -80,6 +81,7 @@ export class Video implements VideoServerModel {
     this.podHost = hash.podHost;
     this.tags = hash.tags;
     this.thumbnailPath = hash.thumbnailPath;
+    this.thumbnailUrl = API_URL + hash.thumbnailPath;
     this.views = hash.views;
     this.likes = hash.likes;
     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';
 
 @Injectable()
 export class VideoService {
-  private static BASE_VIDEO_URL = '/api/v1/videos/';
+  private static BASE_VIDEO_URL = API_URL + '/api/v1/videos/';
 
   videoCategories: Array<{ id: number, label: string }> = [];
   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 {
     this.uploader = new FileUploader({
       authToken: this.authService.getRequestHeaderValue(),
       queueLimit: 1,
-      url: '/api/v1/videos',
+      url: API_URL + '/api/v1/videos',
       removeAfterUpload: true
     });
 
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 @@
     [routerLink]="['/videos/watch', video.id]" [attr.title]="video.description"
     class="video-miniature-thumbnail"
   >
-    <img *ngIf="isVideoNSFWForThisUser() === false" [attr.src]="video.thumbnailPath" alt="video thumbnail" />
+    <img *ngIf="isVideoNSFWForThisUser() === false" [attr.src]="video.thumbnailUrl" alt="video thumbnail" />
     <div *ngIf="isVideoNSFWForThisUser()" class="thumbnail-nsfw">
       NSFW
     </div>
diff --git a/client/src/custom-typings.d.ts b/client/src/custom-typings.d.ts
index 621a416b4..67e069cc6 100644
--- a/client/src/custom-typings.d.ts
+++ b/client/src/custom-typings.d.ts
@@ -58,6 +58,7 @@ declare module 'modern-lru' {
 
 // Extra variables that live on Global that will be replaced by webpack DefinePlugin
 declare var ENV: string;
+declare var API_URL: string;
 declare var HMR: boolean;
 declare var System: SystemJS;
 
@@ -67,6 +68,7 @@ interface SystemJS {
 
 interface GlobalEnvironment {
   ENV: string;
+  API_URL: string;
   HMR: boolean;
   SystemJS: SystemJS;
   System: SystemJS;
diff --git a/client/src/index.html b/client/src/index.html
index e18b83dc8..ea88bb15b 100644
--- a/client/src/index.html
+++ b/client/src/index.html
@@ -12,7 +12,7 @@
     <!-- Do not remove it! -->
 
     <!-- TODO: bundle it with webpack when https://github.com/webpack/webpack/pull/1931 will be merged -->
-    <script src="/client/assets/webtorrent/webtorrent.min.js"></script>
+    <!-- <script src="/client/assets/webtorrent/webtorrent.min.js"></script> -->
 
     <link rel="icon" type="image/png" href="/client/assets/favicon.png" />