SES-105 list of logged charcters #36

Merged
s426134 merged 7 commits from SES-105 into dev 2020-12-21 13:40:47 +01:00
4 changed files with 39 additions and 12 deletions
Showing only changes of commit 8de1b8bb5a - Show all commits

View File

@ -1,5 +1,6 @@
import { Component } from '@angular/core'; import {Component, OnInit} from '@angular/core';
import {animateText, onSideNavChange} from '../../shared/animations/sidenav-animations'; import {animateText, onSideNavChange} from '../../shared/animations/sidenav-animations';
import {GMSignalRService} from '../../shared/signalR-service/gm-signalR.service';
@Component({ @Component({
selector: 'app-game-master-dashboard', selector: 'app-game-master-dashboard',
@ -7,15 +8,19 @@ import {animateText, onSideNavChange} from '../../shared/animations/sidenav-anim
styleUrls: ['./game-master-dashboard.component.css'], styleUrls: ['./game-master-dashboard.component.css'],
animations: [onSideNavChange, animateText] animations: [onSideNavChange, animateText]
}) })
export class GameMasterDashboardComponent { export class GameMasterDashboardComponent implements OnInit {
leftSidenavExpanded = false; leftSidenavExpanded = false;
leftSidenavTextExpanded = false; leftSidenavTextExpanded = false;
rightSidenavExpanded = false; rightSidenavExpanded = false;
rightSidenavTextExpanded = false; rightSidenavTextExpanded = false;
constructor() {} constructor(private signalRService: GMSignalRService) {}
UpdateSidenavStatus(sidenav: string, newValue: boolean){ ngOnInit() {
this.signalRService.Login();
}
UpdateSidenavStatus(sidenav: string, newValue: boolean) {
switch (sidenav) { switch (sidenav) {
case 'left': case 'left':
this.leftSidenavExpanded = newValue; this.leftSidenavExpanded = newValue;

View File

@ -27,15 +27,19 @@ export class SignalRService {
public startConnection() { public startConnection() {
if (this.hubConnection.state === HubConnectionState.Connected) { if (this.hubConnection.state === HubConnectionState.Connected) {
return; return true;
} }
this.hubConnection.start().then( this.hubConnection.start().then(
() => { () => {
console.log('Hub connection started!'); console.log('Hub connection started!');
this.connectionEstablished$.next(true); this.connectionEstablished$.next(true);
return true;
}, },
error => console.error(error) error => {
console.error(error);
return false;
}
); );
} }
} }

View File

@ -8,10 +8,19 @@ export class GMSignalRService {
constructor(@Inject('BASE_URL') baseUrl: string) { constructor(@Inject('BASE_URL') baseUrl: string) {
this.signalR = new SignalRService(baseUrl); this.signalR = new SignalRService(baseUrl);
this.registerOnServerEvents(); this.registerOnServerEvents();
}
public Login() {
this.signalR.startConnection(); this.signalR.startConnection();
this.signalR.connectionEstablished$.subscribe(() => {
if (this.signalR.connectionEstablished$.getValue() === true) {
this.signalR.hubConnection.send('GameMasterLogin');
}
});
} }
private registerOnServerEvents(): void { private registerOnServerEvents(): void {
} }
} }

View File

@ -11,7 +11,16 @@ export class PlayerSignalRService {
this.signalR.startConnection(); 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 {
}
}