Buttons to whoweare page and salvation page

Transactions
Dan 2017-09-28 20:26:36 -06:00
parent 39618eea8b
commit a975314f95
32 changed files with 233 additions and 59 deletions

View File

@ -47,7 +47,7 @@ import { UpdateSermonPopupComponent } from './components/popups/update-sermon-po
import { ContactPageComponent } from './components/contact-page/contact-page.component';
import { SharePopupComponent } from './components/popups/share-popup/share-popup.component';
import { EventLargeComponent } from './components/event-large/event-large.component';
import { SalvationPageComponent } from './components/salvation-page/salvation-page.component';
//Directives
import { FadeInOnScrollDirective } from './directives/fade-in-on-scroll.directive';
@ -58,6 +58,7 @@ import { DurationPipe } from './pipes/duration.pipe';
import { SafeUrlPipe } from './pipes/safe-url.pipe';
import { OfbDatePipe } from './pipes/ofb-date.pipe';
const Routes =
[
{
@ -82,7 +83,7 @@ const Routes =
},
{
path: 'sermons',
redirectTo: 'sermons/0'
component: SermonsComponent
},
{
path: 'sermons/:id',
@ -99,6 +100,10 @@ const Routes =
{
path: 'events/:id',
component: EventsPageComponent
},
{
path: 'salvation',
component: SalvationPageComponent
}
]
@ -135,7 +140,8 @@ const Routes =
EventsPageComponent,
AddEventPopupComponent,
EventLargeComponent,
OfbDatePipe
OfbDatePipe,
SalvationPageComponent
],
imports: [
BrowserModule,
@ -148,7 +154,6 @@ const Routes =
MdSliderModule,
MdSnackBarModule,
MdDialogModule,
MdCardModule,
RouterModule.forRoot(Routes)
],

View File

