From 63c4db6d71b98523753c51747e308682d9a2e8a0 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 11 Dec 2017 17:36:46 +0100 Subject: Move to angular cli --- .../following-add/following-add.component.scss | 4 +++- .../src/app/+admin/follows/shared/follow.service.ts | 13 ++++++------- client/src/app/+admin/index.ts | 1 - client/src/app/+admin/jobs/job.routes.ts | 5 +---- client/src/app/+admin/jobs/shared/job.service.ts | 4 ++-- client/src/app/+admin/users/shared/user.service.ts | 3 ++- .../+admin/users/user-edit/user-edit.component.scss | 3 +++ .../+admin/users/user-list/user-list.component.scss | 19 +++++++++++-------- 8 files changed, 28 insertions(+), 24 deletions(-) delete mode 100644 client/src/app/+admin/index.ts (limited to 'client/src/app/+admin') 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 @@ +@import '_variables'; +@import '_mixins'; + textarea { height: 250px; } @@ -6,4 +9,3 @@ input[type=submit] { @include peertube-button; @include orange-button; } - 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 @@ -import { Injectable } from '@angular/core' import { HttpClient, HttpParams } from '@angular/common/http' -import { Observable } from 'rxjs/Observable' +import { Injectable } from '@angular/core' +import { SortMeta } from 'primeng/primeng' import 'rxjs/add/operator/catch' import 'rxjs/add/operator/map' - -import { SortMeta } from 'primeng/primeng' - -import { RestExtractor, RestPagination, RestService } from '../../../shared' +import { Observable } from 'rxjs/Observable' import { AccountFollow, ResultList } from '../../../../../../shared' +import { environment } from '../../../../environments/environment' +import { RestExtractor, RestPagination, RestService } from '../../../shared' @Injectable() export class FollowService { - private static BASE_APPLICATION_URL = API_URL + '/api/v1/server' + private static BASE_APPLICATION_URL = environment.apiUrl + '/api/v1/server' constructor ( 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 @@ -export * 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 @@ import { Routes } from '@angular/router' - -import { UserRightGuard } from '../../core' -import { FollowingAddComponent } from './following-add' import { UserRight } from '../../../../../shared' -import { FollowingListComponent } from './following-list/following-list.component' +import { UserRightGuard } from '../../core' import { JobsComponent } from './job.component' import { JobsListComponent } from './jobs-list/jobs-list.component' 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' import { Observable } from 'rxjs/Observable' import { ResultList } from '../../../../../../shared' import { Job } from '../../../../../../shared/models/job.model' - +import { environment } from '../../../../environments/environment' import { RestExtractor, RestPagination, RestService } from '../../../shared' @Injectable() export class JobService { - private static BASE_JOB_URL = API_URL + '/api/v1/jobs' + private static BASE_JOB_URL = environment.apiUrl + '/api/v1/jobs' constructor ( 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' import 'rxjs/add/operator/map' import { Observable } from 'rxjs/Observable' import { ResultList, UserCreate, UserUpdate } from '../../../../../../shared' +import { environment } from '../../../../environments/environment' import { RestExtractor, RestPagination, RestService, User } from '../../../shared' @Injectable() export class UserService { - private static BASE_USERS_URL = API_URL + '/api/v1/users/' + private static BASE_USERS_URL = environment.apiUrl + '/api/v1/users/' private bytesPipe = new BytesPipe() 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 @@ +@import '_variables'; +@import '_mixins'; + .admin-sub-title { margin-bottom: 30px; } 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 @@ - .add-button { - @include peertube-button-link; - @include orange-button; +@import '_variables'; +@import '_mixins'; - .icon.icon-add { - @include icon(22px); +.add-button { + @include peertube-button-link; + @include orange-button; - margin-right: 3px; - background-image: url('../../../../assets/images/admin/add.svg'); - } + .icon.icon-add { + @include icon(22px); + + margin-right: 3px; + background-image: url('../../../../assets/images/admin/add.svg'); } +} -- cgit v1.2.3