From 608624252466acf9f1d9ee1c1170bd4fe4d18d18 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 15 Nov 2017 11:00:25 +0100 Subject: Rename Pod -> Server --- .../+admin/follows/followers-list/followers-list.component.ts | 10 ++++------ .../+admin/follows/following-add/following-add.component.html | 2 +- .../+admin/follows/following-add/following-add.component.ts | 2 -- .../+admin/follows/following-list/following-list.component.ts | 11 ++++------- client/src/app/+admin/follows/shared/follow.service.ts | 6 +++--- 5 files changed, 12 insertions(+), 19 deletions(-) (limited to 'client/src/app/+admin/follows') diff --git a/client/src/app/+admin/follows/followers-list/followers-list.component.ts b/client/src/app/+admin/follows/followers-list/followers-list.component.ts index 208a0c648..8dc2d9317 100644 --- a/client/src/app/+admin/follows/followers-list/followers-list.component.ts +++ b/client/src/app/+admin/follows/followers-list/followers-list.component.ts @@ -1,11 +1,9 @@ -import { Component, OnInit } from '@angular/core' +import { Component } from '@angular/core' import { NotificationsService } from 'angular2-notifications' import { SortMeta } from 'primeng/primeng' - -import { ConfirmService } from '../../../core' -import { RestTable, RestPagination } from '../../../shared' -import { Pod } from '../../../../../../shared' +import { AccountFollow } from '../../../../../../shared/models/accounts/follow.model' +import { RestPagination, RestTable } from '../../../shared' import { FollowService } from '../shared' @Component({ @@ -14,7 +12,7 @@ import { FollowService } from '../shared' styleUrls: [ './followers-list.component.scss' ] }) export class FollowersListComponent extends RestTable { - followers: Pod[] = [] + followers: AccountFollow[] = [] totalRecords = 0 rowsPerPage = 10 sort: SortMeta = { field: 'createdAt', order: 1 } diff --git a/client/src/app/+admin/follows/following-add/following-add.component.html b/client/src/app/+admin/follows/following-add/following-add.component.html index 111f6a8de..8e7dddc11 100644 --- a/client/src/app/+admin/follows/following-add/following-add.component.html +++ b/client/src/app/+admin/follows/following-add/following-add.component.html @@ -26,7 +26,7 @@
- It seems that you are not on a HTTPS pod. Your webserver need to have TLS activated in order to follow servers. + It seems that you are not on a HTTPS server. Your webserver need to have TLS activated in order to follow servers.
diff --git a/client/src/app/+admin/follows/following-add/following-add.component.ts b/client/src/app/+admin/follows/following-add/following-add.component.ts index d95d6afa9..0ceb4c1db 100644 --- a/client/src/app/+admin/follows/following-add/following-add.component.ts +++ b/client/src/app/+admin/follows/following-add/following-add.component.ts @@ -94,8 +94,6 @@ export class FollowingAddComponent implements OnInit { this.followService.follow(notEmptyHosts).subscribe( status => { this.notificationsService.success('Success', 'Follow request(s) sent!') - // Wait requests between pods - setTimeout(() => this.router.navigate([ '/admin/friends/list' ]), 1000) }, err => this.notificationsService.error('Error', err.message) diff --git a/client/src/app/+admin/follows/following-list/following-list.component.ts b/client/src/app/+admin/follows/following-list/following-list.component.ts index 7d2c5084b..a1dff1db3 100644 --- a/client/src/app/+admin/follows/following-list/following-list.component.ts +++ b/client/src/app/+admin/follows/following-list/following-list.component.ts @@ -1,11 +1,8 @@ -import { Component, OnInit } from '@angular/core' - +import { Component } from '@angular/core' import { NotificationsService } from 'angular2-notifications' import { SortMeta } from 'primeng/primeng' - -import { ConfirmService } from '../../../core' -import { RestTable, RestPagination } from '../../../shared' -import { Pod } from '../../../../../../shared' +import { AccountFollow } from '../../../../../../shared/models/accounts/follow.model' +import { RestPagination, RestTable } from '../../../shared' import { FollowService } from '../shared' @Component({ @@ -13,7 +10,7 @@ import { FollowService } from '../shared' templateUrl: './following-list.component.html' }) export class FollowingListComponent extends RestTable { - following: Pod[] = [] + following: AccountFollow[] = [] totalRecords = 0 rowsPerPage = 10 sort: SortMeta = { field: 'createdAt', order: 1 } diff --git a/client/src/app/+admin/follows/shared/follow.service.ts b/client/src/app/+admin/follows/shared/follow.service.ts index 622c33cea..3dc91dfca 100644 --- a/client/src/app/+admin/follows/shared/follow.service.ts +++ b/client/src/app/+admin/follows/shared/follow.service.ts @@ -7,7 +7,7 @@ import 'rxjs/add/operator/map' import { SortMeta } from 'primeng/primeng' import { RestExtractor, RestPagination, RestService } from '../../../shared' -import { Pod, ResultList } from '../../../../../../shared' +import { AccountFollow, ResultList } from '../../../../../../shared' @Injectable() export class FollowService { @@ -19,7 +19,7 @@ export class FollowService { private restExtractor: RestExtractor ) {} - getFollowing (pagination: RestPagination, sort: SortMeta): Observable> { + getFollowing (pagination: RestPagination, sort: SortMeta): Observable> { let params = new HttpParams() params = this.restService.addRestGetParams(params, pagination, sort) @@ -28,7 +28,7 @@ export class FollowService { .catch(res => this.restExtractor.handleError(res)) } - getFollowers (pagination: RestPagination, sort: SortMeta): Observable> { + getFollowers (pagination: RestPagination, sort: SortMeta): Observable> { let params = new HttpParams() params = this.restService.addRestGetParams(params, pagination, sort) -- cgit v1.2.3