gatsby-matrix-theme 7.1.2 → 7.1.3

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [7.1.3](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v7.1.2...v7.1.3) (2022-05-19)
+
+
+### Bug Fixes
+
+* an extra if to check if number is present ([f9c09d1](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/f9c09d151c4549e38bef447c8bba73370a9b70b7))
+* button text can be passed through props ([5cb8411](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/5cb84113b3bcad14f8d215f86690dd55f18d4289))
+* og image twitter ([5705d3e](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/5705d3e32acd59df43287ed392b1bddb2b392054))
+* og meta tag facebook ([bbf3205](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/bbf3205e49e9c53cb8254c84239ffd213ef539b4))
+* phone number or email required ([1343b8a](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/1343b8a1b5254fa6a01c3e1120715db5298691bf))
+* some issues ([6b965a4](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/6b965a45b120f85396b528ea04fa53f65edd087e))
+* thank you aded conditionally ([88e58be](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/88e58be24b70636b086a7c0ccc8851a6e2d4769d))
+* updated to latest core version ([6b37034](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/6b370349be538ff663dd67393f7d689d66627b55))
+
+
+* Merge branch 'tm-2828-signup-form' into 'master' ([d56624c](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/d56624c16f2c7b2c912657577386210bd2c0062c))
+* Merge branch 'tm-2828-signup-form' into 'master' ([8653ce5](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/8653ce544cc550d2c1093095bbbc2a10620c6e93))
+* Merge branch 'tm-2828-phone-number-request' into 'master' ([91b1d93](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/91b1d93f5a5f72bb8832071946ef5c506c58387b))
+* Merge branch 'tm2889-og-image' into 'master' ([d247e08](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/d247e08ca99b4d8b864bd45862a8b9294b9a0799))
+* Merge branch 'tm-2563-unhandled-issues' into 'master' ([d8f3887](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/d8f388789d09c52eb30cf1ebe35b2ea8ffc46a91))
+
 ## [7.1.2](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v7.1.1...v7.1.2) (2022-05-18)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-matrix-theme",
-  "version": "7.1.2",
+  "version": "7.1.3",
   "main": "index.js",
   "description": "Matrix Theme NPM Package",
   "author": "",
@@ -29,7 +29,7 @@
     "react": "^17.0.2",
     "gatsby-plugin-sitemap": "^3.3.0",
     "react-dom": "^17.0.2",
-    "gatsby-core-theme": "^7.0.6"
+    "gatsby-core-theme": "^7.0.7"
   },
   "devDependencies": {
     "@babel/core": "^7.13.1",

package/src/components/atoms/newsletter/form/index.js

@@ -13,17 +13,20 @@ const NewsletterForm = ({
   subscribeText,
   setErr,
   redirectUrl,
+  privacyText,
   formText = {
     placeholderName: 'John Doe',
     placeholderEmail: 'johndoe@email.com',
     placeholderPhoneNumber: '123456789',
     buttonText: 'Submit',
+    thankYouText: null,
     textAboveEmail: 'Email address',
     textAboveName: 'Your name',
     textAbovePhoneNumber: 'Phone number',
     mainText,
     subscribeText,
     redirectUrl,
+    privacyText,
   },
 }) => {
   // eslint-disable-next-line react/destructuring-assignment
@@ -55,15 +58,17 @@ const NewsletterForm = ({
       e.email.classList.remove(styles.error);
     }
 
-    if (!e.phone.value && e.phone.value.trim() === '') {
-      numberValidate = false;
-      e.phone.classList.add(styles.error);
-    } else {
-      numberValidate = true;
-      e.phone.classList.remove(styles.error);
+    if (e.phone) {
+      if (!e.phone.value && e.phone.value.trim() === '') {
+        numberValidate = false;
+        e.phone.classList.add(styles.error);
+      } else {
+        numberValidate = true;
+        e.phone.classList.remove(styles.error);
+      }
     }
 
-    if (nameValidate && emailValidate && numberValidate) {
+    if (nameValidate && (emailValidate || numberValidate)) {
       setToggleSubscribe(true);
       return true;
     }
@@ -121,7 +126,7 @@ const NewsletterForm = ({
   return (
     <>
       {toggleSubscribe ? (
-        <h1>Thank you</h1>
+        form.textthankYouText && <h1>Thank you</h1>
       ) : (
         <h1 className={styles.maintext}>{formText.mainText}</h1>
       )}
@@ -152,13 +157,15 @@ const NewsletterForm = ({
             <p className={styles.textAboveInput}>{formText.textAbovePhoneNumber}</p>
           ) : null}
 
-          <input
-            className={styles.input}
-            placeholder={formText.placeholderPhoneNumber}
-            type="tel"
-            name="phone"
-          />
-          <PrivacyandSuccess privacyText={formText.privacyText} />
+          {formText.placeholderPhoneNumber && (
+            <input
+              className={styles.input}
+              placeholder={formText.placeholderPhoneNumber}
+              type="tel"
+              name="phone"
+            />
+          )}
+          <PrivacyandSuccess btnText={formText.buttonText} privacyText={formText.privacyText} />
         </form>
       ) : (
         <span>
@@ -189,6 +196,7 @@ NewsletterForm.propTypes = {
   mainText: PropTypes.string,
   subscribeText: PropTypes.string,
   redirectUrl: PropTypes.string,
+  privacyText: PropTypes.string,
 };
 
 export default NewsletterForm;

package/src/components/atoms/newsletter/privacy&button/index.js

@@ -3,17 +3,18 @@ import PropTypes from 'prop-types';
 import Button from 'gatsby-core-theme/src/components/atoms/button';
 import styles from './newsletter-privacy&button.module.scss';
 
-const PrivacyandSuccess = ({ privacyText }) => (
+const PrivacyandSuccess = ({ privacyText, btnText }) => (
   <div className={styles.display}>
     {privacyText ? (
       <p className={styles.privacytext} dangerouslySetInnerHTML={{ __html: privacyText }} />
     ) : null}
-    <Button className={styles.button} btnText="Submit" isButton />
+    <Button className={styles.button} btnText={btnText} isButton />
   </div>
 );
 
 PrivacyandSuccess.propTypes = {
   privacyText: PropTypes.string,
+  btnText: PropTypes.string,
 };
 
 export default PrivacyandSuccess;

package/src/gatsby-core-theme/components/organisms/head/index.js

@@ -71,7 +71,7 @@ const Head = ({ page = {}, siteInfo }) => {
         />
         <meta property="og:description" content={parsedMetaDescr} />
         <meta property="og:type" content={page.path === '/' ? 'website' : 'article'} />
-        <meta property="og:image" content={pageImage} />
+        <meta property="og:image" content={pageImage.replace('/filters:format(webp)', '')} />
         <meta property="og:url" content={getUrl(page.path)} />
         <meta
           property="og:locale"
@@ -98,7 +98,7 @@ const Head = ({ page = {}, siteInfo }) => {
           <meta name="twitter:site" content={`@${twitterUsername}`} />
           <meta name="twitter:creator" content={`@${twitterUsername}`} />
           <meta name="twitter:card" content="summary" />
-          <meta name="twitter:image" content={pageImage} />
+          <meta name="twitter:image" content={pageImage.replace('/filters:format(webp)', '')} />
           <meta property="twitter:label1" content="Reading time" />
           <meta property="twitter:data1" content={`${page.reading_time}`} />
         </Helmet>