Merge branch 'chord-view' into 'master'

New api and more views

See merge request openlp/web-remote!2

angular.json

@@ -23,11 +23,10 @@
             "polyfills": "src/polyfills.ts",
             "tsConfig": "src/tsconfig.app.json",
             "assets": [
-              "src/favicon.ico",
               "src/assets"
             ],
             "styles": [
-              "src/styles.css"
+              "src/styles.scss"
             ],
             "scripts": []
           },
@@ -76,7 +75,7 @@
             "tsConfig": "src/tsconfig.spec.json",
             "karmaConfig": "src/karma.conf.js",
             "styles": [
-              "styles.css"
+              "src/styles.scss"
             ],
             "scripts": [],
             "assets": [

package.json

@@ -20,41 +20,41 @@
     "e2e": "ng e2e"
   },
   "dependencies": {
-    "@angular/animations": "^6.0.0",
-    "@angular/cdk": "^6.4.2",
-    "@angular/common": "^6.0.0",
-    "@angular/compiler": "^6.0.0",
-    "@angular/core": "^6.0.0",
-    "@angular/forms": "^6.0.0",
-    "@angular/http": "^6.0.0",
-    "@angular/material": "^6.4.2",
-    "@angular/platform-browser": "^6.0.0",
-    "@angular/platform-browser-dynamic": "^6.0.0",
-    "@angular/router": "^6.0.0",
-    "core-js": "^2.5.4",
-    "rxjs": "^6.0.0",
-    "zone.js": "^0.8.26"
+    "@angular/animations": "^8.2.8",
+    "@angular/cdk": "^8.2.1",
+    "@angular/common": "^8.2.8",
+    "@angular/compiler": "^8.2.8",
+    "@angular/core": "^8.2.8",
+    "@angular/forms": "^8.2.8",
+    "@angular/material": "^8.2.1",
+    "@angular/platform-browser": "^8.2.8",
+    "@angular/platform-browser-dynamic": "^8.2.8",
+    "@angular/router": "^8.2.8",
+    "core-js": "^3.2.1",
+    "hammerjs": "^2.0.8",
+    "rxjs": "^6.5.3",
+    "zone.js": "^0.9.1"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.6.0",
-    "@angular/cli": "~6.0.0",
-    "@angular/compiler-cli": "^6.0.0",
-    "@angular/language-service": "^6.0.0",
-    "@types/jasmine": "~2.8.6",
-    "@types/jasminewd2": "~2.0.3",
-    "@types/node": "~8.9.4",
-    "codelyzer": "~4.2.1",
-    "jasmine-core": "~2.99.1",
+    "@angular-devkit/build-angular": "~0.803.6",
+    "@angular/cli": "~8.3.6",
+    "@angular/compiler-cli": "^8.2.8",
+    "@angular/language-service": "^8.2.8",
+    "@types/jasmine": "~3.4.1",
+    "@types/jasminewd2": "~2.0.7",
+    "@types/node": "~12.7.8",
+    "codelyzer": "~5.1.2",
+    "jasmine-core": "~3.5.0",
     "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~1.7.1",
-    "karma-chrome-launcher": "~2.2.0",
-    "karma-coverage-istanbul-reporter": "~1.4.2",
-    "karma-jasmine": "~1.1.1",
-    "karma-jasmine-html-reporter": "^0.2.2",
-    "protractor": "~5.3.0",
-    "ts-node": "~5.0.1",
-    "tslint": "~5.9.1",
-    "typescript": "~2.7.2"
+    "karma": "~4.3.0",
+    "karma-chrome-launcher": "~3.1.0",
+    "karma-coverage-istanbul-reporter": "~2.1.0",
+    "karma-jasmine": "~2.0.1",
+    "karma-jasmine-html-reporter": "^1.4.2",
+    "protractor": "~5.4.2",
+    "ts-node": "~8.4.1",
+    "tslint": "~5.20.0",
+    "typescript": "~3.5.0"
   },
   "private": true
 }

src/app/app.component.html

@@ -6,6 +6,10 @@
       <a mat-list-item (click)="menu.close()" routerLink="/alerts">Alerts</a>
       <a mat-list-item (click)="menu.close()" routerLink="/search">Search</a>
       <mat-divider></mat-divider>
+      <a mat-list-item (click)="menu.close()" routerLink="/main">Main View</a>
+      <a mat-list-item (click)="menu.close()" routerLink="/stage">Stage View</a>
+      <a mat-list-item (click)="menu.close()" routerLink="/chords">Chord View</a>
+      <mat-divider></mat-divider>
       <mat-slide-toggle color="primary" [checked]="fastSwitching" (change)="sliderChanged($event)">Fast switching</mat-slide-toggle>
     </mat-nav-list>
   </mat-sidenav>
@@ -14,6 +18,8 @@
   <mat-toolbar style="background-color: #64aef3;">
     <button mat-icon-button (click)="menu.toggle()"><mat-icon>menu</mat-icon></button>
     <span>OpenLP Remote</span>
+    <span class="filler"></span>
+    <button *ngIf="showLogin" mat-button (click)="login()">Login</button>
   </mat-toolbar>
 </header>
 <main class="content">

src/app/app.component.scss

