diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 000000000..ceba7dfae --- /dev/null +++ b/.eslintignore @@ -0,0 +1 @@ +/src/assets diff --git a/.eslintrc b/.eslintrc index 72f67ff01..08ce1c82c 100644 --- a/.eslintrc +++ b/.eslintrc @@ -33,10 +33,7 @@ } ], "no-template-curly-in-string": "error", - "semi": [ - "error", - "always" - ], + "semi": "off", "array-bracket-spacing": [ "error", "never" @@ -53,10 +50,7 @@ } ], "camelcase": "warn", - "comma-dangle": [ - "error", - "never" - ], + "comma-dangle": "off", "comma-spacing": [ "error", { diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 000000000..90babcf2c --- /dev/null +++ b/.prettierignore @@ -0,0 +1,3 @@ +node_modules +public +src/assets diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 000000000..d170684a1 --- /dev/null +++ b/.prettierrc @@ -0,0 +1,6 @@ +{ + "printWidth": 100, + "singleQuote": true, + "trailingComma": "es5", + "jsxBracketSameLine": false, +} diff --git a/package.json b/package.json index 6e1674ad9..ca171dd02 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "scripts": { "build": "gatsby build", "develop": "gatsby develop", - "format": "prettier --trailing-comma es5 --no-semi --single-quote --write \"src/**/*.js\"", + "format": "prettier --write \"src/**/*.js\"", "test": "jest", "test:watch": "jest --watch", "test:coverage": "jest --env=jsdom --coverage", @@ -53,7 +53,7 @@ }, "lint-staged": { "src/**/*.js": [ - "yarn format", + "eslint ./node_modules/eslint/bin/eslint.js ./src/**/*.js", "git add" ] }, diff --git a/pre-commit.sh b/pre-commit.sh deleted file mode 100755 index f0dde3339..000000000 --- a/pre-commit.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -source ./.env - -if [ $DISABLE_PRECOMMIT == 1 ] -then - echo "Skipping pre-commit hook" -else - yarn pre-commit -fi diff --git a/src/components/Countdown.js b/src/components/Countdown.js index 67d209221..aa27bbcfe 100644 --- a/src/components/Countdown.js +++ b/src/components/Countdown.js @@ -1,5 +1,5 @@ -import React, { Component } from 'react'; -import Link from 'gatsby-link'; +import React, { Component } from 'react' +import Link from 'gatsby-link' class Countdown extends Component { state = { @@ -7,41 +7,41 @@ class Countdown extends Component { hours: null, minutes: null, seconds: null, - interval: null - }; + interval: null, + } componentDidMount = () => { - const interval = setInterval(() => this.getTimeRemaining(), 1000); - this.setState({ interval }); - }; + const interval = setInterval(() => this.getTimeRemaining(), 1000) + this.setState({ interval }) + } componentWillUnmount = () => { - this.stopCountDown(); - }; + this.stopCountDown() + } getTimeRemaining = () => { - const deadLine = 'March 04 2019'; - const time = Date.parse(deadLine) - Date.parse(new Date()); - const seconds = Math.floor((time / 1000) % 60); - const minutes = Math.floor((time / 1000 / 60) % 60); - const hours = Math.floor((time / (1000 * 60 * 60)) % 24); - const days = Math.floor(time / (1000 * 60 * 60 * 24)); + const deadLine = 'March 04 2019' + const time = Date.parse(deadLine) - Date.parse(new Date()) + const seconds = Math.floor((time / 1000) % 60) + const minutes = Math.floor((time / 1000 / 60) % 60) + const hours = Math.floor((time / (1000 * 60 * 60)) % 24) + const days = Math.floor(time / (1000 * 60 * 60 * 24)) this.setState({ days, hours, minutes, - seconds - }); - }; + seconds, + }) + } stopCountDown = () => { - const { interval } = this.state; - clearInterval(interval); - }; + const { interval } = this.state + clearInterval(interval) + } render() { - const { days, hours, minutes, seconds } = this.state; + const { days, hours, minutes, seconds } = this.state return (
@@ -66,8 +66,8 @@ class Countdown extends Component { Apply
- ); + ) } } -export default Countdown; +export default Countdown diff --git a/src/components/DonateModal.js b/src/components/DonateModal.js index b63de483a..767a0f9b8 100644 --- a/src/components/DonateModal.js +++ b/src/components/DonateModal.js @@ -1,22 +1,22 @@ -import React from 'react'; -import PropTypes from 'prop-types'; -import Modal from 'react-modal'; +import React from 'react' +import PropTypes from 'prop-types' +import Modal from 'react-modal' -Modal.setAppElement('#___gatsby'); +Modal.setAppElement('#___gatsby') const container = { content: { top: '20%', bottom: '20%', - height: 'auto' - } -}; + height: 'auto', + }, +} // unused variable do we need this??? // const closeButton = { // right: '8px' -// }; +// } const DonateModal = ({ modalIsOpen, closeModal }) => ( ( style={{ maxWidth: '100%', minWidth: '100%', - maxHeight: 'none!important' + maxHeight: 'none!important', }} seamless="seamless" name="donorbox" @@ -42,11 +42,11 @@ const DonateModal = ({ modalIsOpen, closeModal }) => ( frameBorder={0} /> -); +) DonateModal.propTypes = { modalIsOpen: PropTypes.bool, - closeModal: PropTypes.func -}; + closeModal: PropTypes.func, +} -export default DonateModal; +export default DonateModal diff --git a/src/components/Footer.js b/src/components/Footer.js index 20ff9d597..9767248f6 100644 --- a/src/components/Footer.js +++ b/src/components/Footer.js @@ -1,5 +1,5 @@ -import React from 'react'; -import Link from 'gatsby-link'; +import React from 'react' +import Link from 'gatsby-link' const Footer = () => (
@@ -10,8 +10,8 @@ const Footer = () => (

About #VetsWhoCode

- FRAGO, doing business as #VetsWhoCode, is an exempt organization as described in Section 501(c)(3) of - the Internal Revenue Code. Our EIN is 47-3555231. + FRAGO, doing business as #VetsWhoCode, is an exempt organization as described in + Section 501(c)(3) of the Internal Revenue Code. Our EIN is 47-3555231.

@@ -69,7 +69,11 @@ const Footer = () => ( Contact Us
  • - + Blog
    • @@ -85,8 +89,10 @@ const Footer = () => (

    Hi, if you have any questions, please drop us a line. -
    Email: hello@vetswhocode.io -
    Phone: (917) 960-3806 +
    + Email: hello@vetswhocode.io +
    + Phone: (917) 960-3806

    @@ -98,7 +104,7 @@ const Footer = () => (
    -

    © #VetsWhoCode

    +

    © #VetsWhoCode

      @@ -111,6 +117,6 @@ const Footer = () => (
    -); +) -export default Footer; +export default Footer diff --git a/src/components/Header.js b/src/components/Header.js index 300d49230..d83659e6d 100644 --- a/src/components/Header.js +++ b/src/components/Header.js @@ -1,9 +1,9 @@ -import React from 'react'; -import HeaderSlider from "./HeaderSlider"; +import React from 'react' +import HeaderSlider from './HeaderSlider' const Header = () => ( -); -export default Header; +) +export default Header diff --git a/src/components/HeaderSlider.js b/src/components/HeaderSlider.js index cb9aa265d..fd8f35810 100644 --- a/src/components/HeaderSlider.js +++ b/src/components/HeaderSlider.js @@ -1,21 +1,21 @@ -import React, { Component } from 'react'; -import Slider from 'react-slick'; -import Link from 'gatsby-link'; +import React, { Component } from 'react' +import Slider from 'react-slick' +import Link from 'gatsby-link' -import 'slick-carousel/slick/slick.css'; -import 'slick-carousel/slick/slick-theme.css'; +import 'slick-carousel/slick/slick.css' +import 'slick-carousel/slick/slick-theme.css' -import codePNG from '../images/code.png'; -import speakingPNG from '../images/speaking.png'; -import thisIsUsPNG from '../images/this_is_us.png'; +import codePNG from '../images/code.png' +import speakingPNG from '../images/speaking.png' +import thisIsUsPNG from '../images/this_is_us.png' class HeaderSlider extends Component { next = () => { - this.slider.slickNext(); + this.slider.slickNext() } previous = () => { - this.slider.slickPrev(); + this.slider.slickPrev() } render() { @@ -26,8 +26,8 @@ class HeaderSlider extends Component { slidesToShow: 1, slidesToScroll: 1, autoplay: true, - autoplaySpeed: 3000 - }; + autoplaySpeed: 3000, + } return (
    @@ -126,8 +126,8 @@ class HeaderSlider extends Component {
    - ); + ) } } -export default HeaderSlider; +export default HeaderSlider diff --git a/src/components/Loader.js b/src/components/Loader.js index 2c7393564..fcce133bd 100644 --- a/src/components/Loader.js +++ b/src/components/Loader.js @@ -1,20 +1,20 @@ -import React, { Component } from 'react'; +import React, { Component } from 'react' class Loader extends Component { componentDidMount() { - global.jQuery = require('../../static/vendor/jquery/dist/jquery'); - window.$ = jQuery; - window.jQuery = jQuery; - this.handleLoader(); + global.jQuery = require('../../static/vendor/jquery/dist/jquery') + window.$ = jQuery + window.jQuery = jQuery + this.handleLoader() } handleLoader = () => { $(window).on('load', () => { - $('#loader').fadeOut(); + $('#loader').fadeOut() $('#loader-wrapper') .delay(100) - .fadeOut(); - }); + .fadeOut() + }) } render() { @@ -22,8 +22,8 @@ class Loader extends Component {
    - ); + ) } } -export default Loader; +export default Loader diff --git a/src/components/Nav.js b/src/components/Nav.js index a85c2b734..ff647ae15 100644 --- a/src/components/Nav.js +++ b/src/components/Nav.js @@ -1,23 +1,23 @@ -import React, { Component } from 'react'; +import React, { Component } from 'react' -import Link from 'gatsby-link'; -import logo from '../images/flag.gif'; +import Link from 'gatsby-link' +import logo from '../images/flag.gif' class Nav extends Component { componentDidMount() { - window.addEventListener('scroll', this.handleScroll); + window.addEventListener('scroll', this.handleScroll) } handleScroll = () => { - const $nav = $('#fixedTopNav'); + const $nav = $('#fixedTopNav') if ($(window).scrollTop() > 0) { - $nav.addClass('navbar-solid'); - return; + $nav.addClass('navbar-solid') + return } - $nav.removeClass('navbar-solid'); - $('.navbar-nav > li > a').blur(); + $nav.removeClass('navbar-solid') + $('.navbar-nav > li > a').blur() } render() { @@ -39,24 +39,13 @@ class Nav extends Component { aria-expanded="false" > {' '} - #VetsWhoCode{' '} - + #VetsWhoCode -
    +
    {' '} - - #VetsWhoCode - + #VetsWhoCode - #VetsWhoCode Logo + #VetsWhoCode Logo
    @@ -111,7 +100,12 @@ class Nav extends Component {
  • {' '} - + Blog
    • @@ -119,8 +113,8 @@ class Nav extends Component {
    - ); + ) } } -export default Nav; +export default Nav diff --git a/src/components/SponsorSlider.js b/src/components/SponsorSlider.js index 94495d8df..26512e0e3 100644 --- a/src/components/SponsorSlider.js +++ b/src/components/SponsorSlider.js @@ -1,13 +1,13 @@ -import React from 'react'; -import Slider from 'react-slick'; +import React from 'react' +import Slider from 'react-slick' -import googlePNG from '../images/supporters/google.png'; -import githubPNG from '../images/supporters/github.png'; -import replItPNG from '../images/supporters/repl.it.png'; -import slackPNG from '../images/supporters/slack.png'; -import doPNG from '../images/supporters/DO.png'; -import femPNG from '../images/supporters/fem.png'; -import comcastPNG from '../images/supporters/comcast.png'; +import googlePNG from '../images/supporters/google.png' +import githubPNG from '../images/supporters/github.png' +import replItPNG from '../images/supporters/repl.it.png' +import slackPNG from '../images/supporters/slack.png' +import doPNG from '../images/supporters/DO.png' +import femPNG from '../images/supporters/fem.png' +import comcastPNG from '../images/supporters/comcast.png' const settings = { dots: true, @@ -25,27 +25,23 @@ const settings = { breakpoint: 990, settings: { slidesToShow: 4, - slidesToScroll: 1 - } + slidesToScroll: 1, + }, }, { breakpoint: 480, settings: { slidesToShow: 3, - slidesToScroll: 1 - } - } - ] -}; + slidesToScroll: 1, + }, + }, + ], +} const SponsorSlider = () => (
    - + google
    @@ -65,20 +61,12 @@ const SponsorSlider = () => (
    - + Digital Ocean
    - + Front End Masters
    @@ -92,6 +80,6 @@ const SponsorSlider = () => (
    -); +) -export default SponsorSlider; +export default SponsorSlider diff --git a/src/components/layout.js b/src/components/layout.js index 92b1d71a0..d50272f86 100644 --- a/src/components/layout.js +++ b/src/components/layout.js @@ -1,38 +1,35 @@ -import React, { Component } from 'react'; -import PropTypes from 'prop-types'; -// import { withPrefix } from 'gatsby'; -import Helmet from 'react-helmet'; - -import Nav from './Nav'; -// import Loader from './Loader'; -import Footer from './Footer'; - -import '../assets/lib/bootstrap/dist/css/bootstrap.min.css'; -import '../assets/lib/owlcarousel/owl-carousel/owl.carousel.css'; -import '../assets/lib/owlcarousel/owl-carousel/owl.theme.css'; -import '../assets/lib/ionicons/css/ionicons.css'; -import '../assets/lib/fontawesome/css/font-awesome.min.css'; -import '../assets/extras/swipebox/css/swipebox.min.css'; -import '../assets/extras/rotating-carousel/css/style.css'; -import '../assets/extras/slick/slick.css'; -import '../assets/extras/magnificpopup/magnific-popup.css'; -import '../assets/lib/FlexSlider/flexslider.css'; -import '../assets/css/main.css'; -import '../assets/css/custom.css'; - - - +import React, { Component } from 'react' +import PropTypes from 'prop-types' +// import { withPrefix } from 'gatsby' +import Helmet from 'react-helmet' + +import Nav from './Nav' +// import Loader from './Loader' +import Footer from './Footer' + +import '../assets/lib/bootstrap/dist/css/bootstrap.min.css' +import '../assets/lib/owlcarousel/owl-carousel/owl.carousel.css' +import '../assets/lib/owlcarousel/owl-carousel/owl.theme.css' +import '../assets/lib/ionicons/css/ionicons.css' +import '../assets/lib/fontawesome/css/font-awesome.min.css' +import '../assets/extras/swipebox/css/swipebox.min.css' +import '../assets/extras/rotating-carousel/css/style.css' +import '../assets/extras/slick/slick.css' +import '../assets/extras/magnificpopup/magnific-popup.css' +import '../assets/lib/FlexSlider/flexslider.css' +import '../assets/css/main.css' +import '../assets/css/custom.css' class TemplateWrapper extends Component { componentDidMount() { - global.jQuery = require('../../static/vendor/jquery/dist/jquery'); - require('../../static/vendor/bootstrap/dist/bootstrap'); - window.$ = jQuery; - window.jQuery = jQuery; + global.jQuery = require('../../static/vendor/jquery/dist/jquery') + require('../../static/vendor/bootstrap/dist/bootstrap') + window.$ = jQuery + window.jQuery = jQuery } render() { - const { children } = this.props; + const { children } = this.props return (
    @@ -93,13 +90,12 @@ class TemplateWrapper extends Component {
    - - ); + ) } } TemplateWrapper.propTypes = { - children: PropTypes.array || PropTypes.object -}; + children: PropTypes.array || PropTypes.object, +} -export default TemplateWrapper; +export default TemplateWrapper diff --git a/src/pages/404.js b/src/pages/404.js index c620bf8da..22e35f8d4 100644 --- a/src/pages/404.js +++ b/src/pages/404.js @@ -1,11 +1,11 @@ -import React from 'react'; -import Layout from '../components/layout'; +import React from 'react' +import Layout from '../components/layout' const NotFoundPage = () => (

    NOT FOUND

    You just hit a route that doesn't exist... the sadness.

     -); +) -export default NotFoundPage; +export default NotFoundPage diff --git a/src/pages/about.js b/src/pages/about.js index 29f302aa3..4cf245b4e 100644 --- a/src/pages/about.js +++ b/src/pages/about.js @@ -1,29 +1,29 @@ -import React, { Component } from 'react'; -import Layout from '../components/layout'; -import { Link } from 'gatsby'; +import React, { Component } from 'react' +import Layout from '../components/layout' +import { Link } from 'gatsby' -import vwcGIF from '../images/vwc.gif'; -import jerome from '../images/team/jerome.png'; -import noel from '../images/team/noel.png'; -import andrew from '../images/team/andrew.png'; -import thisIsUs from '../images/this_is_us.png'; +import vwcGIF from '../images/vwc.gif' +import jerome from '../images/team/jerome.png' +import noel from '../images/team/noel.png' +import andrew from '../images/team/andrew.png' +import thisIsUs from '../images/this_is_us.png' -import facebookVideo from '../video/vwc-facebook-reel.mp4'; +import facebookVideo from '../video/vwc-facebook-reel.mp4' class About extends Component { componentDidMount() { - $('.vwc-animated-gif').css('display', 'none'); + $('.vwc-animated-gif').css('display', 'none') } play = () => { - $('.play-button').fadeOut(); - this.video.play(); - this.video.onended = this.end; + $('.play-button').fadeOut() + this.video.play() + this.video.onended = this.end } end = () => { - $('.success-video').hide('fast'); - $('.vwc-animated-gif').toggle('fast'); + $('.success-video').hide('fast') + $('.vwc-animated-gif').toggle('fast') } render() { @@ -33,7 +33,7 @@ class About extends Component { className="inner-header overlay grey text-center slim-bg " style={{ backgroundImage: `url(${thisIsUs})`, - backgroundPositionY: 'bottom' + backgroundPositionY: 'bottom', }} >
    @@ -43,7 +43,7 @@ class About extends Component { Home / - About + About
    @@ -56,7 +56,12 @@ class About extends Component {
    -

    - Launched in 2014, Vets Who Code is a non-profit dedicated to filling the - nations technical skills gap with America’s best. We achieve this by using - technology to connect and train veterans remotely in web development in order to - close the digital talent gap and ease career transition - for military veterans and to give military spouses skills to provide stability as they - move to support their families. We believe that those who serve in uniform can be the - digital economy’s most productive and innovative . Vets Who Code prepares them - to enter the civilian work force with tangible skills for new careers. + Launched in 2014, Vets Who Code is a non-profit dedicated to filling the nations + technical skills gap with America’s best. We achieve this by using technology to + connect and train veterans remotely in web development in order to close the + digital talent gap and ease career transition for military veterans and to give + military spouses skills to provide stability as they move to support their + families. We believe that those who serve in uniform can be the digital + economy’s most productive and innovative . Vets Who Code prepares them to enter + the civilian work force with tangible skills for new careers.

    - Vets Who Code is a reintegration solution for veterans that believes in the principle of - "To Teach a Man To Fish" - to better prepare early stage transitioning veterans for returning to the - workforce. Many veterans are not homeless, but are un- and under-employed. - Some have a deep desire to be independent business owners. - Their skill sets are desperately needed to enhance local economies and to drive innovation. - Vets Who Code serves as a launch pad for our veterans and military spouses. + Vets Who Code is a reintegration solution for veterans that believes in the + principle of "To Teach a Man To Fish" to better prepare early stage + transitioning veterans for returning to the workforce. Many veterans are not + homeless, but are un- and under-employed. Some have a deep desire to be + independent business owners. Their skill sets are desperately needed to enhance + local economies and to drive innovation. Vets Who Code serves as a launch pad + for our veterans and military spouses.

    @@ -117,7 +122,11 @@ class About extends Component {
    - Jerome Hardaway Head Geek + Jerome Hardaway Head Geek
    @@ -137,7 +146,11 @@ class About extends Component {
    - Andrew Lebowitz Brand Geek + Andrew Lebowitz Brand Geek - ); + ) } } -export default About; +export default About diff --git a/src/pages/apply.js b/src/pages/apply.js index 433555e75..717c31a09 100644 --- a/src/pages/apply.js +++ b/src/pages/apply.js @@ -1,8 +1,8 @@ -import React, { Component } from 'react'; -import { Link } from 'gatsby'; +import React, { Component } from 'react' +import { Link } from 'gatsby' -import Layout from '../components/layout'; -import thisIsUs from '../images/this_is_us.png'; +import Layout from '../components/layout' +import thisIsUs from '../images/this_is_us.png' export default class Apply extends Component { state = { @@ -13,12 +13,12 @@ export default class Apply extends Component { 'github-portfolio-or-linkedin': '', location: '', 'favorite-mre': '', - 'tell-us-about-yourself': '' - }; + 'tell-us-about-yourself': '', + } handleChange = e => { - this.setState({ [e.target.name]: e.target.value }); - }; + this.setState({ [e.target.name]: e.target.value }) + } resetForm = () => ({ name: '', @@ -28,12 +28,11 @@ export default class Apply extends Component { 'github-portfolio-or-linkedin': '', location: '', 'favorite-mre': '', - 'tell-us-about-yourself': '' - }); + 'tell-us-about-yourself': '', + }) handleSubmit = e => { - const gatewayUrl = - 'https://eec3hqm275.execute-api.us-east-1.amazonaws.com/prod/apply'; + const gatewayUrl = 'https://eec3hqm275.execute-api.us-east-1.amazonaws.com/prod/apply' const options = { method: 'POST', body: JSON.stringify({ @@ -41,18 +40,16 @@ export default class Apply extends Component { email: this.state.email, 'branch-of-service': this.state['branch-of-service'], experience: this.state.experience, - 'github-portfolio-or-linkedin': this.state[ - 'github-portfolio-or-linkedin' - ], + 'github-portfolio-or-linkedin': this.state['github-portfolio-or-linkedin'], location: this.state.location, 'favorite-mre': this.state['favorite-mre'], - 'tell-us-about-yourself': this.state['tell-us-about-yourself'] - }) - }; - fetch(gatewayUrl, options); - e.preventDefault(); - this.setState(this.resetForm); - }; + 'tell-us-about-yourself': this.state['tell-us-about-yourself'], + }), + } + fetch(gatewayUrl, options) + e.preventDefault() + this.setState(this.resetForm) + } render() { return ( @@ -61,8 +58,9 @@ export default class Apply extends Component { className="inner-header overlay grey text-center slim-bg " style={{ backgroundImage: `url(${thisIsUs})`, - backgroundPositionY: 'bottom' - }}> + backgroundPositionY: 'bottom', + }} + >

    Apply

    @@ -82,10 +80,9 @@ export default class Apply extends Component {

    Apply

    - Thank thank you for choosing to apply to Vets Who Code. We - work really hard to train our veterans and to maintain an - inclusive enviroment so our troops can truly thrive. Please - fill out the form below and we will contact you soon. + Thank thank you for choosing to apply to Vets Who Code. We work really hard to + train our veterans and to maintain an inclusive enviroment so our troops can + truly thrive. Please fill out the form below and we will contact you soon.

    @@ -176,8 +173,7 @@ export default class Apply extends Component {
    -