s426135/session-companion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' into SES-105

Browse Source
This commit is contained in:
Karol Górzyński 2020-12-21 12:57:25 +01:00
commit 8de1b8bb5a
4 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
SessionCompanion/SessionCompanion/ClientApp/src/app/components/game-master-dashboard/game-master-dashboard.component.ts
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 {GMSignalRService} from '../../shared/signalR-service/gm-signalR.service';
@Component({
selector: 'app-game-master-dashboard',
@ -7,13 +8,17 @@ 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) {}
ngOnInit() {
this.signalRService.Login();
}
UpdateSidenavStatus(sidenav: string, newValue: boolean) {
switch (sidenav) {

8
SessionCompanion/SessionCompanion/ClientApp/src/app/shared/signalR-service/base/signalR.service.ts
View File

@ -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;
}
);
}
}

9
SessionCompanion/SessionCompanion/ClientApp/src/app/shared/signalR-service/gm-signalR.service.ts
View File

@ -8,7 +8,16 @@ 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
SessionCompanion/SessionCompanion/ClientApp/src/app/shared/signalR-service/player-signalR.service.ts
View File

@ -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 {
}
}