Permalink
Browse files

fix yarn shit

  • Loading branch information...
bill-burgess committed Oct 11, 2017
2 parents 49965c3 + 8a84109 commit 9e2324718ec7b6ddde298beda41e59d16602b080
Showing with 1,628 additions and 309 deletions.
  1. +4 −2 src/App.js
  2. +2 −1 src/components/Embedly/Embedly.js
  3. +0 −55 src/components/Home/Advice.js
  4. +33 −6 src/components/Home/Contact.js
  5. +16 −13 src/components/Home/Points.js
  6. +4 −3 src/components/Home/UserMessage.js
  7. +52 −0 src/components/Home/contact.css
  8. +25 −22 src/components/Home/homeData.js
  9. +5 −5 src/components/Home/index.js
  10. +39 −0 src/components/Home/points.css
  11. +63 −0 src/components/LinkBlockDropdown/index.js
  12. +44 −0 src/components/LinkBlockDropdown/linkBlockDropdown.css
  13. +2 −2 src/components/NavBar/index.js
  14. +29 −0 src/components/PointsAvailable/index.js
  15. +34 −0 src/components/PointsAvailable/pointsAvailable.css
  16. +10 −19 src/components/RewardCards/Reward.js
  17. +6 −4 src/components/RewardCards/RewardPreview.js
  18. +5 −14 src/components/RewardCards/Rewards.js
  19. +1 −0 src/components/RewardCards/reward.css
  20. +0 −30 src/components/RewardCards/rewards.css
  21. +22 −0 src/components/RewardClaimed/index.css
  22. +80 −17 src/components/RewardClaimed/index.js
  23. +1 −1 src/components/Rewards/EarnMorePoints.js
  24. +5 −5 src/components/Rewards/HowToGetRewards.js
  25. +1 −1 src/components/Rewards/earnMorePoints.css
  26. +10 −0 src/components/Rewards/howToGetRewards.css
  27. +2 −2 src/components/Rewards/index.js
  28. +1 −1 src/components/Rewards/rewardsData.js
  29. +52 −8 src/components/RewardsView/MyRewards.js
  30. +12 −7 src/components/RewardsView/index.css
  31. +10 −26 src/components/RewardsView/index.js
  32. +39 −0 src/components/RewardsView/myRewards.css
  33. +124 −0 src/components/SectionPage/ArticlePage.js
  34. +8 −4 src/components/SectionPage/BabyAndToddler.js
  35. +1 −1 src/components/SectionPage/YourPregnancy.js
  36. +184 −0 src/components/SectionPage/articlePage.css
  37. +151 −17 src/components/SectionPage/babyAndToddlerArticles.js
  38. +292 −14 src/components/SectionPage/supportAndHelpArticles.js
  39. +238 −24 src/components/SectionPage/yourPregnancyArticles.js
  40. BIN src/img/ArticlePages/0-3months.png
  41. BIN src/img/ArticlePages/1-3years.jpg
  42. BIN src/img/ArticlePages/3-5years.jpg
  43. BIN src/img/ArticlePages/3-6months.png
  44. BIN src/img/ArticlePages/6-12months.jpg
  45. BIN src/img/ArticlePages/dangerSigns.png
  46. BIN src/img/ArticlePages/feelingAlone.jpg
  47. BIN src/img/ArticlePages/feelingStressed.jpg
  48. BIN src/img/ArticlePages/feelingUnsafe.jpg
  49. BIN src/img/ArticlePages/feelingUnwell.jpg
  50. BIN src/img/ArticlePages/foodAndNutrition.png
  51. BIN src/img/ArticlePages/gettingAMidwife.png
  52. BIN src/img/ArticlePages/notSleeping.jpg
  53. BIN src/img/ArticlePages/whatNotToEat.png
  54. BIN src/img/angle/red-angle-left.png
  55. BIN src/img/angle/red-angle-right.png
  56. +3 −0 src/img/downAngle.svg
  57. +3 −0 src/img/heart.svg
  58. +3 −0 src/img/upAngle.svg
  59. +2 −2 src/reducers/index.js
  60. +2 −2 src/reducers/{homeDropdown.js → linkDropdown.js}
  61. +4 −0 src/reducers/pointsTotal.js
  62. +3 −0 src/reducers/userRewardIds.js
  63. +1 −1 src/state/index.js
