gatsby-core-theme 42.0.1 → 42.0.3

package/CHANGELOG.md

@@ -1,3 +1,40 @@
+## [42.0.3](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v42.0.2...v42.0.3) (2025-02-07)
+
+
+### Bug Fixes
+
+* add checker ([586b529](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/586b5292d469676e995a7b0c6dddbfa7385b8b30))
+* add tests ([24fe1b1](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/24fe1b19b46addca856bed2d727c46b90cffcc74))
+* add traling slash on content and og:url ([4c1d918](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/4c1d9180e2e3c81ad965a6bc8f65c4fcf415e561))
+* enabled mobile bottom navigation ([b3762c8](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/b3762c88226bf712fa0195e1178773d7aa0d4942))
+* fix placeholder ([75a2619](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/75a261915fee687c451ac5fbc21ef8c21c14f101))
+* update bottom navigation ([ae5fa79](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/ae5fa79b1216e0ff36056b7ffb2616828b81aff9))
+
+
+* Merge branch 'fix-meta-title-placeholder' into 'master' ([8ced56d](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/8ced56d344ff6dea84077d869b168113d1a47bf8))
+* Merge branch 'tm-5176-mobile-bottom-navigation' into 'master' ([9ce920b](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/9ce920b9ef19c0d8133ac43f8826df7a2990b8f6))
+* Merge branch 'tm-5161-trailing-slash' into 'master' ([bb9060e](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/bb9060ee6ddda62657e8275f8f99fe573b136709))
+
+
+### Tests
+
+* add test data ([97b604f](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/97b604f66925da7a6846ccc20e593a52d70e169b))
+
+## [42.0.2](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v42.0.1...v42.0.2) (2025-02-05)
+
+
+### Code Refactoring
+
+* changes to crypto endpoints ([5edcb95](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/5edcb95842d1e37d2f366a2fa784b29f049eba91))
+
+
+* Merge branch 'crypto-endpoints' into 'master' ([1a3f8b5](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/1a3f8b59901ea066c9352e59f1cc4d81ad83e165))
+
+
+### Tests
+
+* add test ([c10989c](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/c10989cf8a0a2200dc09f626a913426d6713be57))
+
 ## [42.0.1](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v42.0.0...v42.0.1) (2025-02-04)
 
 

package/gatsby-node.mjs

@@ -46,6 +46,8 @@ let gamesData = null;
 let sportsData = null;
 let ribbonsData = null;
 let operatorData = null;
+let cryptoExchangesData = null;
+let cryptoBrokersData = null;
 let paymentData = null;
 let allMarketPrefixes = [];
 let allMarketSectionsData = null;
@@ -263,7 +265,9 @@ export const createPages = async (
         payment_method: paymentData,
         software_provider: providersData,
         game: gamesData,
-        sports_data: sportsData
+        sports_data: sportsData,
+        crypto_exchanges: cryptoExchangesData,
+        crypto_brokers: cryptoBrokersData,
       },
     },
     themeOptions,
@@ -505,7 +509,9 @@ export const onPreBootstrap = async () => {
     paymentData,
     providersData,
     gamesData,
-    sportsData
+    sportsData,
+    cryptoExchangesData,
+    cryptoBrokersData,
   } = await fetchSiteSettings(process.env.GATSBY_SITE_NAME));
 };
 

package/package.json

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

package/src/components/molecules/floating-area/index.js

@@ -8,6 +8,7 @@ import CookieConsent from '~organisms/cookie-consent';
 import isSticky from '~hooks/stickyOnScroll';
 import { TrackingKeys } from '~constants/tracking-api'
 import styles from './floating-area.module.scss';
