This repository was archived by the owner on Jun 10, 2019. It is now read-only.
Repository navigation
Created 'Get involved' page -- need some help #871
Merged
Merged
Changes from all commits
Commits
Show all changes
29 commits
Select commit
Hold shift + click to select a range
86833fa
Initial Commit
ksmacleod99 4dbb403
Fixes styles
ksmacleod99 e74642c
makes a file pretty
ksmacleod99 a8c1483
Updating media queries
ksmacleod99 73977ca
Storybook info
ksmacleod99 95a3559
idk what or why this is happening
ksmacleod99 8607bfb
progress so far
ksmacleod99 cf3ca4f
Styles Header
ksmacleod99 ff84649
more styling
ksmacleod99 3cad47f
updates styles
ksmacleod99 2cea7b2
Revert "Storybook info"
ksmacleod99 9ea46bf
Revert "Storybook info"
ksmacleod99 9ab45de
Remove static Storybook files
jjhampton 685751e
removed link button
ksmacleod99 05e904c
FA check
ksmacleod99 6418f1e
updates FA icons
ksmacleod99 ef7816a
Merge remote-tracking branch 'upstream/master' into getInvolved
jjhampton ffa9e62
Fix ESLint max-length errors
jjhampton 86bcce0
Remove imageSize script again
jjhampton 692c092
Adjust heroBanner propTypes, per code-review requests
jjhampton 0a023da
CSS cleanup
jjhampton 4e87850
Clean up markup/CSS for whyGive, use Section component
jjhampton db00d66
Adjust heroBanner height media queries for mobile
jjhampton 7e1af95
DRY up shared CSS for GetInvolved sub sections
jjhampton 5784d04
Remove SuccessStories from this page
jjhampton 580b7cc
Remove SVG checkmark file
jjhampton fbccbc4
Remove duplicate SuccessStories files
jjhampton bc03553
Clean up local names for image URLs
jjhampton e1a5dde
Switch images to using S3 URLs
jjhampton 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,66 @@ | ||
| /* Shared styles for Get Involved sections: Why Give, Volunteer, etc. */ | ||
|
|
||
| .wrapper { | ||
| display: flex; | ||
| } | ||
|
|
||
| .half { | ||
| box-sizing: border-box; | ||
| display: flex; | ||
| flex-direction: column; | ||
| align-items: center; | ||
| justify-content: center; | ||
| width: 50%; | ||
| } | ||
|
|
||
| .halfPhotoWrapper { | ||
| composes: half; | ||
| } | ||
|
|
||
| .photo { | ||
| width: 100%; | ||
| max-width: 500px; | ||
| height: auto; | ||
| } | ||
|
|
||
| .list { | ||
| list-style-type: none; | ||
| margin: 0; | ||
| padding: 0; | ||
| } | ||
|
|
||
| .listItem { | ||
| display: flex; | ||
| align-items: center; | ||
| } | ||
|
|
||
| .itemText { | ||
| margin-left: 20px; | ||
| } | ||
|
|
||
| .button { | ||
| margin-top: 1rem; | ||
| } | ||
|
|
||
| @media only screen and (min-width: 1112px) { | ||
| .half { | ||
| padding: 2rem; | ||
| } | ||
| } | ||
|
|
||
| @media only screen and (min-width: 320px) and (max-width: 1111px) { | ||
| .wrapper { | ||
| display: flex; | ||
| flex-direction: column; | ||
| align-items: center; | ||
| } | ||
|
|
||
| .half { | ||
| padding: 1rem 0; | ||
| width: 100%; | ||
| } | ||
|
|
||
| .halfPhotoWrapper { | ||
| order: -1; | ||
| } | ||
| } |
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,19 @@ | ||
| import React from 'react'; | ||
| import HeroBanner from 'shared/components/heroBanner/heroBanner'; | ||
| import WhyGive from './whyGive/whyGive'; | ||
| import Volunteer from './volunteer/volunteer'; | ||
|
|
||
| const getInvolved = () => ( | ||
| <div> | ||
| <HeroBanner | ||
| imageSrc="https://s3.amazonaws.com/operationcode-assets/page-get_involved/banner_people1.jpg" | ||
| title="Get Involved" | ||
| subtitle="See the magic happen..." | ||
| /> | ||
|
|
||
| <WhyGive /> | ||
| <Volunteer /> | ||
| </div> | ||
| ); | ||
|
|
||
| export default getInvolved; |
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,54 @@ | ||
| import React from 'react'; | ||
| import FontAwesomeIcon from '@fortawesome/react-fontawesome'; | ||
| import faCheck from '@fortawesome/fontawesome-free-solid/faCheck'; | ||
| import LinkButton from 'shared/components/linkButton/linkButton'; | ||
| import Section from 'shared/components/section/section'; | ||
| import styles from '../getInvolved.css'; | ||
|
|
||
| const Volunteer = () => ( | ||
| <Section title="Become a Volunteer"> | ||
| <div className={styles.wrapper}> | ||
| <div className={styles.half}> | ||
| <ul className={styles.list}> | ||
| <li className={styles.listItem}> | ||
| <FontAwesomeIcon icon={faCheck} size="2x" /> | ||
| <p className={styles.itemText}> | ||
| Join our community on Slack, and work with new software developers | ||
| to help grow and mentor them in learning to code and enter the | ||
| tech industry. Answer questions, participate in mock interviews, | ||
| and review resumes. | ||
| </p> | ||
| </li> | ||
|
|
||
| <li className={styles.listItem}> | ||
| <FontAwesomeIcon icon={faCheck} size="2x" /> | ||
| <p className={styles.itemText}> | ||
| Lead a squad of new developers in learning new skills in Linux, | ||
| Python, cloud infrastructure, web development, and more. | ||
| </p> | ||
| </li> | ||
|
|
||
| <li className={styles.listItem}> | ||
| <FontAwesomeIcon icon={faCheck} size="2x" /> | ||
| <p className={styles.itemText}> | ||
| Meet up with a local chapter (or start your own!) and network with | ||
| other new developers eager to build cool apps and code the future! | ||
| </p> | ||
| </li> | ||
| </ul> | ||
| </div> | ||
| <div className={styles.halfPhotoWrapper}> | ||
| <img | ||
| src="https://s3.amazonaws.com/operationcode-assets/page-get_involved/hackathon1.jpg" | ||
| alt="Operation Code Members at Operation Spark" | ||
| className={styles.photo} | ||
| /> | ||
| </div> | ||
| </div> | ||
| <div className={styles.button}> | ||
| <LinkButton text="Volunteer" theme="red" link="/signup" /> | ||
| </div> | ||
| </Section> | ||
| ); | ||
|
|
||
| export default Volunteer; |
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,78 @@ | ||
| import React from 'react'; | ||
| import FontAwesomeIcon from '@fortawesome/react-fontawesome'; | ||
| import faCheck from '@fortawesome/fontawesome-free-solid/faCheck'; | ||
| import LinkButton from 'shared/components/linkButton/linkButton'; | ||
| import Section from 'shared/components/section/section'; | ||
| import styles from '../getInvolved.css'; | ||
|
|
||
| const WhyGive = () => ( | ||
| <Section title="Why give to Operation Code?" theme="white"> | ||
| <div className={styles.wrapper}> | ||
| <div className={styles.half}> | ||
| <img | ||
| src="https://s3.amazonaws.com/operationcode-assets/page-get_involved/benefit_dinner_2017.jpg" | ||
| alt="Benefit Dinner 2017" | ||
| className={styles.photo} | ||
| /> | ||
| </div> | ||
| <div className={styles.half}> | ||
| <ul className={styles.list}> | ||
| <li className={styles.listItem}> | ||
| <FontAwesomeIcon icon={faCheck} size="2x" /> | ||
| <p className={styles.itemText}> | ||
| To provide veterans, transitioning servicemembers, and military | ||
| spouses with transformative educational experiences | ||
| </p> | ||
| </li> | ||
|
|
||
| <li className={styles.listItem}> | ||
| <FontAwesomeIcon icon={faCheck} size="2x" /> | ||
| <p className={styles.itemText}> | ||
| To advocate for more diversity and opportunity in the tech | ||
| industry | ||
| </p> | ||
| </li> | ||
|
|
||
| <li className={styles.listItem}> | ||
| <FontAwesomeIcon icon={faCheck} size="2x" /> | ||
| <p className={styles.itemText}> | ||
| To enable our mission to reach more members of the military | ||
| community | ||
| </p> | ||
| </li> | ||
|
|
||
| <li className={styles.listItem}> | ||
| <FontAwesomeIcon icon={faCheck} size="2x" /> | ||
| <p className={styles.itemText}> | ||
| Scholarship funding for comp sci education, industry certification | ||
| </p> | ||
| </li> | ||
|
|
||
| <li className={styles.listItem}> | ||
| <FontAwesomeIcon icon={faCheck} size="2x" /> | ||
| <p className={styles.itemText}> | ||
| Sending veterans to conferences and major tech industry events | ||
| </p> | ||
| </li> | ||
|
|
||
| <li className={styles.listItem}> | ||
| <FontAwesomeIcon icon={faCheck} size="2x" /> | ||
| <p className={styles.itemText}> | ||
| Building more tech communities near military installations | ||
| </p> | ||
| </li> | ||
| </ul> | ||
| </div> | ||
| </div> | ||
| <div className={styles.button}> | ||
| <LinkButton | ||
| text="Donate" | ||
| theme="red" | ||
| link="https://opencollective.com/operationcode#support" | ||
| isExternal | ||
| /> | ||
| </div> | ||
| </Section> | ||
| ); | ||
|
|
||
| export default WhyGive; |
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,24 @@ | ||
| .heroBanner { | ||
| background-repeat: no-repeat; | ||
| background-size: cover; | ||
| background-position: center; | ||
| display: flex; | ||
| height: 480px; | ||
| width: 100%; | ||
| } | ||
|
|
||
| .header { | ||
| flex-grow: 1; | ||
| box-sizing: border-box; | ||
| padding: 4rem; | ||
| } | ||
|
|
||
| @media only screen and (min-width: 320px) and (max-width: 768px) { | ||
| .heroBanner { | ||
| height: 320px; | ||
| } | ||
|
|
||
| .header { | ||
| padding: 2rem; | ||
| } | ||
| } |
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,32 @@ | ||
| import React from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import styles from './heroBanner.css'; | ||
|
|
||
| const HeroBanner = ({ imageSrc, title, subtitle }) => { | ||
| const bannerStyles = { | ||
| backgroundImage: `url(${imageSrc})` | ||
| }; | ||
|
|
||
| return ( | ||
| <div style={bannerStyles} className={styles.heroBanner}> | ||
| <div className={styles.header}> | ||
| <h1>{title}</h1> | ||
| { subtitle && | ||
| <h4>{subtitle}</h4> | ||
| } | ||
| </div> | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| HeroBanner.propTypes = { | ||
| imageSrc: PropTypes.node.isRequired, | ||
| title: PropTypes.string.isRequired, | ||
| subtitle: PropTypes.string | ||
| }; | ||
|
|
||
| HeroBanner.defaultProps = { | ||
| subtitle: '' | ||
| }; | ||
|
|
||
| export default HeroBanner; |
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,9 @@ | ||
| import react from 'react'; | ||
| import { storiesOf } from '@storybook/react'; | ||
| import HeroBanner from 'shared/components/heroBanner/heroBanner'; | ||
|
|
||
| import jamesBondJpg from '../../asset/james-bond.jpg'; | ||
|
|
||
| storiesOf('HeroBanner', module).add('Default', () => ( | ||
| <HeroBanner imageSrc={jamesBondJpg} title="Bond" subtitle="James Bond" /> | ||
| )); | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. bless your soul for keeping Storybook up-to-date.
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm trying. I have no idea what I'm doing and it's not working, but I'm trying lol |
||
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.
can you also add a Route for
"/get_involved". I think you can use<Redirect>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.
@kylemh Is this due to usage of kebap-case vs snake_case? This won't be the only route that could use redirect to address that - there's several others in home.js already - we've had inconsistencies with route naming for quite some time.
Let's just create another issue to add redirects for all of those at once, so we can finish up this Get Involved page.