diff --git a/src/components/Footer/Footer.js b/src/components/Footer/Footer.js index 7b6d7191..ca38527e 100644 --- a/src/components/Footer/Footer.js +++ b/src/components/Footer/Footer.js @@ -2,6 +2,7 @@ import React from 'react'; import { string } from 'prop-types'; import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; import classNames from 'classnames'; +import { twitterPageURL } from '../../util/urlHelpers'; import config from '../../config'; import { IconSocialMediaFacebook, @@ -14,15 +15,6 @@ import { import css from './Footer.css'; -const twitterPageURL = siteTwitterHandle => { - if (siteTwitterHandle && siteTwitterHandle.charAt(0) === '@') { - return `https://twitter.com/${siteTwitterHandle.substring(1)}`; - } else if (siteTwitterHandle) { - return `https://twitter.com/${siteTwitterHandle}`; - } - return null; -}; - const renderSocialMediaLinks = intl => { const { siteFacebookPage, siteInstagramPage, siteTwitterHandle } = config; const siteTwitterPage = twitterPageURL(siteTwitterHandle); diff --git a/src/containers/AboutPage/AboutPage.js b/src/containers/AboutPage/AboutPage.js index 9a6440dd..230d23ea 100644 --- a/src/containers/AboutPage/AboutPage.js +++ b/src/containers/AboutPage/AboutPage.js @@ -1,4 +1,6 @@ import React from 'react'; +import config from '../../config'; +import { twitterPageURL } from '../../util/urlHelpers'; import { StaticPage, TopbarContainer } from '../../containers'; import { LayoutSingleColumn, @@ -13,6 +15,8 @@ import css from './AboutPage.css'; import image from './about-us.jpg'; const AboutPage = () => { + const { siteTwitterHandle, siteFacebookPage } = config; + const siteTwitterPage = twitterPageURL(siteTwitterHandle); return ( {

Get in touch

- We are happy to help you in anything you have in your mind.?Best way to reach us is + We are happy to help you in anything you have in your mind? Best way to reach us is by emailing us at{' '} hello@saunatime.io @@ -68,10 +72,8 @@ const AboutPage = () => {

You can also checkout our{' '} - - Facebook - {' '} - and Twitter. + Facebook and{' '} + Twitter.

diff --git a/src/util/urlHelpers.js b/src/util/urlHelpers.js index 2a19ebcf..9948a6a0 100644 --- a/src/util/urlHelpers.js +++ b/src/util/urlHelpers.js @@ -167,3 +167,19 @@ export const parse = (search, options = {}) => { return result; }, {}); }; + +/** + * Create Twitter page url from twitterHandle + * + * @param {String} twitterHandle - handle is used for generating Twitter page URL + * + * @return {String} twitterPageURL + */ +export const twitterPageURL = twitterHandle => { + if (twitterHandle && twitterHandle.charAt(0) === '@') { + return `https://twitter.com/${twitterHandle.substring(1)}`; + } else if (twitterHandle) { + return `https://twitter.com/${twitterHandle}`; + } + return null; +};