+import { layout } from '../../../constants/site-settings/navigation';
 
 export default function FloatingArea({
   pageContext,
@@ -20,6 +21,7 @@ export default function FloatingArea({
   const showScroll = isSticky(offsetTop);
   const [closedBanner, setClosedBanner] = useState(false);
   const pageType = pageContext.page.relation_type;
+  const pageTemplate = pageContext?.page?.template
   const getAllMarketsHomepage = () =>
     Object.keys(pageContext?.allMarkets || {})?.map((elm) => elm.split('_')[1]) || [];
   const isPageHomepage =
@@ -32,7 +34,7 @@ export default function FloatingArea({
       : null;
 
   const FooterNavigation =
-    footerNavigationData && footerNavigationData?.modules?.length > 0 && pageType !== 'operator'
+    footerNavigationData && footerNavigationData?.modules?.length > 0 && pageType !== 'operator'&& layout[pageTemplate]?.footerNavigation
       ? lazy(() => import(`gatsby-core-theme/src/components/organisms/footer-navigation`))
       : null;
 

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

@@ -10,14 +10,19 @@ export function getLanguage(language) {
   if (language === 'no') return 'nb-NO';
   return language || 'en';
 }
-export function getCanonicalUrl(page) {
+export function getCanonicalUrl(page, isTracker) {
   if (page.canonical_url) {
     return `${process.env.GATSBY_SITE_URL}${page.canonical_url}`;
   }
   if (page.path === '/') {
     return process.env.GATSBY_SITE_URL;
   }
-  return `${process.env.GATSBY_SITE_URL}${page.path.replace(/^\//, '')}`;
+  const trailingSlash = process.env.TRAILING_SLASH ? '/' : '';
+
+  return `${process.env.GATSBY_SITE_URL}${page.path.replace(/^\//, '')}${
+    !isTracker ? trailingSlash : ''
+  }`
+
 }
 export function getRobotOptions(options) {
   const array = [];
@@ -39,6 +44,7 @@ function setName(string) {
 
 const HeadData = ({ page = {}, siteInfo }) => {
   const pageImage = getPageImage(page) ? getPageImage(page) : imagePrettyUrl(siteInfo?.site_logo);
+  const isTracker = page.template === 'tracker';
   let defaultHref = null;
   // 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
   return (
@@ -55,7 +61,7 @@ const HeadData = ({ page = {}, siteInfo }) => {
       {process.env.GATSBY_ACTIVE_ENV === 'development' && (
         <meta name="googlebot" content="noindex,follow" />
       )}
-      <link rel="canonical" href={getCanonicalUrl(page)} />
+      <link rel="canonical" href={getCanonicalUrl(page, isTracker)} />
       {page?.hreflangs?.map((link) => {
         if (link?.default) defaultHref = link?.path;
         return <link rel="alternate" href={getUrl(link.path)} hrefLang={link.language} />;
@@ -69,7 +75,7 @@ const HeadData = ({ page = {}, siteInfo }) => {
       <meta name="og:description" content={page.meta_description} />
       <meta name="og:type" content={page.path === '/' ? 'website' : 'article'} />
       <meta name="og:image" content={pageImage} />
-      <meta name="og:url" content={getUrl(page.path)} />
+      <meta name="og:url" content={getCanonicalUrl(page, isTracker)} />
       <meta
         property="og:locale"
         content={getLanguage(page.language) === 'en' ? 'en_GB' : getLanguage(page.language)}

package/src/constants/pick-keys.mjs

@@ -166,6 +166,31 @@ export const pickRelationKeys = {
   payment_method: ["name", "rating", "logo", "selling_points", "id", "payout_time", "min_deposit", "support_types", "short_name", "iso_code", ],
   country: ["id", "iso_code", "logo", "name", "code"],
   currency: ["id", "name", "iso_code", "symbol", "crypto", "logo"],
+  crypto: [
+    "logo",
+    "id",
+    "selling_points",
+    "founded",
+    "name",
+    "rating_security",
+    "rating_fees",
+    "rating_usability",
+    "rating_features",
+    "rating_support",
+    "rating_average",
+    "short_name",
+    "links",
+    "email",
+    "url",
+    "markets_amount",
+    "support_types",
+    "headquarters",
+    "crypto_currencies",
+    "min_deposit",
+    "max_withdrawal",
+    "licences",
+    "services",
+  ]
 };
 
 export const pickHTMLSitemapPageKeys = ["title", "path", "template_id"];

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

@@ -41,3 +41,9 @@ export const pageTypes = {
     disablePopup: false,
   },
 };
+
+export const layout = {
+  homepage: {
+    footerNavigation: false,
+  }
+};

package/src/helpers/api.mjs

@@ -130,6 +130,19 @@ export async function getSports(siteName) {
   return callAPIV2(`v0.1/sports/sorted/sorted-v2/${siteName}`);
 }
 
+export async function getCryptoBrokers() {
+  return callAPIV2(`v0.1/cryptos/brokers/sorted`);
+}
+
+export async function getCryptoExchanges() {
+  return callAPIV2(`v0.1/cryptos/exchanges/sorted`);
+}
+
+// NOTE To be done later
+export async function getCryptoWallets() {
+  return callAPIV2(`v0.1/cryptos/wallets/sorted`);
+}
+
 export async function getTeamJerseys(teamIds) {
   const path = `https://enigma.micro7s.com/v1/sports-api/participants/teamkits?page_size=200`;
 

package/src/helpers/fetch-site-settings.mjs

@@ -15,10 +15,14 @@ import {
   getProviders,
   getSports,
   getTeamJerseys,
-  getGamesJackpot
+  getGamesJackpot,
+  getCryptoBrokers,
+  getCryptoExchanges,
+  getCryptoWallets,
 } from "./api.mjs";
 import { groupBy } from "./getters.mjs";
 import { transformOperators } from "./processor/operators.mjs";
+import { transformCryptosData } from "./processor/cryptos.mjs";
 import { transformGames, transformGamesJackpot } from "./processor/games.mjs";
 import { transformPayments } from "./processor/payment.mjs";
 import { transformProvider } from "./processor/providers.mjs";
@@ -32,6 +36,11 @@ export const fetchSiteSettings = async (siteName) => {
   const providersPromise = getProviders();
   const gamblingCompaniesPromise = getGamblingCompanies();
 
+  // NOTE Crypto data
+  const cryptoBrokersPromise = getCryptoBrokers();
+  const cryptoExchangesPromise = getCryptoExchanges();
+  const cryptoWalletsPromise = getCryptoWallets();
+
   // Wait for siteSettings to get siteId and then chain other requests
   const siteSettingsData = await siteSettingsPromise;
   const siteId = Object.keys(siteSettingsData.general)[0];
@@ -72,7 +81,10 @@ export const fetchSiteSettings = async (siteName) => {
     providers,
     games,
     gamesJackpotData,
-    sportsData
+    sportsData,
+    cryptoBrokers,
+    cryptoExchanges,
+    cryptoWallets
   ] = await Promise.all([
     ribbonsPromise,
     responsableGamingPromise,
@@ -87,7 +99,10 @@ export const fetchSiteSettings = async (siteName) => {
     providersPromise,
     gamesPromise,
     gamesJackpotPromise,
-    sportsPromise
+    sportsPromise,
+    cryptoBrokersPromise,
+    cryptoExchangesPromise,
+    cryptoWalletsPromise
   ]);
 
   const allMarketPrefixes = Object.keys(allMarketsData)
@@ -116,6 +131,19 @@ export const fetchSiteSettings = async (siteName) => {
     jackpot_data: transformGamesJackpot(gamesJackpotData)
   });
 
+  const cryptoExchangesData = transformCryptosData(cryptoExchanges, {
+    countries: countriesData,
+    currencies: currenciesData,
+    payments: paymentData,
+  })
+
+  const cryptoBrokersData = transformCryptosData(cryptoBrokers, {
+    countries: countriesData,
+    currencies: currenciesData,
+    payments: paymentData,
+  })
+
+
   if(["rage_seo", "rage_ppc", "sports"].includes(siteSettingsData.general[siteId].type)) {
     const teamIds = Object.values(sportsData.teams).map((team) => String(team.livegoals_v2_id));
     const teamKits = await getTeamJerseys(teamIds);
@@ -143,6 +171,8 @@ export const fetchSiteSettings = async (siteName) => {
     paymentData,
     providersData,
     gamesData,
-    sportsData
+    sportsData,
+    cryptoExchangesData,
+    cryptoBrokersData
   };
 };

package/src/helpers/processor/common.mjs

@@ -162,7 +162,7 @@ export function removeUnwantedSections(obj, pageType) {
     games: ["post_main_games"],
     operator: ['post_main_operators', "pre_main_operators", "recommended_casinos"],
     article: ['post_main_articles'],
-    default: ['footer', 'links', 'navigation', 'popup', 'rg_navigation', 'sidebar']
+    default: ['footer', 'links', 'navigation', 'popup', 'rg_navigation', 'sidebar', 'footer_navigation']
   }
 
   // Get sections to keep: merge default sections and specific sections for the key

package/src/helpers/processor/cryptos.mjs

@@ -0,0 +1,71 @@
+// eslint-disable-next-line import/no-extraneous-dependencies
+import loadash from "lodash/index.js";
+import {
+  processLogo,
+  processCountries,
+  processCurrencies,
+  processPaymentMethods,
+} from "./relations.mjs";
+import { pickRelationKeys } from "../../constants/pick-keys.mjs";
+
+const { cloneDeep, pick } = loadash;
+
+export function sanitizeCryptoData(data) {
+  const cryptoClone = cloneDeep(data);
+    
+  return pick(cryptoClone, pickRelationKeys.crypto);
+  // return cryptoClone;
+}
+
+export function transformCryptosData(jsonData, relationsData) {
+  const cryptos = {};
+
+  Object.values(jsonData).forEach(crypto => {
+    const newCryptoData = {
+      ...crypto,
+    }
+
+    // OPERATOR LOGO (temp fix included and will be removed)
+    newCryptoData.logo = processLogo(
+      newCryptoData.logo,
+      newCryptoData.standardised_logo
+    );
+    
+    // DEPOSIT METHODS
+    if (newCryptoData.deposit_methods && Object.values(relationsData.payments).length) {
+      newCryptoData.deposit_methods = processPaymentMethods(
+        newCryptoData.deposit_methods,
+        newCryptoData.market,
+        relationsData.payments
+      );
+    }
+
+    // CRYRPTO CURRENCIES
+    if ((newCryptoData.crypto_currencies || newCryptoData.currencies) && Object.values(relationsData.currencies).length) {
+      newCryptoData.crypto_currencies = processCurrencies(
+        newCryptoData.crypto_currencies || newCryptoData.currencies,
+        relationsData.currencies
+      );
+    }
+
+    // FIAT CURRENCIES
+    if (newCryptoData.fiat_currencies && Object.values(relationsData.currencies).length) {
+      newCryptoData.fiat_currencies = processCurrencies(
+        newCryptoData.fiat_currencies,
+        relationsData.currencies
+      );
+    }
+
+    // COUNTRIES
+    if (newCryptoData.restricted_countries && Object.values(relationsData.countries).length) {
+      newCryptoData.restricted_countries = processCountries(
+        newCryptoData.restricted_countries,
+        relationsData.countries
+      );
+    }
+
+    cryptos[crypto.id] = sanitizeCryptoData(newCryptoData);
+  });
+
+  return cryptos;
+}

package/src/helpers/processor/cryptos.test.js

@@ -0,0 +1,27 @@
+import { cleanup, } from '@testing-library/react';
+import { transformCryptosData } from './cryptos.mjs';
+import { getCryptoExchangesList } from '../../../tests/factories/crypto-exchanges/crypto-exchanges.factory';
+import getCurrenciesData from '../../../tests/factories/currencies/currencies.factory';
+
+describe("Transform Cryptos Data", () => {
+  test('Transform Cryptos', () => {
+    const exchangesData = getCryptoExchangesList({ count: 3 });
+    // const operatorPage = getPageDataList(1);
+
+    const transformedCryptoExchanges = transformCryptosData(exchangesData, {payments: {}, currencies: getCurrenciesData(), countries: {}});
+
+    // values before transforming
+    expect(Object.values(exchangesData)[0].name).toBe('Crypto Exchange 1');
+    expect(Object.values(exchangesData)[2].name).toBe('Crypto Exchange 3');
+    expect(Object.values(exchangesData)[1].crypto_currencies.length).toBe(2);
+    expect(Object.values(exchangesData)[1].crypto_currencies[0]).toBe(1);
+
+    // values after transforming
+    expect(Object.values(transformedCryptoExchanges)[0].name).toBe('Crypto Exchange 1');
+    expect(Object.values(transformedCryptoExchanges)[1].crypto_currencies.length).toBe(2);
+    expect(Object.values(transformedCryptoExchanges)[1].crypto_currencies[0].name).toBe('Bitcoin');
+  });
+});
+afterEach(() => {
+  cleanup();
+});

package/src/helpers/processor/index.mjs

@@ -289,23 +289,26 @@ export function processExtraFields(
 }
 
 function updatePlaceholders(page, data, translationsData) {
+
   page.title =
     page.title &&
     generatePlaceholderString(page.title, translationsData, {
       siteName: data.site_name,
-      siteTitle: page.title,
+      pageTitle: page.title
     });
+
   page.meta_title =
     page.meta_title &&
     generatePlaceholderString(page.meta_title, translationsData, {
       siteName: data.site_name,
-      siteTitle: page.title,
+      pageTitle: page.title
     });
+
   page.meta_description =
     page.meta_description &&
     generatePlaceholderString(page.meta_description, translationsData, {
       siteName: data.site_name,
-      siteTitle: page.title,
+      pageTitle: page.title
     });
 }
 

package/src/helpers/processor/relations.mjs

@@ -54,6 +54,18 @@ export const processRelations = (
             );
         }
         break;
+      case "crypto_exchanges":
+        if (!hasRelation) {
+          transformedPages[market][pageType][index].relation =
+            data.relations.crypto_exchanges[page.relation_id];
+        }      
+        break;
+      case "crypto_brokers":
+        if (!hasRelation) {
+          transformedPages[market][pageType][index].relation =
+            data.relations.crypto_brokers[page.relation_id];
+        }
+        break;
       default:
         break;
     }

package/src/helpers/processor/relations.test.js

@@ -82,7 +82,38 @@ describe('Processor Relations', () => {
     });
     expect(pages[market][relation_type]).toHaveLength(1);
   });
+  test('Crypto Exchanges', () => {
+    const relation_type = 'crypto_exchanges';
+    const market = 'ie_en';
+    const data = getData({ template: relation_type, count: 3 });
+    const pages = {
+      [market]: {
+        [relation_type]: getPageList({ template: relation_type, count: 3, relation_id: 2 })
+      },
+    };
 
+    pages[market][relation_type].forEach((page, index) => {
+      processRelations(page, relation_type, pages, market, data, index);
+      expect(page.relation_type).toEqual(relation_type);
+    });
+    expect(pages[market][relation_type]).toHaveLength(3);
+  });
+  test('Crypto Brokers', () => {
+    const relation_type = 'crypto_brokers';
+    const market = 'ie_en';
+    const data = getData({ template: relation_type, count: 3 });
+    const pages = {
+      [market]: {
+        [relation_type]: getPageList({ template: relation_type, count: 3, relation_id: 2 })
+      },
+    };
+
+    pages[market][relation_type].forEach((page, index) => {
+      processRelations(page, relation_type, pages, market, data, index);
+      expect(page.relation_type).toEqual(relation_type);
+    });
+    expect(pages[market][relation_type]).toHaveLength(3);
+  });
   test('processCurrencies maps currencies with logos', () => {
     const ids = [1, 2];
     const currencies = {