Merge branch 'dont-install-dev-deps' into 'master'

Don't install dev dependencies when building

See merge request openlp/web-remote!103

.gitlab-ci.yml

@@ -33,7 +33,7 @@ test:
 build-branch:
   stage: build
   script:
-    - yarn install
+    - yarn install --production
     - yarn build --no-progress --configuration production --aot
     - export APP_VERSION=`git describe --dirty --tags --long --match '*[0-9]*'`
     - 'echo "window.appVersion = \"$APP_VERSION\";" > dist/web-remote/assets/version.js'
@@ -46,7 +46,7 @@ build-branch:
 build-tag:
   stage: build
   script:
-    - yarn install
+    - yarn install --production
     - yarn build --no-progress --configuration production --aot
     - 'echo "window.appVersion = \"$CI_COMMIT_TAG\";" > dist/web-remote/assets/version.js'
   artifacts:

src/app/app.component.html

@@ -154,7 +154,7 @@
             @else if (state.display) {
               <mat-icon>desktop_windows</mat-icon>
             }
-            @else if (state.live) {
+            @else if (state.live()) {
               <mat-icon>videocam</mat-icon>
             }
           </button>
@@ -193,7 +193,7 @@
             (click)="showDisplay()"
             class="displayButton"
             [class.active]="state.display"
-            [disabled]="state.live"
+            [disabled]="state.live()"
             matTooltip="{{ 'SHOW_PRESENTATION' | translate }}"
             matTooltipPosition="above">
             <mat-icon>videocam</mat-icon>
@@ -242,7 +242,7 @@
             @else if (state.display) {
               <mat-icon>desktop_windows</mat-icon>
             }
-            @else if (state.live) {
+            @else if (state.live()) {
               <mat-icon>videocam</mat-icon>
             }
           </button>
@@ -278,7 +278,7 @@
             mat-icon-button (click)="showDisplay()"
             class="displayButton"
             [class.active]="state.display"
-            [disabled]="state.live"
+            [disabled]="state.live()"
             matTooltip="{{ 'SHOW_PRESENTATION' | translate }}"
             matTooltipPosition="above">
             <mat-icon>videocam</mat-icon>

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

@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component } from '@angular/core';
 import { MatDialogRef } from '@angular/material/dialog';
 import { MatSnackBar } from '@angular/material/snack-bar';
 import { TranslateService } from '@ngx-translate/core';
@@ -10,7 +10,7 @@ import { OpenLPService } from '../../openlp.service';
   templateUrl: './login.component.html',
   styleUrl: './login.component.scss'
 })
-export class LoginComponent implements OnInit {
+export class LoginComponent {
   username: string;
   password: string;
   loginSucceededMessage: string;
@@ -29,17 +29,13 @@ export class LoginComponent implements OnInit {
     });
   }
 
-  ngOnInit() {
-    // Do nothing
-  }
-
   performLogin() {
-    this.openlpService.login({username: this.username, password: this.password}).subscribe(
+    this.openlpService.login({ username: this.username, password: this.password }).subscribe({
-      result => {
+      next: result => {
-        this.snackBar.open(this.loginSucceededMessage, '', {duration: 2000});
+        this.snackBar.open(this.loginSucceededMessage, '', { duration: 2000 });
         this.dialogRef.close(result);
       },
-      () => this.snackBar.open(this.loginFailedMessage, '', {duration: 2000})
+      error: () => this.snackBar.open(this.loginFailedMessage, '', { duration: 2000 })
-    );
+    });
   }
 }