gatsby-core-theme 1.6.5 → 1.6.6

package/CHANGELOG.md

@@ -1,3 +1,14 @@
+## [1.6.6](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v1.6.5...v1.6.6) (2021-11-23)
+
+
+### Bug Fixes
+
+* added captcha on form ([a85dcb1](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/a85dcb1b6aa405cab07b4e2d235e63bb189f9511))
+* general fixes ([80bab76](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/80bab7614074a770f0d97a3c3499086701fe7bda))
+
+
+* Merge branch 'tm-2565-contact-us-page' into 'master' ([0563d78](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/0563d781911004f3fb370e96fcca76066405cd60))
+
 ## [1.6.5](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v1.6.4...v1.6.5) (2021-11-22)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-core-theme",
-  "version": "1.6.5",
+  "version": "1.6.6",
   "description": "Gatsby Theme NPM Package",
   "main": "index.js",
   "GATSBY_RECAPTCHA_SITEKEY": "6LfoyvMUAAAAAO4nl_MQnqHb4XdHxEiu5cXgIqeB",
@@ -57,7 +57,7 @@
     "react": "^17.0.2",
     "react-cookies": "^0.1.1",
     "react-dom": "^17.0.2",
-    "react-google-recaptcha": "^2.0.1",
+    "react-google-recaptcha": "^2.1.0",
     "react-helmet": "^6.0.0",
     "react-icons": "^4.2.0",
     "react-lazyload": "^2.6.5"

package/src/components/organisms/form/form.module.scss

