diff --git a/package-lock.json b/package-lock.json index 891d212..cfdcb25 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "bolingbrook-church", - "version": "1.2.8", + "version": "1.2.9", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index d81afa9..e6efba7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bolingbrook-church", - "version": "1.2.8", + "version": "1.2.9", "license": "MIT", "angular-cli": {}, "scripts": { diff --git a/src/app/components/atoms/_typography.scss b/src/app/components/atoms/_typography.scss index 1c4a3ee..89649b1 100644 --- a/src/app/components/atoms/_typography.scss +++ b/src/app/components/atoms/_typography.scss @@ -21,6 +21,7 @@ a[href], button, .mat-button, .mat-raised-button, .mat-icon-button { h1, h2, h3, h4, h5, h6 { font-family: 'Khand', sans-serif; font-weight: 400; + margin: .5em 0; } h1 { @@ -28,39 +29,32 @@ h1 { margin: 1em 0 .5em; @include break(medium) { font-size: 55px; } - @include break(small) { font-size: 45px; } - @include break(tiny) { font-size: 38px; } - @include break(micro) { font-size: 36px; } + @include break(small) { font-size: 46px; } + @include break(tiny) { font-size: 44px; } + @include break(micro) { font-size: 40px; } } h2 { - font-size: 41px; - margin: 1em 0 .5em; - - @include break(small) { font-size: 37px; } - @include break(tiny) { font-size: 29px; } - @include break(micro) { font-size: 27px; } + font-size: 48px; + @include break(small) { font-size: 42px; } + @include break(tiny) { font-size: 36px; } + @include break(micro) { font-size: 32px; } } h3 { - font-size: 27px; - margin: 1em 0 .5em; - - @include break(small) { font-size: 23px; } - @include break(tiny) { font-size: 23px; } - @include break(micro) { font-size: 21px; } + font-size: 32px; + @include break(small) { font-size: 30px; } + @include break(tiny) { font-size: 28px; } + @include break(micro) { font-size: 26px; } } h4 { - font-size: 19px; - margin: 1em 0 .5em; - - @include break(small) { font-size: 17px; } - @include break(tiny) { font-size: 17px; } - @include break(micro) { font-size: 16px; } + font-size: 29px; + @include break(small) { font-size: 26px; } + @include break(tiny) { font-size: 24px; } + @include break(micro) { font-size: 22px; } } h5 { - font-size: 16px; - margin: 1em 0 .5em; + font-size: 22px; } \ No newline at end of file diff --git a/src/app/components/organisms/footer.html b/src/app/components/organisms/footer.html index 6a719a2..06cee4c 100644 --- a/src/app/components/organisms/footer.html +++ b/src/app/components/organisms/footer.html @@ -1,6 +1,6 @@
- Our live stream begins at 12pm Central Time on Saturday’s. + Our live stream begins at 12pm Central Time on Saturdays.
@@ -12,7 +12,7 @@
-

About

+

About

-

Get Involved

+

