diff --git a/Client/src/app/app-routing.module.ts b/Client/src/app/app-routing.module.ts index 4472627..abf09e0 100644 --- a/Client/src/app/app-routing.module.ts +++ b/Client/src/app/app-routing.module.ts @@ -80,7 +80,17 @@ const routes = }, { path: 'covid', - component: ImageComponent + component: ImageComponent, + data: { + imageUrl: 'assets/images/tiny/covid_tract.jpg' + } + }, + { + path: 'covid2', + component: ImageComponent, + data: { + imageUrl: 'assets/images/tiny/covid_tract_2.jpg' + } }, { path: 'camp', diff --git a/Client/src/app/components/home/home.component.html b/Client/src/app/components/home/home.component.html index 31984e2..bd9ef44 100644 --- a/Client/src/app/components/home/home.component.html +++ b/Client/src/app/components/home/home.component.html @@ -45,12 +45,12 @@ -
+

COVID-19

- Due to the COVID-19 outbreak our church building will be closed until April 1st. Video + Due to the COVID-19 outbreak our church building will be closed until May 1st. Video and audio services will be posted online during this time.


@@ -61,10 +61,30 @@ headset Click here to listen online

- insert_photo Click here for coronavirus encouragement + insert_photo Click here for coronavirus encouragement

+ + + +
+
+
+ +
+
+
+

Days of Uncertainty

+

+ Days of uncertainty are looming over us. There is fear of loss - of life, jobs and income. Restricted gatherings. Food & medical equipment shortages. The future is concerning. Fear produces a negative atmospher, tormenting us, agitating our minds. Fear is crippling to those caught in its grip. +

+
+

+ insert_photo There is Hope! There is an Answer! Click Here! +

+
+
@@ -108,7 +128,7 @@
-
+

...that ye also may have fellowship with us...

It is exciting to gather together in the name of the Lord and we sincerily hope that YOU will join us. Guests are always welcome at Old Fashion @@ -116,7 +136,7 @@

For where two or three are gathered together in my name, there am I in the midst of them. - Matthew 18:20

info_outline Learn more about us

-
+
diff --git a/Client/src/app/components/image/image.component.html b/Client/src/app/components/image/image.component.html index 7c9a253..3a68a05 100644 --- a/Client/src/app/components/image/image.component.html +++ b/Client/src/app/components/image/image.component.html @@ -1,13 +1,13 @@
- -
+ +
-
+
\ No newline at end of file diff --git a/Client/src/app/components/image/image.component.ts b/Client/src/app/components/image/image.component.ts index 1569d22..17c74e6 100644 --- a/Client/src/app/components/image/image.component.ts +++ b/Client/src/app/components/image/image.component.ts @@ -1,8 +1,9 @@ import { BibleVerseService } from './../../services/bible-verse.service'; -import { Component, OnInit, Inject } from '@angular/core'; +import { Component, OnInit, Inject, Input } from '@angular/core'; import { MatDialogConfig, MatDialog } from '@angular/material'; import { SharePopupComponent } from '../popups/share-popup/share-popup.component'; import { DOCUMENT } from '@angular/platform-browser'; +import { Router, ActivatedRouteSnapshot, ActivatedRoute } from '@angular/router'; @Component({ selector: 'image-component', @@ -11,9 +12,11 @@ import { DOCUMENT } from '@angular/platform-browser'; }) export class ImageComponent implements OnInit { - public shareUrl: string; + public imageUrl: string; - constructor(private dialog: MatDialog, @Inject(DOCUMENT) private document) { } + constructor(private dialog: MatDialog, @Inject(DOCUMENT) private document, private route: ActivatedRoute) { + this.imageUrl = this.route.snapshot.data.imageUrl; + } ngOnInit() { // this.bibleVerseService.randomVerse().subscribe( @@ -34,8 +37,7 @@ export class ImageComponent implements OnInit { imageWidth: 750, imageHeight: 404, title: 'Coronavirus Anxiety?', - description: 'The cure for coronavirus anxiety', - url: baseUrl + '/covid' + description: 'The cure for coronavirus anxiety' } }; let dialog = this.dialog.open(SharePopupComponent, opts); diff --git a/Client/src/assets/images/home-images/tiny/covid_header_2.jpg b/Client/src/assets/images/home-images/tiny/covid_header_2.jpg new file mode 100644 index 0000000..11a2c94 Binary files /dev/null and b/Client/src/assets/images/home-images/tiny/covid_header_2.jpg differ diff --git a/Client/src/assets/images/tiny/covid_tract_2.jpg b/Client/src/assets/images/tiny/covid_tract_2.jpg new file mode 100644 index 0000000..626c2d7 Binary files /dev/null and b/Client/src/assets/images/tiny/covid_tract_2.jpg differ diff --git a/Server/src/routes/api/share.js b/Server/src/routes/api/share.js index 9c27041..57cecc3 100644 --- a/Server/src/routes/api/share.js +++ b/Server/src/routes/api/share.js @@ -8,6 +8,7 @@ const calendarImageUrl = '/api2/cim/'; const eventUrl = '/api2/share/e'; const sermonImageUrl = '/assets/images/tiny/facebookplay.png'; const sermonUrl = '/api2/share/s'; +const otherUrl = '/api2/share/o'; router.get("/:shareCode",function(req,res){ @@ -40,9 +41,9 @@ function getOther(req, res, param) { userAgent === 'Facebot' || userAgent.startsWith('Twitterbot') || referrer.startsWith('http://opengraphcheck.com')) { - getOtherMeta(req, res, params.title, params.description, params.imageUrl, params.imageWidth, params.imageHeight, params.url); + getOtherMeta(req, res, params.title, params.description, params.imageUrl, params.imageWidth, params.imageHeight); } else { - var url = params.url || (req.protocol + "://" + req.hostname); + var url = params.url || (req.protocol + "://" + req.hostname + req.originalUrl); res.redirect(url); } } @@ -64,15 +65,16 @@ function getSermon(req, res, id){ } } -function getOtherMeta(req, res, title, description, imageUrl, imageWidth, imageHeight, url) { +function getOtherMeta(req, res, title, description, imageUrl, imageWidth, imageHeight) { imageWidth = imageWidth || 200; imageHeight = imageHeight || 200; + const url = req.protocol + '://' + req.hostname + req.originalUrl; var result = ` Old Fashion Baptist Church - +