Quick fix (#84)

clarkmalmgren · Sep 16, 2017 · 4585c71 · 4585c71
1 parent 2bea93a
commit 4585c71
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 9 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bolingbrook-church",
-  "version": "1.2.11",
+  "version": "1.2.12",
   "license": "MIT",
   "angular-cli": {},
   "scripts": {

diff --git a/src/app/components/pages/sermons/sermon.html b/src/app/components/pages/sermons/sermon.html
@@ -1,5 +1,13 @@
 <bc-header></bc-header>
 <main>
+  <section *ngIf="youtube_live_issues && live">
+    <h2>Experiencing Issues</h2>
+    <p>
+      Unfortunately, we are having techincal issues with our live streaming. We are working hard to address
+      the issue and will be back soon.
+    </p>
+  </section>
+
   <section class="video">
     <iframe *ngIf="youtube_url"
             id="sermonVideo"

diff --git a/src/app/components/pages/sermons/sermon.spec.ts b/src/app/components/pages/sermons/sermon.spec.ts
@@ -8,6 +8,7 @@ import {
   SeriesImageService,
   Sermon,
   SermonService,
+  TogglesService,
   VideoState,
   YoutubeService
 } from 'app/services';
@@ -25,7 +26,11 @@ describe('SermonComponent', () => {
                                 .with('params', Observable.empty())
                                 .build();
 
-      const sermon = new SermonComponent(activatedRoute, null, null, null, null, null, youtubeService);
+      const togglesService = MockBuilder.of(TogglesService)
+                                .withStub('getToggles', Observable.empty())
+                                .build();
+
+      const sermon = new SermonComponent(activatedRoute, null, null, null, null, null, togglesService, youtubeService);
 
       sermon.ngOnInit();
 
@@ -48,7 +53,11 @@ describe('SermonComponent', () => {
                           .withSpy('event')
                           .build();
 
-      const sermon = new SermonComponent(activatedRoute, analytics, null, null, null, null, youtubeService);
+      const togglesService = MockBuilder.of(TogglesService)
+                                .withStub('getToggles', Observable.empty())
+                                .build();
+
+      const sermon = new SermonComponent(activatedRoute, analytics, null, null, null, null, togglesService, youtubeService);
       sermon.analyticsInterval = 5;
       sermon.videoState = VideoState.PLAYING;
       sermon.sermon = { youtube: 'Jesus4Life' } as Sermon;
@@ -76,7 +85,10 @@ describe('SermonComponent', () => {
                           .withSpy('event')
                           .build();
 
-      const sermon = new SermonComponent(activatedRoute, analytics, null, null, null, null, youtubeService);
+      const togglesService = MockBuilder.of(TogglesService)
+                              .withStub('getToggles', Observable.empty())
+                              .build();
+      const sermon = new SermonComponent(activatedRoute, analytics, null, null, null, null, togglesService, youtubeService);
       sermon.analyticsInterval = 5;
       sermon.videoState = VideoState.PLAYING;
       sermon.live = true;
@@ -110,7 +122,11 @@ describe('SermonComponent', () => {
                             .withSpy('event')
                             .build();
 
-        const sermon = new SermonComponent(activatedRoute, analytics, null, null, null, null, youtubeService);
+      const togglesService = MockBuilder.of(TogglesService)
+                                .withStub('getToggles', Observable.empty())
+                                .build();
+
+        const sermon = new SermonComponent(activatedRoute, analytics, null, null, null, null, togglesService, youtubeService);
         sermon.analyticsInterval = 5;
         sermon.videoState = state;
         sermon.sermon = { youtube: 'Jesus4Life' } as Sermon;
@@ -124,9 +140,6 @@ describe('SermonComponent', () => {
       }));
     });
 
-
-
-
   });
 
 });
diff --git a/src/app/components/pages/sermons/sermon.ts b/src/app/components/pages/sermons/sermon.ts
@@ -10,6 +10,7 @@ import {
   SeriesImageService,
   Sermon,
   SermonService,
+  TogglesService,
   VideoState,
   YoutubeService
 } from '../../../services';
@@ -24,6 +25,7 @@ export class SermonComponent extends Autoclean implements OnInit {
   sermon: Sermon;
   live: boolean = false;
   youtube_url: SafeResourceUrl;
+  youtube_live_issues: boolean = false;
   icon: SafeStyle;
 
   videoState: VideoState = VideoState.UNSTARTED;
@@ -36,6 +38,7 @@ export class SermonComponent extends Autoclean implements OnInit {
     private meta: Meta,
     private sanitizer: DomSanitizer,
     private service: SermonService,
+    private togglesService: TogglesService,
     private youtubeService: YoutubeService
   ) {
     super();
@@ -50,6 +53,13 @@ export class SermonComponent extends Autoclean implements OnInit {
           this.videoState = state;
         }));
 
+    /* Handle issues if youtube is having issues */
+    this.autoclean(
+      this.togglesService.getToggles()
+        .subscribe((toggles) => {
+          this.youtube_live_issues = !!toggles.youtube_live_issues;
+        }));
+
     /* Record Analytics when Playing */
     this.autoclean(
       Observable.interval(this.analyticsInterval)

diff --git a/src/app/services/toggles.service.ts b/src/app/services/toggles.service.ts
@@ -4,6 +4,7 @@ import { Observable }         from './observable';
 
 export interface FeatureToggles {
   youtube_live: boolean;
+  youtube_live_issues: boolean;
 }
 
 @Injectable()