gatsby-core-theme 6.1.9 → 7.0.0

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+# [7.0.0](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v6.1.9...v7.0.0) (2022-05-03)
+
+
+### Code Refactoring
+
+* add factor checker ([cdc5192](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/cdc519230240daf883b1de48ccd7297a88cb81eb))
+* add reviewer object to page and change test script to reflect ([ac16823](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/ac16823efc52a33fa3a6e2c613929eb590c1a909))
+* align spotlight links ([235cb3e](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/235cb3e8dbdcea6459b23ddaa21ef29b6eaccaf6))
+* remove matrix specific schema and update tests ([4401079](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/4401079658c2cb922b0d7a909331c39039667f8e))
+
+
+* Merge branch 'tm-2801-fact-checker' into 'master' ([03be105](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/03be105386f4462e6b367cb50a858831729f44ba))
+* Merge branch 'tm-2880-spotlight-links' into 'master' ([4f89cfb](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/4f89cfb955dc9e906f7285835776d8db185d93ec))
+* Merge branch 'master' into tm-2801-fact-checker ([2b769fd](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/2b769fd65099798d4edf621dc262db154707e698))
+* Merge branch 'tm-2708-remove-matrix-specific-schema' into 'master' ([cb883ed](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/cb883ed7504aaddc24bf25e33d7aef4698097818))
+
 ## [6.1.9](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v6.1.8...v6.1.9) (2022-04-28)
 
 

package/package.json

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

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

