openlp/web-remote
1
0
Fork 0
mirror of https://gitlab.com/openlp/web-remote.git synced 2024-12-22 03:22:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'get-port-from-url' into 'master'

Browse Source 
Get the remote api port from the url

See merge request openlp/web-remote!1
This commit is contained in:
Simon Hanna 2018-08-31 13:30:13 +00:00
commit f08a80e3bd
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/openlp.service.ts
View File

@ -2,10 +2,10 @@ import { Injectable, EventEmitter } from '@angular/core';
import { HttpClient } from '@angular/common/http'; import { HttpClient } from '@angular/common/http';
import { URLSearchParams, Http } from '@angular/http'; import { URLSearchParams, Http } from '@angular/http';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { map, take } from 'rxjs/operators'; import { map, take } from 'rxjs/operators';
import { PluginDescription, State, Slide, ServiceItem } from './responses'; import { PluginDescription, State, Slide, ServiceItem } from './responses';
import { environment } from '../environments/environment';
let deserialize = (json, cls) => { let deserialize = (json, cls) => {
var inst = new cls(); var inst = new cls();
@ -20,11 +20,19 @@ let deserialize = (json, cls) => {
@Injectable() @Injectable()
export class OpenLPService { export class OpenLPService {
private apiURL: string = 'http://localhost:4316'; private apiURL: string;
public stateChanged$: EventEmitter<State>; public stateChanged$: EventEmitter<State>;
constructor(private http: HttpClient) { constructor(private http: HttpClient) {
let port: string;
if (environment.production) {
port = window.location.port;
} else {
port = '4316';
}
this.apiURL = `http://localhost:${port}`;
this.stateChanged$ = new EventEmitter<State>(); this.stateChanged$ = new EventEmitter<State>();
let state:State = null; let state:State = null;
let ws:WebSocket = new WebSocket('ws://localhost:4317/state') let ws:WebSocket = new WebSocket('ws://localhost:4317/state')