gatsby-core-theme 2.2.0 → 2.2.4

package/.ci.yml

@@ -33,4 +33,6 @@ Theme Publish:
   only:
     refs:
       - master
+    variables:
+      - $PIPELINE != "content-trigger"
   

package/CHANGELOG.md

@@ -1,3 +1,55 @@
+## [2.2.4](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v2.2.3...v2.2.4) (2022-01-27)
+
+
+### Code Refactoring
+
+* update matrix tracker generation with operators ([66f8c13](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/66f8c13ec89baeaf7da2127eefe3b3a6b75de404))
+* update tracker generation for operators and providers ([9b0b738](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/9b0b73894b02c9bc1b4abdc480562e24c91231d7))
+
+
+* Merge branch 'tm-2653-update-matrix-tracker-generation' into 'master' ([4af9022](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/4af9022aa570f864ac5bd5579aec281af9dfd3a6))
+
+## [2.2.3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v2.2.2...v2.2.3) (2022-01-25)
+
+
+### Code Refactoring
+
+* update schema and tests ([ef8a496](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/ef8a496552c50178349004d7d8695a39ef2f11d2))
+* update schema for matrix sites with position and image ([e804f7b](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/e804f7bef4b2a6a233e3ef14878f2afaf147996c))
+* update templateSchemas publisher and breadcrumb position ([9dd4955](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/9dd495589a977cb5fa0e11d4411316330bbf7a80))
+
+
+### Config
+
+* added content deploy pipeline ([6febaa4](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/6febaa49d529191978358b3b61f034c7e057b013))
+* added content deploy pipeline ([9f23f69](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/9f23f69108933e5c1ef48f31be0f0afef1872139))
+* added content deploy pipeline ([d8c8147](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/d8c814782c099890a01a26aa2f86fe9973c346f4))
+* added content deploy pipeline ([2d31659](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/2d31659b0681f78633a5668c9f493a4f34d32f25))
+* added content deploy pipeline ([c497607](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/c49760723a860abc31906df31d5269dc3357c5ab))
+* added content deploy pipeline ([e193c83](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/e193c83d3d17126a7c936a266939580906dab639))
+* added content deploy pipeline ([4b43283](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/4b43283bff99d22093ebd019fcdd7831a61917de))
+
+
+* Merge branch 'misc-update-schema-and-tests' into 'master' ([88111e6](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/88111e62f2eff8fe742a0948f4f977ce4f236fa6))
+* Merge branch 'master' of git.ilcd.rocks:team-floyd/themes/gatsby-themes ([7466000](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/74660006e597a5f7ff3a0d2856a6191e69ab69f3))
+
+## [2.2.2](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v2.2.1...v2.2.2) (2022-01-21)
+
+
+### Bug Fixes
+
+* dmca url fix ([778e0a6](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/778e0a6ed1fc4828e165203c090d3cf26f3ac1a9))
+
+
+* Merge branch 'master' of git.ilcd.rocks:team-floyd/themes/gatsby-themes ([cf5e415](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/cf5e4157bc7a75842dbf9f71c34501bd631b111f))
+
+## [2.2.1](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v2.2.0...v2.2.1) (2022-01-20)
+
+
+### Bug Fixes
+
+* dmca badge now using env var for id ([bc65104](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/bc651049d3a435ee0cbf4b7f2bd418a300609fc8))
+
 # [2.2.0](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v2.1.0...v2.2.0) (2022-01-18)
 
 

package/gatsby-node.esm.js

@@ -251,70 +251,68 @@ exports.createPages = async ({ actions: { createPage } }, themeOptions) => {
             },
           });
         }
+      });
+    });
+  });
 