@@ -1,8 +1,6 @@
-.contactForm,
-.newsLetterForm {
+.contactForm {
   width: 100%;
-  max-width: 80rem;
-  margin: 0 auto;
+  padding-top: 1.6rem;
   form {
     width: 100%;
     @include flex-direction(column);
@@ -20,16 +18,17 @@
     .formGroup {
       width: 100%;
       display: inline-block;
+      background-color: var(--color-48);
       &.name {
-        width: calc(50% - 0.4rem);
-        margin-right: 0.8rem;
+        width: calc(50% - 0.8rem);
+        margin-right: 1.6rem;
       }
       &.email {
-        width: calc(50% - 0.4rem);
+        width: calc(50% - 0.8rem);
       }
       &.message {
         width: 100%;
-        margin-bottom: 1rem;
+        margin-bottom: 1.6rem;
       }
     }
   }
@@ -51,14 +50,14 @@
 
   input,
   textarea {
-    background: #f3f2f2;
-    border: 1px solid rgba(0, 0, 0, 0.1);
+    background: var(--color-48);
     border-radius: 0.3rem;
     font-size: 1.4rem;
+    line-height: 2.1rem;
     padding: 1.6rem;
     width: 100%;
     max-width: 100%;
-    //   border: none;
+    border: none;
     outline: none;
     &:invalid,
     &.invalid {
@@ -78,12 +77,16 @@
     display: none;
   }
 }
+
 .formButton {
+  display: inline-block;
   width: 100%;
+  margin-bottom: .8rem;
   button {
+    margin: 0;
     width: 100%;
     text-align: center;
-    height: 4.4rem;
+    height: 4.8rem;
     &:focus {
       border: none;
       outline: none;
@@ -92,37 +95,36 @@
   @include min(tablet) {
     width: 100%;
     button {
-      width: auto;
+      min-width: 16.2rem;
     }
   }
-  @include min(desktop) {
+  @include min(tablet) {
     width: auto;
     margin-right: 1.6rem;
     display: inline-block;
   }
 }
 .formAlerts {
-  width: 100%;
+  display: inline-block;
   order: -1;
   @include min(tablet) {
+    width: calc(100% - 18rem);
     order: unset;
   }
   @include min(desktop) {
-    width: calc(100% - 12rem);
     display: inline-block;
-    float: right;
   }
   div {
     border-radius: 0.4rem;
-    border: 1px solid #000;
+    border: 1px solid var(--color-33);
     font-size: 1.4rem;
     font-weight: 400;
     width: 100%;
     height: 4.4rem;
     padding: 1rem 1.6rem;
     &.alertSuccess {
-      border-color: var(--primary-color);
-      color: var(--primary-color);
+      border-color: var(--color-44);
+      color: var(--color-44) ;
     }
     &.alertDanger {
       border-color: var(--color-11);

package/src/components/organisms/form/index.js

@@ -1,6 +1,6 @@
-import React, { useState } from 'react';
+import React, { useState, useRef } from 'react';
 import PropTypes from 'prop-types';
-
+import ReCAPTCHA from 'react-google-recaptcha';
 import Button from '~atoms/button';
 import styles from './form.module.scss';
 
@@ -13,11 +13,13 @@ const FormComponent = ({
   hasButton = true,
   buttonLabel = 'Submit',
 }) => {
+  const recaptchaRef = useRef();
   const [state, setState] = useState({
     loading: false,
     success: false,
     failed: false,
     isValid: true,
+    isDisabled: true,
     name: '',
     email: '',
     message: '',
@@ -41,14 +43,19 @@ const FormComponent = ({
   }
   const handleSubmit = (e) => {
     e.preventDefault();
-    const { name, email, message } = state;
-    if (name === '' || email === '' || (type === 'contact' && message === '')) {
-      setState({ ...state, isValid: false });
+    const { name, email, message, isDisabled } = state;
+    if (
+      name === '' ||
+      email === '' ||
+      (type === 'contact' && message === '') ||
+      isDisabled === true
+    ) {
+      setState({ ...state, isValid: false, success: false });
       return;
     }
 
     const form = e.target;
-    setState({ ...state, loading: true, success: false, failed: false });
+    setState({ ...state, loading: true, success: false, failed: false, isDisabled: true });
     postData(submitUrl, new FormData(form))
       .then((response) => {
         // on success
@@ -58,6 +65,7 @@ const FormComponent = ({
             success: true,
             loading: false,
             isValid: true,
+            isDisabled: true,
           });
         } else {
           // on error
@@ -78,8 +86,14 @@ const FormComponent = ({
           isValid: true,
         });
       });
+    recaptchaRef.current.reset();
   };
 
+  function recaptchaOnChange(value) {
+    // eslint-disable-next-line no-unused-expressions
+    value && setState({ ...state, isDisabled: false });
+  }
+
   return (
     <div
       className={`${styles.formComponent} ${
@@ -122,6 +136,13 @@ const FormComponent = ({
           </div>
         )}
         {/* if has button  */}
+        <div className={styles.recaptcha}>
+          <ReCAPTCHA
+            ref={recaptchaRef}
+            sitekey={`${process.env.RECAPTCHA_SITE_KEY}`}
+            onChange={recaptchaOnChange}
+          />
+        </div>
         {hasButton && (
           <div className={styles.formButton}>
             <Button

package/src/components/organisms/head/index.js

@@ -31,6 +31,12 @@ export function getRobotOptions(options) {
   if (process.env.GATSBY_ACTIVE_ENV === 'development') array.push('noindex,follow');
   return array.join();
 }
+
+function setName(string) {
+  const [name] = string.split('.');
+  return name[0].toUpperCase() + name.slice(1);
+}
+
 const Head = ({ page = {}, siteInfo }) => {
   const pageImage = getPageImage(page) ? getPageImage(page) : imagePrettyUrl(siteInfo?.site_logo);
   // When google re-indexes dev NSA and IRL, remove lines 28, 41, 42, 43 and process.env.GATSBY_ACTIVE_ENV !== 'development' from lines 24, 25, 27, 29, 43
@@ -43,7 +49,12 @@ const Head = ({ page = {}, siteInfo }) => {
       {page.meta_robots && process.env.GATSBY_ACTIVE_ENV !== 'development' && (
         <meta name="robots" content={page.meta_robots.join()} />
       )}
-      {page.robot_options && <meta name="robots" content={getRobotOptions(page.robot_options)} />}
+
+      {page.robot_options && !page.path.includes('/page/') && (
+        <meta name="robots" content={getRobotOptions(page.robot_options)} />
+      )}
+      {page.path.includes('/page/') && <meta name="robots" content="noindex,follow" />}
+
       {process.env.GATSBY_ACTIVE_ENV === 'development' && (
         <meta name="googlebot" content="noindex,follow" />
       )}
@@ -51,11 +62,12 @@ const Head = ({ page = {}, siteInfo }) => {
       {page.preconnect_links &&
         page.preconnect_links.map((link) => <link key={keygen()} rel="preconnect" href={link} />)}
       <meta name="og:title" content={page.meta_title} />
-      <meta name="og:site_name" content={siteInfo?.site_name} />
+      <meta name="og:site_name" content={siteInfo?.site_name && setName(siteInfo?.site_name)} />
       <meta name="og:description" content={page.meta_description} />
-      <meta name="og:type" content="article" />
+      <meta name="og:type" content={page.path === '/' ? 'website' : 'article'} />
       <meta name="og:image" content={pageImage} />
       <meta name="og:url" content={getUrl(page.path)} />
+
       {schemaGenerator(page, pageImage).map(
         (schema) =>
           schema && (

package/src/hooks/tabs/tab/tab-list.js

@@ -79,7 +79,7 @@ TabList.propTypes = {
   activeTab: PropTypes.string,
   activeTabClass: PropTypes.string,
   alignRight: PropTypes.bool,
-  gtmClass: PropTypes.bool,
+  gtmClass: PropTypes.string,
 };
 
 export default TabList;

package/src/pages/404/404.test.js

@@ -10,12 +10,12 @@ describe('404', () => {
     const { container } = render(
       <PageNotFound
         pageContext={{
-          page: { sections: {} },
+          page: { sections: {}, path: '' },
           marketSections: {},
           siteInfo: {
             site_name: '',
-            site_logo: ''
-          }
+            site_logo: '',
+          },
         }}
       />
     );

package/src/styles/utils/variables/_colors.scss

@@ -49,4 +49,5 @@
   --color-45: #83ad10;
   --color-46: #cc8006;
   --color-47: #006695;
+  --color-48: #E5E5E5;
 }

package/tests/factories/modules/contact-us-authors.factory.js

@@ -0,0 +1,59 @@
+// eslint-disable-next-line import/prefer-default-export
+export const authors = {
+  1: {
+    author_title: 'Irish Sportsbook Specialist',
+    email_address: 'siobhan.aslett@irishluck.ie',
+    facebook_profile: null,
+    image: 'siobhan-aslett.png',
+    image_alt: 'Siobhan Aslett',
+    image_object: {
+      width: '1024',
+      height: '1024',
+      url: 'https://assets-srv.s3.eu-west-1.amazonaws.com/siobhan-aslett.png',
+      filename: 'siobhan-aslett.png',
+    },
+    instagram_profile: null,
+    linkedin_profile: 'https://ie.linkedin.com/in/siobhan-aslett-b748091ab',
+    name: 'Siobhan Aslett',
+    twitter_profile: null,
+  },
+  2: {
+    author_title: 'Online Casino Specialist',
+    email_address: 'dermot.heathcote@irishluck.ie',
+    facebook_profile: null,
+    image: 'dermot-heathcote.png',
+    image_alt: null,
+    instagram_profile: null,
+    linkedin_profile: null,
+    image_object: {
+      width: '1024',
+      height: '1024',
+      url: 'https://assets-srv.s3.eu-west-1.amazonaws.com/dermot-heathcote.png',
+      filename: 'dermot-heathcote.png',
+    },
+    name: 'Dermot Heathcote',
+    twitter_profile: null,
+  },
+  3: {
+    additional_url: null,
+    author_title: 'Junior Copywriter',
+    email_address: 'cameron.murphy@irishluck.ie',
+    facebook_profile: null,
+    image: 'cameron-murphy.jpeg',
+    image_alt: null,
+    image_asset_id: 37728,
+    image_object: {
+      width: '1024',
+      height: '1024',
+      url: 'https://assets-srv.s3.eu-west-1.amazonaws.com/cameron-murphy.jpeg',
+      filename: 'cameron-murphy.jpeg',
+    },
+    instagram_profile: null,
+    linkedin_profile: null,
+    name: 'Cameron Murphy',
+    personal_website: null,
+    profile_page_path: 'about-us/cameron-murphy',
+    site_id: 1,
+    twitter_profile: null,
+  },
+};

package/tests/factories/modules/site-schema.factory.js

@@ -0,0 +1,17 @@
+// eslint-disable-next-line import/prefer-default-export
+export const siteSchema = {
+  address: null,
+  alias_site_name: null,
+  email: null,
+  facebook: 'https://www.facebook.com/',
+  instagram: 'https://www.instagram.com/',
+  linkedin: 'https://www.linkedin.com/',
+  organization_founding_date: null,
+  owned_by: null,
+  phone_number: null,
+  site_name: null,
+  spotify: 'https://www.spotify.com/',
+  twitter: 'https://www.twitter.com/',
+  wikipedia: 'https://www.wikipedia.com/',
+  youtube: 'https://www.youtube.com/',
+};