gatsby-core-theme 36.0.0 → 36.0.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [36.0.1](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v36.0.0...v36.0.1) (2024-08-21)
+
+
+### Bug Fixes
+
+* cards v2 ([0632f74](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/0632f7482bb4ecb16e9305b4f46921ae2761e015))
+
 # [36.0.0](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v35.1.9...v36.0.0) (2024-08-21)
 
 

package/package.json

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

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

@@ -1,38 +1,48 @@
 /* eslint-disable camelcase */
 /* eslint-disable no-useless-concat */
 /* eslint-disable no-restricted-globals */
-import React, { useEffect } from 'react';
-import PropTypes from 'prop-types';
+import React, { useEffect } from "react";
+import PropTypes from "prop-types";
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { v4 as uuidv4 } from 'uuid';
-import { getSection } from '~helpers/getters';
-import Header from '~molecules/header';
-import Main from '~molecules/main';
-import Footer from '~molecules/footer';
-import Navigation from '~organisms/navigation';
-import FloatingArea from '../../molecules/floating-area';
-import styles from './body.module.scss';
-import { setCookie, getCookie } from '~helpers/cookies';
-import { pageTypes } from '../../../constants/site-settings/navigation';
+import { v4 as uuidv4 } from "uuid";
+import { getSection, getMarketSection } from "~helpers/getters";
+import Header from "~molecules/header";
+import Main from "~molecules/main";
+import Footer from "~molecules/footer";
+import Navigation from "~organisms/navigation";
+import FloatingArea from "../../molecules/floating-area";
+import styles from "./body.module.scss";
+import { setCookie, getCookie } from "~helpers/cookies";
+import { pageTypes } from "../../../constants/site-settings/navigation";
 
 function Body({ pageContext, children, serverData }) {
   const getBodySection = (name) => getSection(name, pageContext);
   const { template } = pageContext.page;
-  const is404 = pageContext?.page?.path?.includes('404');
-  const main = getBodySection('main');
-  const navigation = getBodySection(pageTypes[template]?.section || pageTypes.default.section);
-  const footer = getBodySection('footer');
+  const is404 = pageContext?.page?.path?.includes("404");
+  const main = getBodySection("main");
+
+  const navigation = getMarketSection(
+    pageTypes[template]?.section || pageTypes.default.section,
+    pageContext
+  );
+
+  const footer = pageTypes[template]?.disableFooter
+    ? null
+    : getMarketSection("footer", pageContext);
 
   useEffect(() => {
-    if (!getCookie('affUUID')) {
-      setCookie('affUUID', uuidv4());
+    if (!getCookie("affUUID")) {
+      setCookie("affUUID", uuidv4());
     }
   }, []);
 
-  const customComponent = pageTypes[template]?.customComponent ?? pageTypes.default.customComponent;
-  const marketDropdown = pageTypes[template]?.marketDropdown ?? pageTypes.default.marketDropdown;
+  const customComponent =
+    pageTypes[template]?.customComponent ?? pageTypes.default.customComponent;
+  const marketDropdown =
+    pageTypes[template]?.marketDropdown ?? pageTypes.default.marketDropdown;
   const menu = pageTypes[template]?.navMenu ?? pageTypes.default.navMenu;
-  const disableSearch = pageTypes[template]?.disableSearch ?? pageTypes.default.disableSearch;
+  const disableSearch =
+    pageTypes[template]?.disableSearch ?? pageTypes.default.disableSearch;
 
   return (
     <>
@@ -53,11 +63,19 @@ function Body({ pageContext, children, serverData }) {
       )}
       {!is404 && <Header serverData={serverData} section={pageContext} />}
       {main && !children && (
-        <Main serverData={serverData} section={main} pageContext={pageContext} />
+        <Main
+          serverData={serverData}
+          section={main}
+          pageContext={pageContext}
+        />
       )}
       {children && <main>{children}</main>}
       <Footer template={template} section={footer} />
-      <FloatingArea pageContext={pageContext} template={template} customStyles={styles} />
+      <FloatingArea
+        pageContext={pageContext}
+        template={template}
+        customStyles={styles}
+      />
     </>
   );
 }

