gatsby-core-theme 41.1.6 → 41.1.8

package/CHANGELOG.md

@@ -1,3 +1,20 @@
+## [41.1.8](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v41.1.7...v41.1.8) (2024-12-12)
+
+
+### Bug Fixes
+
+* game relation ([1ee1976](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/1ee19762c03dd3c3a75ca68842b04590d84a3ef4))
+
+## [41.1.7](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v41.1.6...v41.1.7) (2024-12-11)
+
+
+### Bug Fixes
+
+* v2 apis and preview feature ([f526fa6](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/f526fa67ec08a3b4b4878d31ff4a9dbf18eee130))
+
+
+* Merge branch 'tm-4960-5005-4906-v2-feature' into 'master' ([5af777e](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/5af777e45613060efed2534fe1f4db9a32e25ccc))
+
 ## [41.1.6](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v41.1.5...v41.1.6) (2024-12-09)
 
 

package/gatsby-node.mjs

@@ -10,7 +10,7 @@ import chalk from "chalk";
 import fs from "fs";
 import { dirname } from "path";
 import { fileURLToPath } from "url";
-import { getData, getLocalData, getTranslations } from "./src/helpers/api.mjs";
+import { getTranslations } from "./src/helpers/api.mjs";
 import { fetchSiteSettings } from "./src/helpers/fetch-site-settings.mjs";
 import { generateTrackerLink } from "./src/helpers/generators.mjs";
 import processor, {
@@ -30,7 +30,6 @@ let prefilledModules = [];
 let operators = null;
 
 let context404 = null;
-let sports = null;
 let siteSchema = null;
 let authors = null;
 
@@ -42,6 +41,9 @@ let translationsData = null;
 let siteSettingsData = null;
 let siteGeneralData = null;
 let allMarketsData = null;
+let providersData = null;
+let gamesData = null;
+let sportsData = null;
 let ribbonsData = null;
 let operatorData = null;
 let paymentData = null;
@@ -199,19 +201,6 @@ export const createPages = async (
 ) => {
   process.env.GATSBY_SITE_NAME = String(themeOptions.siteName);
 
-  let response = [];
-  if (process.env.LOCAL_DATA === "false") {
-    console.log(
-      chalk.magenta("info") + chalk.whiteBright(" getting data from api")
-    );
-    response = await getData(String(themeOptions.siteName));
-  } else {
-    console.log(
-      chalk.magenta("info") + chalk.whiteBright(" getting data from local file")
-    );
-    response = await getLocalData(fs);
-  }
-
   const stream = fs.createWriteStream("rewrites.conf");
   console.log(
     chalk.magenta("info") + chalk.whiteBright(" creating rewrite rules")
@@ -249,34 +238,9 @@ export const createPages = async (
   preconnectLinks = themeOptions.preconnectLinks || [];
   console.log(chalk.magenta("info") + chalk.whiteBright(" starting processor"));
 
-  delete response.site_markets;
-  delete response.pages;
-  delete response.redirects;
-  delete response.breadcrumbs;
-  delete response.general;
-  delete response.schema;
-  delete response.menus;
-  delete response.page_styles;
-  delete response.categories;
-  delete response.ribbons;
-  delete response.prefilled_market_modules;
-  delete response.templates;
-  delete response.authors;
-  delete response.relations.translations;
-  delete response.relations.responsible_gamings;
-  delete response.relations.dms_affiliate_settings;
-  delete response.relations.operator;
-  delete response.relations.payment_method;
-
-  // Note: Not used
-  delete response.colors;
-  delete response.module_styles;
-  delete response.styles;
-
   // add data to modules
   const processed = processor.run(
     {
-      ...response,
       ...siteSettingsData,
       pages: pagesData,
       general: siteGeneralData,
@@ -286,9 +250,11 @@ export const createPages = async (
       content: contentData,
       ribbons: ribbonsData,
       relations: {
-        ...response.relations,
         operator: operatorData,
         payment_method: paymentData,
+        software_provider: providersData,
+        game: gamesData,
+        sports_data: sportsData
       },
     },
     themeOptions,
@@ -302,12 +268,6 @@ export const createPages = async (
 
   htmlSitemapPages = processSitemapPages(pages, processed.site_markets);
 
-  if (["rage_seo", "rage_ppc", "sports"].includes(siteGeneralData.type)) {
-    sports = Object.keys(response.relations["sports_data"].sports).map(
-      (key) => response.relations["sports_data"].sports[key]
-    );
-  }
-
   // create robots.txt file
   const robotsTxtContent = siteGeneralData.robots_txt
     ? siteGeneralData.robots_txt
@@ -334,7 +294,7 @@ export const createPages = async (
         processedPage.preconnect_links = preconnectLinks;
 
         siteSchema = schemaData[page["market_id"]];
-        authors = response.authors;
+        authors = siteSettingsData.authors;
 
         // siteInfo, siteSchema and authors are added to page for schemaGenerator()
         page.siteInfo = siteGeneralData;
@@ -416,12 +376,11 @@ export const createPages = async (
   const pageTemplate = "tracker";
   if (["rage_seo", "rage_ppc"].includes(siteGeneralData.type)) {
     Object.keys(
-      (processed.relations &&
-        processed.relations.sports_data &&
-        processed.relations.sports_data.providers) ||
+      ( sportsData &&
+        sportsData.providers) ||
         {}
     ).forEach((providerId) => {
-      const provider = processed.relations.sports_data.providers[providerId];
+      const provider = sportsData.providers[providerId];
       const tracker = generateTrackerLink(provider, "main", true, pageTemplate);
       const trackerPageObject = {
         meta_title: "Tracker",
@@ -563,7 +522,10 @@ export const onPreBootstrap = async () => {
     contentData,
     pagesData,
     operatorData,
-    paymentData
+    paymentData,
+    providersData,
+    gamesData,
+    sportsData
   } = await fetchSiteSettings(process.env.GATSBY_SITE_NAME));
 };
 
@@ -593,7 +555,7 @@ export const sourceNodes = async ({
       const translation = {
         key: key[0],
         value: key[1],
-        language: language,
+        language,
       };
 
       const nodeMeta = {

package/package.json

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

package/src/components/atoms/admin/bar/layout-section/index.js

@@ -13,7 +13,7 @@ const LayoutSection = ({ menus }) => {
       case "operator":
         return `operators/${id.operator_id}/sites-data/edit/${id.id}`;
       case "game":
-        return `games/${id.id}/sites?site_name=${process.env.GATSBY_SITE_NAME}`;
+        return `games/${id.game_id}/sites?site_name=${process.env.GATSBY_SITE_NAME}`;
       case "author":
         return `site-authors/${id}`;
       case "payment_method":

package/src/components/molecules/header/variants/slot/template-one/index.js

@@ -17,8 +17,7 @@ export default function SlotHeader({
   width = '170',
   height = '170',
 }) {
-  const imageObject =
-    page.relation?.standardised_logo_filename_object || page.relation?.thumbnail_filename_object;
+  const imageObject = page.relation?.logo;
 
   const averageRating = page.relation?.average_rating;
   // eslint-disable-next-line react/prop-types
@@ -84,7 +83,7 @@ SlotHeader.propTypes = {
       volatility: PropTypes.number,
       average_rating: PropTypes.string,
       thumbnail_filename_object: PropTypes.string,
-      standardised_logo_filename_object: PropTypes.string,
+      logo: PropTypes.shape({}),
       slot: PropTypes.shape({
         name: PropTypes.string,
         game_provider: PropTypes.string,

package/src/components/molecules/header/variants/slot/template-one/templateone.test.js

@@ -56,7 +56,7 @@ describe('summary component', () => {
       await waitFor(() => expect(img).toBeVisible());
       expect(img).toHaveAttribute(
         'src',
-        imagePrettyUrl(page.relation?.thumbnail_filename_object?.filename, 170, 170)
+        imagePrettyUrl(page.relation?.logo?.filename, 170, 170)
       );
       expect(img).toHaveAttribute('width', '170');
       expect(img).toHaveAttribute('height', '170');

package/src/constants/pick-keys.mjs

@@ -112,14 +112,13 @@ export const pickRelationKeys = {
   ],
   game: [
     "id",
+    "game_id",
     "game_provider",
+    "provider_path",
     "first_rating",
     "second_rating",
     "third_rating",
     "fourth_rating",
-    "standardised_logo_filename_object",
-    "thumbnail_filename",
-    "thumbnail_filename_object",
     "name",
     "iframe",
     "average_rating",
@@ -133,6 +132,7 @@ export const pickRelationKeys = {
     "minimum_bet",
     "jackpots",
     "launch_date",
+    "logo"
   ],
   software_provider: [
     "logo_filename_object",

package/src/helpers/api.mjs

@@ -106,13 +106,14 @@ export async function getProviders() {
   return callAPIV2(`v0.1/globals/software-sorted-v2`);
 }
 
-export async function getData(siteName, page = null, marketId = null, preview = false) {
+export async function getGames(params) {
+  return callAPIV2(`v0.1/games/games-sorted-v2${params ? `?${params}` : ''}`);
+}
+
+// TO MODIFY and use the new sports API 
+export async function getSportsData(siteName) {
   let path = `${API_URL}/sites/v0.1/pages/sorted?site_name=${siteName}`;
  
-  if (page) {
-    path += `&path=${page}`;
-    if(preview) path +=`&market_id=${marketId}&preview=1`
-  }
   path += '&reverse_order=1&relations=1';
   console.log(chalk.magenta('calling ') + chalk.whiteBright(path));
  
@@ -123,23 +124,10 @@ export async function getData(siteName, page = null, marketId = null, preview =
       .then((response) => {
         const end = new Date() - start;
         console.log(chalk.green('success') + chalk.whiteBright(` calling hercules - %ds`), end / 1000);
-        resolve(response.data.result);
+        resolve(response.data.result.relations.sports_data);
       })
       .catch((error) => {
         reject(error.response.data.errors.join());
       });
   });
-}
- 
-export async function getLocalData(fs) {
-  return new Promise((resolve, reject) => {
-    if (!fs.existsSync('./src/data/source/data.json')) {
-      reject(new Error('Local Data file not found!'));
-    }
- 
-    let response = fs.readFileSync('./src/data/source/data.json');
-    response = JSON.parse(response);
-    resolve(response.result);
-  });
-}
- 
+}

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

@@ -7,16 +7,19 @@ import {
   getToplists,
   getPages,
   getOperators,
+  getGames,
   getCountries,
   getCurrencies,
   getPayments,
-  getProviders
+  getProviders,
+  getSportsData
 } from "./api.mjs";
 import { transformOperators } from "./processor/operators.mjs";
+import { transformGames } from "./processor/games.mjs";
 import { transformPayments } from "./processor/payment.mjs";
 import { transformProvider } from "./processor/providers.mjs";
 
-export const fetchSiteSettings = async (siteName, isPreview) => {
+export const fetchSiteSettings = async (siteName) => {
   const siteSettingsPromise = getSiteSettings(siteName);
   const ribbonsPromise = getRibbons(`site=${process.env.GATSBY_SITE_NAME}`);
 
@@ -37,12 +40,15 @@ export const fetchSiteSettings = async (siteName, isPreview) => {
   const operatorPromise = getOperators(
     `site_name=${process.env.GATSBY_SITE_NAME}`
   );
+  const gamesPromise = getGames(`site_name=${process.env.GATSBY_SITE_NAME}`);
 
   const paymentPromise = getPayments(Object.keys(allMarketsData));
 
   const contentPromise = getContent(process.env.GATSBY_SITE_NAME);
   const pagesPromise = getPages(process.env.GATSBY_SITE_NAME);
 
+
+
   const [
     ribbonsData,
     responsableGamingData,
@@ -53,7 +59,8 @@ export const fetchSiteSettings = async (siteName, isPreview) => {
     countriesData,
     currenciesData,
     payments,
-    providers
+    providers,
+    games
   ] = await Promise.all([
     ribbonsPromise,
     responsableGamingPromise,
@@ -64,7 +71,8 @@ export const fetchSiteSettings = async (siteName, isPreview) => {
     countriesPromise,
     currenciesPromise,
     paymentPromise,
-    providersPromise
+    providersPromise,
+    gamesPromise
   ]);
 
   const allMarketPrefixes = Object.keys(allMarketsData)
@@ -84,9 +92,18 @@ export const fetchSiteSettings = async (siteName, isPreview) => {
     ribbons: ribbonsData,
     countries: countriesData,
     currencies: currenciesData,
-    providers: providersData
+    providers: providersData,
   });
 
+  const gamesData = transformGames(games, {
+    providers: providersData,
+  });
+
+  let sportsData = null;
+  if(["rage_seo", "rage_ppc", "sports"].includes(siteSettingsData.general[siteId].type)) {
+    sportsData = await getSportsData(process.env.GATSBY_SITE_NAME);
+  }
+
   return {
     siteSettingsData,
     siteGeneralData: siteSettingsData.general[siteId],
@@ -104,6 +121,8 @@ export const fetchSiteSettings = async (siteName, isPreview) => {
     countriesData,
     currenciesData,
     paymentData,
-    providersData
+    providersData,
+    gamesData,
+    sportsData
   };
 };

package/src/helpers/getters.mjs

@@ -188,7 +188,7 @@ export function getPageImage(page) {
     page.relation &&
     page.relation.logo
   ) {
-    return page.relation && imagePrettyUrl(page.relation.logo);
+    return page.relation && imagePrettyUrl(page.relation.logo.filename);
   }
   if (page.banner) {
     return imagePrettyUrl(page.banner);

package/src/helpers/getters.test.js

@@ -129,7 +129,7 @@ describe('Getters Helper', () => {
       Getters.imagePrettyUrl('bar.svg')
     );
     expect(
-      Getters.getPageImage({ relation_type: 'software_provider', relation: { logo: 'logo.jpg' } })
+      Getters.getPageImage({ relation_type: 'software_provider', relation: { logo: {filename: 'logo.jpg'}, } })
     ).toEqual(Getters.imagePrettyUrl('logo.jpg'));
     expect(Getters.getPageImage({ banner: 'bar.svg' })).toEqual(Getters.imagePrettyUrl('bar.svg'));
   });

package/src/helpers/processor/games.mjs

@@ -0,0 +1,64 @@
+// eslint-disable-next-line import/no-extraneous-dependencies
+import loadash from "lodash/index.js";
+import { filterNonNullValues } from "gatsby-core-theme/src/helpers/getters.mjs";
+import { pickRelationKeys } from "../../constants/pick-keys.mjs";
+import { getProviderData } from "./providers.mjs";
+
+const { cloneDeep, pick } = loadash;
+
+export function sanitizegameData(game, pages = null) {
+  const gameClone = cloneDeep(game);
+
+  const providerPage = pages
+    ? pages.filter((provider) => game.game_provider?.id === provider.relation_id)
+    : null;
+
+  if(providerPage && providerPage.length > 0 && gameClone.game_provider) {
+    gameClone.game_provider.path =  providerPage[0].path;
+  }
+
+  return pick(gameClone, pickRelationKeys.game);
+}
+
+export function transformGames(jsonData, relationsData) {
+  const games = {};
+
+  // Iterate over each operator
+  Object.entries(jsonData).forEach(([shortname, gamesData]) => {
+    const {
+      general_data: generalData = {},
+      sites_data: sitesData = {},
+      markets_data: marketsData = {},
+    } = gamesData;
+
+    // Iterate over each market in sites_data
+    Object.entries(sitesData).forEach(([market, sitesMarketData]) => {
+      const filteredSitesData = filterNonNullValues(sitesMarketData);
+      const marketSpecificData = filterNonNullValues(
+        marketsData ? marketsData[market] || {} : {}
+      );
+
+      // Combining all general, market and sites Data
+      const newGamesData = {
+        ...generalData, // General data
+        ...marketSpecificData, // Filtered market-specific data
+        ...filteredSitesData, // Filtered affiliate data
+      };
+
+      newGamesData.logo = newGamesData.logo || newGamesData.standardised_logo;
+
+      // Provider
+      newGamesData.game_provider = relationsData.providers[
+        newGamesData.game_provider_id
+      ]
+        ? getProviderData(
+            relationsData.providers[newGamesData.game_provider_id]
+          )
+        : null;
+
+      games[sitesMarketData.id] = sanitizegameData(newGamesData);
+    });
+  });
+
+  return games;
+}

package/src/helpers/processor/index.mjs

@@ -141,7 +141,6 @@ export function processSections(
   markets,
   siteName,
   data,
-  isPreview,
   toplists,
   content
 ) {
@@ -196,7 +195,6 @@ export function processSections(
             { ...relationData, siteName, pageTitle: page?.title },
             markets,
             data,
-            isPreview,
             toplists,
             content
           );
@@ -323,7 +321,7 @@ function updatePlaceholders(page, data, translationsData) {
 }
 
 export default {
-  run(data, themeOptions, fs, translationsData, isPreview = false) {
+  run(data, themeOptions, fs, translationsData, previewPagePath = null) {
     const start = new Date();
     const transformedPages = transform(data);
 
@@ -567,7 +565,6 @@ export default {
           data.site_markets,
           generalData.site_name,
           null,
-          isPreview,
           data.toplists,
           data.content
         );
@@ -579,7 +576,7 @@ export default {
           transformedPages[market][pageType].forEach((page, index) => {
             page.hreflangs = generateHreflangs(page, data);
 
-            if (page.sections) {
+            if ((page.sections && !previewPagePath) || (previewPagePath && page.path === previewPagePath)) {
               transformedPages[market][pageType][index] = Object.assign(page, {
                 sections: processSections(
                   page.sections,
@@ -589,7 +586,6 @@ export default {
                   data.site_markets,
                   generalData.site_name,
                   data,
-                  isPreview,
                   data.toplists,
                   data.content
                 ),

package/src/helpers/processor/modules.mjs

@@ -115,8 +115,7 @@ export function processCardsV2(
   module,
   pagesCloned,
   pagesMappedById,
-  pageId,
-  isPreview
+  pageId
 ) {
   const cardType = module.cards_page_type;
   const pageTemplateId = module.cards_page_type_id;
@@ -151,23 +150,7 @@ export function processCardsV2(
     const selectedReviewer = module.cards_selector_filters.page_reviewer;
     const selectedCategories = module.cards_selector_filters.page_categories;
 
-    const allFilters = [
-      cardType,
-      pageTemplateId,
-      selectedAuthors,
-      selectedReviewer,
-      selectedCategories,
-      moduleSelectedProviders,
-      moduleSelectedCategories,
-      moduleSelectedTypes,
-    ];
-    const u8 = new Uint8Array(allFilters);
-    let b64 = "";
-    if (!isPreview) {
-      b64 = Buffer.from(u8).toString("base64");
-    } else {
-      b64 = (Math.random() + 1).toString(36).substring(7);
-    }
+    const b64 = (Math.random() + 1).toString(36).substring(7);
 
     if (cardType) {
       // Get all pages by the selected page type
@@ -438,7 +421,6 @@ export function processModule(
   relationData,
   markets,
   data,
-  isPreview,
   toplists,
   content
 ) {
@@ -461,7 +443,7 @@ export function processModule(
   }
 
   if (module.name === "cards_v2") {
-    processCardsV2(module, pagesCloned, pagesMappedById, pageId, isPreview);
+    processCardsV2(module, pagesCloned, pagesMappedById, pageId);
   } else if (module.name === "content") {
     processContentModule(module, translations, relationData, content);
   } else if (module.name === "bonus") {

package/src/helpers/processor/relations.mjs

@@ -1,7 +1,7 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
 import loadash from "lodash/index.js";
-import { mergeMarketValues } from "./game.mjs";
 import { pickRelationKeys } from "../../constants/pick-keys.mjs";
+import { sanitizegameData } from "./games.mjs"
 import { getPaymentDataByMarket } from "./payment.mjs";
 import { getProviderData } from "./providers.mjs";
 
@@ -15,8 +15,7 @@ export const processRelations = (
   market,
   data,
   index,
-  isPreview,
-  translations
+  isPreview
 ) => {
   if (page.relation_type !== "page" && page.relation_id) {
     const hasRelation =
@@ -29,24 +28,10 @@ export const processRelations = (
       : null;
 
     switch (page.relation_type) {
-      // Add path for game page from game provider
+      // // Add path for game page from game provider
       case "game":
-        if (hasRelation && transformedPages[market][pageType][index].relation) {
-          const providerId =
-            transformedPages[market][pageType][index].relation.game_provider.id;
-          const providerPage = transformedPages[market].software_provider
-            ? transformedPages[market].software_provider.filter(
-                (provider) => providerId === provider.relation_id
-              )
-            : [];
-          transformedPages[market][pageType][
-            index
-          ].relation.game_provider.path =
-            providerPage.length > 0 ? providerPage[0].path : null;
-          page.relation = pick(
-            mergeMarketValues(page.relation, market),
-            pickRelationKeys.game
-          );
+        if (hasRelation && transformedPages[market][pageType][index].relation) {          
+          page.relation = sanitizegameData(page.relation, transformedPages[market].software_provider)
         }
         break;
       // Add author for page from authors

package/src/helpers/server-data.js

@@ -6,7 +6,6 @@ import chalk from 'chalk';
 import loadSource from "~helpers/search-source";
 import { deparam } from "~helpers/strings";
 import { groupBy } from "~helpers/getters";
-import { getData } from "~helpers/api";
 import processor from "./processor/index.mjs";
 import { fetchSiteSettings } from "./fetch-site-settings.mjs";
 
@@ -15,37 +14,6 @@ export async function getAPIData(page, url, headers, preview) {
     const start = new Date();
     const siteName = process.env.GATSBY_SITE_NAME;
     const params = deparam(url.split("?")[1]);
-    // eslint-disable-next-line camelcase
-    const response = await getData(
-      siteName,
-      params?.path,
-      params?.market_id,
-      true
-    );
-
-    delete response.site_markets;
-    delete response.pages;
-    delete response.redirects;
-    delete response.breadcrumbs;
-    delete response.general;
-    delete response.schema;
-    delete response.menus;
-    delete response.page_styles;
-    delete response.categories;
-    delete response.ribbons;
-    delete response.prefilled_market_modules;
-    delete response.templates;
-    delete response.authors;
-    delete response.relations.translations;
-    delete response.relations.responsible_gamings;
-    delete response.relations.dms_affiliate_settings;
-    delete response.relations.operator;
-    delete response.relations.payment_method;
-
-    // Note: Not used
-    delete response.colors;
-    delete response.module_styles;
-    delete response.styles;
 
     const {
       siteSettingsData,
@@ -57,12 +25,15 @@ export async function getAPIData(page, url, headers, preview) {
       pagesData,
       operatorData,
       paymentData,
-      allMarketsData
+      allMarketsData,
+      gamesData,
+      providersData
     } = await fetchSiteSettings(siteName, true);
 
+    const pagePath = `${params?.market && allMarketsData[params?.market].path_prefix  ? `${allMarketsData[params?.market].path_prefix}/` : '' }${params?.path}`
+
     const processed = processor.run(
       {
-        ...response,
         ...siteSettingsData,
         pages: pagesData,
         general: siteGeneralData,
@@ -72,19 +43,20 @@ export async function getAPIData(page, url, headers, preview) {
         content: contentData,
         ribbons: ribbonsData,
         relations: {
-          ...response.relations,
           operator: operatorData,
           payment_method: paymentData,
+          software_provider: providersData,
+          game: gamesData
         },
       },
       {},
       null,
       null,
-      true
+      pagePath
     );
 
     const pagePreviewProcessed = Object.values(pagesData).filter(
-      (value) => (value.path === `${params?.market && allMarketsData[params?.market].path_prefix  ? `${allMarketsData[params?.market].path_prefix}/` : '' }${params?.path}`)
+      (value) => (value.path === pagePath)
     );
     
     if(pagePreviewProcessed.length > 0 ) {

package/src/components/pages/tracker-geo/index-ssr.js

@@ -1,196 +0,0 @@
-/* eslint-disable no-console */
-/* eslint-disable react/prop-types */
-/* eslint-disable react/forbid-prop-types */
-import React, { useEffect } from 'react';
-import PropTypes from 'prop-types';
-import LazyImage from '~hooks/lazy-image';
-import { imagePrettyUrl, getAltText } from '~helpers/getters';
-import { getTrackerName, getAffiliateLink } from '~helpers/tracker';
-import styles from './tracker.module.scss';
-import HeadData from '~organisms/head';
-import Logo from '~images/icons/logo';
-
-export default function TrackerGeo({
-  pageContext,
-  path,
-  mainText = 'One sec, while we load [operator_name] for you..',
-  redirectText = 'If the casino has not loaded within a few seconds',
-  bgImage = '',
-  bgVideo = '',
-  redirectTimer = 5000,
-  logo = <Logo />,
-  counter = false,
-  operatorLogo = false,
-  operatorLogoWidth = 80,
-  operatorLogoHeight = 80,
-  siteLogoWidth = '100',
-  siteLogoHeight = '100',
-  serverData,
-}) {
-  const { page, operatorsByMarket } = pageContext;
-  const operator = operatorsByMarket[Object.keys(operatorsByMarket)[0]][0];
-  // eslint-disable-next-line dot-notation
-  const defaultMarketOperator = operatorsByMarket[`us_en`] || null;
-  const showSplashScreen = typeof window !== 'undefined';
-
-  const getData = async () => {
-    if (serverData.success && serverData.result.link) {
-      console.log('FROM API');
-      window.location.replace(serverData.result.link);
-    } else {
-      console.log('FROM LOCAL');
-      await fetch('https://geolocation-db.com/json/', {
-        method: 'GET',
-      })
-        .then((response) => response.json())
-        .then(async (data) => {
-          const ipAddress = data.IPv4;
-          const apiUrl = `https://pro.ip-api.com/json/${ipAddress}?key=sQhiSjgnSScSHqR&fields=status,countryCode,region,city,zip,lat,lon`;
-
-          await fetch(apiUrl, {})
-            .then((response) => response.json())
-            .then((data1) => {
-              if (data1.countryCode) {
-                const userMarketOperator =
-                  operatorsByMarket[`us_en_${data1.region.toLowerCase()}`] || null;
-
-                const trackerRedirect =
-                  (userMarketOperator && userMarketOperator[0]) || defaultMarketOperator[0];
-
-                if (trackerRedirect) {
-                  setTimeout(
-                    () => window.location.replace(getTrackerName(trackerRedirect, page, path)),
-                    redirectTimer
-                  );
-                } else {
-                  console.log('No Valid Tracker');
-                }
-              }
-            })
-            .catch((err) => {
-              console.log(`Error ${err}`);
-              setTimeout(
-                () => window.location.replace(getTrackerName(defaultMarketOperator[0], page, path)),
-                redirectTimer
-              );
-            });
-        })
-        .catch((err) => {
-          console.log(`Error ${err}`);
-          setTimeout(
-            () => window.location.replace(getTrackerName(defaultMarketOperator[0], page, path)),
-            redirectTimer
-          );
-        });
-    }
-  };
-
-  useEffect(() => {
-    window.loadGTM = false;
-    getData();
-  });
-
-  let background = <></>;
-  if (bgVideo) {
-    background = (
-      <video muted autoPlay loop className={styles.background} poster={bgImage && bgImage}>
-        <source src={bgVideo} type="video/webm" />
-      </video>
-    );
-  } else if (bgImage) {
-    background = <LazyImage className={styles.background} src={bgImage} alt="background image" />;
-  }
-
-  return (
-    <>
-      {showSplashScreen && (
-        <>
-          <div className={styles.container}>
-            {background}
-            <div className={styles.content}>
-              <LazyImage alt="Site logo" src={logo} width={siteLogoWidth} height={siteLogoHeight} />
-              <p
-                className={`${styles.mainText} ${operatorLogo && styles.mainTextWithlogo}`}
-              >{`${mainText.replace(
-                '[operator_name]',
-                operator?.bonus?.operator_name || operator.name
-              )}`}</p>
-              {operatorLogo && (
-                <LazyImage
-                  src={imagePrettyUrl(
-                    operator?.logo?.filename,
-                    operatorLogoWidth,
-                    operatorLogoHeight
-                  )}
-                  alt={getAltText(operator?.logo, operator.name)}
-                  loading="eager"
-                  width={operatorLogoWidth}
-                  height={operatorLogoHeight}
-                  className={styles.operatorlogo}
-                />
-              )}
-              <div className={styles.bar} />
-              {counter ? (
-                redirectText
-              ) : (
-                <div
-                  className={styles.redirectText}
-                  // eslint-disable-next-line react/no-danger
-                  dangerouslySetInnerHTML={{ __html: redirectText }}
-                />
-              )}
-            </div>
-          </div>
-        </>
-      )}
-    </>
-  );
-}
-
-export const Head = ({ pageContext }) => (
-  <HeadData page={pageContext.page} siteInfo={pageContext.siteInfo} />
-);
-
-TrackerGeo.propTypes = {
-  redirectText: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
-  mainText: PropTypes.string,
-  bgImage: PropTypes.string,
-  bgVideo: PropTypes.string,
-  path: PropTypes.string,
-  logo: PropTypes.element,
-  counter: PropTypes.bool,
-  redirectTimer: PropTypes.number,
-  operatorLogo: PropTypes.bool,
-  operatorLogoWidth: PropTypes.string,
-  operatorLogoHeight: PropTypes.string,
-  pageContext: PropTypes.shape({
-    operatorsByMarket: PropTypes.shape({
-      bonus: PropTypes.shape({
-        operator_name: PropTypes.string,
-      }),
-      name: PropTypes.string,
-      logo: PropTypes.shape({}),
-      links: PropTypes.shape({
-        main: PropTypes.string,
-        terms_and_conditions: PropTypes.string,
-      }),
-    }).isRequired,
-    page: PropTypes.shape({
-      template: PropTypes.string,
-    }),
-  }),
-  styles: PropTypes.shape({}),
-  serverData: PropTypes.any,
-};
-
-export async function getServerData({ pageContext, headers, url }) {
-  let res = '';
-  res = await getAffiliateLink(
-    pageContext.operator,
-    pageContext.page.path,
-    pageContext.page,
-    headers,
-    url
-  );
-  return res;
-}

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

@@ -1,196 +0,0 @@
-/* eslint-disable no-console */
-/* eslint-disable react/prop-types */
-/* eslint-disable react/forbid-prop-types */
-import React, { useEffect } from 'react';
-import PropTypes from 'prop-types';
-import LazyImage from '~hooks/lazy-image';
-import { imagePrettyUrl, getAltText } from '~helpers/getters';
-import { generateTrackerLink } from '~helpers/generators';
-import styles from './tracker.module.scss';
-import HeadData from '~organisms/head';
-
-export default function TrackerGeo({
-  pageContext,
-  path,
-  mainText = 'One sec, while we load [operator_name] for you..',
-  redirectText = 'If the casino has not loaded within a few seconds',
-  bgImage = '',
-  bgVideo = '',
-  redirectTimer = 5000,
-  logo = '/images/logo.svg',
-  counter = false,
-  operatorLogo = false,
-  operatorLogoWidth = 80,
-  operatorLogoHeight = 80,
-  siteLogoWidth = '100',
-  siteLogoHeight = '100',
-}) {
-  const { page, operatorsByMarket } = pageContext;
-  const operator = operatorsByMarket[Object.keys(operatorsByMarket)[0]][0];
-  // eslint-disable-next-line dot-notation
-  const defaultMarketOperator = operatorsByMarket[`us_en`] || null;
-  const showSplashScreen = typeof window !== 'undefined';
-
-  // eslint-disable-next-line no-shadow
-  const getTracker = (operator) => {
-    let tracker = '';
-    const trackerLinks = operator ? Object.keys(operator.links) : [];
-    for (let i = 0; i < trackerLinks.length; i += 1) {
-      const trackerLink = trackerLinks[i].toLowerCase().replace(' ', '_');
-      if (generateTrackerLink(operator, trackerLink, false, page.template) === path) {
-        tracker =
-          operator.links[
-            Object.keys(operator.links).find(
-              (key) => key.toLowerCase() === trackerLink.toLowerCase()
-            )
-          ];
-        break;
-      }
-
-      tracker = operator.links.main;
-    }
-    return tracker;
-  };
-
-  const getData = async () => {
-    await fetch('https://geolocation-db.com/json/', {
-      method: 'GET',
-    })
-      .then((response) => response.json())
-      .then(async (data) => {
-        const ipAddress = data.IPv4;
-        const apiUrl = `https://pro.ip-api.com/json/${ipAddress}?key=sQhiSjgnSScSHqR&fields=status,countryCode,region,city,zip,lat,lon`;
-
-        await fetch(apiUrl, {})
-          .then((response) => response.json())
-          .then((data1) => {
-            if (data1.countryCode) {
-              const userMarketOperator =
-                operatorsByMarket[`us_en_${data1.region.toLowerCase()}`] || null;
-
-              const trackerRedirect =
-                (userMarketOperator && userMarketOperator[0]) || defaultMarketOperator[0];
-
-              if (trackerRedirect) {
-                setTimeout(
-                  () => window.location.replace(getTracker(trackerRedirect)),
-                  redirectTimer
-                );
-              } else {
-                console.log('No Valid Tracker');
-              }
-            }
-          })
-          .catch((err) => {
-            console.log(`Error ${err}`);
-            setTimeout(
-              () => window.location.replace(getTracker(defaultMarketOperator[0])),
-              redirectTimer
-            );
-          });
-      })
-      .catch((err) => {
-        console.log(`Error ${err}`);
-        setTimeout(
-          () => window.location.replace(getTracker(defaultMarketOperator[0])),
-          redirectTimer
-        );
-      });
-  };
-
-  useEffect(() => {
-    window.loadGTM = false;
-    getData();
-  });
-
-  let background = <></>;
-  if (bgVideo) {
-    background = (
-      <video muted autoPlay loop className={styles.background} poster={bgImage && bgImage}>
-        <source src={bgVideo} type="video/webm" />
-      </video>
-    );
-  } else if (bgImage) {
-    background = <LazyImage className={styles.background} src={bgImage} alt="background image" />;
-  }
-
-  return (
-    <>
-      {showSplashScreen && (
-        <>
-          <div className={styles.container}>
-            {background}
-            <div className={styles.content}>
-              <LazyImage alt="Site logo" src={logo} width={siteLogoWidth} height={siteLogoHeight} />
-              <p
-                className={`${styles.mainText} ${operatorLogo && styles.mainTextWithlogo}`}
-              >{`${mainText.replace(
-                '[operator_name]',
-                operator?.bonus?.operator_name || operator.name
-              )}`}</p>
-              {operatorLogo && (
-                <LazyImage
-                  src={imagePrettyUrl(
-                    operator?.logo?.filename,
-                    operatorLogoWidth,
-                    operatorLogoHeight
-                  )}
-                  alt={getAltText(operator?.logo, operator.name)}
-                  loading="eager"
-                  width={operatorLogoWidth}
-                  height={operatorLogoHeight}
-                  className={styles.operatorlogo}
-                />
-              )}
-              <div className={styles.bar} />
-              {counter ? (
-                redirectText
-              ) : (
-                <div
-                  className={styles.redirectText}
-                  // eslint-disable-next-line react/no-danger
-                  dangerouslySetInnerHTML={{ __html: redirectText }}
-                />
-              )}
-            </div>
-          </div>
-        </>
-      )}
-    </>
-  );
-}
-
-export const Head = ({ pageContext }) => (
-  <HeadData page={pageContext.page} siteInfo={pageContext.siteInfo} />
-);
-
-TrackerGeo.propTypes = {
-  redirectText: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
-  mainText: PropTypes.string,
-  bgImage: PropTypes.string,
-  bgVideo: PropTypes.string,
-  path: PropTypes.string,
-  logo: PropTypes.string,
-  counter: PropTypes.bool,
-  redirectTimer: PropTypes.number,
-  operatorLogo: PropTypes.bool,
-  operatorLogoWidth: PropTypes.string,
-  operatorLogoHeight: PropTypes.string,
-  pageContext: PropTypes.shape({
-    operatorsByMarket: PropTypes.shape({
-      bonus: PropTypes.shape({
-        operator_name: PropTypes.string,
-      }),
-      name: PropTypes.string,
-      logo: PropTypes.shape({}),
-      links: PropTypes.shape({
-        main: PropTypes.string,
-        terms_and_conditions: PropTypes.string,
-      }),
-    }).isRequired,
-    page: PropTypes.shape({
-      template: PropTypes.string,
-    }),
-  }),
-  styles: PropTypes.shape({}),
-};