Merge pull request 'SES-101 Added Login to Signalr on GM' (#34) from SES-101 into dev
Reviewed-on: #34
This commit is contained in:
commit
44fdbc9029
@ -1,5 +1,6 @@
|
||||
import { Component } from '@angular/core';
|
||||
import {Component, OnInit} from '@angular/core';
|
||||
import {animateText, onSideNavChange} from '../../shared/animations/sidenav-animations';
|
||||
import {GMSignalRService} from '../../shared/signalR-service/gm-signalR.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-game-master-dashboard',
|
||||
@ -7,15 +8,19 @@ import {animateText, onSideNavChange} from '../../shared/animations/sidenav-anim
|
||||
styleUrls: ['./game-master-dashboard.component.css'],
|
||||
animations: [onSideNavChange, animateText]
|
||||
})
|
||||
export class GameMasterDashboardComponent {
|
||||
export class GameMasterDashboardComponent implements OnInit {
|
||||
leftSidenavExpanded = false;
|
||||
leftSidenavTextExpanded = false;
|
||||
|
||||
rightSidenavExpanded = false;
|
||||
rightSidenavTextExpanded = false;
|
||||
constructor() {}
|
||||
constructor(private signalRService: GMSignalRService) {}
|
||||
|
||||
UpdateSidenavStatus(sidenav: string, newValue: boolean){
|
||||
ngOnInit() {
|
||||
this.signalRService.Login();
|
||||
}
|
||||
|
||||
UpdateSidenavStatus(sidenav: string, newValue: boolean) {
|
||||
switch (sidenav) {
|
||||
case 'left':
|
||||
this.leftSidenavExpanded = newValue;
|
||||
|
@ -27,15 +27,19 @@ export class SignalRService {
|
||||
|
||||
public startConnection() {
|
||||
if (this.hubConnection.state === HubConnectionState.Connected) {
|
||||
return;
|
||||
return true;
|
||||
}
|
||||
|
||||
this.hubConnection.start().then(
|
||||
() => {
|
||||
console.log('Hub connection started!');
|
||||
this.connectionEstablished$.next(true);
|
||||
return true;
|
||||
},
|
||||
error => console.error(error)
|
||||
error => {
|
||||
console.error(error);
|
||||
return false;
|
||||
}
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -8,10 +8,19 @@ export class GMSignalRService {
|
||||
constructor(@Inject('BASE_URL') baseUrl: string) {
|
||||
this.signalR = new SignalRService(baseUrl);
|
||||
this.registerOnServerEvents();
|
||||
}
|
||||
|
||||
public Login() {
|
||||
this.signalR.startConnection();
|
||||
|
||||
this.signalR.connectionEstablished$.subscribe(() => {
|
||||
if (this.signalR.connectionEstablished$.getValue() === true) {
|
||||
this.signalR.hubConnection.send('GameMasterLogin');
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private registerOnServerEvents(): void {
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -11,7 +11,16 @@ export class PlayerSignalRService {
|
||||
this.signalR.startConnection();
|
||||
}
|
||||
|
||||
private registerOnServerEvents(): void {
|
||||
|
||||
public Login() {
|
||||
this.signalR.startConnection();
|
||||
|
||||
this.signalR.connectionEstablished$.subscribe(() => {
|
||||
if (this.signalR.connectionEstablished$.getValue() === true) {
|
||||
this.signalR.hubConnection.send('GameMasterLogin');
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
private registerOnServerEvents(): void {
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user