View
@@ -16,7 +16,7 @@ import Challenges from './components/Challenges'
import YourPregnancy from './components/SectionPage/YourPregnancy'
import SupportAndHelp from './components/SectionPage/SupportAndHelp'
import BabyAndToddler from './components/SectionPage/BabyAndToddler'
// import ArticlePage from './components/ArticlePage'
import ArticlePage from './components/SectionPage/ArticlePage'
import ChallengesResult from './components/ChallengesResult'
class App extends Component {
@@ -35,8 +35,10 @@ class App extends Component {
<Route exact path='/your-pregnancy' component={YourPregnancy} />
<Route exact path='/support-and-help' component={SupportAndHelp} />
<Route exact path='/baby-and-toddler' component={BabyAndToddler} />
{/* <Route exact path='/your-pregnancy/:articleId' component={ArticlePage} /> */}
<Route exact path='/your-pregnancy/:articleId' component={ArticlePage} />
<Route exact path='/challenges/:id/result' component={ChallengesResult} />
<Route exact path='/support-and-help/:articleId' component={ArticlePage} />
<Route exact path='/baby-and-toddler/:articleId' component={ArticlePage} />
</div>
)
}
@@ -4,12 +4,13 @@ import React from 'react'
class Embedly extends React.Component {
render () {
return (
<div>
<div className='responsive-object'>
<a
className='embedly-card'
data-card-controls={0}
data-card-theme='dark'
href={this.props.href}
style={{width: '600px'}}
>
Link
</a>

This file was deleted.

Oops, something went wrong.
@@ -1,15 +1,42 @@
import React, {Component} from 'react'
import { Button, Container, Row, Col } from 'reactstrap'
import heart from '../../img/heart.svg'
import nph from '../../img/logo.png'
import './contact.css'
class Contact extends Component {
render () {
return (
<div>
<p>Contact us - Te Puia Hospital:</p>
<p> 06 864 6803 </p>
<br />
<p>Midwives </p>
<p>NPH - Corrina Parata: 021 765053</p>
<p>Independent - Lisa Anne: 021 1234567</p>
<div className='send-div'>
<Container>
<img className='send-heart' src={heart} />
<p className='send-text'>
Do you have a friend or family member you think would benefit from our app?
</p>
<Button className='send-button'> Send to family & friends </Button>
</Container>
</div>
<div className='contact-div'>
<Container>
<p>Contact us - Te Puia Hospital:</p>
<p> 06 864 6803 </p>
<br />
<p>Midwives </p>
<p>NPH - Corrina Parata: 021 765053</p>
</Container>
</div>
<div className='nph-div'>
<Row>
<Col xs='4' className='nph-img-div'>
<img className='nph-img' src={nph} />
</Col>
<Col xs='8'>
<h2 className='nph-text'> by Ngati Porou Hauora</h2>
</Col>
</Row>
</div>
</div>
)
}
@@ -1,25 +1,28 @@
import React, {Component} from 'react'
import { connect } from 'react-redux'
import { Card } from 'reactstrap'
import { Card, Container, Col, Row, CardTitle, CardText } from 'reactstrap'
import trophy from '../../img/resultsTrophy.svg'
import './points.css'
class Points extends Component {
render () {
const { pointsTotal } = this.props
return (
<div>
<Card>
<div className='home-points'>
<div className='home-points-text'>
<p>You have {pointsTotal} points</p>
<p>Check your rewards</p>
</div>
<div className='home-points-img'>
<img src='https://image.flaticon.com/icons/svg/321/321773.svg' alt='' id='trophy-img' />
</div>
</div>
<Container>
<Card className='home-points'>
<Row className='home-points-row'>
<Col className='home-points-text' xs='10'>
<CardTitle className='home-points-total'>You have {pointsTotal} points</CardTitle>
<CardText className='home-points-check'>Check your rewards</CardText>
</Col>
<Col xs='2'>
<img src={trophy} alt='' id='trophy-img' className='home-points-img' />
</Col>
</Row>
</Card>
</div>
</Container>
)
}
}
@@ -4,7 +4,8 @@ import {
Carousel,
CarouselItem,
CarouselControl,
CarouselIndicators
CarouselIndicators,
Container
} from 'reactstrap'
const items = [
@@ -78,7 +79,7 @@ class UserMessage extends Component {
})
return (
<div>
<Container>
<h2>Kia Ora {hasName}</h2>
<Carousel
activeIndex={activeIndex}
@@ -90,7 +91,7 @@ class UserMessage extends Component {
<CarouselControl direction='prev' directionText='Previous' onClickHandler={this.previous} />
<CarouselControl direction='next' directionText='Next' onClickHandler={this.next} />
</Carousel>
</div>
</Container>
)
}
}
@@ -0,0 +1,52 @@
.send-div{
text-align: center;
height: 199px;
width:auto;
background-color: #f9f8f8;
padding-bottom: 10%
}
.send-heart{
height:60px;
width:60px;
padding-top: 25px;
}
.send-text{
padding-top: 17px;
}
.send-button{
margin-top: 19px;
margin-bottom: 20px;
}
.contact-div{
text-align: center;
padding-top: 20px;
padding-bottom: 20px;
}
.nph-div{
height: 83px;
width: auto;
background-color: #f9f8f8;
}
.nph-img{
height:72;
width:66px;
margin-top: 6px;
margin-bottom: 5px;
margin-left: 19px;
}
.nph-text{
font-size:18px;
font-weight:500;
line-height:1.06;
color: #777777;
text-align: left;
padding-top: 29px;
}
@@ -4,36 +4,39 @@ const data = {
pregnancy: {
header: 'Pregnancy',
subheaders: [
{name: 'Food & Nutrition'},
{name: 'Exercise & Fitness'},
{name: 'Common Symptoms'},
{name: 'Smoking, Drugs & Alcohol'},
{name: 'Getting Ready for Baby'},
{name: 'Danger Signs'},
{name: 'Labour & Birth'},
{name: 'Sex During Pregnancy'}
]
{name: 'Food & Nutrition', link: ''},
{name: 'Exercise & Fitness', link: ''},
{name: 'Common Symptoms', link: ''},
{name: 'Smoking, Drugs & Alcohol', link: ''},
{name: 'Getting Ready for Baby', link: ''},
{name: 'Danger Signs', link: ''},
{name: 'Labour & Birth', link: ''},
{name: 'Sex During Pregnancy', link: ''}
],
descText: 'Help with your pregnancy'
},
babyToddler: {
header: 'Baby & Toddler',
subheaders: [
{name: '0 - 3 months'},
{name: '3 - 6 months'},
{name: '6 - 12 months'},
{name: '1-3 years'},
{name: '3 - 5 years'}
]
{name: '0 - 3 months', link: ''},
{name: '3 - 6 months', link: ''},
{name: '6 - 12 months', link: ''},
{name: '1-3 years', link: ''},
{name: '3 - 5 years', link: ''}
],
descText: 'Help with your kids'
},
supportHelp: {
header: 'Support & Help',
subheaders: [
{name: 'Feeling stressed?'},
{name: 'Not sleeping?'},
{name: 'Feeling unhappy?'},
{name: 'Feeling unsafe?'},
{name: 'Feeling unwell?'},
{name: 'Feeling alone?'}
]
{name: 'Feeling stressed?', link: ''},
{name: 'Not sleeping?', link: ''},
{name: 'Feeling unhappy?', link: ''},
{name: 'Feeling unsafe?', link: ''},
{name: 'Feeling unwell?', link: ''},
{name: 'Feeling alone?', link: ''}
],
descText: 'Let us help you'
}
}
}
@@ -1,12 +1,12 @@
import React, { Component } from 'react'
import { connect } from 'react-redux'
import Advice from './Advice'
import data from './homeData'
import Contact from './Contact'
import Points from './Points'
import UserMessage from './UserMessage'
import NavBar from '../NavBar'
import LinkBlockDropdown from '../LinkBlockDropdown'
class Home extends Component {
render () {
@@ -15,18 +15,18 @@ class Home extends Component {
<div className='container'>
<NavBar />
<UserMessage /><hr />
<Points /><hr />
<Points />
{
this.props.isPregnant === 'false'
? null
: <div><Advice section={data.homepageDropdowns.pregnancy} /><hr /></div>
: <div><LinkBlockDropdown section={data.homepageDropdowns.pregnancy} /></div>
}
{
this.props.hasChildren === 'false'
? null
: <div><Advice section={data.homepageDropdowns.babyToddler} /><hr /></div>
: <div><LinkBlockDropdown section={data.homepageDropdowns.babyToddler} /></div>
}
<Advice section={data.homepageDropdowns.supportHelp} /><hr /><br />
<LinkBlockDropdown section={data.homepageDropdowns.supportHelp} /><br />
</div>
<Contact />
</div>
Oops, something went wrong.

0 comments on commit 9e23247

Please sign in to comment.