-        // Operator tracker pages
-        if (page.type === 'operator') {
-          const operator = operators[page.relation_id];
-          const trackerLinks = Object.keys(page.relation.links);
-          const tracker = trackerLinks.map((key) =>
-            generateTrackerLink(page.relation, key).toLowerCase().replace(' ', '_')
-          );
-          tracker.forEach((trackerPath) => {
-            // Create splash page
-            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, operator, isTracker: true },
-            });
+  if (themeOptions.siteType === 'sport') {
+    Object.keys(
+      (processed.relations &&
+        processed.relations.sports_data &&
+        processed.relations.sports_data.providers)
+      || {}
+    ).forEach((providerId) => {
+      const provider = processed.relations.sports_data.providers[providerId];
+      const tracker = generateTrackerLink(provider, 'main');
+      const trackerPageObject = {
+        meta_title: 'Tracker',
+        template: 'tracker',
+        title: 'Tracker',
+        type: 'page',
+        language: languageKey,
+        path: tracker,
+        meta_robots: ['noindex', 'nofollow'],
+      };
+      createPage({
+        path: tracker,
+        component: require.resolve('./src/components/app.js'),
+        context: {
+          page: trackerPageObject,
+          provider: provider,
+          isTracker: true,
+        },
+      });
+    });
+  } 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, operator, isTracker: true },
           });
         }
-
-        // Provider tracker pages (sports sites)
-        if (
-          page.type === 'sport' ||
-          (themeOptions.themeType === 'rage-seo' && page.template === 'live_stream_providers')
-        ) {
-          const { providers } = page.relation;
-          if (providers && providers.length) {
-            const providerData = providers.map((provider) => {
-              const tracker = generateTrackerLink(provider, 'main');
-              const providerObject = provider;
-              return { tracker, providerObject };
-            });
-            providerData.forEach((provider) => {
-              const trackerPageObject = {
-                meta_title: 'Tracker',
-                template: 'tracker',
-                title: 'Tracker',
-                type: 'page',
-                language: languageKey,
-                path: provider.tracker,
-                meta_robots: ['noindex', 'nofollow'],
-              };
-              createPage({
-                path: provider.tracker,
-                component: require.resolve('./src/components/app.js'),
-                context: {
-                  page: trackerPageObject,
-                  provider: provider.providerObject,
-                  isTracker: true,
-                },
-              });
-            });
-          }
-        }
       });
     });
-  });
+  }
 };
 
 exports.onCreatePage = ({ page, actions }) => {

package/package.json

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

package/src/components/atoms/disclaimer/index.js

@@ -15,7 +15,7 @@ const Disclaimer = ({ image }) => {
         if (element.getAttribute('href').indexOf('refurl') < 0) {
           element.href = `${`${
             element.href + (element.href.indexOf('?') === -1 ? '?' : '&')
-          }refurl`}=${document.location}`;
+          }refurl`}=${document.location.href.replace(/\/$/, '')}`;
         }
       },
       false
