gatsby-core-theme 30.0.115 → 30.0.116

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [30.0.116](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v30.0.115...v30.0.116) (2024-04-26)
+
+
+### Bug Fixes
+
+* add the option to translate newsletter per page ([bba0490](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/bba04906c05bc5c925fe3527f6dc1fb33e9783ab))
+* add validation ([11e3141](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/11e3141bbf1011c62113c63eb9019c8477ad1e1e))
+* fix translation per page ([646e777](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/646e777fac1967a0f7ba56aef5859e704fe73b19))
+
+
+* Merge branch 'tm-4315-newsletter' into 'master' ([2e16682](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/2e166829a50958e78f226611711eed9df1b63c95))
+
 ## [30.0.115](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v30.0.114...v30.0.115) (2024-04-22)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-core-theme",
-  "version": "30.0.115",
+  "version": "30.0.116",
   "description": "Gatsby Theme NPM Package",
   "author": "",
   "license": "ISC",

package/src/components/atoms/contact-form/index.js

@@ -47,6 +47,7 @@ const ContactForm = ({
             successMessage={successMessage}
             failMessage={failMessage}
             validationMessage={validationMessage}
+            path={page?.path}
           />
         </div>
       </div>
@@ -59,6 +60,7 @@ export default ContactForm;
 ContactForm.propTypes = {
   page: PropTypes.shape({
     market: PropTypes.string,
+    path: PropTypes.string,
   }).isRequired,
   submitUrl: PropTypes.string,
   successMessage: PropTypes.string,

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

@@ -7,7 +7,14 @@ import { translate } from 'gatsby-core-theme/src/helpers/getters';
 import Form from '../../../organisms/form';
 import { newsLetterForm } from '../../../../constants/forms';
 
-const NewsletterForm = ({ handleApi, redirectUrl, submitText = 'Submit', market, setErr }) => {
+const NewsletterForm = ({
+  handleApi,
+  redirectUrl,
+  submitText = 'Submit',
+  market,
+  setErr,
+  path,
+}) => {
   const [ip, setIP] = useState('');
   const [error, setError] = useState(false);
   const { translations } = useContext(Context) || {};
@@ -81,6 +88,7 @@ const NewsletterForm = ({ handleApi, redirectUrl, submitText = 'Submit', market,
       customeSubmit={handelSubmit}
       customError
       buttonLabel={submitText}
+      path={path}
     />
   );
 };
@@ -90,6 +98,7 @@ NewsletterForm.propTypes = {
   submitText: PropTypes.string,
   market: PropTypes.string,
   setErr: PropTypes.bool,
+  path: PropTypes.string,
 };
 
 export default NewsletterForm;

package/src/components/molecules/newsletter/index.js

@@ -48,7 +48,7 @@ const Newsletter = ({ page, openBtnText = 'Unlock Bonuses', isSticky = true }) =
               : `${styles?.form || ''} ${toggleNewsetter ? styles?.active || '' : ''}`
           }
         >
-          <NewsletterForm market={page?.market} redirectUrl={redirectUrl} />
+          <NewsletterForm market={page?.market} path={page?.path} redirectUrl={redirectUrl} />
           {isSticky && (
             <MdClose
               className={styles?.closeBtn || ''}

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

@@ -21,6 +21,7 @@ const FormComponent = ({
   showLabels = true,
   customeSubmit = null,
   customError = false,
+  path = '',
 }) => {
   const { translations } = useContext(Context) || {};
   const recaptchaRef = useRef();
@@ -105,18 +106,27 @@ const FormComponent = ({
 
   // form not specified on constant
   if (!Object.keys(formOptions).length) return;
+
   return (
     <div className={`${styles.formComponent || ''} `}>
       {formOptions?.title && (
         <h2>
-          {translate(translations, formOptions.title?.translationKey, formOptions.title?.label)}
+          {translate(
+            translations,
+            translations && translations[`${path}_${formOptions.title?.translationKey}`]
+              ? `${path}_${formOptions.title?.translationKey}`
+              : formOptions.title?.translationKey,
+            formOptions.title?.label
+          )}
         </h2>
       )}
       {formOptions?.description && (
         <p>
           {translate(
             translations,
-            formOptions.description?.translationKey,
+            translations && translations[`${path}_${formOptions?.description?.translationKey}`]
+              ? `${path}_${formOptions?.description?.translationKey}`
+              : formOptions?.description?.translationKey,
             formOptions.description?.label
           )}
         </p>
@@ -216,5 +226,6 @@ FormComponent.propTypes = {
   showButtonIcon: PropTypes.bool,
   customError: PropTypes.bool,
   customeSubmit: PropTypes.func,
+  path: PropTypes.string,
 };
 export default FormComponent;

package/src/constants/forms.js

@@ -132,7 +132,7 @@ export const newsLetterForm = {
         options: [
           {
             label:
-              'By subscribing, you confirm that you are over 18 years of age and that you accept our. [link]',
+              'By subscribing, you confirm [link] that you are over 18 years of age and that you accept our.[link] ',
             id: 'checkbox',
             type: 'checkbox',
             link: {
@@ -145,6 +145,18 @@ export const newsLetterForm = {
           },
         ],
       },
+      {
+        type: 'checkbox',
+        id: 'checkbox_1',
+        options: [
+          {
+            label: 'Test test ',
+            id: 'checkbox',
+            type: 'checkbox_1',
+            translationKey: 'newsletter_form_privacy_text_1',
+          },
+        ],
+      },
     ],
   },
   // 'ie_en': {