From 27f33320e6297bd1703bd02e21d712a749577a19 Mon Sep 17 00:00:00 2001 From: dan Date: Sat, 21 Mar 2020 21:57:38 -0600 Subject: [PATCH] Add video refresh --- Client/node_modules - Shortcut.lnk | Bin 0 -> 1154 bytes Client/src/app/components/home/countdown.ts | 10 +++--- .../app/components/home/home.component.css | 24 +++++++++++-- .../app/components/home/home.component.html | 28 +++++++++++++-- .../src/app/components/home/home.component.ts | 2 ++ .../live-stream/live-stream.component.css | 4 +++ .../live-stream/live-stream.component.html | 3 +- .../live-stream/live-stream.component.ts | 33 +++++++++++++++++- .../assets/images/home-images/tiny/covid.jpg | Bin 0 -> 8690 bytes 9 files changed, 91 insertions(+), 13 deletions(-) create mode 100644 Client/node_modules - Shortcut.lnk create mode 100644 Client/src/assets/images/home-images/tiny/covid.jpg diff --git a/Client/node_modules - Shortcut.lnk b/Client/node_modules - Shortcut.lnk new file mode 100644 index 0000000000000000000000000000000000000000..75bef40b3e795ef0275e928f1f4bab3eec7473f6 GIT binary patch literal 1154 zcmbVLUr1A76#rd|n58ypsY&UGG))|uf;gHOTRJLrU{=tDsoR|{-L84J{(<2`MWJG9 zQV$vtOF;_>i=aq-=_PuQ)X1KUp8Qiof~*kgoV%qNNYH`b`M!J3`F`ho=Y01l06`Z) z8W>YGidvw7miFoM7j`^fm=p#El5ULsoD$kEhgM*t8YzV0SF|YTkZhYN8`sYn-P(Ka zG|0%x>NUd9+?f$KA$46W>aOc-Fuu|Zr9wa|f+MkX)-_nQFZuPPuoOSLJo95pxZM(3 zbvTY}mHT_?hjcAuSGD5yNhm}lk#gjYX_B!Qr3d}~aLXjF3u|yIrvcvD8yDDP1lVa%ZqE~iGc8~1z*GrTu z1_p@hmQoo?boV5!EKW(O^T`dFc{#P&`87GveLhgJr!dtzIyyYtwbZN)sYq58E27 m{nkQ5z;wQK7ujn$z)F~S+5Yin^TLrK{g+$u!KM_p|CV35%L)?! literal 0 HcmV?d00001 diff --git a/Client/src/app/components/home/countdown.ts b/Client/src/app/components/home/countdown.ts index 4cc65c5..a33717b 100644 --- a/Client/src/app/components/home/countdown.ts +++ b/Client/src/app/components/home/countdown.ts @@ -6,9 +6,7 @@ export class Countdown { public minutes: number = 0; public seconds: number = 0; public liveDates: Date[] = [ - DateTime.fromObject({year: 2020, month: 3, day: 22, hour: 10, zone: 'America/Denver'}), - DateTime.fromObject({year: 2020, month: 3, day: 22, hour: 11, zone: 'America/Denver'}), - DateTime.fromObject({year: 2020, month: 3, day: 22, hour: 19, zone: 'America/Denver'}) + DateTime.fromObject({year: 2020, month: 3, day: 22, hour: 11, zone: 'America/Denver'}) ]; public showButton: boolean; public showCounter: boolean = true; @@ -74,7 +72,7 @@ export class Countdown { var nearestPast = this.getNearestPastDate(now); if (nearestPast) { var pastDiff = now.diff(nearestPast, ['minutes']); - if (pastDiff.minutes < 45) { + if (pastDiff.minutes < 10080) { this.showButton = true; this.dateDisplay = nearestPast.toLocaleString(DateTime.DATETIME_HUGE); this.dateDisplaySmall = nearestPast.toLocaleString(DateTime.DATETIME_MED); @@ -92,8 +90,8 @@ export class Countdown { this.dateDisplaySmall = ''; return; } - var minDiff = nearestFuture.diff(now, ['minutes']); - if (minDiff.minutes <= 10) { + var secDiff = nearestFuture.diff(now, ['seconds']); + if (secDiff.seconds <= 0) { this.showButton = true; } diff --git a/Client/src/app/components/home/home.component.css b/Client/src/app/components/home/home.component.css index ae3ffeb..fc197a6 100644 --- a/Client/src/app/components/home/home.component.css +++ b/Client/src/app/components/home/home.component.css @@ -114,6 +114,9 @@ img.full { #countdown-container { font-size: 20pt; } + #live-button { + font-size: 20pt; + } } .display-sm { @@ -132,7 +135,7 @@ img.full { #countdown-container { font-size: 13pt; margin-top: 3px; - } + } .display-none-sm { display: none; } @@ -142,6 +145,10 @@ img.full { #live-date { margin-top: 2px; } + #live-button { + font-size: 18pt; + margin-top: -5px; + } } @@ -154,6 +161,14 @@ img.full { margin-right: 10px; } +.w-200 { + width: 200px; +} + +.h-200 { + height: 200px; +} + .action{ font-weight: bold; font-size: 20px; @@ -290,7 +305,9 @@ img.full { margin: 10px; } - +img.m-100-lg { + margin-left: 100px; +} @media(max-width: 850px){ .row-content-col-left, .row-content-col-right{ @@ -302,5 +319,8 @@ img.full { img.full { width: 90%; } + img.m-100-lg { + margin-left: 0; + } } \ No newline at end of file diff --git a/Client/src/app/components/home/home.component.html b/Client/src/app/components/home/home.component.html index 041dbe8..ce496e3 100644 --- a/Client/src/app/components/home/home.component.html +++ b/Client/src/app/components/home/home.component.html @@ -4,14 +4,14 @@
- LIVE + VIDEO SERMON STARTS IN - SERMON STREAMING NOW + SERMON AVAILABLE NOW
live_tv - Click to Watch Now + Click to Watch
{{countdown.daysDisplay}} @@ -46,6 +46,28 @@
+ +
diff --git a/Client/src/app/components/home/home.component.ts b/Client/src/app/components/home/home.component.ts index 844e779..b229abe 100644 --- a/Client/src/app/components/home/home.component.ts +++ b/Client/src/app/components/home/home.component.ts @@ -12,6 +12,8 @@ import { Countdown } from './countdown'; export class HomeComponent { backgroundTop: string = "0px"; public get showSpecial() : boolean { + return true; //COVID-19 + let maxDate = new Date(2018,8,6); // September 6th 2018 -- Set the month one month behind since JavaScript dates are 0 based let now = new Date(); if (now.getFullYear() > maxDate.getFullYear()) return false; diff --git a/Client/src/app/components/live-stream/live-stream.component.css b/Client/src/app/components/live-stream/live-stream.component.css index 0a0f280..f3db060 100644 --- a/Client/src/app/components/live-stream/live-stream.component.css +++ b/Client/src/app/components/live-stream/live-stream.component.css @@ -10,4 +10,8 @@ left: 0; width: 100%; height: 100%; +} + +.opacity-zero { + opacity: 0; } \ No newline at end of file diff --git a/Client/src/app/components/live-stream/live-stream.component.html b/Client/src/app/components/live-stream/live-stream.component.html index ba1c230..22c185b 100644 --- a/Client/src/app/components/live-stream/live-stream.component.html +++ b/Client/src/app/components/live-stream/live-stream.component.html @@ -1,7 +1,8 @@
- + +
diff --git a/Client/src/app/components/live-stream/live-stream.component.ts b/Client/src/app/components/live-stream/live-stream.component.ts index c4e907a..2e37b03 100644 --- a/Client/src/app/components/live-stream/live-stream.component.ts +++ b/Client/src/app/components/live-stream/live-stream.component.ts @@ -1,5 +1,6 @@ import { BibleVerseService } from './../../services/bible-verse.service'; import { Component, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; @Component({ selector: 'live-stream-component', @@ -7,9 +8,39 @@ import { Component, OnInit } from '@angular/core'; styleUrls: ['./live-stream.component.css'] }) export class LiveStreamComponent implements OnInit { + + + public sermonVideo: string = 'https://ofbbutte.com/static/media/video/sermon.mp4'; + public pleaseWait: string = 'https://ofbbutte.com/static/media/video/PleaseWait.jpg'; + public clickToPlay: string = 'https://ofbbutte.com/static/media/video/ClickToPlay.jpg'; + + + public videoSrc: string = this.sermonVideo; + public poster: string = this.clickToPlay; + public error: boolean = false; + public showVideo: boolean = false; - constructor() { } + constructor(private router: Router) { } ngOnInit() { + setTimeout(() => { + if (!this.error) { + this.showVideo = true; + } + }, 3000) + } + + public async vidError() { + if (this.videoSrc === '') return; + this.error = true; + setTimeout(async () => { + this.error = false; + setTimeout(() => { + if (!this.error) { + this.showVideo = true; + } + }, 3000); + }, 3000); + } } diff --git a/Client/src/assets/images/home-images/tiny/covid.jpg b/Client/src/assets/images/home-images/tiny/covid.jpg new file mode 100644 index 0000000000000000000000000000000000000000..59cb25bbbfb43e4f9064d0acace264b70fdc2518 GIT binary patch literal 8690 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 literal 0 HcmV?d00001