gatsby-core-theme 12.0.4-beta.2 → 12.0.4

package/CHANGELOG.md

@@ -1,22 +1,12 @@
-## [12.0.4-beta.2](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v12.0.4-beta.1...v12.0.4-beta.2) (2022-10-12)
+## [12.0.4](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v12.0.3...v12.0.4) (2022-10-13)
 
 
 ### Bug Fixes
 
-* livestream providers tracker fix ([59424e7](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/59424e77caa4768e1adc608aeaafb541fd5c4c0e))
+* old schema ([9650bd5](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/9650bd5e149cbf5f917d41564e2b7bfaa7eee8ea))
 
 
-* Merge branch 'tm-3082-tracker-links' into 'beta' ([b7c650c](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/b7c650c52bf7aee45ed96d613df69c451ae4d569))
-
-## [12.0.4-beta.1](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v12.0.3...v12.0.4-beta.1) (2022-10-12)
-
-
-### Bug Fixes
-
-* chnaged logic for live stream tracker links ([5efb851](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/5efb851401b8f99722ef2491514d2f08329ecef7))
-
-
-* Merge branch 'tm-3082-tracker-links' into 'beta' ([109371d](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/109371d239ca8765afa649227a858a4ae2edc174))
+* Merge branch 'tm-2833-old-schema' into 'master' ([ed9e83e](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/ed9e83e26392f5f7d58e8427c6f0c8cdc4ef9037))
 
 ## [12.0.3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v12.0.2...v12.0.3) (2022-10-10)
 

package/gatsby-node.esm.js

@@ -291,7 +291,7 @@ exports.createPages = async ({ actions: { createPage } }, themeOptions) => {
         {}
     ).forEach((providerId) => {
       const provider = processed.relations.sports_data.providers[providerId];
-      const tracker = generateTrackerLink(provider, 'main', true);
+      const tracker = generateTrackerLink(provider, 'main');
       const trackerPageObject = {
         meta_title: 'Tracker',
         template: 'tracker',
@@ -309,47 +309,45 @@ exports.createPages = async ({ actions: { createPage } }, themeOptions) => {
           siteInfo,
           provider,
           isTracker: true,
-          isLiveStreamProvider: true,
           meta_robots: ['noindex', 'nofollow'],
         },
       });
     });
-  }
-
-  Object.keys(operators || {}).forEach((operatorId) => {
-    const operator = operators[operatorId];
-    const trackerLinks = Object.keys(operator.links);
-    const tracker = trackerLinks.map((key) =>
-      operator.links[key]
-        ? generateTrackerLink(operator, key).toLowerCase().replace(' ', '_')
-        : null
-    );
-    tracker.forEach((trackerPath) => {
-      // Create splash page
-      if (trackerPath) {
-        const trackerPageObject = {
-          meta_title: 'Tracker',
-          template: 'tracker',
-          title: 'Tracker',
-          type: 'page',
-          language: languageKey,
-          path: trackerPath,
-          meta_robots: ['noindex', 'nofollow'],
-        };
-        createPage({
-          path: trackerPath,
-          component: require.resolve('./src/components/app.js'),
-          context: {
-            page: trackerPageObject,
-            siteInfo,
-            operator,
-            isTracker: true,
-            isLiveStreamProvider: false,
-          },
-        });
-      }
+  } else {
+    Object.keys(operators || {}).forEach((operatorId) => {
+      const operator = operators[operatorId];
+      const trackerLinks = Object.keys(operator.links);
+      const tracker = trackerLinks.map((key) =>
+        operator.links[key]
+          ? generateTrackerLink(operator, key).toLowerCase().replace(' ', '_')
+          : null
+      );
+      tracker.forEach((trackerPath) => {
+        // Create splash page
+        if (trackerPath) {
+          const trackerPageObject = {
+            meta_title: 'Tracker',
+            template: 'tracker',
+            title: 'Tracker',
+            type: 'page',
+            language: languageKey,
+            path: trackerPath,
+            meta_robots: ['noindex', 'nofollow'],
+          };
+          createPage({
+            path: trackerPath,
+            component: require.resolve('./src/components/app.js'),
+            context: {
+              page: trackerPageObject,
+              siteInfo,
+              operator,
+              isTracker: true,
+            },
+          });
+        }
+      });
     });
-  });
+  }
 };
 
 exports.onCreatePage = ({ page, actions }) => {

package/package.json

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

package/src/helpers/generators.js

@@ -1,12 +1,8 @@
 import { months } from '../constants/common';
 
-export function generateTrackerLink(operator, trackerType, provider = false) {
-  const defaultTrackerFormat = provider
-    ? process.env.PROVIDER_TRACKER_LINK_FORMAT_MAIN
-    : process.env.TRACKER_LINK_FORMAT_MAIN;
-  const trackerFormat = provider
-    ? process.env.PROVIDER_TRACKER_LINK_FORMAT_NON_MAIN
-    : process.env.TRACKER_LINK_FORMAT_NON_MAIN;
+export function generateTrackerLink(operator, trackerType) {
+  const defaultTrackerFormat = process.env.TRACKER_LINK_FORMAT_MAIN;
+  const trackerFormat = process.env.TRACKER_LINK_FORMAT_NON_MAIN;
 
   if (defaultTrackerFormat && trackerFormat) {
     const linkFormatArray =

package/src/helpers/getters.js

@@ -177,7 +177,7 @@ export function getPageImage(page) {
   return null;
 }
 
-export function prettyTracker(operator, trackerType = 'main', provider = false) {
+export function prettyTracker(operator, trackerType = 'main') {
   if (!operator || !operator.short_name) {
     return null;
   }
@@ -190,7 +190,7 @@ export function prettyTracker(operator, trackerType = 'main', provider = false)
     trackerType = 'main';
   }
 
-  return generateTrackerLink(operator, trackerType, provider);
+  return generateTrackerLink(operator, trackerType);
 }
 
 export function getBonus(name, operator) {