Get Involved

  • Giving
    • diff --git a/src/app/components/organisms/footer.scss b/src/app/components/organisms/footer.scss index 0184cf2..e0d3ff1 100644 --- a/src/app/components/organisms/footer.scss +++ b/src/app/components/organisms/footer.scss @@ -41,7 +41,7 @@ div.footer { color: $color-grey-100; - h3 { + h4 { padding: 0 16px; } diff --git a/src/app/components/pages/about.html b/src/app/components/pages/about.html index ead6049..b9b29ef 100644 --- a/src/app/components/pages/about.html +++ b/src/app/components/pages/about.html @@ -1,22 +1,34 @@ - -

    Our Story

    + +

    OUR STORY
    +
    +
    +

    + Bolingbrook Church is passionate about helping those far from God to become fully committed Christ-centered disciples. This + is more than just lip-service. We center every- thing we do around helping people understand exactly who Jesus was, + what he was talking about nearly two thousand years ago, and what that means for their lives today. Our hope is that + as they begin to understand his words, they begin to live it out in the everyday. We want them to be inspired to + connect to other people who are trying to do the same, to grow in their passion for Jesus and the people He’s called + them to serve, and then to invite those around them on that same journey. +

    +
    +
    +

    MISSION

    -

    Developing Christ-like disciples of all ages and peoples.

    -

    - We exist to help people become fully committed Christ-like disciples. This is more than just lip-service. We are passionate - about helping people understand exactly who Jesus was, what he was talking about nearly two thousand years ago, and - what that means for their lives today. + Bolingbrook Church is founded on the belief that the church exists to continue the work of Jesus Christ in our world. While + Jesus was on earth, He preached the good news to the poor, freed the oppressed, confronted the evils in our world, + and removed any obstacle that would keep people from living fully as God intended. Jesus demonstrated a passionate + love for outsiders; He gave them unlimited access to God’s transforming love. In the same manner, we believe that + the church ought to be a living, loving, growing community that brings healing to our world. This conviction drives + our purpose. Simply put:

    - +

    - Our hope is that as they begin to understand his words, they begin to live it out in the everyday. We want them to be inspired - to connect to other people who are trying to do the same, to serve others based on their passion, and to invite others - to do the same by coming into their relationship with Jesus Christ. + WE EXIST TO DEVELOP CHRIST-LIKE DISCIPLES OF ALL AGES & PEOPLES

    @@ -24,24 +36,97 @@

    Developing Christ-like disciples of all ages and peoples.

    VISION

    -

    Creating spaces for the people God misses the most

    - +

    + Creating Spaces for the people God misses the most. +

    +

    - The church we see goes far beyond the confines of church walls, but one that utilizes a multitude of spaces to create genuine - relationships and facilitate growth. When we say spaces, we mean just that: houses of worship, schools, community centers, - concert halls, art & music centers you name it. We desire to create a multiplicity of spaces all over the world - that make it possible for us to reach the ones God misses the most! For us, the people God misses the most are those - who are far from having their own personal relationship with God. + When you are finally at the point where you are trying to understand God and what He has planned for your life — it should + be easy, not hard. At Bolingbrook Church we are hyper-focused on the people God misses the most, those who are far + from God yet wanting to come near. For their sake, we have done our best to keep church simple. We seek to serve + those who are looking to begin exploring who God is and what Jesus has done for them. Our goal is that as they draw + towards Christ, they catch the vision and begin inviting others to embark on the same journey they are partaking + in. In order to facilitate this process, we’ve had to be incredibly intentional. This means rather than provide people + a plethora of programs to choose from, we have three disciple-making spaces that serve as intentional Jesus-Centered + communities that facilitate genuine relationships and foster authentic spiritual growth. This is not a one-size-fits-all + approach, rather we are seeking to engage each person on their journey right where they are to move them along in + a fluid disciple-making process.

    +
    +
    + +
    +
    +

    INVITE. CONNECT. GROW.

    - Whether that means they gave up on church, or have never really explored God for themselves, we believe that those are the - people God misses so deeply. So, we seek to provide an embracing multicultural community where the people God misses - the most can freely inquire of God, and explore what Jesus teaches as they walk at their own pace nearer to Him. We - believe that once people feel they belong, they can become inspired to believe Jesus’ plan for their life and begin - engaging the world as Jesus sees it. + Invite - Our Invite spaces are corporate worship gatherings geared at helping people encounter a loving God + who has been yearning for relationship with them. +

    +

    + Connect - Our Connect spaces are intimate Jesus Communities that facilitate genuine relationships. +

    +

    + Grow - Our Grow Spaces are more intimate, even smaller groups who are committed to fostering in one another + authentic spiritual growth. +

    +

    + When we talk of these disciple-making spaces, we are stating that as a result of participating in our spaces, people will + come to entrust their lives to Jesus and his teachings, connect through intentional Jesus communities, serve the + neighborhood/world around them, give their time and resources to the church, and continually invite others into relationship + with Jesus Christ. +

    +

    + As a result, people will become freer beings, liberated to live life in abundance as God intended humanity to live it. Enabled + by the Holy Spirit, we wholeheartedly believe that those who venture in the path of discipleship will become more + loving, more joyful, more peaceable, more kind, having more patience, having more goodness, being more gentle, and + becoming more self-controlled. Thereby, fulfilling, the mission of the church to develop Christ-like disciples of + all ages and peoples.

    - - Our Beliefs
    + +
    +
    +

    VALUES

    +

    + Every community has some inherent values that serve as core behavioral traits for those + who choose to join in. At Bolingbrook Church, we have identified five core values that + we call all those who commit to our community to embrace and eventually live by. +

    + +

    Prayerful

    +

    + We include prayer in everything we do, knowing that it is our most powerful vehicle through which we can directly connect + to God. Through prayer, we give God unlimited access to our lives in order to accomplish His sovereign will through + us. +

    + +

    Gracious Flexibility

    +

    + We are willing to change or modify established human traditions and embrace biblical truths and practices in order to fully + demonstrate God’s eternal love. +

    + +

    Church of One

    +

    + We embrace, celebrate, and invite a multiplicity of cultures, ethnicities, generations, and various social economic classes + to come together as one family, unified to fulfill a grander God-given vision to create spaces for those who find + themselves far from God. +

    + +

    Authentic

    +

    + We foster authenticity by modeling vulnerability in leadership, creating a culture of acceptance, cultivating genuine compassion + and empathy to those around us, in order to display the depths of God’s love. +

    + +

    Intentional Excellence

    +

    + We are committed to using our strengths, talents, and thoughtful planning to create a culture that reflects the wonder of + God. +

    + + Our Beliefs +
    +
    diff --git a/src/app/components/pages/about.scss b/src/app/components/pages/about.scss new file mode 100644 index 0000000..c238027 --- /dev/null +++ b/src/app/components/pages/about.scss @@ -0,0 +1,26 @@ +@import '../atoms/colors'; + +main section div.content { + h2 { + color: black; + } + + p { + color: $color-grey-000; + } + + &.values { + h4 { + margin-bottom: 0; + } + p.value { + margin-top: 0; + } + + a { + margin-top: 20px; + color: black; + background-color: white; + } + } +} diff --git a/src/app/components/pages/about.ts b/src/app/components/pages/about.ts index 7c9e5b1..ddc9363 100644 --- a/src/app/components/pages/about.ts +++ b/src/app/components/pages/about.ts @@ -2,7 +2,8 @@ import { Component } from '@angular/core'; import { Analytics } from '../../services'; @Component({ - templateUrl: './about.html' + templateUrl: './about.html', + styleUrls: [ './about.scss' ] }) export class AboutComponent { diff --git a/src/app/components/pages/giving.html b/src/app/components/pages/giving.html index 86ee232..c4f6fcf 100644 --- a/src/app/components/pages/giving.html +++ b/src/app/components/pages/giving.html @@ -8,11 +8,11 @@

    WAYS TO GIVE

    - + -

    ENVELOPE

    +

    ENVELOPE

    cash or check     @@ -20,7 +20,7 @@

    ENVELOPE

    -

    ONLINE

    +

    ONLINE

    Adventist Giving @@ -28,7 +28,7 @@

    ONLINE

    -

    ONLINE

    +

    ONLINE

    Easy Tithe @@ -36,7 +36,7 @@

    ONLINE

    -

    TEXT AMOUNT TO

    +

    TEXT AMOUNT TO

    630-246-4885 @@ -58,44 +58,46 @@

    Tithing is the beginning of giving

    The Bible talks of tithing as the beginning point for giving. The word tithe literally means a tenth, that is 10% of our - income. When we give the first 10% of our income to the church, we put God first in our lives and we help spread the - story of His love. In fact, tithing is more than just giving something to God, it is giving back to God what He already - gave to us. Of course, there is no way we can ever repay God for the ultimate gift of His Son on the cross, but in - tithing we begin to express our gratitude, trust, and worship to Him who has given us all. + income. When we give the first 10% of our income to the church, we put God first in our lives and we help spread + the story of His love. In fact, tithing is more than just giving something to God, it is returning to God what you + believe He provided for you in the first place. Tithing is an act of faith, a gesture of gratitude that responds + to God’s faithfulness in your life.

    - Moreover, our tithe helps support the global mission of the Seventh Day Adventist church and its Pastors. + + Your tithe helps support the vision of the Illinois conference of Seventh-Day Adventists to grow healthy disciple-making + churches all over Illinois. These funds go to support the conference mission and it’s pastors. +

    Your Offering Helps Create Spaces for the People God misses the Most.

    - We are all called to be change agents in some way. When you give an offering to our local church it continues to fuel change - in the lives of so many we serve on a weekly basis. Your offering makes our vision possible to see God work through - a variety of spaces to reach the ones God misses the most. + When your generosity extends beyond tithing, that is called an offering. Offering is going above and beyond What God has + asked of us, and is the continuation of our expression of faithfulness. Offering is an expression of our gratitude, + trust, and worship to Him who has given us all. Your offering is a way of saying thank you to God, and a sign of + your commitment to get involved with what God is doing in the world around you. It’s one of the many ways you declare + that you care about what God is doing in the world, and you want to partner with Him to see lives changed for His + glory. Your offering to the Bolingbrook Church helps fuel change in the lives of so many people who are served by + our spaces on a weekly basis. Your offering makes our vision possible to impact the lives of those God misses the + most one space at a time.

    -

    More Opportunities to Give

    - -
    Food Pantry

    - The Bolingbrook Church Food Pantry has helped hundreds of families since its beginning. The number of families that receive - groceries each month continues to grow. Join us in serving our community as many are facing difficult financial circumstances. + + Your offering remains at the Bolingbrook Church and helps fund our current spaces, our staff, and continues to fuel our + vision to develop more spaces throughout the Chicago-land area that seek to reach the people God misses the most. +

    +

    More Opportunities to Give

    +
    Crest Hill Christian School

    The Crest Hill Christian School is one of our newest spaces in fulfilling the vision to reach the ones God misses the most. Our School exists to show children Jesus, nurture their love for Him and others, teach them to think, and empower them to serve. Join us in supporting our school.

    - -
    Go & Tell
    -

    - If you’ve ever felt called by God to help plant a new church or help make more disciples, then this may be your opportunity. - Go & Tell funds help the Illinois Conference plant new churches throughout Illinois and give existing churches - like ours more resources to spread the good news of God’s love. -

diff --git a/src/app/components/pages/giving.scss b/src/app/components/pages/giving.scss index 1d4a861..be174fb 100644 --- a/src/app/components/pages/giving.scss +++ b/src/app/components/pages/giving.scss @@ -27,8 +27,9 @@ div.giving-list { color: black; } - h3 { + h4 { margin: 5px 0 0; + font-size: 27px; } } } diff --git a/src/app/components/pages/giving.spec.ts b/src/app/components/pages/giving.spec.ts new file mode 100644 index 0000000..623eb94 --- /dev/null +++ b/src/app/components/pages/giving.spec.ts @@ -0,0 +1,64 @@ +import { expect, sinon, async, MockBuilder } from 'testing'; +import { GivingComponent } from './giving'; +import { Analytics, Observable } from 'app/services'; + +describe('GivingComponent', () => { + + describe('give', () => { + it('should stop propogation', () => { + const analytics = MockBuilder.of(Analytics) + .withStub('event', Observable.empty()) + .build(); + + const giving = new GivingComponent(analytics); + expect(giving.give('easy')).to.be.false; + }); + + [ + ['easy', 'easytithe'], + ['adventist', 'adventistgiving'], + ['default', 'adventistgiving'] + ].forEach(([type, href]) => { + it('should record analytics event and then navigate', () => { + const analytics = MockBuilder.of(Analytics) + .withStub('event', Observable.of('')) + .build(); + + const location = {} as Location; + + const giving = new GivingComponent(analytics); + giving._location = location; + giving.give(type); + + expect(analytics.event).to.have.been.calledWithMatch('nav'); + expect(location.href).to.contain(href); + }); + }); + }); + + describe('showing the envelope', () => { + it('should register analytics event', () => { + const analytics = MockBuilder.of(Analytics) + .withStub('event', Observable.of('')) + .build(); + + const giving = new GivingComponent(analytics); + const response = giving.showEnvelope(); + + expect(response).to.be.false; + expect(giving.envelopeShown).to.be.true; + expect(analytics.event).to.have.been.calledWithMatch('overlay'); + }); + }); + + describe('hiding the envelope', () => { + it('just hide the envelope', () => { + const giving = new GivingComponent(undefined); + giving.envelopeShown = true; + giving.hideEnvelope(); + + expect(giving.envelopeShown).to.be.false; + }); + }); + +}); diff --git a/src/app/components/pages/giving.ts b/src/app/components/pages/giving.ts index b19c250..e316edd 100644 --- a/src/app/components/pages/giving.ts +++ b/src/app/components/pages/giving.ts @@ -8,6 +8,7 @@ import { Analytics } from '../../services'; export class GivingComponent { envelopeShown: boolean = false; + _location: Location = location; constructor( private analytics: Analytics @@ -16,7 +17,7 @@ export class GivingComponent { give(type: string): boolean { this.analytics.event('nav', 'leave', 'donate') .subscribe(() => { - location.href = (type === 'easy') ? + this._location.href = (type === 'easy') ? 'http://www.easytithe.com/dl/?uid=boli301244t7' : 'https://www.adventistgiving.org/?OrgID=ANF4BV'; }); @@ -26,6 +27,7 @@ export class GivingComponent { showEnvelope() { this.analytics.event('overlay', 'show', 'giving envelope'); this.envelopeShown = true; + return false; } hideEnvelope() { diff --git a/src/app/components/pages/home.html b/src/app/components/pages/home.html index 6f95d2d..de6481f 100644 --- a/src/app/components/pages/home.html +++ b/src/app/components/pages/home.html @@ -16,8 +16,6 @@

Latest Sermon

-

Join Us

-

Worship With Us

Every Saturday at 12:00 PM
1251 Windham Pkwy, Romeoville, IL 60446
@@ -26,28 +24,42 @@

Bible Study

Every Wednesday at 7:00 PM
301 E Boughton Rd, Bolingbrook, IL 60440
+

Sabbath School

+
Every Saturday
+
    +
  • 10:45 AM - Adult Growth Group
    • +
  • 10:45 AM - Discipletown Growth Groups (ages 0-11)
    • +
  • 11:00 AM - Student Connections Middle School & High School Experience (ages 12-18)
    • +
  • 12:00 PM - Kids Experience (ages 5-9)
    • +
+
1251 Windham Pkwy, Romeoville, IL 60446
+
-

- Creating Spaces for the People God Misses the Most -

- +

CREATING SPACES FOR THE PEOPLE GOD MISSES THE MOST

- The church we see goes far beyond the confines of church walls, but one that utilizes a multitude of spaces to create genuine - relationships and facilitate growth. When we say spaces, we mean just that: houses of worship, schools, community centers, - concert halls, art & music centers you name it. We desire to create a multiplicity of spaces all over the world - that make it possible for us to reach the ones God misses the most! For us, the people God misses the most are those - who are far from having their own personal relationship with God. + The church we see goes far beyond the confines of traditional church walls, but one that utilizes a multitude of spaces to + facilitate genuine relationships and foster spiritual growth. When we say spaces, we don’t just mean buildings or + corporate gatherings; but rather intentional Jesus-centered communities that seek to create opportunities for the + people God misses the most to be drawn to him and live out the rest of their lives for Him.

+ +

+ For us, the people God misses the most are those who are far from having their own personal relationship with God. Whether + that means they gave up on church, or have never really explored God for themselves, we believe that those are the + people God misses so deeply. So, we seek to create a multiplicity of Jesus-centered-highly-relational spaces all + over the Chicagoland area, and eventually all over the world that make it possible to reach the ones God misses the + most! +

+

- Whether that means they gave up on church, or have never really explored God for themselves, we believe that those are the - people God misses so deeply. So, we seek to provide an embracing multicultural community where the people God misses - the most can freely inquire of God, and explore what Jesus teaches as they walk at their own pace nearer to Him. We - believe that once people feel they belong, they can become inspired to believe Jesus’ plan for their life and begin - engaging the world as Jesus sees it. + Whether you’ve experienced one of our spaces before or are looking to explore for the first time, we hope you find an embracing + multicultural environment where you feel free to inquire of God, and explore what Jesus teaches as you walk at your + own pace nearer to Him. Our goal is to help you belong, so that eventually you can become inspired to believe Jesus’ + plan for your life and begin engaging the world as Jesus sees it.

diff --git a/src/app/components/pages/home.scss b/src/app/components/pages/home.scss index b30cc82..f8b900c 100644 --- a/src/app/components/pages/home.scss +++ b/src/app/components/pages/home.scss @@ -20,13 +20,16 @@ bc-header { } } +h3.black { + color: black; +} + main section.join div.content { color: black; margin-bottom: 15px; - h3 { + h4 { column-width: 800px; - margin: 1em 0 0; } div.time, div.location {