gatsby-core-theme 17.0.5 → 17.0.7

package/CHANGELOG.md

@@ -1,3 +1,33 @@
+## [17.0.7](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v17.0.6...v17.0.7) (2022-12-28)
+
+
+### Bug Fixes
+
+* add a checker to fix failings ([af60ad2](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/af60ad25f42f3a54e3721ceea3372c61b18ee57d))
+* add eslint disable for cammel case ([b07a2a8](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/b07a2a81c96af9d1d882a33753bc05fa7a3db78e))
+* fix conflicts ([88701ba](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/88701badb2204f6c51025f2b08489b8850de2aac))
+* getPageImage ([1d8be86](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/1d8be865a8ece5f232c7df2aedd92d2a8b387d10))
+* tracker pages to use operator name only ([95e8c59](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/95e8c595ee0c45e50a0f06c63630adda27bb7df1))
+* update operator header for testing ([42c261d](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/42c261d7088d69d57bd4ba0b0238a63a530b6971))
+* update p with span ([110a9d5](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/110a9d57c143dad744edd6f934972ee3da0589d0))
+* update processor in order to update url and email ([44730a6](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/44730a6a4e15d341632cef12a8b3ade9f9760cea))
+
+
+* Merge branch 'tm-2980-using-operator-name-from-market-data-for-url-and-email' into 'master' ([19b619c](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/19b619c6cb9b29098ebc5d258b802e745c01bc2c))
+* Merge branch 'master' into 'tm-2980-using-operator-name-from-market-data-for-url-and-email' ([12bb0ed](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/12bb0edeaa473620dc0a9c3ff66dfc4815e36881))
+* Merge branch 'tm-2980-using-operator-name-from-market-data-for-url-and-email' into 'master' ([b1dc94b](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/b1dc94bf5980c23b5b93d8d9e7e7cd6cd28bd692))
+* Merge branch 'bug-getPageImage' into 'master' ([35b13e0](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/35b13e0102f68979d9ef247fd8eadcea3e085adf))
+
+## [17.0.6](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v17.0.5...v17.0.6) (2022-12-21)
+
+
+### Bug Fixes
+
+* validate payment data pages ([08c1afd](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/08c1afd53794b041354e9b4312436d6f0bc69fbd))
+
+
+* Merge branch 'master' of git.ilcd.rocks:team-floyd/themes/gatsby-themes ([6116b83](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/6116b8306c8d75efb833fb95f8c5e6416ad03d57))
+
 ## [17.0.5](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v17.0.4...v17.0.5) (2022-12-21)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-core-theme",
-  "version": "17.0.5",
+  "version": "17.0.7",
   "description": "Gatsby Theme NPM Package",
   "main": "index.js",
   "GATSBY_RECAPTCHA_SITEKEY": "6LfoyvMUAAAAAO4nl_MQnqHb4XdHxEiu5cXgIqeB",

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

@@ -74,7 +74,11 @@ function Header({ section, content = null, backgroundImage = true, showAuthor =
         </div>
 
         {section.page.template !== 'author' && !['article', 'game'].includes(section.page.type) && (
-          <h1>{section.page.title}</h1>
+          <div>
+            <h1>{section.page.title}</h1>
+            <span>{section.page?.relation?.url}</span>
+            <span>{section.page?.relation?.email}</span>
+          </div>
         )}
         <div className={!content && styles.headerText}>{headerContent()}</div>
       </div>
@@ -98,6 +102,10 @@ Header.propTypes = {
         name: PropTypes.string,
         profile_page_path: PropTypes.string,
       }),
+      relation: PropTypes.shape({
+        url: PropTypes.string,
+        email: PropTypes.string,
+      }),
       authors: PropTypes.shape([PropTypes.shape({})]),
       sections: PropTypes.shape({
         header: PropTypes.shape({

package/src/components/pages/tracker/index.js

@@ -95,10 +95,7 @@ const Tracker = ({
               <LazyImage alt="Site logo" src={logo} />
               <p
                 className={`${styles.mainText} ${operatorLogo && styles.mainTextWithlogo}`}
-              >{`${mainText.replace(
-                '[operator_name]',
-                operator.bonus.operator_name || operator.name
-              )}`}</p>
+              >{`${mainText.replace('[operator_name]', operator.name)}`}</p>
               {operatorLogo && (
                 <LazyImage
                   src={imagePrettyUrl(
@@ -106,7 +103,7 @@ const Tracker = ({
                     operatorLogoWidth,
                     operatorLogoHeight
                   )}
-                  alt={getAltText(imageObject, operator.bonus.operator_name || operator.name)}
+                  alt={getAltText(imageObject, operator.name)}
                   loading="eager"
                   width={operatorLogoWidth}
                   height={operatorLogoHeight}

package/src/helpers/getters.js

@@ -167,8 +167,8 @@ export function getPageImage(page) {
     }
   }
 
-  if (page.type === 'software_provider' && page.relation.logo) {
-    return imagePrettyUrl(page.relation.logo);
+  if (page.type === 'software_provider' && page.relation && page.relation.logo) {
+    return page.relation && imagePrettyUrl(page.relation.logo);
   }
   if (page.banner) {
     return imagePrettyUrl(page.banner);

package/src/helpers/processor/index.js

@@ -1,3 +1,4 @@
+/* eslint-disable camelcase */
 /* eslint-disable no-unused-expressions */
 /* eslint-disable import/no-extraneous-dependencies */
 /* eslint-disable no-console */
@@ -269,10 +270,21 @@ export default {
               // Add path of page for payment
               bonus.deposit_methods &&
                 bonus.deposit_methods.forEach((e) => {
-                  const el = pages.payment_method.find((el) => e.id === el.relation_id);
+                  const el =
+                    pages.payment_method &&
+                    pages.payment_method.find((el) => e.id === el.relation_id);
                   if (el) e.path = el.path;
                 });
 
+              const { operator_url, support_email, operator_name } = page.relation.bonus;
+
+              page.relation.url = operator_url || page.relation.url;
+
+              page.relation.email = support_email || page.relation.email;
+
+              page.relation.name = operator_name || page.relation.name;
+
+              // eslint-disable-next-line no-unused-expressions
               ribbons.length > 0 &&
                 ribbons.forEach((res, index) => {
                   ribbons[index] = data.ribbons[res] ? data.ribbons[res].label : res;