diff --git a/client/src/components/Header/Header.test.js b/client/src/components/Header/Header.test.js index d94c6e7eec..4671019acd 100644 --- a/client/src/components/Header/Header.test.js +++ b/client/src/components/Header/Header.test.js @@ -5,6 +5,8 @@ import TestRenderer from 'react-test-renderer'; import { UniversalNav } from './components/UniversalNav'; import NavLinks from './components/NavLinks'; +import { forumLocation } from '../../../config/env.json'; + describe('', () => { it('renders to the DOM', () => { const shallow = new ShallowRenderer(); @@ -23,7 +25,7 @@ describe('', () => { return acc; }, []); - const expectedLinks = ['/learn', '/news', 'https://forum.freecodecamp.org']; + const expectedLinks = ['/learn', '/news', forumLocation]; it('renders to the DOM', () => { expect(root).toBeTruthy(); diff --git a/client/src/components/Header/components/NavLinks.js b/client/src/components/Header/components/NavLinks.js index 3bc49edbbc..92d3947c5b 100644 --- a/client/src/components/Header/components/NavLinks.js +++ b/client/src/components/Header/components/NavLinks.js @@ -1,5 +1,6 @@ import React from 'react'; import { Link } from '../../helpers'; +import { forumLocation } from '../../../../../config/env.json'; import PropTypes from 'prop-types'; @@ -17,11 +18,7 @@ function NavLinks({ displayMenu }) {
  • - + /forum
  • diff --git a/client/src/components/Intro/index.js b/client/src/components/Intro/index.js index 5e64011150..d559c5f2d5 100644 --- a/client/src/components/Intro/index.js +++ b/client/src/components/Intro/index.js @@ -2,7 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { Link, Spacer, Loader, FullWidthRow } from '../helpers'; import { Row, Col } from '@freecodecamp/react-bootstrap'; -import { apiLocation } from '../../../config/env.json'; +import { apiLocation, forumLocation } from '../../../config/env.json'; import { randomQuote } from '../../utils/get-words'; import CurrentChallengeLink from '../helpers/CurrentChallengeLink'; @@ -153,7 +153,7 @@ function Intro({

    You can do this on Twitter and GitHub, and also on{' '} - + the freeCodeCamp forum . diff --git a/client/src/templates/Challenges/components/HelpModal.js b/client/src/templates/Challenges/components/HelpModal.js index 761c9a8c6d..81d6f158b5 100644 --- a/client/src/templates/Challenges/components/HelpModal.js +++ b/client/src/templates/Challenges/components/HelpModal.js @@ -6,6 +6,7 @@ import { Button, Modal } from '@freecodecamp/react-bootstrap'; import { createQuestion, closeModal, isHelpModalOpenSelector } from '../redux'; import { executeGA } from '../../../redux'; +import { forumLocation } from '../../../../config/env.json'; import './help-modal.css'; @@ -23,7 +24,7 @@ const propTypes = { isOpen: PropTypes.bool }; -const RSA = 'https://forum.freecodecamp.org/t/19514'; +const RSA = forumLocation + '/t/19514'; export class HelpModal extends Component { render() {