-
Notifications
You must be signed in to change notification settings - Fork 1
[#49] Coming Soon page #59
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
f1bc5bf
[#49] Create temporary react route / custom layout for Coming Soon ho…
krissy a6d1f2e
[#49] Initial template for Coming Soon page
krissy 3b42cc7
[#49] DML button component (TODO: debug include error)
krissy e97f776
Converts link to button component
steverabino ad3fb78
extra divs removed and page stylised
tanyapowell bc6c235
Merge branch 'master' into 49/coming-soon
tanyapowell 9f63cc7
[#49] Style up Coming Soon page with new UX as per issue #48 and prep…
krissy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| .coming-soon { | ||
| .container-fluid { | ||
| padding-top: 220px; | ||
| background-image: url(../assets/images/coming_soon.png); | ||
| background-position: top center; | ||
| background-repeat: no-repeat; | ||
| background-size: cover; | ||
| background-color: #fff; | ||
| text-align: center; | ||
| min-height: 800px; | ||
| } | ||
|
|
||
| h1 { | ||
| font-size: 6em; | ||
| } | ||
|
|
||
| .dml-logo { | ||
| width: 250px; | ||
| height: 150px; | ||
| background-image: url(../assets/images/DML-Logo-web-150x-high.png); | ||
| background-position: top center; | ||
| background-repeat: no-repeat; | ||
| background-size: cover; | ||
| text-indent: -9999px; | ||
| margin: 0 auto; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| .dml-button { | ||
|
|
||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,3 +2,4 @@ | |
| --- | ||
|
|
||
| @import "background"; | ||
| @import "coming_soon"; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| import React from 'react'; | ||
|
|
||
| export default class ComingSoonLayout extends React.Component { | ||
| static get propTypes() { | ||
| return { | ||
| children: React.PropTypes.any | ||
| }; | ||
| } | ||
|
|
||
| render() { | ||
| return ( | ||
| <div className="page-wrap coming-soon"> | ||
|
|
||
| <div className="container-fluid"> | ||
| <div className="wrapper"> | ||
| { this.props.children } | ||
| </div> | ||
| </div> | ||
| </div> | ||
| ); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| import React from 'react'; | ||
| import { PageHeader } from 'react-bootstrap-4'; | ||
|
|
||
| import { comingSoon } from '../../copy/coming_soon.js'; | ||
| import DMLButton from '../shared/DMLButton.jsx'; | ||
|
|
||
| export default class ComingSoon extends React.Component { | ||
| render() { | ||
| return ( | ||
| <div className="container"> | ||
| <PageHeader className="title">{ comingSoon.title }</PageHeader> | ||
|
|
||
| <div className="dml-logo"> | ||
| Draw My Life logo | ||
| </div> | ||
|
|
||
| <p>{ comingSoon.tagline }</p> | ||
|
|
||
| <DMLButton buttonText={ comingSoon.callToActionText } buttonURL={ comingSoon.callToActionURL } /> | ||
|
|
||
| <div dangerouslySetInnerHTML={ comingSoon.description } /> | ||
| </div> | ||
| ); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| import React from 'react'; | ||
|
|
||
| export default class DMLButton extends React.Component { | ||
| static get propTypes() { | ||
| return { | ||
| buttonText: React.PropTypes.string, | ||
| buttonURL: React.PropTypes.string | ||
| }; | ||
| } | ||
|
|
||
| render() { | ||
| return ( | ||
| <div> | ||
| <a className="btn btn-primary dml-button" href={ this.props.buttonURL } role="button">{ this.props.buttonText }</a> | ||
| </div> | ||
| ); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| export const comingSoon = { | ||
| title: 'Coming Soon', | ||
| tagline: 'A Perception of Migration Through Anonymised Childrens\' Drawings & Data', | ||
| callToActionText: 'Contact Us', | ||
| callToActionURL: 'mailto:drawmylife@empowerhack.com', | ||
| description: {__html: ` | ||
| <p>How can the humanitarian community strengthen and understand the voice of child refugees?</p> | ||
| <p>Draw My Life is inspired by how childrens' art therapy in the field can become a basis for better data around the needs and experience of refugee children.</p> | ||
| <p>Read more about us and other projects at <a href="http://empowerhack.io/#drawmylife">EmpowerHack</a>.</p> | ||
| `} | ||
| }; |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could we use a
buttonrather than adiv?