From 5769e1db8d3d5a1e3baa8dff23090cfe93d48a50 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 27 Jan 2017 16:54:44 +0100 Subject: Client: better confirm box for a beautiful world --- .../friends/friend-add/friend-add.component.ts | 22 ++++++++++++++-------- .../friends/friend-list/friend-list.component.ts | 21 ++++++++++++++------- 2 files changed, 28 insertions(+), 15 deletions(-) (limited to 'client/src/app/+admin/friends') diff --git a/client/src/app/+admin/friends/friend-add/friend-add.component.ts b/client/src/app/+admin/friends/friend-add/friend-add.component.ts index a271970ae..12c46e5cd 100644 --- a/client/src/app/+admin/friends/friend-add/friend-add.component.ts +++ b/client/src/app/+admin/friends/friend-add/friend-add.component.ts @@ -4,6 +4,7 @@ import { Router } from '@angular/router'; import { NotificationsService } from 'angular2-notifications'; +import { ConfirmService } from '../../../core'; import { validateHost } from '../../../shared'; import { FriendService } from '../shared'; @@ -20,6 +21,7 @@ export class FriendAddComponent implements OnInit { constructor( private router: Router, private notificationsService: NotificationsService, + private confirmService: ConfirmService, private friendService: FriendService ) {} @@ -84,16 +86,20 @@ export class FriendAddComponent implements OnInit { return; } - const confirmMessage = 'Are you sure to make friends with:\n - ' + notEmptyHosts.join('\n - '); - if (!confirm(confirmMessage)) return; + const confirmMessage = 'Are you sure to make friends with:
- ' + notEmptyHosts.join('
- '); + this.confirmService.confirm(confirmMessage, 'Make friends').subscribe( + res => { + if (res === false) return; - this.friendService.makeFriends(notEmptyHosts).subscribe( - status => { - this.notificationsService.success('Sucess', 'Make friends request sent!'); - this.router.navigate([ '/admin/friends/list' ]); - }, + this.friendService.makeFriends(notEmptyHosts).subscribe( + status => { + this.notificationsService.success('Sucess', 'Make friends request sent!'); + this.router.navigate([ '/admin/friends/list' ]); + }, - err => this.notificationsService.error('Error', err.text) + err => this.notificationsService.error('Error', err.text) + ); + } ); } diff --git a/client/src/app/+admin/friends/friend-list/friend-list.component.ts b/client/src/app/+admin/friends/friend-list/friend-list.component.ts index 700ea7a69..175ad9cba 100644 --- a/client/src/app/+admin/friends/friend-list/friend-list.component.ts +++ b/client/src/app/+admin/friends/friend-list/friend-list.component.ts @@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { NotificationsService } from 'angular2-notifications'; +import { ConfirmService } from '../../../core'; import { Friend, FriendService } from '../shared'; @Component({ @@ -14,6 +15,7 @@ export class FriendListComponent implements OnInit { constructor( private notificationsService: NotificationsService, + private confirmService: ConfirmService, private friendService: FriendService ) { } @@ -22,16 +24,21 @@ export class FriendListComponent implements OnInit { } quitFriends() { - if (!confirm('Are you sure?')) return; + const confirmMessage = 'Do you really want to quit your friends? All their videos will be deleted.'; + this.confirmService.confirm(confirmMessage, 'Quit friends').subscribe( + res => { + if (res === false) return; - this.friendService.quitFriends().subscribe( - status => { - this.notificationsService.success('Sucess', 'Friends left!'); + this.friendService.quitFriends().subscribe( + status => { + this.notificationsService.success('Sucess', 'Friends left!'); - this.getFriends(); - }, + this.getFriends(); + }, - err => this.notificationsService.error('Error', err.text) + err => this.notificationsService.error('Error', err.text) + ); + } ); } -- cgit v1.2.3