@ -26,14 +26,12 @@ export class AppComponent {
constructor(private router: Router, private audioPlayerService: AudioPlayerService){
this.router.events.subscribe((event:Event) => {
if(event instanceof NavigationStart) {
console.log("last: " + this.lastRoute + "; curr: " + this.currRoute + "; evt: " + event.url);
this.lastRoute = this.currRoute;
this.currRoute = event.url;
let doc = document.documentElement;
let scrollPos = (window.pageYOffset || doc.scrollTop) - (doc.clientTop || 0);
//console.log("Scroll: " + scrollPos + "; lastRoute: " + this.lastRoute + "; thisRoute: " + event.url);
if (event.url === '/home'){
this.fadeHeader = true;
this.headerOpacity = 0;
@ -43,7 +41,6 @@ export class AppComponent {
}
if (this.lastRoute === event.url){
window.scrollTo(0,this.lastScrollPos);
//console.log("Last POS");
} else {
window.scrollTo(0, 0);
}

View File

@ -68,7 +68,7 @@ export class ContactPageComponent implements OnInit {
}
private emailError(){
console.log("error");
console.error("error");
let opts = new MdDialogConfig;
opts.data = { title:'Email Error','message':'Please make sure that you have entered a valid email address.' };
let popup = this.mdDialog.open(OkPopupComponent,opts);

View File

@ -72,13 +72,10 @@ export class EventLargeComponent implements AfterContentInit {
}
constructor(private dialog: MdDialog,
private eventService: EventService){
console.log(this.title);
private eventService: EventService){
}
ngAfterContentInit(): void{
console.log(this.delayFadeIn);
setTimeout(() => this.startFadeIn = true, this.delayFadeIn);
}
@ -101,8 +98,8 @@ export class EventLargeComponent implements AfterContentInit {
s = s as boolean;
if (s === true){
this.eventService.deleteEvent(this.id).subscribe(
success => { console.log(success); },
error => { console.log(error); }
success => { },
error => { console.error(error); }
);
}
});

View File

@ -32,11 +32,9 @@ export class EventComponent implements AfterContentInit {
public delayFadeIn: number = 100;
constructor(){
console.log(this.title);
}
ngAfterContentInit(): void{
console.log(this.delayFadeIn);
setTimeout(() => this.startFadeIn = true, this.delayFadeIn);
}
}

View File

@ -41,7 +41,6 @@ export class EventsPageComponent implements OnInit {
id = Number.isNaN(id) ? -1 : id;
if (id > -1){
this.getSingleEvent(id);
console.log("GG");
this.showAllButtonVisible = true;
} else {
this.getEvents(true);
@ -59,11 +58,10 @@ export class EventsPageComponent implements OnInit {
}
this.eventService.getEvents(1).subscribe(
events => {
console.log(events);
this.addEvents(events);
this.loading = false;
},
error => console.log(error)
error => console.error(error)
);
}

View File

@ -66,7 +66,8 @@
<p ofbFadeInOnScroll class="row-content-header">The Holy Bible</p>
<div ofbFadeInOnScroll>
Here at Old Fashion Baptist Church we love the Word of God!
<p class="verse">In the beginning was the Word, and the Word was with God, and the Word was God. - John 1:1</p>
<p class="verse">
But he answered and said, <span class="red">It is written, Man shall not live by bread alone, but by every word that proceedeth out of the mouth of God.</span> - Matthew 4:4</p>
We encourage you to come and join as as we study, teach and preach Gods Word!
<br><br>
<p class="action">

View File

@ -1,13 +1,12 @@
<secondary-page-component [hideSideBarOnMobile]="true" >
<div mainContent class="mapWrapper">
<p *ngIf="mapLoading">Loading Map...</p>
<p *ngIf="mapLoading">Loading Google Map...</p>
<iframe class="map" (load)="mapLoaded()" src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d2773.999802164379!2d-112.51416668494458!3d45.951286979109824!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x535b078c3c74ea33%3A0xac299097142c5894!2sOld+Fashion+Baptist+Church!5e0!3m2!1sen!2sus!4v1493451790286" frameborder="0" style="border:0" allowfullscreen></iframe>
</div>
<div sideBar ofbFadeInOnScroll>
We are located South West of the Copper King hotel in Butte, Montana just off of Motor View Road.
<br><br>
<iframe id="verseFrame" (load)="verseLoaded()" src="http://www.kingjamesbibleonline.org/popular-bible-verses-widget.php">
</iframe>
<br><br><br>
Trust in the LORD with all thine heart; and lean not unto thine own understanding.
In all thy ways acknowledge him, and he shall direct thy paths. <a href="https://www.kingjamesbibleonline.org/Proverbs-3-5_3-6/">(Proverbs 3:5 - 6)</a>
</div>
</secondary-page-component>

View File

@ -12,11 +12,11 @@ export class LocationComponent implements OnInit {
constructor(private bibleVerseService: BibleVerseService) { }
ngOnInit() {
this.bibleVerseService.randomVerse().subscribe(
verse => {
// this.bibleVerseService.randomVerse().subscribe(
// verse => {
},
error => console.log(error) );
// },
// error => console.log(error) );
}
mapLoaded(){

View File

@ -88,12 +88,10 @@ export class AddEventPopupComponent implements OnInit {
this.eventService.addEvent(e).subscribe(
data=>{
console.log(data);
this.updateAddButton(true);
this.mdDialogRef.close(data.sermon);
},
error => {
alert(error);
this.updateAddButton(true);
let errorDialog = this.mdDialog.open(OkPopupComponent,{data:{title:'Upload Error',message:'There was an error uploading the sermon\n' + error}});
});

View File

@ -98,7 +98,6 @@ export class AddSermonPopupComponent implements OnInit, OnDestroy {
this.errorMessages.push("Please add a sermon MP3 file");
}
if (this.sermonFile != null && this.sermonFile.type != 'audio/mp3'){
console.log(this.sermonFile.type);
this.errorMessages.push("File must be a MP3");
}
if (this.errorMessages.length > 0){ this.updateAddButton(true); return; }
@ -117,7 +116,6 @@ export class AddSermonPopupComponent implements OnInit, OnDestroy {
},500);
this.sermonService.addSermon(s,this.sermonFile).subscribe(
data=>{
console.log(data);
this.updateAddButton(true);
this.monitorProgress = false;
clearInterval(timer);

View File

@ -33,12 +33,11 @@ export class LoginPopupComponent implements OnInit {
} else {
this.showLoginError(data.message);
}
console.log(data);
this.loginButtonText = 'Login';
this.loginButtonDisabled = false;
},
error => {
console.log(error);
console.error(error);
this.showLoginError(error);
this.loginButtonText = 'Login';
this.loginButtonDisabled = false;

View File

@ -40,18 +40,16 @@ export class SharePopupComponent implements OnInit {
}
copyLink(target){
console.log(target);
target.select();
try {
var successful = document.execCommand('copy');
var msg = successful ? 'successful' : 'unsuccessful';
console.log('Copying text command was ' + msg);
target.blur();
let s = this.snackbar.open("Link Copied","OK");
s.onAction().subscribe(()=>{ s.dismiss(); });
s.afterOpened().subscribe(()=>{ setTimeout(()=>{ s.dismiss(); },3000); });
} catch (err) {
console.log('Oops, unable to copy');
console.error('Oops, unable to copy');
}
}
}

View File

@ -73,7 +73,6 @@ export class UpdateSermonPopupComponent implements OnInit {
//Start monitoring Progress
this.sermonService.updateSermon(s).subscribe(
data=>{
console.log(data);
this.mdDialogRef.close(data.sermon);
},
error => {

View File

@ -28,7 +28,6 @@ export class RecentSermonsComponent implements OnInit {
this.sermonService.getSermons(this.numberOfSermonsToShow).subscribe(sermons => {
this.sermons = sermons;
this.loading = false;
console.log(this.sermons)
});
}
}

View File

@ -0,0 +1,6 @@
.section-header{
font-size: 1.2em;
font-weight: bold;
border-bottom: 1px solid gray;
margin-bottom: 10px;
}

View File

@ -0,0 +1,67 @@
<secondary-page-component [hideSideBarOnMobile]="true">
<div mainContent>
<p ofbFadeInOnScroll class="section-header">Salvation</p>
<p ofbFadeInOnScroll class="section-paragraph">
Salvation put simply means being saved from sin, from Satan and from Hell. The truth is that
we are all sinners and we have fallen short. The punishment or wage for our sin is eternal death
and seperation from God. So, how does someone receive salvation?
</p>
<br><br>
<p ofbFadeInOnScroll class="section-header">God says we won't arrive</p>
<div ofbFadeInOnScroll class="section-paragraph">
<div class="verse">"For all have sinned and come short of the glory of God." <a href="https://www.kingjamesbibleonline.org/Romans-3-23/">Romans 3:23</a></div>
<br>
We are all sinners and <a href="https://www.kingjamesbibleonline.org/Romans-6-23/">Romans 6:23</a> tells us that the consequence of our sin is death.
<br>
<div class="verse">"For the wages of sin is death;..." <a href="https://www.kingjamesbibleonline.org/Romans-6-23/">Romans 6:23</a></div>
<br>
We have all sinned, we have all earned death and eternal seperation from God. The outlook
for us is not too good when we consider our position. God, knowing all about our helpless situation, has made
a way for every individual to avoid death, to be set free and receive the gift of eternal life.
The second half of <a href="https://www.kingjamesbibleonline.org/Romans-6-23/">Romans 6:23</a> says:
<div class="verse">"...but the gift of God is eternal life through Jesus Christ our Lord." <a href="https://www.kingjamesbibleonline.org/Romans-6-23/">Romans 6:23</a></div>
</div>
<br><br>
<p ofbFadeInOnScroll class="section-header">God says the road ends</p>
<div ofbFadeInOnScroll class="section-paragraph">
<div class="verse">"There is a way that seemeth right unto a man, but the end thereof are the ways of
death." <a href="https://www.kingjamesbibleonline.org/Proverbs-16-25/">Proverbs 16:25</a></div>
</div>
<br><br>
<b></b>
<p ofbFadeInOnScroll class="section-header">God says that we need to turn around</p>
<div ofbFadeInOnScroll class="section-paragraph">
<div class="verse">"But, except ye repent, ye shall all likewise perish." <a href="https://www.kingjamesbibleonline.org/Luke-13-3/">Luke 13:3</a></div>
</div>
<br><br>
<p ofbFadeInOnScroll class="section-header">God says there is only one way</p>
<div ofbFadeInOnScroll class="section-paragraph">
<div class="verse">"Jesus says, <span class="red">I am the way, the truth, and the life: no man cometh unto the Father,
but by me.</span>" <a href="https://www.kingjamesbibleonline.org/John-14-6/">John 11:6</a></div>
</div>
<br><br>
<p ofbFadeInOnScroll class="section-header">God says we need to change drivers</p>
<div ofbFadeInOnScroll class="section-paragraph">
<div class="verse">"But as many as received him to them gave he power to become the sons of God,
even to them that believe on His name." <a href="https://www.kingjamesbibleonline.org/John-1-12/">John 1:12</a></div>
<br><br>
Salvation is when we realize our own sin and because of that realization we repent of our wrong doing
and turn to Christ asking Him to save us and by faith receiving Jesus Christ as our personal living Saviour.
Each individual has the choice to reject or accept the gift of eternal life. What will your choice be?
If you understand that you are a sinner and the need to repent, you can do so right now. Pray to God, repent
of your sin and ask Him to come into your life.
<br><br>
If you would like more information or if you have put your faith in Jesus alone for salvation and would like further
guidance please click <a routerLink="/contact">here to contact us.</a>
</div>
</div>
<div sideBar class="side-bar">
<upcoming-events-component [numberOfEventsToShow]="4" ></upcoming-events-component>
</div>
</secondary-page-component>

View File

@ -0,0 +1,25 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { SalvationPageComponent } from './salvation-page.component';
describe('SalvationPageComponent', () => {
let component: SalvationPageComponent;
let fixture: ComponentFixture<SalvationPageComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ SalvationPageComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(SalvationPageComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@ -0,0 +1,15 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-salvation-page',
templateUrl: './salvation-page.component.html',
styleUrls: ['./salvation-page.component.css']
})
export class SalvationPageComponent implements OnInit {
constructor() { }
ngOnInit() {
}
}

View File

@ -113,8 +113,8 @@ export class SermonLargeComponent extends SermonSmallComponent implements OnInit
s = s as boolean;
if (s === true){
this.sermonService.deleteSermon(this.id).subscribe(
success => { console.log(success); },
error => { console.log(error); }
success => { },
error => { console.error(error); }
);
}

View File

@ -99,7 +99,7 @@ export class SermonsComponent implements OnInit {
this.addSermons(sermons);
this.loading = false;
},
error => console.log(error) );
error => console.error(error) );
}
addSermons(sermons: Sermon[]): void{

View File

@ -5,8 +5,6 @@
<p ofbFadeInOnScroll class="section-paragraph">
Join Us every Sunday and Wednesday for challenging messages from the Bible and fellowship with others!
Bring the whole family!
<br><br>
Nursery is available during all services.
</p>
<br>
<div ofbFadeInOnScroll class="imageBorder">
@ -22,19 +20,19 @@
<br><br>
<p ofbFadeInOnScroll class="section-header">Sunday Morning 11 AM</p>
<p ofbFadeInOnScroll class="section-paragraph">
Sunday Morning church service immediately follows Sunday School service with a short break inbetween. Nursery and childrens church for ages up through age 4 is available during the Sunday morning hour.
Sunday Morning church service immediately follows Sunday School service with a short break in between. Nursery and childrens church is available during the Sunday morning hour.
</p>
<br><br>
<p ofbFadeInOnScroll class="section-header">Sunday Evening 7 PM</p>
<p ofbFadeInOnScroll class="section-paragraph">
Sunday night is the last opportunity to hear a great message before the work week starts. We encourage you to come visit us each sunday night at 7 P.M. Nursery services are available.
Sunday night is the last opportunity to hear a great message before the work week starts. We encourage you to come fellowship with us each sunday night at 7 P.M. Nursery services are available.
</p>
<br><br>
<p ofbFadeInOnScroll class="section-header">Wednesday Evening 7 PM</p>
<p ofbFadeInOnScroll class="section-paragraph">
Join us on Wednesday night for a Bible study that will surely challenge you in your walk with the Lord. Wednesday evening is a great time to come and hear a great message from the Bible to stay focused during the week. Nursery and childrens church are also available.
Join us on Wednesday night for a Bible study that will challenge you in your walk with the Lord. Wednesday evening is a great time to come and hear a great message from the Bible to stay focused during the week. Nursery and childrens church are also available.
</p>
<br><br>

View File

@ -30,7 +30,6 @@ export class UpcomingEventsComponent implements OnInit {
this.eventService.getEvents(1).subscribe(events => {
this.events = events.slice(0,this.numberOfEventsToShow);
this.loading = false;
console.log(this.events)
});
}

View File

@ -3,6 +3,25 @@
font-size: 1.2em;
}
a{
color: inherit;
}
a:visited{
color: inherit;
}
.action{
display: block;
font-weight: bold;
font-size: 20px;
margin: 20px;
}
.align-top{
vertical-align: top;
}
.side-bar-header{
text-align: center;
@ -16,10 +35,36 @@
margin-bottom: 10px;
}
img{
.shadow{
border-radius: 5px;
width: 100%;
-webkit-box-shadow: 3px 3px 5px 0px rgba(50, 50, 50, 0.75);
-moz-box-shadow: 3px 3px 5px 0px rgba(50, 50, 50, 0.75);
box-shadow: 3px 3px 5px 0px rgba(50, 50, 50, 0.75);
}
.container-3-col{
width: 100%;
}
.container-3-col > button{
width: calc(33% - 12px);
}
.container-3-col > button ~ button{
margin-left: 18px;
}
@media(max-width: 600px){
.container-3-col{
text-align: center;
}
.container-3-col > button{
width: 90%;
margin: 10px;
}
.container-3-col > button ~ button{
margin-left: 10px;
}
}

View File

@ -2,15 +2,19 @@
<div mainContent>
<div>
<p ofbFadeInOnScroll class="section-header">Who We Are</p>
<p ofbFadeInOnScroll class="section-paragraph">
Old Fashion Baptist Church is a small church located in Butte, Montana. We meet regularly throughout the week
<div ofbFadeInOnScroll class="section-paragraph">
Old Fashion Baptist Church is a small independent baptist church located in Butte, Montana. We meet regularly throughout the week
to spread the word of God as well as encourage and challenge believers in their Christian life.
For service times click <a routerLink="/services">here</a>. Contact information and directions are available
<a routerLink="/contact">here</a>
</p>
<br><br>
<div class="container-3-col">
<button md-raised-button color="primary" routerLink="/services"><i ofbicon>access_time</i> Service Schedule</button><!--
--><button md-raised-button color="primary" routerLink="/location"><i ofbicon>directions</i> Directions</button><!--
--><button md-raised-button color="primary" routerLink="/contact"><i ofbicon>mail_outline</i> Contact Us</button>
</div>
</div>
<br><br>
<div ofbFadeInOnScroll class="imageBorder">
<img class="image" src="assets/images/home-images/tiny/church.jpg" alt="Church Image" />
<img class="image shadow" src="assets/images/home-images/tiny/church.jpg" alt="Church Image" />
</div>
<br><br>
@ -39,6 +43,33 @@
We also offer Sunday School classes for all age groups of kids. This is a great opportunity for
children to recieve a message that is appropriate for their age.
</p>
<br><br>
<p ofbFadeInOnScroll class="section-header">Jesus</p>
<p ofbFadeInOnScroll class="section-paragraph">
Jesus, God who became flesh and dwelt among us by being born of the virgin Mary is our only hope for eternal life.
Because of the sin and wickedness of mankind a wage was earned - that wage is death. Out of His great love
for us God sent his only begotten Son who lived on this earth as a man who "was in all points tempted like as we are, yet without sin" <a href="https://www.kingjamesbibleonline.org/Hebrews-4-15/">Hebrews 4:15</a>.
<br><br>
He was sinless - He layed down His life and became the sacrifice for all! <a routerLink="/salvation">Have you accepted Him?</a>
</p>
<br><br>
<p ofbFadeInOnScroll class="section-header">The Bible</p>
<p ofbFadeInOnScroll class="section-paragraph">
In the beginning was the Word, and the Word was with God, and the Word was God. <a href="https://www.kingjamesbibleonline.org/John-1-1/">John 1:1</a>
<br><br>
All scripture is given by inspiration of God, and is profitable for doctrine, for reproof, for correction, for instruction in righteousness:
That the man of God may be perfect, thoroughly furnished unto all good works. <a href="https://www.kingjamesbibleonline.org/2-Timothy-3-16_3-17/">2 Timothy 3:16 - 17</a>
<br><br>
But he answered and said, <span class="red">It is written, Man shall not live by bread alone, but by every word that proceedeth out of the mouth of God.</span> <a href="https://www.kingjamesbibleonline.org/Matthew-4-4/">Matthew 4:4</a>
<br><br>
The words of the LORD are pure words: as silver tried in a furnace of earth, purified seven times.
Thou shalt keep them, O LORD, thou shalt preserve them from this generation for ever. <a href="https://www.kingjamesbibleonline.org/Psalms-12-6_12-7/">Psalm 12:6 - 7</a>
<br><br>
<span class="red">Heaven and earth shall pass away, but my words shall not pass away.</span> <a href="https://www.kingjamesbibleonline.org/Matthew-24-35/">Matthew 24:35</a>
</p>
</div>
</div>
<div sideBar ofbFadeInOnScroll>

View File

@ -5,7 +5,6 @@ import { DomSanitizer} from '@angular/platform-browser';
export class SafeUrlPipe implements PipeTransform {
constructor(private sanitizer: DomSanitizer) {}
transform(url) {
console.log(this.sanitizer.bypassSecurityTrustResourceUrl(url));
return this.sanitizer.bypassSecurityTrustResourceUrl(url);
}
}

View File

@ -12,7 +12,7 @@ export class BibleVerseService {
constructor(private http: Http){}
randomVerse(){
return this.http.get(RANDOM_VERSE_URL).map(this.gotData).catch(this.dataError);
//return this.http.get(RANDOM_VERSE_URL).map(this.gotData).catch(this.dataError);
}
gotData(res: Response){

View File

@ -16,7 +16,6 @@ export class LoginService {
private options: RequestOptions;
constructor(private http: Http){
console.log()
this.options = new RequestOptions({
withCredentials: true
});

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

View File

@ -12,6 +12,10 @@ html, body{
height: 100%;
}
.red{
color: red;
}
/*MATERIAL FONT FOR ICONS*/
@font-face {
font-family: 'Material Icons';