aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/shared
diff options
context:
space:
mode:
Diffstat (limited to 'client/src/app/shared')
-rw-r--r--client/src/app/shared/account/account.model.ts3
-rw-r--r--client/src/app/shared/forms/form-validators/host.ts (renamed from client/src/app/shared/forms/form-validators/host.validator.ts)0
-rw-r--r--client/src/app/shared/forms/form-validators/index.ts2
-rw-r--r--client/src/app/shared/forms/form-validators/validator-message.ts5
-rw-r--r--client/src/app/shared/forms/form-validators/video.ts6
-rw-r--r--client/src/app/shared/misc/button.component.scss3
-rw-r--r--client/src/app/shared/users/user.service.ts8
-rw-r--r--client/src/app/shared/video-abuse/video-abuse.service.ts12
-rw-r--r--client/src/app/shared/video-blacklist/video-blacklist.service.ts13
-rw-r--r--client/src/app/shared/video/video-miniature.component.scss3
-rw-r--r--client/src/app/shared/video/video-thumbnail.component.scss3
-rw-r--r--client/src/app/shared/video/video.model.ts5
-rw-r--r--client/src/app/shared/video/video.service.ts6
13 files changed, 38 insertions, 31 deletions
diff --git a/client/src/app/shared/account/account.model.ts b/client/src/app/shared/account/account.model.ts
index 0b008188a..9d1fd3e1d 100644
--- a/client/src/app/shared/account/account.model.ts
+++ b/client/src/app/shared/account/account.model.ts
@@ -1,5 +1,6 @@
1import { Account as ServerAccount } from '../../../../../shared/models/accounts/account.model' 1import { Account as ServerAccount } from '../../../../../shared/models/accounts/account.model'
2import { Avatar } from '../../../../../shared/models/avatars/avatar.model' 2import { Avatar } from '../../../../../shared/models/avatars/avatar.model'
3import { environment } from '../../../environments/environment'
3 4
4export class Account implements ServerAccount { 5export class Account implements ServerAccount {
5 id: number 6 id: number
@@ -15,6 +16,6 @@ export class Account implements ServerAccount {
15 static GET_ACCOUNT_AVATAR_PATH (account: Account) { 16 static GET_ACCOUNT_AVATAR_PATH (account: Account) {
16 if (account && account.avatar) return account.avatar.path 17 if (account && account.avatar) return account.avatar.path
17 18
18 return API_URL + '/client/assets/images/default-avatar.png' 19 return environment.apiUrl + '/client/assets/images/default-avatar.png'
19 } 20 }
20} 21}
diff --git a/client/src/app/shared/forms/form-validators/host.validator.ts b/client/src/app/shared/forms/form-validators/host.ts
index c18a35f9b..c18a35f9b 100644
--- a/client/src/app/shared/forms/form-validators/host.validator.ts
+++ b/client/src/app/shared/forms/form-validators/host.ts
diff --git a/client/src/app/shared/forms/form-validators/index.ts b/client/src/app/shared/forms/form-validators/index.ts
index efe77d4ae..09ae86f8a 100644
--- a/client/src/app/shared/forms/form-validators/index.ts
+++ b/client/src/app/shared/forms/form-validators/index.ts
@@ -1,4 +1,4 @@
1export * from './host.validator' 1export * from './host'
2export * from './user' 2export * from './user'
3export * from './video-abuse' 3export * from './video-abuse'
4export * from './video' 4export * from './video'
diff --git a/client/src/app/shared/forms/form-validators/validator-message.ts b/client/src/app/shared/forms/form-validators/validator-message.ts
new file mode 100644
index 000000000..5ce45833b
--- /dev/null
+++ b/client/src/app/shared/forms/form-validators/validator-message.ts
@@ -0,0 +1,5 @@
1export type ValidatorMessage = {
2 [ id: string ]: {
3 [ error: string ]: string
4 }
5}
diff --git a/client/src/app/shared/forms/form-validators/video.ts b/client/src/app/shared/forms/form-validators/video.ts
index 45da7df4a..500b5bc5f 100644
--- a/client/src/app/shared/forms/form-validators/video.ts
+++ b/client/src/app/shared/forms/form-validators/video.ts
@@ -1,11 +1,5 @@
1import { Validators } from '@angular/forms' 1import { Validators } from '@angular/forms'
2 2
3export type ValidatorMessage = {
4 [ id: string ]: {
5 [ error: string ]: string
6 }
7}
8
9export const VIDEO_NAME = { 3export const VIDEO_NAME = {
10 VALIDATORS: [ Validators.required, Validators.minLength(3), Validators.maxLength(120) ], 4 VALIDATORS: [ Validators.required, Validators.minLength(3), Validators.maxLength(120) ],
11 MESSAGES: { 5 MESSAGES: {
diff --git a/client/src/app/shared/misc/button.component.scss b/client/src/app/shared/misc/button.component.scss
index 5fcae4f10..c380c7ae1 100644
--- a/client/src/app/shared/misc/button.component.scss
+++ b/client/src/app/shared/misc/button.component.scss
@@ -1,3 +1,6 @@
1@import '_variables';
2@import '_mixins';
3
1.action-button { 4.action-button {
2 @include peertube-button-link; 5 @include peertube-button-link;
3 6
diff --git a/client/src/app/shared/users/user.service.ts b/client/src/app/shared/users/user.service.ts
index 6d1017fc9..d97edbcbe 100644
--- a/client/src/app/shared/users/user.service.ts
+++ b/client/src/app/shared/users/user.service.ts
@@ -1,14 +1,14 @@
1import { Injectable } from '@angular/core'
2import { HttpClient } from '@angular/common/http' 1import { HttpClient } from '@angular/common/http'
2import { Injectable } from '@angular/core'
3import 'rxjs/add/operator/catch' 3import 'rxjs/add/operator/catch'
4import 'rxjs/add/operator/map' 4import 'rxjs/add/operator/map'
5
6import { RestExtractor } from '../rest'
7import { UserCreate, UserUpdateMe } from '../../../../../shared' 5import { UserCreate, UserUpdateMe } from '../../../../../shared'
6import { environment } from '../../../environments/environment'
7import { RestExtractor } from '../rest'
8 8
9@Injectable() 9@Injectable()
10export class UserService { 10export class UserService {
11 static BASE_USERS_URL = API_URL + '/api/v1/users/' 11 static BASE_USERS_URL = environment.apiUrl + '/api/v1/users/'
12 12
13 constructor ( 13 constructor (
14 private authHttp: HttpClient, 14 private authHttp: HttpClient,
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 8d979de31..96a1f1fd2 100644
--- a/client/src/app/shared/video-abuse/video-abuse.service.ts
+++ b/client/src/app/shared/video-abuse/video-abuse.service.ts
@@ -1,19 +1,17 @@
1import { Injectable } from '@angular/core'
2import { HttpClient, HttpParams } from '@angular/common/http' 1import { HttpClient, HttpParams } from '@angular/common/http'
2import { Injectable } from '@angular/core'
3import { SortMeta } from 'primeng/components/common/sortmeta'
3import 'rxjs/add/operator/catch' 4import 'rxjs/add/operator/catch'
4import 'rxjs/add/operator/map' 5import 'rxjs/add/operator/map'
5import { Observable } from 'rxjs/Observable' 6import { Observable } from 'rxjs/Observable'
6 7import { ResultList, VideoAbuse } from '../../../../../shared'
7import { SortMeta } from 'primeng/components/common/sortmeta'
8
9import { AuthService } from '../core'
10import { RestExtractor, RestPagination, RestService } from '../rest' 8import { RestExtractor, RestPagination, RestService } from '../rest'
11import { Utils } from '../utils' 9import { Utils } from '../utils'
12import { ResultList, VideoAbuse } from '../../../../../shared' 10import { environment } from '../../../environments/environment'
13 11
14@Injectable() 12@Injectable()
15export class VideoAbuseService { 13export class VideoAbuseService {
16 private static BASE_VIDEO_ABUSE_URL = API_URL + '/api/v1/videos/' 14 private static BASE_VIDEO_ABUSE_URL = environment.apiUrl + '/api/v1/videos/'
17 15
18 constructor ( 16 constructor (
19 private authHttp: HttpClient, 17 private authHttp: HttpClient,
diff --git a/client/src/app/shared/video-blacklist/video-blacklist.service.ts b/client/src/app/shared/video-blacklist/video-blacklist.service.ts
index 17373d52e..1231690aa 100644
--- a/client/src/app/shared/video-blacklist/video-blacklist.service.ts
+++ b/client/src/app/shared/video-blacklist/video-blacklist.service.ts
@@ -1,18 +1,17 @@
1import { Injectable } from '@angular/core'
2import { HttpClient, HttpParams } from '@angular/common/http' 1import { HttpClient, HttpParams } from '@angular/common/http'
3import { Observable } from 'rxjs/Observable' 2import { Injectable } from '@angular/core'
3import { SortMeta } from 'primeng/components/common/sortmeta'
4import 'rxjs/add/operator/catch' 4import 'rxjs/add/operator/catch'
5import 'rxjs/add/operator/map' 5import 'rxjs/add/operator/map'
6 6import { Observable } from 'rxjs/Observable'
7import { SortMeta } from 'primeng/components/common/sortmeta' 7import { BlacklistedVideo, ResultList } from '../../../../../shared'
8 8import { environment } from '../../../environments/environment'
9import { RestExtractor, RestPagination, RestService } from '../rest' 9import { RestExtractor, RestPagination, RestService } from '../rest'
10import { Utils } from '../utils' 10import { Utils } from '../utils'
11import { BlacklistedVideo, ResultList } from '../../../../../shared'
12 11
13@Injectable() 12@Injectable()
14export class VideoBlacklistService { 13export class VideoBlacklistService {
15 private static BASE_VIDEOS_URL = API_URL + '/api/v1/videos/' 14 private static BASE_VIDEOS_URL = environment.apiUrl + '/api/v1/videos/'
16 15
17 constructor ( 16 constructor (
18 private authHttp: HttpClient, 17 private authHttp: HttpClient,
diff --git a/client/src/app/shared/video/video-miniature.component.scss b/client/src/app/shared/video/video-miniature.component.scss
index 37e84897b..49ba1e51c 100644
--- a/client/src/app/shared/video/video-miniature.component.scss
+++ b/client/src/app/shared/video/video-miniature.component.scss
@@ -1,3 +1,6 @@
1@import '_variables';
2@import '_mixins';
3
1.video-miniature { 4.video-miniature {
2 display: inline-block; 5 display: inline-block;
3 padding-right: 15px; 6 padding-right: 15px;
diff --git a/client/src/app/shared/video/video-thumbnail.component.scss b/client/src/app/shared/video/video-thumbnail.component.scss
index ab4f9bcb1..0fc2df220 100644
--- a/client/src/app/shared/video/video-thumbnail.component.scss
+++ b/client/src/app/shared/video/video-thumbnail.component.scss
@@ -1,3 +1,6 @@
1@import '_variables';
2@import '_mixins';
3
1.video-thumbnail { 4.video-thumbnail {
2 display: inline-block; 5 display: inline-block;
3 position: relative; 6 position: relative;
diff --git a/client/src/app/shared/video/video.model.ts b/client/src/app/shared/video/video.model.ts
index d86ef8f92..32c33829d 100644
--- a/client/src/app/shared/video/video.model.ts
+++ b/client/src/app/shared/video/video.model.ts
@@ -1,6 +1,7 @@
1import { Video as VideoServerModel } from '../../../../../shared'
2import { User } from '../' 1import { User } from '../'
2import { Video as VideoServerModel } from '../../../../../shared'
3import { Account } from '../../../../../shared/models/accounts' 3import { Account } from '../../../../../shared/models/accounts'
4import { environment } from '../../../environments/environment'
4 5
5export class Video implements VideoServerModel { 6export class Video implements VideoServerModel {
6 accountName: string 7 accountName: string
@@ -48,7 +49,7 @@ export class Video implements VideoServerModel {
48 } 49 }
49 50
50 constructor (hash: VideoServerModel) { 51 constructor (hash: VideoServerModel) {
51 let absoluteAPIUrl = API_URL 52 let absoluteAPIUrl = environment.apiUrl
52 if (!absoluteAPIUrl) { 53 if (!absoluteAPIUrl) {
53 // The API is on the same domain 54 // The API is on the same domain
54 absoluteAPIUrl = window.location.origin 55 absoluteAPIUrl = window.location.origin
diff --git a/client/src/app/shared/video/video.service.ts b/client/src/app/shared/video/video.service.ts
index 1a0644c3d..91dd3977a 100644
--- a/client/src/app/shared/video/video.service.ts
+++ b/client/src/app/shared/video/video.service.ts
@@ -9,9 +9,9 @@ import { UserVideoRateUpdate } from '../../../../../shared/models/videos/user-vi
9import { UserVideoRate } from '../../../../../shared/models/videos/user-video-rate.model' 9import { UserVideoRate } from '../../../../../shared/models/videos/user-video-rate.model'
10import { VideoRateType } from '../../../../../shared/models/videos/video-rate.type' 10import { VideoRateType } from '../../../../../shared/models/videos/video-rate.type'
11import { VideoUpdate } from '../../../../../shared/models/videos/video-update.model' 11import { VideoUpdate } from '../../../../../shared/models/videos/video-update.model'
12import { environment } from '../../../environments/environment'
12import { RestExtractor } from '../rest/rest-extractor.service' 13import { RestExtractor } from '../rest/rest-extractor.service'
13import { RestService } from '../rest/rest.service' 14import { RestService } from '../rest/rest.service'
14import { Search } from '../header/search.model'
15import { UserService } from '../users/user.service' 15import { UserService } from '../users/user.service'
16import { SortField } from './sort-field.type' 16import { SortField } from './sort-field.type'
17import { VideoDetails } from './video-details.model' 17import { VideoDetails } from './video-details.model'
@@ -21,7 +21,7 @@ import { Video } from './video.model'
21 21
22@Injectable() 22@Injectable()
23export class VideoService { 23export class VideoService {
24 private static BASE_VIDEO_URL = API_URL + '/api/v1/videos/' 24 private static BASE_VIDEO_URL = environment.apiUrl + '/api/v1/videos/'
25 25
26 constructor ( 26 constructor (
27 private authHttp: HttpClient, 27 private authHttp: HttpClient,
@@ -118,7 +118,7 @@ export class VideoService {
118 118
119 loadCompleteDescription (descriptionPath: string) { 119 loadCompleteDescription (descriptionPath: string) {
120 return this.authHttp 120 return this.authHttp
121 .get(API_URL + descriptionPath) 121 .get(environment.apiUrl + descriptionPath)
122 .map(res => res['description']) 122 .map(res => res['description'])
123 .catch((res) => this.restExtractor.handleError(res)) 123 .catch((res) => this.restExtractor.handleError(res))
124 } 124 }