@@ -11,6 +11,10 @@ mat-sidenav {
     min-height: 100vh;
 }
 
+.filler {
+    flex-grow: 1;
+}
+
 .content {
     flex: 1;
 }

src/app/app.component.ts

@@ -1,21 +1,40 @@
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { State } from './responses';
 import { OpenLPService } from './openlp.service';
-import { MatSlideToggleChange } from '@angular/material';
+import { MatSlideToggleChange, MatDialog } from '@angular/material';
+import { LoginComponent } from './components/login/login.component';
 
 @Component({
   selector: 'app-root',
   templateUrl: './app.component.html',
   styleUrls: ['./app.component.scss']
 })
-export class AppComponent {
+export class AppComponent implements OnInit {
   fastSwitching = false;
-  state: State = new State();
+  state = new State();
+  showLogin = false;
 
-  constructor(private openlpService: OpenLPService) {
+  constructor(private openlpService: OpenLPService, private dialog: MatDialog) {
     openlpService.stateChanged$.subscribe(item => this.state = item);
   }
 
+  ngOnInit(): void {
+    this.openlpService.retrieveSystemInformation().subscribe(res => this.showLogin = res.login_required);
+  }
+
+  login() {
+    const dialogRef = this.dialog.open(LoginComponent, {
+      width: '250px'
+    });
+
+    dialogRef.afterClosed().subscribe(result => {
+      if (result) {
+        this.showLogin = false;
+        this.openlpService.setAuthToken(result.token);
+      }
+    });
+  }
+
   nextItem() {
     this.openlpService.nextItem().subscribe();
   }

src/app/app.module.ts

@@ -3,6 +3,7 @@ import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
 
 import { NgModule } from '@angular/core';
 
+import { MatCardModule, MatDialogModule, MatSnackBarModule } from '@angular/material';
 import { MatListModule } from '@angular/material/list';
 import { MatSidenavModule } from '@angular/material/sidenav';
 import { MatIconModule } from '@angular/material/icon';
@@ -25,10 +26,21 @@ import { AlertComponent } from './components/alert/alert.component';
 import { SearchComponent } from './components/search/search.component';
 import { SlidesComponent } from './components/slides/slides.component';
 import { FormsModule } from '@angular/forms';
+import { ChordViewComponent } from './components/chord-view/chord-view.component';
+import { StageViewComponent } from './components/stage-view/stage-view.component';
+import { MainViewComponent } from './components/main-view/main-view.component';
+import { ChordProPipe } from './components/chord-view/chordpro.pipe';
+import { LoginComponent } from './components/login/login.component';
+
 
 @NgModule({
   declarations: [
     AppComponent,
+    ChordViewComponent,
+    StageViewComponent,
+    MainViewComponent,
+    ChordProPipe,
+    LoginComponent,
     ServiceComponent,
     AlertComponent,
     SearchComponent,
@@ -50,11 +62,17 @@ import { FormsModule } from '@angular/forms';
     MatButtonModule,
     MatInputModule,
     MatTooltipModule,
-    MatSlideToggleModule
+    MatSlideToggleModule,
+    MatCardModule,
+    MatDialogModule,
+    MatSnackBarModule
   ],
   providers: [
     OpenLPService
   ],
+  entryComponents: [
+    LoginComponent
+  ],
   bootstrap: [AppComponent]
 })
 export class AppModule { }

src/app/app.routing.ts

@@ -1,39 +1,27 @@
-import { ModuleWithProviders, NgModule } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 
-import { AppComponent } from './app.component';
 import { ServiceComponent } from './components/service/service.component';
 import { AlertComponent } from './components/alert/alert.component';
 import { SearchComponent } from './components/search/search.component';
 import { SlidesComponent } from './components/slides/slides.component';
+import { ChordViewComponent } from './components/chord-view/chord-view.component';
+import { MainViewComponent } from './components/main-view/main-view.component';
+import { StageViewComponent } from './components/stage-view/stage-view.component';
 
 const routes: Routes = [
-  {
-    path: '',
-    redirectTo: '/service',
-    pathMatch: 'full'
-  },
-  {
-    path: 'service',
-    component: ServiceComponent
-  },
-  {
-    path: 'slides',
-    component: SlidesComponent
-  },
-  {
-    path: 'alerts',
-    component: AlertComponent
-  },
-  {
-    path: 'search',
-    component: SearchComponent
-  }
+    { path: '', redirectTo: '/service', pathMatch: 'full' },
+    { path: 'service', component: ServiceComponent },
+    { path: 'slides', component: SlidesComponent },
+    { path: 'alerts', component: AlertComponent },
+    { path: 'search', component: SearchComponent },
+    { path: 'chords', component: ChordViewComponent },
+    { path: 'main', component: MainViewComponent },
+    { path: 'stage', component: StageViewComponent }
 ];
 @NgModule({
-  imports: [RouterModule.forRoot(routes)],
-  exports: [RouterModule]
+    imports: [RouterModule.forRoot(routes, {useHash: true})],
+    exports: [RouterModule]
 })
 
-export class AppRoutingModule {
-}
+export class AppRoutingModule { }

src/app/components/alert/alert.component.html

@@ -3,5 +3,5 @@
   <mat-form-field>
     <input matInput [(ngModel)]="alert" type="text" name="alert" placeholder="Alert" required>
   </mat-form-field>
-  <button mat-raised-button color="primary" id="sendButton" [disabled]="!alertForm.form.valid" (click)="onSubmit()">Send</button>
+  <button mat-raised-button color="primary" id="sendButton" [disabled]="!alertForm.form.valid" (click)="onSubmit(); alertForm.reset()">Send</button>
 </form>

src/app/components/alert/alert.component.ts

@@ -2,6 +2,7 @@ import { Component } from '@angular/core';
 
 
 import { OpenLPService } from '../../openlp.service';
+import { MatSnackBar } from '@angular/material';
 
 @Component({
   selector: 'openlp-alert',
@@ -14,11 +15,9 @@ export class AlertComponent {
 
   public alert: string;
 
-  constructor(private openlpService: OpenLPService) { }
+  constructor(private openlpService: OpenLPService, private snackBar: MatSnackBar) { }
 
   onSubmit() {
-    console.log('submitted: ', this.alert);
-    this.openlpService.showAlert(this.alert).subscribe(res => console.log(res));
-    this.alert = '';
+    this.openlpService.showAlert(this.alert).subscribe(res => this.snackBar.open('Alert submitted', '', {duration: 2000}));
   }
 }

src/app/components/chord-view/chord-view.component.html

@@ -0,0 +1,26 @@
+<div class="overlay">
+  <div>
+    <div class="tags">
+      <span *ngFor="let tag of tags" [class.active]="tag.active">{{ tag.text }}</span>
+    </div>
+    <div class="container">
+      <div class="slide currentSlide song" [innerHTML]="chordproFormatted(currentSlides[0])|chordpro:transpose"></div>
+      <div class="nextSlides">
+        <div class="slide song" [class.first]="slide.first_slide_of_tag" *ngFor="let slide of nextSlides" [innerHTML]="chordproFormatted(slide)|chordpro:transpose"></div>
+      </div>
+    </div>
+  </div>
+  <div class="sidebar">
+    <div class="time">{{ time|date:'HH:mm' }}</div>
+    <div class="transpose">
+      <button mat-icon-button (click)="transposeUp()">
+        <mat-icon>keyboard_arrow_up</mat-icon>
+      </button>
+      <span>{{ transpose }}</span>
+      <button mat-icon-button (click)="transposeDown()">
+        <mat-icon>keyboard_arrow_down</mat-icon>
+      </button>
+    </div>
+    <button mat-raised-button routerLink="/">Close</button>
+  </div>
+</div>

src/app/components/chord-view/chord-view.component.scss

@@ -0,0 +1,12 @@
+.transpose {
+    margin-left: 25px;
+    display: flex;
+    flex-direction: column;
+    font-size: 3rem;
+    mat-icon {
+        font-size: 3rem;
+    }
+    span {
+        margin-left: 17px;
+    }
+}

src/app/components/chord-view/chord-view.component.ts

@@ -0,0 +1,38 @@
+import { Component, OnInit, ViewEncapsulation } from '@angular/core';
+import { OpenLPService } from '../../openlp.service';
+import { Slide } from '../../responses';
+import { Observable } from 'rxjs';
+import { StageViewComponent } from '../stage-view/stage-view.component';
+
+@Component({
+  selector: 'app-chord-view',
+  templateUrl: './chord-view.component.html',
+  styleUrls: ['./chord-view.component.scss', '../overlay.scss', './chordpro.scss'],
+  encapsulation: ViewEncapsulation.None // needed for the chords to be displayed
+
+})
+export class ChordViewComponent extends StageViewComponent {
+  transpose = 0;
+
+  transposeUp(): void {
+    this.transpose++;
+  }
+
+  transposeDown(): void {
+    this.transpose--;
+  }
+
+  chordproFormatted(slide: Slide): string {
+    if (!slide) {
+      return '';
+    }
+    let chordpro: string = slide.chords_text;
+    chordpro = chordpro.replace(/<span class="\w*\s*\w*">/g, '');
+    chordpro = chordpro.replace(/<span>/g, '');
+    chordpro = chordpro.replace(/<\/span>/g, '');
+    chordpro = chordpro.replace(/<strong>/g, '[');
+    chordpro = chordpro.replace(/<\/strong>/g, ']');
+
+    return chordpro;
+  }
+}

src/app/components/chord-view/chordpro.pipe.ts

@@ -0,0 +1,183 @@
+/**
+ * ChordProPipe
+ *
+ * A pipe for angular 2/4 that translate ChordPro-formatted text into an HTML representation, to be used in conjunction with a set of styles
+ * for proper display.
+ *
+ * If you make improvements, please send them to me for incorporation.
+ *
+ * @author David Quinn-Jacobs (dqj@authentrics.com)
+ * @licence Use this in any way you like, with no constraints.
+ */
+import { Pipe, PipeTransform } from '@angular/core';
+import { MAT_AUTOCOMPLETE_SCROLL_STRATEGY_FACTORY } from '@angular/material';
+import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
+
+@Pipe({ name: 'chordpro' })
+
+export class ChordProPipe implements PipeTransform {
+    /**
+     * @var chordRegex Expression used to determine if given line contains a chord.
+     * @type {RegExp}
+     */
+    private chordRegex = /\[([^\]]*)\]/;
+    private readonly MAX_HALF_STEPS = 11;
+
+    constructor(private sanitizer: DomSanitizer) {
+        this.notesSharpNotation['german'] = ['C', 'C#', 'D', 'D#', 'E', 'F', 'F#', 'G', 'G#', 'A', 'A#', 'H'];
+        this.notesFlatNotation['german'] = ['C', 'Db', 'D', 'Eb', 'Fb', 'F', 'Gb', 'G', 'Ab', 'A', 'B', 'H'];
+        this.notesSharpNotation['english'] = ['C', 'C#', 'D', 'D#', 'E', 'F', 'F#', 'G', 'G#', 'A', 'A#', 'B'];
+        this.notesFlatNotation['english'] = ['C', 'Db', 'D', 'Eb', 'Fb', 'F', 'Gb', 'G', 'Ab', 'A', 'Bb', 'B'];
+    }
+
+    private keys = [
+        { name: 'Ab', value: 0 },
+        { name: 'A', value: 1 },
+        { name: 'Bb', value: 2 },
+        { name: 'A#', value: 2 },
+        { name: 'B', value: 3 },
+        { name: 'C', value: 4 },
+        { name: 'C#', value: 5 },
+        { name: 'Db', value: 5 },
+        { name: 'D', value: 6 },
+        { name: 'Eb', value: 7 },
+        { name: 'D#', value: 7 },
+        { name: 'E', value: 8 },
+        { name: 'F', value: 9 },
+        { name: 'F#', value: 10 },
+        { name: 'Gb', value: 10 },
+        { name: 'G', value: 11 },
+        { name: 'G#', value: 0 }
+    ];
+    notesSharpNotation = {};
+    notesFlatNotation = {};
+
+    decodeHTML(value: string) {
+        const tempElement = document.createElement('div');
+        tempElement.innerHTML = value;
+        return tempElement.innerText;
+    }
+
+    /**
+     * Pipe transformation for ChordPro-formatted song texts.
+     * @param {string} song
+     * @param {number} nHalfSteps
+     * @returns {string}
+     */
+    transform(song: string, nHalfSteps: number): string|SafeHtml {
+        try {
+            if (song !== undefined && song) {
+                return this.sanitizer.bypassSecurityTrustHtml(this.parseToHTML(song, nHalfSteps));
+            }
+            else {
+                return song;
+            }
+        }
+        catch (exception) {
+            console.warn('chordpro translation error', exception);
+        }
+    }
+
+    chordRoot(chord) {
+        let root = '';
+        let ch2 = '';
+        if (chord && chord.length > 0) {
+            root = chord.substr(0, 1);
+            if (chord.length > 1) {
+                ch2 = chord.substr(1, 1);
+                if (ch2 === 'b' || ch2 === '#') {
+                    root += ch2;
+                }
+            }
+        }
+        return root;
+    }
+
+    restOfChord(chord) {
+        let rest = '';
+        const root = this.chordRoot(chord);
+        if (chord.length > root.length) {
+            rest = chord.substr(root.length);
+        }
+        return rest;
+    }
+
+    /**
+     * Transpose the given chord the given (positive or negative) number of half steps.
+     * @param {string} chordRoot
+     * @param {number} nHalfSteps
+     * @returns {string}
+     */
+    transposeChord(chordRoot, nHalfSteps) {
+        let pos = -1;
+        for (let i = 0; i < this.keys.length; i++) {
+            if (this.keys[i].name === chordRoot) {
+                pos = this.keys[i].value;
+                break;
+            }
+        }
+        if (pos >= 0) {
+            pos += nHalfSteps;
+            if (pos < 0) {
+                pos += this.MAX_HALF_STEPS;
+            }
+            else if (pos > this.MAX_HALF_STEPS) {
+                pos -= this.MAX_HALF_STEPS + 1;
+            }
+            for (let i = 0; i < this.keys.length; i++) {
+                if (this.keys[i].value === pos) {
+                    return this.keys[i].name;
+                }
+            }
+        }
+        return chordRoot;
+    }
+
+    /**
+     * Parse a string containing a ChordPro-formatted song, building an array of output HTML lines.
+     *
+     * @param {number} nHalfSteps
+     * @param {string} song
+     */
+    private parseToHTML(song: string, nHalfSteps = 0): string {
+        // we are currently receiving html, we need to replace that stuff,
+        // becuase it gets messed up when a chord is placed on it..
+        // shouldn't be relevant if we actually get chordpro format
+        song = this.decodeHTML(song);
+        const comp = this;
+        if (!song) {
+            return '';
+        }
+        let chordText = '';
+        let lastChord = '';
+        if (!song.match(comp.chordRegex)) {
+            return `<div class="no-chords">${song}</div>`;
+        }
+        song.split(comp.chordRegex).forEach((part, index) => {
+            if (index % 2 === 0) {
+                // text
+                if (lastChord) {
+                    chordText += `<span data-chord="${lastChord}">${part.substring(0, 1)}</span>${part.substring(1)}`;
+                    lastChord = '';
+                } else {
+                    chordText += part;
+                }
+            } else {
+                // chord
+                lastChord = part.replace(/[[]]/, '');
+                if (nHalfSteps !== 0) {
+                    lastChord = lastChord.split('/').map(chord => {
+                        const chordRoot = comp.chordRoot(chord);
+                        const newRoot = comp.transposeChord(chordRoot, nHalfSteps);
+                        return newRoot + comp.restOfChord(chord);
+                    }).join('/');
+                }
+
+                // use proper symbols
+                lastChord = lastChord.replace(/b/g, '♭');
+                lastChord = lastChord.replace(/#/g, '♯');
+            }
+        });
+        return `<div class="with-chords">${chordText}</div>`;
+    }
+}

src/app/components/chord-view/chordpro.scss

@@ -0,0 +1,23 @@
+.song {
+    white-space: pre-wrap;
+    .with-chords {
+        line-height: 2;
+    }
+    
+    span[data-chord]:before {
+        position: relative;
+        top: -1em;
+        display: inline-block;
+        content: attr(data-chord);
+        width: 0;
+        color: yellow;
+    }
+}
+
+.nextSlides {
+    .song {
+        span[data-chord]:before {
+            color: gray;
+        }
+    }
+}

src/app/components/login/login.component.html

@@ -0,0 +1,15 @@
+<h1 mat-dialog-title>Login</h1>
+
+<form #loginForm="ngForm">
+  <div mat-dialog-content>
+    <mat-form-field>
+      <input matInput placeholder="Username" [(ngModel)]="username" name="username" required>
+    </mat-form-field>
+    <mat-form-field>
+      <input matInput placeholder="password" type="password" [(ngModel)]="password" name="password" required>
+    </mat-form-field>
+  </div>
+  <div mat-dialog-actions>
+    <button mat-raised-button id="loginButton" color="primary" [disabled]="!loginForm.form.valid" (click)="performLogin()">Login</button>
+  </div>
+</form>

src/app/components/login/login.component.scss

@@ -0,0 +1,3 @@
+mat-form-field {
+    width: 100%;
+}

src/app/components/login/login.component.ts

@@ -0,0 +1,29 @@
+import { Component, OnInit } from '@angular/core';
+import { Credentials } from '../../responses';
+import { MatDialogRef, MatSnackBar } from '@angular/material';
+import { OpenLPService } from '../../openlp.service';
+
+@Component({
+  selector: 'app-login',
+  templateUrl: './login.component.html',
+  styleUrls: ['./login.component.scss']
+})
+export class LoginComponent implements OnInit {
+  username: string;
+  password: string;
+  constructor(private dialogRef: MatDialogRef<LoginComponent>, private openlpService: OpenLPService,
+              private snackBar: MatSnackBar) { }
+
+  ngOnInit() {
+  }
+
+  performLogin() {
+    this.openlpService.login({username: this.username, password: this.password}).subscribe(
+      result => {
+        this.snackBar.open('Successfully logged in', '', {duration: 2000});
+        this.dialogRef.close(result);
+      },
+      err => this.snackBar.open('Login failed', '', {duration: 2000})
+    );
+  }
+}

src/app/components/main-view/main-view.component.html

@@ -0,0 +1,3 @@
+<div class="overlay">
+  <img src="{{ img }}">
+</div>

src/app/components/main-view/main-view.component.scss

@@ -0,0 +1,8 @@
+img {
+    position: absolute;
+    top: 0;
+    vertical-align: middle;
+    height: 100%;
+    background-size: cover;
+    background-repeat: no-repeat;
+}

src/app/components/main-view/main-view.component.ts

@@ -0,0 +1,22 @@
+import { Component, OnInit } from '@angular/core';
+import { OpenLPService } from '../../openlp.service';
+
+@Component({
+  selector: 'app-main-view',
+  templateUrl: './main-view.component.html',
+  styleUrls: ['./main-view.component.scss', '../overlay.scss']
+})
+export class MainViewComponent implements OnInit {
+  img: string;
+  constructor(private openlpService: OpenLPService) { }
+
+  ngOnInit() {
+    this.updateImage();
+    this.openlpService.stateChanged$.subscribe(item => this.updateImage());
+  }
+
+  updateImage(): void {
+    this.openlpService.getMainImage().subscribe(view => this.img = view.binary_image);
+  }
+
+}

src/app/components/overlay.scss

@@ -0,0 +1,64 @@
+.overlay {
+    background: black;
+    width: 100%;
+    height: 100%;
+    position: fixed;
+    left: 0;
+    top: 0;
+    z-index: 1;
+    overflow: hidden;
+    color: white;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+}
+
+.sidebar {
+    margin: 1rem;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+}
+
+.time {
+    font-size: 2rem;
+    color: gray;
+}
+
+.tags {
+    margin-top: 1rem;
+    margin-bottom: 1rem;
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    color: gray;
+    font-size: 4rem;
+    span {
+        margin-left: 1rem;
+        &.active {
+            color: white;
+        }
+    }
+}
+
+.slide {
+    font-size: 3rem;
+    white-space: pre-line;
+    margin: 0;
+    &.first {
+        margin-top: 1rem;
+    }
+}
+
+.container {
+    margin-left: 1rem;
+}
+
+.nextSlides {
+    font-size: 2rem;
+    margin-top: 1rem;
+    color: gray;
+    .slide {
+        font-size: 2rem;
+    }
+}

src/app/components/search/search.component.ts

@@ -27,11 +27,11 @@ export class SearchComponent implements OnInit {
   }
 
   sendLive(id) {
-    this.openlpService.sendItemLive(this.currentPlugin, id).subscribe(res => console.log(res));
+    this.openlpService.sendItemLive(this.currentPlugin, id).subscribe(res => {});
   }
 
   addToService(id) {
-    this.openlpService.addItemToService(this.currentPlugin, id).subscribe(res => console.log(res));
+    this.openlpService.addItemToService(this.currentPlugin, id).subscribe(res => {});
   }
 
   ngOnInit() {

src/app/components/service/service.component.ts

@@ -18,7 +18,7 @@ export class ServiceComponent implements OnInit {
   }
 
   onItemSelected(item) {
-    this.openlpService.setServiceItem(item).subscribe(res => console.log(res));
+    this.openlpService.setServiceItem(item).subscribe(res => {});
     this.router.navigate(['slides']);
   }
 

src/app/components/slides/slides.component.ts

@@ -17,7 +17,7 @@ export class SlidesComponent implements OnInit {
   }
 
   onSlideSelected(item) {
-    this.openlpService.setSlide(item).subscribe(res => console.log(res));
+    this.openlpService.setSlide(item).subscribe(res => {});
   }
 
   getSlides() {

src/app/components/stage-view/stage-view.component.html

@@ -0,0 +1,21 @@
+<div class="overlay">
+  <div>
+    <div class="tags">
+      <span *ngFor="let tag of tags" [class.active]="tag.active">{{ tag.text }}</span>
+    </div>
+    <div class="container">
+      <div class="slide currentSlide mat-display-3">
+        {{ currentSlides[activeSlide]?.text }}
+      </div>
+      <div class="nextSlides">
+        <div class="slide mat-display-1" [class.first]="slide.first_slide_of_tag" *ngFor="let slide of nextSlides">
+          {{ slide.text }}
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="sidebar">
+    <div class="time">{{ time|date:'HH:mm' }}</div>
+    <button mat-raised-button class="closeButton" routerLink="/">Close</button>
+  </div>
+</div>

src/app/components/stage-view/stage-view.component.ts

@@ -0,0 +1,84 @@
+import { Component, OnInit } from '@angular/core';
+import { OpenLPService } from '../../openlp.service';
+import { Slide } from '../../responses';
+
+interface Tag {
+  text: string;
+  active: boolean;
+}
+
+@Component({
+  selector: 'app-stage-view',
+  templateUrl: './stage-view.component.html',
+  styleUrls: ['./stage-view.component.scss', '../overlay.scss']
+})
+export class StageViewComponent implements OnInit {
+  currentSlides: Slide[] = [];
+  activeSlide = 0;
+  tags: Tag[] = [];
+  time = new Date();
+  constructor(private openlpService: OpenLPService) {
+    setInterval(() => this.time = new Date(), 1000);
+  }
+
+  ngOnInit() {
+    this.updateCurrentSlides();
+    this.openlpService.stateChanged$.subscribe(item => this.updateCurrentSlides());
+  }
+
+  updateCurrentSlides(): void {
+    this.openlpService.getItemSlides().subscribe(slides => this.setNewSlides(slides));
+  }
+
+  get nextSlides(): Slide[] {
+    return this.currentSlides.slice(this.activeSlide + 1);
+  }
+
+  setNewSlides(slides: Slide[]): void {
+    if (slides.length === 0) {
+      return;
+    }
+    this.currentSlides = slides;
+    this.activeSlide = slides.findIndex(s => s.selected);
+    this.updateTags();
+  }
+
+  /**
+   * This method updates the tags from the current slides.
+   *
+   * We add a tag as soon as we know we need it.
+   * So we start with the first tag and on each tag change we push the new one.
+   *
+   * If we find the same tag, we check to see if the current slide is a repition.
+   * In case of a repition we also add a new tag.
+   *
+   * TODO This approach should work for most cases. It is a primary candidate for a test :-)
+   */
+  updateTags(): void {
+    this.tags = [];
+    this.tags.push({text: this.currentSlides[0].tag, active: this.currentSlides[0].selected});
+    let lastIndex = 0;
+    loop:
+    for (let index = 1; index < this.currentSlides.length; ++index) {
+      let foundActive = false;
+      if (this.currentSlides[index].tag === this.currentSlides[lastIndex].tag) {
+        for (let i = 0; i < index - lastIndex; ++i) {
+          foundActive = foundActive || this.currentSlides[index + i].selected;
+
+          // they are different, stop checking and continue outer loop
+          if (this.currentSlides[lastIndex + i].text !== this.currentSlides[index + i].text) {
+            // Since we are collapsing tags, we make sure to mark the tag active, if any of the collapsed tags were active
+            if (foundActive) {
+              this.tags[this.tags.length - 1].active = foundActive;
+            }
+            continue loop;
+          }
+        }
+      }
+      // either the tags differed, or we found a repitition. Either way add a tag
+      this.tags.push({text: this.currentSlides[index].tag, active: this.currentSlides[index].selected});
+      this.currentSlides[index].first_slide_of_tag = true;
+      lastIndex = index;
+    }
+  }
+}

src/app/openlp.service.ts

@@ -1,10 +1,9 @@
 import { Injectable, EventEmitter } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
-import { URLSearchParams, Http } from '@angular/http';
+import { HttpClient, HttpHeaders } from '@angular/common/http';
 
 import { Observable } from 'rxjs';
-import { map, take } from 'rxjs/operators';
-import { PluginDescription, State, Slide, ServiceItem } from './responses';
+
+import { PluginDescription, State, Slide, ServiceItem, MainView, SystemInformation, Credentials, AuthToken } from './responses';
 import { environment } from '../environments/environment';
 
 const deserialize = (json, cls) => {
@@ -18,6 +17,10 @@ const deserialize = (json, cls) => {
   return inst;
 };
 
+const httpOptions = {
+  headers: new HttpHeaders({'Content-Type': 'application/json'})
+};
+
 @Injectable()
 export class OpenLPService {
   private apiURL: string;
@@ -31,30 +34,45 @@ export class OpenLPService {
     else {
       port = '4316';
     }
-    this.apiURL = `http://localhost:${port}`;
+    this.apiURL = `http://localhost:${port}/api/v1`;
+
+
     this.stateChanged$ = new EventEmitter<State>();
-    let state: State = null;
-    const ws: WebSocket = new WebSocket('ws://localhost:4317/state');
-    ws.onmessage = (event) => {
-      const reader = new FileReader();
-      reader.onload = () => {
-        state = deserialize(JSON.parse(reader.result).results, State);
-        this.stateChanged$.emit(state);
+    this.retrieveSystemInformation().subscribe(info => {
+      const ws = new WebSocket(`ws://localhost:${info.websocket_port}/state`);
+      ws.onmessage = (event) => {
+        const reader = new FileReader();
+        reader.onload = () => {
+          const state = deserialize(JSON.parse(reader.result as string).results, State);
+          this.stateChanged$.emit(state);
+        };
+        reader.readAsText(event.data);
       };
-      reader.readAsText(event.data);
-    };
+    });
+  }
+
+  setAuthToken(token: string): void {
+    httpOptions.headers = httpOptions.headers.set('Authorization', token);
+  }
+
+  retrieveSystemInformation(): Observable<SystemInformation> {
+    return this.http.get<SystemInformation>(`${this.apiURL}/core/system`, httpOptions);
+  }
+
+  getMainImage(): Observable<MainView> {
+    return this.http.get<MainView>(`${this.apiURL}/core/live-image`, httpOptions);
   }
 
   getItemSlides(): Observable<Slide[]> {
-    return this.http.get<Slide[]>(`${this.apiURL}/controller/live/text`);
+    return this.http.get<Slide[]>(`${this.apiURL}/controller/live-item`, httpOptions);
   }
 
   getServiceItems(): Observable<ServiceItem[]> {
-    return this.http.get<ServiceItem[]>(`${this.apiURL}/service/list`);
+    return this.http.get<ServiceItem[]>(`${this.apiURL}/service/list`, httpOptions);
   }
 
   getSearchablePlugins(): Observable<PluginDescription[]> {
-    return this.http.get<PluginDescription[]>(`${this.apiURL}/plugin/search`);
+    return this.http.get<PluginDescription[]>(`${this.apiURL}/core/plugins`, httpOptions);
   }
 
   setServiceItem(id: number): Observable<any> {
@@ -62,54 +80,58 @@ export class OpenLPService {
   }
 
   search(plugin, text): Observable<any> {
-    return this.http.get(`${this.apiURL}/${plugin}/search?q=${text}`);
+    return this.http.get(`${this.apiURL}/plugins/${plugin}/search?text=${text}`, httpOptions);
   }
 
   setSlide(id): Observable<any> {
-    return this.http.get(`${this.apiURL}/controller/live/set?id=${id}`);
+    return this.http.post(`${this.apiURL}/controller/show`, {'id': id}, httpOptions);
   }
 
   nextItem(): Observable<any> {
-    return this.http.get(`${this.apiURL}/service/next`);
+    return this.http.post(`${this.apiURL}/service/progress`, {'action': 'next'}, httpOptions);
   }
 
   previousItem(): Observable<any> {
-    return this.http.get(`${this.apiURL}/service/previous`);
+    return this.http.post(`${this.apiURL}/service/progress`, {'action': 'previous'}, httpOptions);
   }
 
   nextSlide(): Observable<any> {
-    return this.http.get(`${this.apiURL}/controller/live/next`);
+    return this.http.post(`${this.apiURL}/controller/progress`, {'action': 'next'}, httpOptions);
   }
 
   previousSlide(): Observable<any> {
-    return this.http.get(`${this.apiURL}/controller/live/previous`);
+    return this.http.post(`${this.apiURL}/controller/progress`, {'action': 'previous'}, httpOptions);
   }
 
   blankDisplay(): Observable<any> {
-    return this.http.get(`${this.apiURL}/display/blank`);
+    return this.http.post(`${this.apiURL}/core/display`, {'display': 'blank'}, httpOptions);
   }
 
   themeDisplay(): Observable<any> {
-    return this.http.get(`${this.apiURL}/display/theme`);
+    return this.http.post(`${this.apiURL}/core/display`, {'display': 'theme'}, httpOptions);
   }
 
   desktopDisplay(): Observable<any> {
-    return this.http.get(`${this.apiURL}/display/desktop`);
+    return this.http.post(`${this.apiURL}/core/display`, {'display': 'desktop'}, httpOptions);
   }
 
   showDisplay(): Observable<any> {
-    return this.http.get(`${this.apiURL}/display/show`);
+    return this.http.post(`${this.apiURL}/core/display`, {'display': 'show'}, httpOptions);
   }
 
   showAlert(text): Observable<any> {
-    return this.http.get(`${this.apiURL}/alert?text=${text}`);
+    return this.http.post(`${this.apiURL}/plugins/alerts`, {'text': text}, httpOptions);
   }
 
   sendItemLive(plugin, id): Observable<any> {
-    return this.http.get(`${this.apiURL}/${plugin}/live?id=${id}`);
+    return this.http.post(`${this.apiURL}/plugins/${plugin}/live`, {'id': id}, httpOptions);
   }
 
   addItemToService(plugin, id): Observable<any> {
-    return this.http.get(`${this.apiURL}/${plugin}/add?id=${id}`);
+    return this.http.post(`${this.apiURL}/plugins/${plugin}/add`, {'id': id}, httpOptions);
+  }
+
+  login(credentials: Credentials): Observable<AuthToken> {
+    return this.http.post<AuthToken>(`${this.apiURL}/core/login`, credentials, httpOptions);
   }
 }

src/app/responses.ts

@@ -21,13 +21,33 @@ export interface Slide {
   html: string;
   tag: string;
   text: string;
+  chords_text: string;
   lines: string[];
+  first_slide_of_tag: boolean;
 }
 
 export interface ServiceItem {
-  id: string;
-  notes: string;
-  plugin: string;
-  selected: boolean;
-  title: string;
+    id: string;
+    notes: string;
+    plugin: string;
+    selected: boolean;
+    title: string;
+}
+
+export interface MainView {
+  binary_image: string;
+}
+
+export interface SystemInformation {
+  websocket_port: number;
+  login_required: boolean;
+}
+
+export interface Credentials {
+  username: string;
+  password: string;
+}
+
+export interface AuthToken {
+  token: string;
 }

src/index.html

@@ -6,14 +6,14 @@
   <base href="/">
 
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="icon" type="image/x-icon" href="favicon.ico">
+  <link rel="icon" type="image/x-icon" href="/assets/favicon.ico">
 <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
 </head>
 <body>
   <app-root>
     <div style="margin-top: 80px;">
       <div style="margin: auto; width: 100%; display: block;">
-        <img src="/assets/images/loading.png" style='height: 100%; width: 100%; object-fit: contain'>
+        <img src="/assets/loading.png" style='height: 100%; width: 100%; object-fit: contain'>
         <p style="text-align: center;">Loading...</p>
       </div>
     </div>

src/main.ts

@@ -3,6 +3,7 @@ import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
 import { AppModule } from './app/app.module';
 import { environment } from './environments/environment';
+import 'hammerjs';
 
 if (environment.production) {
   enableProdMode();

src/polyfills.ts

@@ -43,7 +43,7 @@
 
 /** Evergreen browsers require these. **/
 // Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove.
-import 'core-js/es7/reflect';
+// import 'core-js/es7/reflect';
 
 
 /**

src/styles.css

@@ -1,24 +0,0 @@
-/* You can add global styles to this file, and also import other style files */
-@import "~@angular/material/prebuilt-themes/indigo-pink.css";
-
-
-* {
-	-webkit-font-smoothing: antialiased;
-	-moz-osx-font-smoothing: grayscale;
-}
-
-mat-sidenav-layout {
-	background: rgba(0,0,0,0.03);
-}
-mat-sidenav {
-	width: 200px;
-}
-
-.displayButton .active {
-	background: 'teal';
-}
-
-.content {
-	margin: 20px;
-}
-

src/styles.scss

@@ -0,0 +1,45 @@
+/* You can add global styles to this file, and also import other style files */
+@import "~@angular/material/prebuilt-themes/indigo-pink.css";
+
+
+* {
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+mat-sidenav-layout {
+	background: rgba(0,0,0,0.03);
+}
+mat-sidenav {
+	width: 200px;
+}
+
+.displayButton .active {
+	background: 'teal';
+}
+
+.content {
+	margin: 20px;
+}
+
+.chordline {                                                                                                 
+    line-height: 1.8;
+  }
+  
+  .chordline1 {
+    line-height: 1.0 
+  }
+  
+  .chordline span.chord span {
+    position: relative;
+  }
+  
+  .chordline span.chord span strong {
+    position: absolute;
+    top: -2.1rem;
+    left: 0;
+    font-size: 30pt;
+    font-weight: normal;
+    line-height: normal;
+    color: yellow;
+  }