Merge branch 'workingon' into 'master'

Updated a couple routes to the new api and made small tweaks to the UI

See merge request openlp/web-remote!6
This commit is contained in:
Raoul Snyman 2019-11-15 15:46:11 +00:00
commit 44aee1b8ce
3 changed files with 9 additions and 4 deletions

View File

@ -1,3 +1,7 @@
mat-divider {
border-color: rgb(175, 175, 175);
}
mat-sidenav {
background: white;
}

View File

@ -3,7 +3,8 @@ mat-card {
}
.selected {
font-weight: 700;
background-color: rgb(235, 235, 235);
font-weight: 700;
}
.verse-tag {

View File

@ -45,7 +45,7 @@ export class OpenLPService {
else {
port = '4316';
}
this.apiURL = `http://${host}:${port}/api/v1`;
this.apiURL = `http://${host}:${port}/api/v2`;
this.stateChanged$ = new EventEmitter<State>();
this.retrieveSystemInformation().subscribe(info => {
@ -78,7 +78,7 @@ export class OpenLPService {
}
getServiceItems(): Observable<ServiceItem[]> {
return this.http.get<ServiceItem[]>(`${this.apiURL}/service/list`, httpOptions);
return this.http.get<ServiceItem[]>(`${this.apiURL}/service/items`, httpOptions);
}
getSearchablePlugins(): Observable<PluginDescription[]> {
@ -86,7 +86,7 @@ export class OpenLPService {
}
setServiceItem(id: number): Observable<any> {
return this.http.get(`${this.apiURL}/service/set?id=${id}`);
return this.http.post(`${this.apiURL}/service/show`, {'id': id}, httpOptions);
}
search(plugin, text): Observable<any> {