diff --git a/shared/helpers/redirects.js b/shared/helpers/redirects.js index 40ffb918e..2213f844a 100644 --- a/shared/helpers/redirects.js +++ b/shared/helpers/redirects.js @@ -1,3 +1,4 @@ +import { CONTACT_FORM, CONTRASTER_FEEDBACK_FORM } from 'client-utils/common/typeformConstants'; import appConfig from './appConfig'; const redirects = [ @@ -8,7 +9,7 @@ const redirects = [ { from: '/copyright', to: 'https://creativecommons.org/licenses/by-sa/3.0/' }, { from: '/flickr', to: 'https://www.flickr.com/photos/georgegillams' }, { from: '/youtube', to: 'https://www.youtube.com/channel/UCT42ju8eCIWexjzT2whVOgQ' }, - { from: '/typeform', to: 'https://form.typeform.com/to/WJSWmnKh' }, + { from: '/typeform', to: CONTACT_FORM }, { from: '/monzo', to: 'https://join.monzo.com/r/vjd3d74' }, { from: '/github', to: 'https://github.com/georgegillams' }, { from: '/dotfiles', to: 'https://github.com/georgegillams/dotfiles' }, @@ -55,7 +56,7 @@ const redirects = [ { from: '/reading', to: '/reading-list' }, { from: '/medals', to: '/races' }, - { from: '/contraster-feedback', to: 'https://form.typeform.com/to/XhSSvzDp' }, + { from: '/contraster-feedback', to: CONTRASTER_FEEDBACK_FORM }, ]; export default redirects; diff --git a/src/containers/Contact/Container.js b/src/containers/Contact/Container.js index b341d5337..f02b0811b 100755 --- a/src/containers/Contact/Container.js +++ b/src/containers/Contact/Container.js @@ -16,6 +16,7 @@ import instagramLogo from './instagram.svg'; import formLogo from './form.svg'; import PageContainer, { WIDTHS } from 'components/common/PageContainer'; import { IconImage, ImageIconContainer, InfoCellContainer, Spacer, StyledInfoCellWithScroll } from './contact.styles'; +import { CONTACT_FORM } from 'client-utils/common/typeformConstants'; const Contact = () => { return ( @@ -26,7 +27,7 @@ const Contact = () => { + Fill in my contact form } diff --git a/src/containers/Drone/Container.js b/src/containers/Drone/Container.js index 007e911a7..d3d44727e 100755 --- a/src/containers/Drone/Container.js +++ b/src/containers/Drone/Container.js @@ -13,6 +13,7 @@ import TextLink from 'components/common/TextLink'; import Button from 'components/common/Button'; import { BUTTON_SIZES } from '@george-gillams/components/button'; import { withScrollAnimation } from '@george-gillams/components/effects'; +import { LOST_FOUND_FORM } from 'client-utils/common/typeformConstants'; const SectionWithScroll = withScrollAnimation(Section); const Drone = () => { @@ -25,7 +26,7 @@ const Drone = () => {
- diff --git a/src/containers/Luggage/Container.js b/src/containers/Luggage/Container.js index e64818528..0592e53b9 100755 --- a/src/containers/Luggage/Container.js +++ b/src/containers/Luggage/Container.js @@ -8,6 +8,7 @@ import Paragraph from '@george-gillams/components/paragraph/paragraph'; import Button from 'components/common/Button'; import { BUTTON_SIZES } from '@george-gillams/components/button'; import { withScrollAnimation } from '@george-gillams/components/effects'; +import { LOST_FOUND_FORM } from 'client-utils/common/typeformConstants'; const SectionWithScroll = withScrollAnimation(Section); const Luggage = () => { @@ -20,7 +21,7 @@ const Luggage = () => {
- diff --git a/src/containers/SiteMap/tests/__snapshots__/Container.test.js.snap b/src/containers/SiteMap/tests/__snapshots__/Container.test.js.snap index 8bb83ad04..d287526fd 100644 --- a/src/containers/SiteMap/tests/__snapshots__/Container.test.js.snap +++ b/src/containers/SiteMap/tests/__snapshots__/Container.test.js.snap @@ -1042,7 +1042,7 @@ exports[` should render correctly - index 1`] = ` - /typeform ⇒ https://form.typeform.com/to/WJSWmnKh + /typeform ⇒ https://georgegillams.typeform.com/contact
@@ -1575,7 +1575,7 @@ exports[` should render correctly - index 1`] = ` - /contraster-feedback ⇒ https://form.typeform.com/to/XhSSvzDp + /contraster-feedback ⇒ https://georgegillams.typeform.com/contraster
@@ -2630,7 +2630,7 @@ exports[` should render correctly 1`] = ` - /typeform ⇒ https://form.typeform.com/to/WJSWmnKh + /typeform ⇒ https://georgegillams.typeform.com/contact
@@ -3163,7 +3163,7 @@ exports[` should render correctly 1`] = ` - /contraster-feedback ⇒ https://form.typeform.com/to/XhSSvzDp + /contraster-feedback ⇒ https://georgegillams.typeform.com/contraster
@@ -4146,7 +4146,7 @@ exports[` should render correctly with blogs 1`] = ` - /typeform ⇒ https://form.typeform.com/to/WJSWmnKh + /typeform ⇒ https://georgegillams.typeform.com/contact
@@ -4679,7 +4679,7 @@ exports[` should render correctly with blogs 1`] = ` - /contraster-feedback ⇒ https://form.typeform.com/to/XhSSvzDp + /contraster-feedback ⇒ https://georgegillams.typeform.com/contraster
@@ -5733,7 +5733,7 @@ exports[` should render correctly with blogs and admin user 1`] = ` - /typeform ⇒ https://form.typeform.com/to/WJSWmnKh + /typeform ⇒ https://georgegillams.typeform.com/contact
@@ -6266,7 +6266,7 @@ exports[` should render correctly with blogs and admin user 1`] = ` - /contraster-feedback ⇒ https://form.typeform.com/to/XhSSvzDp + /contraster-feedback ⇒ https://georgegillams.typeform.com/contraster
@@ -7249,7 +7249,7 @@ exports[` should render correctly with ssrBlogs 1`] = ` - /typeform ⇒ https://form.typeform.com/to/WJSWmnKh + /typeform ⇒ https://georgegillams.typeform.com/contact
@@ -7782,7 +7782,7 @@ exports[` should render correctly with ssrBlogs 1`] = ` - /contraster-feedback ⇒ https://form.typeform.com/to/XhSSvzDp + /contraster-feedback ⇒ https://georgegillams.typeform.com/contraster
diff --git a/src/utils/common/typeformConstants.js b/src/utils/common/typeformConstants.js new file mode 100644 index 000000000..b242b6673 --- /dev/null +++ b/src/utils/common/typeformConstants.js @@ -0,0 +1,3 @@ +export const CONTACT_FORM = 'https://georgegillams.typeform.com/contact'; +export const LOST_FOUND_FORM = 'https://georgegillams.typeform.com/found'; +export const CONTRASTER_FEEDBACK_FORM = 'https://georgegillams.typeform.com/contraster';