diff --git a/client/src/components/Header/index.js b/client/src/components/Header/index.js index 5b055b7b65..28f04d58d2 100644 --- a/client/src/components/Header/index.js +++ b/client/src/components/Header/index.js @@ -1,11 +1,11 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; -import { Link } from 'gatsby'; import Media from 'react-media'; import FCCSearch from 'react-freecodecamp-search'; import NavLogo from './components/NavLogo'; import UserState from './components/UserState'; +import { Link } from '../helpers'; import './header.css'; @@ -61,14 +61,14 @@ class Header extends Component { Learn
  • - + Forum - +
  • - + News - +
  • diff --git a/client/src/pages/about.js b/client/src/pages/about.js index e45438e1e2..66893f3c81 100644 --- a/client/src/pages/about.js +++ b/client/src/pages/about.js @@ -1,4 +1,3 @@ -/* eslint-disable max-len */ import React, { Fragment } from 'react'; import Helmet from 'react-helmet'; import { Grid, Col, Row, Table } from '@freecodecamp/react-bootstrap'; diff --git a/client/src/pages/accept-privacy-terms.js b/client/src/pages/accept-privacy-terms.js index 314a1c2887..28e6c5c9d9 100644 --- a/client/src/pages/accept-privacy-terms.js +++ b/client/src/pages/accept-privacy-terms.js @@ -14,7 +14,7 @@ import { import Helmet from 'react-helmet'; import { createSelector } from 'reselect'; -import { ButtonSpacer, Spacer } from '../components/helpers'; +import { ButtonSpacer, Spacer, Link } from '../components/helpers'; import { acceptTerms, userSelector } from '../redux'; import createRedirect from '../components/createRedirect'; @@ -103,13 +103,9 @@ class AcceptPrivacyTerms extends Component { onChange={this.createHandleChange('termsOfService')} > I accept the{' '} - + terms of service - {' '} + {' '} (required) @@ -125,13 +121,9 @@ class AcceptPrivacyTerms extends Component { onChange={this.createHandleChange('privacyPolicy')} > I accept the{' '} - + privacy policy - {' '} + {' '} (required) diff --git a/client/src/pages/code-of-conduct.js b/client/src/pages/code-of-conduct.js index 59cd70ec10..8d9ac820fe 100644 --- a/client/src/pages/code-of-conduct.js +++ b/client/src/pages/code-of-conduct.js @@ -1,4 +1,3 @@ -/* eslint-disable max-len */ import React, { Fragment } from 'react'; import Helmet from 'react-helmet'; import { Grid, Col, Row } from '@freecodecamp/react-bootstrap'; diff --git a/client/src/pages/donate-other.js b/client/src/pages/donate-other.js index ee3bdfdf0c..da22f26386 100644 --- a/client/src/pages/donate-other.js +++ b/client/src/pages/donate-other.js @@ -1,11 +1,9 @@ -/* eslint-disable max-len */ import React, { Component, Fragment } from 'react'; import Helmet from 'react-helmet'; -import { Link } from 'gatsby'; import { Grid, Col, Row } from '@freecodecamp/react-bootstrap'; import ReactGA from '../analytics/index.js'; -import Spacer from '../components/helpers/Spacer'; +import { Link, Spacer } from '../components/helpers'; const paypalMonthlyDonations = [ { diff --git a/client/src/pages/donate.js b/client/src/pages/donate.js index d46e8de5f9..8b073fa38b 100644 --- a/client/src/pages/donate.js +++ b/client/src/pages/donate.js @@ -1,4 +1,3 @@ -/* eslint-disable max-len */ import React, { Component, Fragment } from 'react'; import Helmet from 'react-helmet'; import { StripeProvider, Elements } from 'react-stripe-elements'; diff --git a/client/src/pages/guide.js b/client/src/pages/guide.js index 6eff5c75de..5f1150d012 100644 --- a/client/src/pages/guide.js +++ b/client/src/pages/guide.js @@ -1,5 +1,6 @@ import React, { Fragment } from 'react'; import Helmet from 'react-helmet'; +import { Link } from '../components/helpers'; function Index() { return ( @@ -13,10 +14,9 @@ function Index() {

    freeCodeCamp Guide

    - {'This website is full of articles about all things related to ' + - 'programming. You can use the search bar above to find something ' + - 'you would like to learn about, or use the navigation to explore ' + - 'the content.'} + This website is full of articles about all things related to + programming. You can use the search bar above to find something would + like to learn about, or use the navigation to explore the content.

    There are articles on:

    Not sure where to start?

    - {"If you want to learn programming but you're not sure where to " + - 'start, check out '} - - freeCodeCamp.org - - {'. It has a curriculum that starts from zero and helps you learn' + - ' to code.'} + If you want to learn programming but you're not sure where to start, + check out freeCodeCamp.org. + It has a curriculum that starts from zero and helps you learn to code.

    Contribute to the Guide

    - {'This site and the articles on it are '} - - open source - - {'. Your help in making it better is greatly appreciated!'} + This site and the articles on it are{' '} + + {' '} + open source{' '} + {' '} + . Your help in making it better is greatly appreciated!


    Happy coding!

    diff --git a/client/src/pages/index.js b/client/src/pages/index.js index b2c30af981..a3b2f50302 100644 --- a/client/src/pages/index.js +++ b/client/src/pages/index.js @@ -12,7 +12,7 @@ import { import { faDatabase } from '@fortawesome/free-solid-svg-icons'; import Helmet from 'react-helmet'; -import { Spacer } from '../components/helpers'; +import { Link, Spacer } from '../components/helpers'; import Login from '../components/Header/components/Login'; import './index.css'; @@ -227,14 +227,9 @@ const IndexPage = () => (

    Donations to freeCodeCamp go toward our education initiatives, and help pay for servers, services, and staff. You can{' '} - + make a tax-deductible donation here - +

    . diff --git a/client/src/pages/learn.js b/client/src/pages/learn.js index 039850f6c7..bb1df281ee 100644 --- a/client/src/pages/learn.js +++ b/client/src/pages/learn.js @@ -1,7 +1,7 @@ /* eslint-disable max-len */ import React from 'react'; import PropTypes from 'prop-types'; -import { Link, graphql } from 'gatsby'; +import { graphql } from 'gatsby'; import Helmet from 'react-helmet'; import { connect } from 'react-redux'; @@ -12,7 +12,7 @@ import { } from '../redux/propTypes'; import LearnLayout from '../components/layouts/Learn'; -import Spacer from '../components/helpers/Spacer'; +import { Link, Spacer } from '../components/helpers'; import Map from '../components/Map'; import './learn.css'; @@ -49,9 +49,9 @@ const IndexPage = ({

    And yes - all of this is 100% free, thanks to the thousands of campers who{' '} - + donate - {' '} + {' '} to our nonprofit.

    diff --git a/client/src/pages/privacy-policy.js b/client/src/pages/privacy-policy.js index 05d3bf96eb..39993e9eba 100644 --- a/client/src/pages/privacy-policy.js +++ b/client/src/pages/privacy-policy.js @@ -1,4 +1,3 @@ -/* eslint-disable max-len */ import React, { Fragment } from 'react'; import Helmet from 'react-helmet'; import { Grid, Col, Row } from '@freecodecamp/react-bootstrap'; diff --git a/client/src/pages/software-resources-for-nonprofits.js b/client/src/pages/software-resources-for-nonprofits.js index c298d4114e..412520c2c8 100644 --- a/client/src/pages/software-resources-for-nonprofits.js +++ b/client/src/pages/software-resources-for-nonprofits.js @@ -3,7 +3,7 @@ import { Grid } from '@freecodecamp/react-bootstrap'; import Helmet from 'react-helmet'; import FullWidthRow from '../components/helpers/FullWidthRow'; -import { Spacer } from '../components/helpers'; +import { Spacer, Link } from '../components/helpers'; function SoftwareResourcesForNonProfits() { return ( @@ -26,287 +26,129 @@ function SoftwareResourcesForNonProfits() {

    Skills-based Volunteer Organizations:

    Building a website:

    Donor and Volunteer Management Systems:

    Inventory Management Systems:

    E-Learning platforms:

    Community Management:

    Electronic Forms:

    diff --git a/client/src/pages/sponsors.js b/client/src/pages/sponsors.js index 1ba621040c..3a3d898f0e 100644 --- a/client/src/pages/sponsors.js +++ b/client/src/pages/sponsors.js @@ -1,4 +1,3 @@ -/* eslint-disable max-len */ import React, { Fragment } from 'react'; import Helmet from 'react-helmet'; import { Grid, Col, Row } from '@freecodecamp/react-bootstrap'; @@ -10,7 +9,12 @@ import './sponsors.css'; const SponsorsPage = () => { return ( - + diff --git a/client/src/pages/support.js b/client/src/pages/support.js index 180bede934..d14a970e2a 100644 --- a/client/src/pages/support.js +++ b/client/src/pages/support.js @@ -1,4 +1,3 @@ -/* eslint-disable max-len */ import React, { Fragment } from 'react'; import Helmet from 'react-helmet'; import { Grid, Col, Row } from '@freecodecamp/react-bootstrap'; diff --git a/client/src/pages/terms-of-service.js b/client/src/pages/terms-of-service.js index 6861baf597..07e1bb246d 100644 --- a/client/src/pages/terms-of-service.js +++ b/client/src/pages/terms-of-service.js @@ -1,4 +1,3 @@ -/* eslint-disable max-len */ import React, { Fragment } from 'react'; import Helmet from 'react-helmet'; import { Grid, Col, Row } from '@freecodecamp/react-bootstrap';