@@ -27,7 +27,7 @@ const Disclaimer = ({ image }) => {
       <a
         ref={anchorElement}
         onClick={dmca}
-        href="//www.dmca.com/Protection/Status.aspx?ID=9e466e76-827d-4247-ac51-4eb75b227301"
+        href={`//www.dmca.com/Protection/Status.aspx?ID=${process.env.DMCA_PROTECTION_ID}`}
         title="DMCA.com Protection Status"
         target="_blank"
         rel="noreferrer"

package/src/helpers/schema.js

@@ -2,7 +2,7 @@ import { getGameRating, getUrl, getLanguage } from './getters';
 import { cleanHTML } from './strings';
 
 /* HardCoded Start */
-const isIL = process.env.GATSBY_SITE_NAME === 'Irishluck.ie';
+const isIL = process.env.GATSBY_SITE_NAME === 'irishluck.ie';
 const isNSA = process.env.GATSBY_SITE_NAME === 'norskespilleautomater.com';
 const publishingPrinciples = isIL
   ? 'https://www.irishluck.ie/editorial-principles'
@@ -86,7 +86,7 @@ export function breadcrumbsSchema(breadcrumbs) {
     itemListElement: breadcrumbs.map((breadcrumb, index) => ({
       '@type': 'ListItem',
       name: breadcrumb.path,
-      position: index,
+      position: index + 1,
       item: {
         '@id': `${getUrl(breadcrumb.path)}#webpage`,
       },
@@ -198,14 +198,25 @@ export function moduleSchemas(modules) {
   return filteredSchema;
 }
 
-export function templateSchemas(page) {
+export function templateSchemas(page, pageImage) {
+  const sharedProps = {
+    author: {
+      '@type': 'Person',
+      name: page.author?.name?.substring(0, 100),
+      url: getUrl(page.author?.profile_page_path || '/'),
+    },
+    publisher: {
+      '@type': 'Organization',
+      name: process.env.GATSBY_SITE_NAME,
+      logo: page.featured_image_object?.url || pageImage,
+    },
+  };
   switch (page.type) {
     case 'article': {
       const schema = {
         '@context': 'https://schema.org',
         '@type': 'Article',
         url: getUrl(page.path),
-        image: page.featured_image_object?.url,
         headline: page.title,
         datePublished: page.created_at,
         dateModified: page.updated_at,
@@ -213,15 +224,7 @@ export function templateSchemas(page) {
           '@type': 'WebPage',
           url: process.env.GATSBY_SITE_URL,
         },
-        author: {
-          '@type': 'Person',
-          name: page.author?.name?.substring(0, 100),
-          url: getUrl(page.author?.profile_page_path || '/'),
-        },
-        publisher: {
-          '@type': 'Organization',
-          name: process.env.GATSBY_SITE_NAME,
-        },
+        ...sharedProps,
       };
 
       return JSON.stringify(generateSchemaObject(schema));
@@ -244,19 +247,7 @@ export function templateSchemas(page) {
           worstRating: '0',
           ratingValue: page.relation?.rating?.toString() || '',
         },
-        author: {
-          '@type': 'Person',
-          name: page.author?.name?.substring(0, 100),
-          url: getUrl(page.author?.profile_page_path || '/'),
-        },
-        publisher: {
-          '@type': 'Organization',
-          name: process.env.GATSBY_SITE_NAME,
-          logo: {
-            '@type': 'ImageObject',
-            url: page.featured_image_object?.url,
-          },
-        },
+        ...sharedProps,
       };
 
       return JSON.stringify(generateSchemaObject(schema));
@@ -269,7 +260,6 @@ export function templateSchemas(page) {
         url: getUrl(page.path),
         name: page.relation?.name || '',
         description: page.extra_fields?.game_summary || '',
-        image: page.featured_image_object?.url,
         operatingSystem: 'Multi-platform',
         applicationCategory: ['Game'],
         author: {
@@ -279,22 +269,14 @@ export function templateSchemas(page) {
         },
         review: {
           '@type': 'Review',
-          name: 'TODO - Review Name',
+          name: page.relation?.name || '',
           reviewRating: {
             '@type': 'Rating',
             bestRating: '10',
             worstRating: '0',
             ratingValue: rating?.toString() || '',
           },
-          author: {
-            '@type': 'Person',
-            name: page.author?.name?.substring(0, 100),
-            url: getUrl(page.author?.profile_page_path || '/'),
-          },
-          publisher: {
-            '@type': 'Organization',
-            name: process.env.GATSBY_SITE_NAME,
-          },
+          ...sharedProps,
         },
       };
 
@@ -314,7 +296,7 @@ export function schemaGenerator(page = {}, pageImage) {
     // Modules Schemas
     webPageSchema(page, pageImage),
     organizationSchema(page, pageImage),
-    templateSchemas(page),
+    templateSchemas(page, pageImage),
     ...(page.sections?.main?.modules ? moduleSchemas(page.sections.main.modules) : [null]),
   ];
 

package/src/helpers/schema.test.js

@@ -1,5 +1,5 @@
-import * as Schema from './schema';
 import { getUrl } from './getters';
+import * as Schema from './schema';
 
 const parseCheckSchema = (schema) => {
   const json = JSON.parse(schema);
@@ -9,6 +9,8 @@ const parseCheckSchema = (schema) => {
   return json;
 };
 const pageImage = 'pageImage/pageImage.jpg';
+const isIL = process.env.GATSBY_SITE_NAME === 'irishluck.ie';
+const isNSA = process.env.GATSBY_SITE_NAME === 'norskespilleautomater.com';
 
 describe('Schema Helper', () => {
   test('breadcrumbsSchema()', () => {
@@ -25,8 +27,8 @@ describe('Schema Helper', () => {
     expect(json.itemListElement[1]['@type']).toEqual('ListItem');
     expect(json.itemListElement[0].name).toEqual('breadcrumb_a');
     expect(json.itemListElement[1].name).toEqual('breadcrumb_b');
-    expect(json.itemListElement[0].position).toEqual(0);
-    expect(json.itemListElement[1].position).toEqual(1);
+    expect(json.itemListElement[0].position).toEqual(1);
+    expect(json.itemListElement[1].position).toEqual(2);
 
     expect(Object.prototype.toString.call(json.itemListElement[0].item)).toEqual('[object Object]');
     expect(Object.prototype.toString.call(json.itemListElement[1].item)).toEqual('[object Object]');
@@ -81,7 +83,7 @@ describe('Schema Helper', () => {
     expect(Object.prototype.toString.call(json.isPartOf)).toEqual('[object Object]');
     expect(json.isPartOf['@type']).toEqual('WebSite');
     expect(json.isPartOf['@id']).toEqual(`${process.env.GATSBY_SITE_URL}#website`);
-    expect(json.isPartOf.url).toEqual(process.env.GATSBY_SITE_URL);
+    expect(json.isPartOf.url).toEqual(`${process.env.GATSBY_SITE_URL}`);
     expect(json.isPartOf.inLanguage).toEqual('site_lang');
 
     expect(Object.prototype.toString.call(json.primaryImageOfPage)).toEqual('[object Object]');
@@ -95,9 +97,15 @@ describe('Schema Helper', () => {
     expect(json.author.name).toEqual('Site Name');
     expect(json.author.alternateName).toEqual('Alias Site Name');
     expect(json.author.foundingDate).toEqual('01/02/03');
-    expect(json.author.publishingPrinciples).toEqual(
-      'https://www.norskespilleautomater.com/om-oss/prinsipper'
-    );
+    if (isIL || isNSA) {
+      expect(json.author.publishingPrinciples).toEqual(
+        isIL
+          ? 'https://www.irishluck.ie/editorial-principles'
+          : 'https://www.norskespilleautomater.com/om-oss/prinsipper'
+      );
+    } else {
+      expect(json.author.publishingPrinciples).toEqual(undefined);
+    }
 
     expect(Object.prototype.toString.call(json.author.logo)).toEqual('[object Object]');
     expect(json.author.logo['@type']).toEqual('ImageObject');
@@ -124,11 +132,15 @@ describe('Schema Helper', () => {
     expect(json.author.sameAs[1]).toEqual('author_spotify');
     expect(json.author.sameAs[2]).toEqual('author_wikipedia');
 
-    expect(Object.prototype.toString.call(json.author.knowsAbout)).toEqual('[object Array]');
-    expect(json.author.knowsAbout).toHaveLength(4);
-    expect(Object.prototype.toString.call(json.author.knowsAbout[0])).toEqual('[object Object]');
-    expect(json.author.knowsAbout[0]['@type']).toEqual('Thing');
-    expect(json.author.knowsAbout[0].name).toEqual('Norway');
+    if (isNSA) {
+      expect(Object.prototype.toString.call(json.author.knowsAbout)).toEqual('[object Array]');
+      expect(json.author.knowsAbout).toHaveLength(4);
+      expect(Object.prototype.toString.call(json.author.knowsAbout[0])).toEqual('[object Object]');
+      expect(json.author.knowsAbout[0]['@type']).toEqual('Thing');
+      expect(json.author.knowsAbout[0].name).toEqual('Norway');
+    } else {
+      expect(json.author.knowsAbout).toEqual(undefined);
+    }
 
     expect(Object.prototype.toString.call(json.keywords)).toEqual('[object Array]');
     expect(json.keywords).toHaveLength(2);
@@ -225,7 +237,6 @@ describe('Schema Helper', () => {
     const json = parseCheckSchema(output);
     expect(json['@type']).toEqual('Article');
     expect(json.url).toEqual(getUrl('article_page'));
-    expect(json.image).toEqual('featured_image/image.jpg');
     expect(json.headline).toEqual('Article Title');
     expect(json.datePublished).toEqual('01/01/01');
     expect(json.dateModified).toEqual('02/02/02');
@@ -245,6 +256,7 @@ describe('Schema Helper', () => {
     expect(Object.prototype.toString.call(json.publisher)).toEqual('[object Object]');
     expect(json.publisher['@type']).toEqual('Organization');
     expect(json.publisher.name).toEqual(process.env.GATSBY_SITE_NAME);
+    expect(json.publisher.logo).toEqual('featured_image/image.jpg');
   });
 
   test('templateSchemas(operator)', () => {
@@ -299,19 +311,15 @@ describe('Schema Helper', () => {
     expect(Object.prototype.toString.call(json.publisher)).toEqual('[object Object]');
     expect(json.publisher['@type']).toEqual('Organization');
     expect(json.publisher.name).toEqual(process.env.GATSBY_SITE_NAME);
-
-    expect(Object.prototype.toString.call(json.publisher.logo)).toEqual('[object Object]');
-    expect(json.publisher.logo['@type']).toEqual('ImageObject');
-    expect(json.publisher.logo.url).toEqual('featured_image/image.jpg');
+    expect(json.publisher.logo).toEqual('featured_image/image.jpg');
   });
 
   test('templateSchemas(game)', () => {
     const output = Schema.templateSchemas({
       type: 'game',
       path: 'game_page',
-      title: 'Operator Title',
       relation: {
-        name: 'Operator Relation Name',
+        name: 'Game Relation Name',
         first_rating: 3.5,
         third_rating: 1.5,
       },
@@ -330,9 +338,8 @@ describe('Schema Helper', () => {
     const json = parseCheckSchema(output);
     expect(json['@type']).toEqual('VideoGame');
     expect(json.url).toEqual(getUrl('game_page'));
-    expect(json.name).toEqual('Operator Relation Name');
+    expect(json.name).toEqual('Game Relation Name');
     expect(json.description).toEqual('Game Review Summary');
-    expect(json.image).toEqual('featured_image/image.jpg');
     expect(json.operatingSystem).toEqual('Multi-platform');
 
     expect(Object.prototype.toString.call(json.applicationCategory)).toEqual('[object Array]');
@@ -346,7 +353,7 @@ describe('Schema Helper', () => {
 
     expect(Object.prototype.toString.call(json.review)).toEqual('[object Object]');
     expect(json.review['@type']).toEqual('Review');
-    expect(json.review.name).toEqual('TODO - Review Name');
+    expect(json.review.name).toEqual('Game Relation Name');
 
     expect(Object.prototype.toString.call(json.review.reviewRating)).toEqual('[object Object]');
     expect(json.review.reviewRating['@type']).toEqual('Rating');
@@ -365,6 +372,7 @@ describe('Schema Helper', () => {
     expect(Object.prototype.toString.call(json.review.publisher)).toEqual('[object Object]');
     expect(json.review.publisher['@type']).toEqual('Organization');
     expect(json.review.publisher.name).toEqual(process.env.GATSBY_SITE_NAME);
+    expect(json.review.publisher.logo).toEqual('featured_image/image.jpg');
   });
 
   test('schemaGenerator()', () => {