gatsby-core-theme 12.0.2 → 12.0.4-beta.1

package/CHANGELOG.md

@@ -1,3 +1,20 @@
+## [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))
+
+## [12.0.3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v12.0.2...v12.0.3) (2022-10-10)
+
+
+### Bug Fixes
+
+* fix warnings in schema ([1e48075](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/1e4807503936bdfe77e34eac7c0606ceac040974))
+
 ## [12.0.2](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v12.0.1...v12.0.2) (2022-10-05)
 
 

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');
+      const tracker = generateTrackerLink(provider, 'main', true);
       const trackerPageObject = {
         meta_title: 'Tracker',
         template: 'tracker',
@@ -309,45 +309,47 @@ exports.createPages = async ({ actions: { createPage } }, themeOptions) => {
           siteInfo,
           provider,
           isTracker: true,
+          isLiveStreamProvider: false,
           meta_robots: ['noindex', 'nofollow'],
         },
       });
     });
-  } 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,
-            },
-          });
-        }
-      });
-    });
   }
+
+  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,
+          },
+        });
+      }
+    });
+  });
 };
 
 exports.onCreatePage = ({ page, actions }) => {

package/package.json

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

package/src/helpers/generators.js

@@ -1,8 +1,12 @@
 import { months } from '../constants/common';
 
-export function generateTrackerLink(operator, trackerType) {
-  const defaultTrackerFormat = process.env.TRACKER_LINK_FORMAT_MAIN;
-  const trackerFormat = process.env.TRACKER_LINK_FORMAT_NON_MAIN;
+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;
 
   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') {
+export function prettyTracker(operator, trackerType = 'main', provider = false) {
   if (!operator || !operator.short_name) {
     return null;
   }
@@ -190,7 +190,7 @@ export function prettyTracker(operator, trackerType = 'main') {
     trackerType = 'main';
   }
 
-  return generateTrackerLink(operator, trackerType);
+  return generateTrackerLink(operator, trackerType, provider);
 }
 
 export function getBonus(name, operator) {

package/src/helpers/schema.js

@@ -351,10 +351,11 @@ export function webPageSchema(page, pageImage) {
       description: page?.meta_title,
     },
     publisher: {
-      '@type': 'Organization',
+      '@type': 'CreativeWork',
       url: getUrl('/'),
       name: page?.meta_title,
       publisher: {
+        '@type': 'Organization',
         '@id': `${getUrl('/')}#organization`,
       },
       potentialAction: {