@@ -75,7 +75,7 @@ const Spotlights = ({ module, themeStyles = {} }) => {
 
             {mode === 'image_text' &&
               (item.link.value ? (
-                <div>
+                <div className={styles.spotlightsTextCTA}>
                   <div dangerouslySetInnerHTML={{ __html: item.text }} />
                   {item.link.type === 'external' ? (
                     <a

package/src/components/atoms/spotlights/spotlights.module.scss

@@ -47,7 +47,11 @@
         display: block;
       }
 
-      > div {
+      .spotlightsTextCTA {
+        display: flex;
+        flex-direction: column;
+        flex: 1;
+        justify-content: space-between;
         font-size: 1.4rem;
         color: #777;
       }

package/src/components/molecules/header/header.test.js

@@ -14,7 +14,7 @@ describe('header component', () => {
     expect(container.querySelectorAll('.headerContent')).toHaveLength(1);
 
     // Inner HTML
-    expect(container.querySelectorAll('p')).toHaveLength(2);
+    expect(container.querySelectorAll('p')).toHaveLength(3);
     expect(container.querySelectorAll('i')).toHaveLength(1);
 
     // Testing image

package/src/components/molecules/header/index.js

@@ -75,6 +75,12 @@ function Header({ section, content = null, backgroundImage = true }) {
         <p className={styles.readingTime}>
           Reading Time: <span>{section.page.reading_time}</span>
         </p>
+        {section.page.reviewer && (
+          <p className={styles.readingTime}>
+            Fact checked by:{' '}
+            <a href={section.page.reviewer.profile_page_path}>{section.page.reviewer.name}</a>
+          </p>
+        )}
         <div className={!content && styles.headerText}>{headerContent()}</div>
       </div>
     </header>
@@ -90,10 +96,12 @@ Header.propTypes = {
       updated_at: PropTypes.string,
       created_at: PropTypes.string,
       reading_time: PropTypes.string,
+      reviewer: PropTypes.string,
       author: PropTypes.shape({
         name: PropTypes.string,
         profile_page_path: PropTypes.string,
       }),
+      authors: PropTypes.shape([PropTypes.shape({})]),
       sections: PropTypes.shape({
         header: PropTypes.shape({
           extra_fields: PropTypes.shape({

package/src/helpers/processor/index.js

@@ -248,6 +248,13 @@ export default {
             transformedPages[market][pageType][index].author = data.authors[page.author_id];
           }
 
+          // add reviewer object to page
+          if (page.reviewer !== null && Object.values(data.authors).length) {
+            transformedPages[market][pageType][index].reviewer = Object.values(data.authors).find(
+              (each) => each.name === page.reviewer
+            );
+          }
+
           // add breadcrumbs array to page
           const pageBreadcrumbIds = transformedPages[market][pageType][index].breadcrumb_ids;
           if (pageBreadcrumbIds) {

package/src/helpers/schema.js

@@ -2,45 +2,6 @@ import { getGameRating, getUrl, getLanguage } from './getters';
 import { cleanHTML } from './strings';
 
 /* HardCoded Start */
-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'
-  : 'https://www.norskespilleautomater.com/om-oss/prinsipper';
-const knowsAbout = [
-  {
-    '@type': 'Thing',
-    name: 'Norway',
-    sameAs: [
-      'https://no.wikipedia.org/wiki/Norge',
-      'https://www.google.no/search?q=Norge&pws=0&nord=1&hl=no&gl=NO',
-    ],
-  },
-  {
-    '@type': 'Thing',
-    name: 'LottStift',
-    sameAs: [
-      'https://no.wikipedia.org/wiki/Lotteri-_og_stiftelsestilsynet',
-      'https://www.google.no/search?q=lottstift&pws=0&nord=1&hl=no&gl=NO',
-    ],
-  },
-  {
-    '@type': 'Thing',
-    name: 'Kasino',
-    sameAs: [
-      'https://no.wikipedia.org/wiki/Kasino',
-      'https://www.google.no/search?q=Kasino&pws=0&nord=1&hl=no&gl=NO',
-    ],
-  },
-  {
-    '@type': 'Thing',
-    name: 'Norsk Tipping Kommisjonær',
-    sameAs: [
-      'https://no.wikipedia.org/wiki/Norsk_Tipping',
-      'https://www.google.no/search?q=norsk+tipping&pws=0&nord=1&hl=no&gl=NO',
-    ],
-  },
-];
 const customSchema = {
   // Matrix
   'playcasino.co.za': 'Playcasino',
@@ -60,7 +21,6 @@ const customSchema = {
   'verfutbolonline.net': 'Ver Futbol Online',
   'watchsport.gr': 'Watch Sport',
 };
-/* HardCoded End */
 
 const socialLinks = [
   'facebook',
@@ -71,6 +31,7 @@ const socialLinks = [
   'wikipedia',
   'youtube',
 ];
+/* HardCoded End */
 
 function checkSchemaProp(prop) {
   return (
@@ -138,8 +99,7 @@ export function webPageSchema(page, pageImage) {
       name: page.siteSchema?.site_name || '',
       alternateName: page.siteSchema?.alias_site_name || '',
       foundingDate: page.siteSchema?.organization_founding_date || '',
-      publishingPrinciples:
-        page.siteSchema?.publishing_principles || (isIL || isNSA ? publishingPrinciples : null),
+      publishingPrinciples: page.siteSchema?.publishing_principles,
       logo: {
         '@type': 'ImageObject',
         url: pageImage,
@@ -154,7 +114,7 @@ export function webPageSchema(page, pageImage) {
       sameAs: socialLinks
         .map((socialLink) => page.siteSchema?.[socialLink])
         .filter((socialLink) => socialLink),
-      ...(isNSA ? { knowsAbout } : {}),
+      ...(page.knowsAbout ? { knowsAbout: page.knowsAbout } : {}),
     },
   };
 

package/src/helpers/schema.test.js

@@ -9,8 +9,6 @@ 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()', () => {
@@ -97,15 +95,7 @@ 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');
-    if (isIL || isNSA) {
-      expect(json.author.publishingPrinciples).toEqual(
-        isNSA
-          ? 'https://www.norskespilleautomater.com/om-oss/prinsipper'
-          : 'https://www.irishluck.ie/editorial-principles'
-      );
-    } else {
-      expect(json.author.publishingPrinciples).toEqual(null);
-    }
+    expect(json.author.publishingPrinciples).toEqual(undefined);
 
     expect(Object.prototype.toString.call(json.author.logo)).toEqual('[object Object]');
     expect(json.author.logo['@type']).toEqual('ImageObject');
@@ -131,16 +121,7 @@ describe('Schema Helper', () => {
     expect(json.author.sameAs[0]).toEqual('author_linkedin');
     expect(json.author.sameAs[1]).toEqual('author_spotify');
     expect(json.author.sameAs[2]).toEqual('author_wikipedia');
-
-    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(json.author.knowsAbout).toEqual(undefined);
 
     expect(Object.prototype.toString.call(json.keywords)).toEqual('[object Array]');
     expect(json.keywords).toHaveLength(2);
@@ -174,6 +155,13 @@ describe('Schema Helper', () => {
     expect(json.sameAs[2]).toEqual('organization_wikipedia');
   });
 
+  test('moduleSchemas(null)', () => {
+    const output = Schema.moduleSchemas([{ name: 'other' }], '/');
+
+    expect(output).toHaveLength(0);
+    expect(output[0]).toEqual(undefined);
+  });
+
   test('moduleSchemas(faq)', () => {
     const output = Schema.moduleSchemas(
       [
@@ -221,6 +209,15 @@ describe('Schema Helper', () => {
     expect(json.mainEntity[2].acceptedAnswer.text).toEqual('Answer C');
   });
 
+  test('templateSchemas(null)', () => {
+    const output = Schema.templateSchemas({
+      type: 'other',
+      path: 'other_page',
+    });
+
+    expect(output).toEqual(null);
+  });
+
   test('templateSchemas(article)', () => {
     const output = Schema.templateSchemas({
       type: 'article',

package/tests/factories/sections/header.factory.js

@@ -22,6 +22,13 @@ export default function getHeaderSection() {
         image_alt: null,
         image_asset_id: 37728,
       },
+      reviewer: {
+        name: 'Cameron Murphy',
+        image: 'cameron-murphy.jpeg',
+        image_alt: null,
+        image_asset_id: 37728,
+        profile_page_path: 'about-us/cameron-murphy',
+      },
     },
   };