aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/+admin
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2017-12-11 17:36:46 +0100
committerChocobozzz <me@florianbigard.com>2017-12-12 10:58:16 +0100
commit63c4db6d71b98523753c51747e308682d9a2e8a0 (patch)
treed26c0d092ce016f2afe56bf71b08ca4698fe673f /client/src/app/+admin
parent908f6e5e38e85cc0debab0051b7fa34b13025f96 (diff)
downloadPeerTube-63c4db6d71b98523753c51747e308682d9a2e8a0.tar.gz
PeerTube-63c4db6d71b98523753c51747e308682d9a2e8a0.tar.zst
PeerTube-63c4db6d71b98523753c51747e308682d9a2e8a0.zip
Move to angular cli
Diffstat (limited to 'client/src/app/+admin')
-rw-r--r--client/src/app/+admin/follows/following-add/following-add.component.scss4
-rw-r--r--client/src/app/+admin/follows/shared/follow.service.ts13
-rw-r--r--client/src/app/+admin/index.ts1
-rw-r--r--client/src/app/+admin/jobs/job.routes.ts5
-rw-r--r--client/src/app/+admin/jobs/shared/job.service.ts4
-rw-r--r--client/src/app/+admin/users/shared/user.service.ts3
-rw-r--r--client/src/app/+admin/users/user-edit/user-edit.component.scss3
-rw-r--r--client/src/app/+admin/users/user-list/user-list.component.scss19
8 files changed, 28 insertions, 24 deletions
diff --git a/client/src/app/+admin/follows/following-add/following-add.component.scss b/client/src/app/+admin/follows/following-add/following-add.component.scss
index 2cb3efe28..7594b502c 100644
--- a/client/src/app/+admin/follows/following-add/following-add.component.scss
+++ b/client/src/app/+admin/follows/following-add/following-add.component.scss
@@ -1,3 +1,6 @@
1@import '_variables';
2@import '_mixins';
3
1textarea { 4textarea {
2 height: 250px; 5 height: 250px;
3} 6}
@@ -6,4 +9,3 @@ input[type=submit] {
6 @include peertube-button; 9 @include peertube-button;
7 @include orange-button; 10 @include orange-button;
8} 11}
9
diff --git a/client/src/app/+admin/follows/shared/follow.service.ts b/client/src/app/+admin/follows/shared/follow.service.ts
index 0bfbe8eb6..3a430ff64 100644
--- a/client/src/app/+admin/follows/shared/follow.service.ts
+++ b/client/src/app/+admin/follows/shared/follow.service.ts
@@ -1,17 +1,16 @@
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/primeng'
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/primeng'
8
9import { RestExtractor, RestPagination, RestService } from '../../../shared'
10import { AccountFollow, ResultList } from '../../../../../../shared' 7import { AccountFollow, ResultList } from '../../../../../../shared'
8import { environment } from '../../../../environments/environment'
9import { RestExtractor, RestPagination, RestService } from '../../../shared'
11 10
12@Injectable() 11@Injectable()
13export class FollowService { 12export class FollowService {
14 private static BASE_APPLICATION_URL = API_URL + '/api/v1/server' 13 private static BASE_APPLICATION_URL = environment.apiUrl + '/api/v1/server'
15 14
16 constructor ( 15 constructor (
17 private authHttp: HttpClient, 16 private authHttp: HttpClient,
diff --git a/client/src/app/+admin/index.ts b/client/src/app/+admin/index.ts
deleted file mode 100644
index b628a3662..000000000
--- a/client/src/app/+admin/index.ts
+++ /dev/null
@@ -1 +0,0 @@
1export * from './admin.module'
diff --git a/client/src/app/+admin/jobs/job.routes.ts b/client/src/app/+admin/jobs/job.routes.ts
index a7bf2b221..331dc2af2 100644
--- a/client/src/app/+admin/jobs/job.routes.ts
+++ b/client/src/app/+admin/jobs/job.routes.ts
@@ -1,9 +1,6 @@
1import { Routes } from '@angular/router' 1import { Routes } from '@angular/router'
2
3import { UserRightGuard } from '../../core'
4import { FollowingAddComponent } from './following-add'
5import { UserRight } from '../../../../../shared' 2import { UserRight } from '../../../../../shared'
6import { FollowingListComponent } from './following-list/following-list.component' 3import { UserRightGuard } from '../../core'
7import { JobsComponent } from './job.component' 4import { JobsComponent } from './job.component'
8import { JobsListComponent } from './jobs-list/jobs-list.component' 5import { JobsListComponent } from './jobs-list/jobs-list.component'
9 6
diff --git a/client/src/app/+admin/jobs/shared/job.service.ts b/client/src/app/+admin/jobs/shared/job.service.ts
index 0cfbdbbea..61ee16077 100644
--- a/client/src/app/+admin/jobs/shared/job.service.ts
+++ b/client/src/app/+admin/jobs/shared/job.service.ts
@@ -6,12 +6,12 @@ import 'rxjs/add/operator/map'
6import { Observable } from 'rxjs/Observable' 6import { Observable } from 'rxjs/Observable'
7import { ResultList } from '../../../../../../shared' 7import { ResultList } from '../../../../../../shared'
8import { Job } from '../../../../../../shared/models/job.model' 8import { Job } from '../../../../../../shared/models/job.model'
9 9import { environment } from '../../../../environments/environment'
10import { RestExtractor, RestPagination, RestService } from '../../../shared' 10import { RestExtractor, RestPagination, RestService } from '../../../shared'
11 11
12@Injectable() 12@Injectable()
13export class JobService { 13export class JobService {
14 private static BASE_JOB_URL = API_URL + '/api/v1/jobs' 14 private static BASE_JOB_URL = environment.apiUrl + '/api/v1/jobs'
15 15
16 constructor ( 16 constructor (
17 private authHttp: HttpClient, 17 private authHttp: HttpClient,
diff --git a/client/src/app/+admin/users/shared/user.service.ts b/client/src/app/+admin/users/shared/user.service.ts
index dc77cc1d8..6536546fb 100644
--- a/client/src/app/+admin/users/shared/user.service.ts
+++ b/client/src/app/+admin/users/shared/user.service.ts
@@ -6,11 +6,12 @@ import 'rxjs/add/operator/catch'
6import 'rxjs/add/operator/map' 6import 'rxjs/add/operator/map'
7import { Observable } from 'rxjs/Observable' 7import { Observable } from 'rxjs/Observable'
8import { ResultList, UserCreate, UserUpdate } from '../../../../../../shared' 8import { ResultList, UserCreate, UserUpdate } from '../../../../../../shared'
9import { environment } from '../../../../environments/environment'
9import { RestExtractor, RestPagination, RestService, User } from '../../../shared' 10import { RestExtractor, RestPagination, RestService, User } from '../../../shared'
10 11
11@Injectable() 12@Injectable()
12export class UserService { 13export class UserService {
13 private static BASE_USERS_URL = API_URL + '/api/v1/users/' 14 private static BASE_USERS_URL = environment.apiUrl + '/api/v1/users/'
14 private bytesPipe = new BytesPipe() 15 private bytesPipe = new BytesPipe()
15 16
16 constructor ( 17 constructor (
diff --git a/client/src/app/+admin/users/user-edit/user-edit.component.scss b/client/src/app/+admin/users/user-edit/user-edit.component.scss
index 68d270c19..1bb1c5f0f 100644
--- a/client/src/app/+admin/users/user-edit/user-edit.component.scss
+++ b/client/src/app/+admin/users/user-edit/user-edit.component.scss
@@ -1,3 +1,6 @@
1@import '_variables';
2@import '_mixins';
3
1.admin-sub-title { 4.admin-sub-title {
2 margin-bottom: 30px; 5 margin-bottom: 30px;
3} 6}
diff --git a/client/src/app/+admin/users/user-list/user-list.component.scss b/client/src/app/+admin/users/user-list/user-list.component.scss
index 8b22f67ff..72d31a0cc 100644
--- a/client/src/app/+admin/users/user-list/user-list.component.scss
+++ b/client/src/app/+admin/users/user-list/user-list.component.scss
@@ -1,11 +1,14 @@
1 .add-button { 1@import '_variables';
2 @include peertube-button-link; 2@import '_mixins';
3 @include orange-button;
4 3
5 .icon.icon-add { 4.add-button {
6 @include icon(22px); 5 @include peertube-button-link;
6 @include orange-button;
7 7
8 margin-right: 3px; 8 .icon.icon-add {
9 background-image: url('../../../../assets/images/admin/add.svg'); 9 @include icon(22px);
10 } 10
11 margin-right: 3px;
12 background-image: url('../../../../assets/images/admin/add.svg');
11 } 13 }
14}