package/src/constants/site-settings/navigation.js

@@ -11,6 +11,7 @@ export const pageTypes = {
     disablePopup: true,
   },
   responsible_gambling_guide: {
+    disableFooter: true,
     section: "rg_navigation",
     showLogoWithLink: false,
     disableSearch: false,

package/src/helpers/getters.mjs

@@ -25,8 +25,7 @@ export function getExtraField(extraFields, key, defaultValue) {
   return null;
 }
 
-export function getSection(shortCode, pageContext) {
-  const page = pageContext && pageContext.page;
+export function getMarketSection(shortCode, pageContext) {
   const marketSections = pageContext && pageContext.marketSections;
 
   // market has priority over page
@@ -34,6 +33,13 @@ export function getSection(shortCode, pageContext) {
     return marketSections[shortCode];
   }
 
+  return null;
+}
+
+export function getSection(shortCode, pageContext) {
+  const page = pageContext && pageContext.page;
+  const marketSections = pageContext && pageContext.marketSections;
+
   // eslint-disable-next-line
   if (
     !page ||
@@ -42,6 +48,11 @@ export function getSection(shortCode, pageContext) {
   ) {
     return null;
   }
+  
+  // market has priority over page
+  if (marketSections[shortCode]) {
+    return marketSections[shortCode];
+  }
 
   return page.sections[shortCode] || {};
 }

package/src/helpers/processor/common.mjs

@@ -79,11 +79,8 @@ export function clonePageForCards(item, style) {
     : item.relation;
 
   if(object.relation && object.relation.bonus) {
-    delete object.relation.bonus.withdrawal_methods;
-    delete object.relation.bonus.currencies;
-    delete object.relation.bonus.license_objects;
-  
-    object.relation.bonus.deposit_methods = (object.relation.bonus.deposit_methods && object.relation.bonus.deposit_methods.length > 0) ?  object.relation.bonus.deposit_methods.slice(0, 3) : [];  
+    object.relation.bonus.withdrawal_methods = (object.relation.bonus.withdrawal_methods && object.relation.bonus.withdrawal_methods.length > 0) ?  object.relation.bonus.withdrawal_methods.slice(0, 5) : [];
+    object.relation.bonus.deposit_methods = (object.relation.bonus.deposit_methods && object.relation.bonus.deposit_methods.length > 0) ?  object.relation.bonus.deposit_methods.slice(0, 5) : [];  
   }
   
   if (

package/src/helpers/processor/modules.mjs

@@ -134,12 +134,12 @@ export function processCardsV2(module, pagesCloned, pagesMappedById, pageId) {
     const selectedReviewer = module.cards_selector_filters.page_reviewer;
     const selectedCategories = module.cards_selector_filters.page_categories;
 
-    const allFilters = [selectedAuthors, selectedReviewer, selectedCategories, moduleSelectedProviders, moduleSelectedCategories, moduleSelectedTypes];
+    const allFilters = [cardType, pageTemplateId, selectedAuthors, selectedReviewer, selectedCategories, moduleSelectedProviders, moduleSelectedCategories, moduleSelectedTypes];
     const u8 = new Uint8Array(allFilters);
     const b64 = Buffer.from(u8).toString('base64');
 
-      
 
+    
     if (cardType) {
       // Get all pages by the selected page type
       const pagesGroupedByType = pagesCloned[cardType];

package/src/helpers/tracker.mjs

@@ -51,7 +51,7 @@ function deparam(paramStr) {
 }
 
 function clean(obj) {
-  for (var propName in obj) {
+  for (const propName in obj) {
     if (obj[propName] === null || obj[propName] === undefined) {
       delete obj[propName];
     }