gatsby-core-theme 2.2.4 → 2.2.5

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+## [2.2.5](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v2.2.4...v2.2.5) (2022-02-01)
+
+
+### Bug Fixes
+
+* content images url changed to main cdn ([eb71334](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/eb71334aa843df6b68ff021b7bce89f72ba37cd7))
+* navigation menu fix ([0ae522f](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/0ae522f85dc646e535787132770b415feb2c2ce7))
+
+
+### Code Refactoring
+
+* update review publisher info in schema ([4be14d8](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/4be14d8d058af3132eabfc5f3d7edcb2b65ae2db))
+* update schema publisher name with owned_by ([b1f41c3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/b1f41c3161db39eb90afa11ff10584a5ed36e257))
+
+
+* Merge branch 'tm-2685-content-images-cdn' into 'master' ([426ae80](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/426ae80f987034558cb2503dfda17c5757859897))
+* Merge branch 'tm-2670-update-schema-and-tests' into 'master' ([c8d60fb](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/c8d60fb00dfbfdea9f335bc4d12ea1766df2b114))
+* Merge branch 'navigation' into 'master' ([02eccb3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/02eccb39c3ea7f615fac6978950a25872c5f5df6))
+
 ## [2.2.4](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v2.2.3...v2.2.4) (2022-01-27)
 
 

package/gatsby-node.esm.js

@@ -198,7 +198,8 @@ exports.createPages = async ({ actions: { createPage } }, themeOptions) => {
         authors = response.authors;
 
         page.translations = {};
-        // siteSchema and authors are added to page for schemaGenerator()
+        // siteInfo, siteSchema and authors are added to page for schemaGenerator()
+        page.siteInfo = siteInfo;
         page.siteSchema = siteSchema;
         page.authors = Object.keys(authors || {}).map((key) =>
           pick(authors[key], pickAuthorsPageKeys)

package/package.json

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

package/src/components/atoms/menu/items/item/item.module.scss

@@ -10,6 +10,10 @@
 .item {
   padding: 1.5rem 2rem;
 
+  @include custom-min-max(1200, 1260) {
+    padding: 1.5rem 1.8rem;
+  }
+
   &.openedLink {
     background-color: var(--primary-hover-color);
   }

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

@@ -7,6 +7,7 @@ import parse from 'html-react-parser';
 import loadable from '@loadable/component';
 import LazyImage from '~hooks/lazy-image';
 import { parseCss } from '~helpers/css-parser';
+import { parseContentImageUrl } from '~helpers/strings';
 import styles from './content.module.scss';
 
 const Content = ({ module, pageContext = null }) => {
@@ -32,7 +33,7 @@ const Content = ({ module, pageContext = null }) => {
       }
 
       const lazyProps = {
-        src: node.attribs.src,
+        src: parseContentImageUrl(node.attribs.src),
         style: node.attribs.style ? parseCss(node.attribs.style) : null,
         alt: node.attribs.alt ? node.attribs.alt : 'missing alt',
         className: styles[stylesClass],

package/src/helpers/schema.js

@@ -41,6 +41,25 @@ const knowsAbout = [
     ],
   },
 ];
+const customSchema = {
+  // Matrix
+  'playcasino.co.za': 'Playcasino',
+  'norskespilleautomater.com': 'Norske Spilleautomater',
+  'irishluck.ie': 'Irish Luck',
+  // Rage PPC
+  'bekijksport.nl': 'Bekijk Sport',
+  'bestsports.gr': 'Best Sports',
+  'sesport.dk': 'Se Sport',
+  'watchfooty.co.uk': 'WatchFooty',
+  // Rage SEO
+  'fotballstreams.com': 'Fotball Streams',
+  'fussballstreams.com': 'Fussball Streams',
+  'livefotbollonline.se': 'Live Fotboll Online',
+  'livestreamsvoetbal.nl': 'Live Streams Voetbal',
+  'sefodbold.dk': 'Se Fodbold',
+  'verfutbolonline.net': 'Ver Futbol Online',
+  'watchsport.gr': 'Watch Sport',
+};
 /* HardCoded End */
 
 const socialLinks = [
@@ -118,7 +137,8 @@ export function webPageSchema(page, pageImage) {
       name: page.siteSchema?.site_name || '',
       alternateName: page.siteSchema?.alias_site_name || '',
       foundingDate: page.siteSchema?.organization_founding_date || '',
-      ...(isIL || isNSA ? { publishingPrinciples } : {}),
+      publishingPrinciples:
+        page.siteSchema?.publishing_principles || (isIL || isNSA ? publishingPrinciples : null),
       logo: {
         '@type': 'ImageObject',
         url: pageImage,
@@ -207,8 +227,15 @@ export function templateSchemas(page, pageImage) {
     },
     publisher: {
       '@type': 'Organization',
-      name: process.env.GATSBY_SITE_NAME,
-      logo: page.featured_image_object?.url || pageImage,
+      name:
+        page.siteSchema?.owned_by ||
+        customSchema[process.env.GATSBY_SITE_NAME] ||
+        page.siteInfo?.site_name ||
+        process.env.GATSBY_SITE_NAME,
+      logo:
+        `${process.env.IMAGE_CDN_URL}/${page.siteInfo?.site_logo}` ||
+        page.featured_image_object?.url ||
+        pageImage,
     },
   };
   switch (page.type) {

package/src/helpers/schema.test.js

@@ -232,6 +232,9 @@ describe('Schema Helper', () => {
         name: 'Very long name for the 100 characters Article Author test - ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ',
         profile_page_path: 'article_author/author_page',
       },
+      siteInfo: {
+        site_logo: 'logo.jpg',
+      },
     });
 
     const json = parseCheckSchema(output);
@@ -255,8 +258,8 @@ 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');
+    expect(json.publisher.name).toBeTruthy();
+    expect(json.publisher.logo).toEqual(`${process.env.IMAGE_CDN_URL}/logo.jpg`);
   });
 
   test('templateSchemas(operator)', () => {
@@ -278,6 +281,9 @@ describe('Schema Helper', () => {
         name: 'Very long name for the 100 characters Article Author test - ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ',
         profile_page_path: 'operator_review_author/author_page',
       },
+      siteInfo: {
+        site_logo: 'logo.jpg',
+      },
       extra_fields: {
         operator_summary: 'Operator Review Summary',
       },
@@ -310,8 +316,8 @@ 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');
+    expect(json.publisher.name).toBeTruthy();
+    expect(json.publisher.logo).toEqual(`${process.env.IMAGE_CDN_URL}/logo.jpg`);
   });
 
   test('templateSchemas(game)', () => {
@@ -330,6 +336,9 @@ describe('Schema Helper', () => {
         name: 'Very long name for the 100 characters Article Author test - ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ',
         profile_page_path: 'operator_review_author/author_page',
       },
+      siteInfo: {
+        site_logo: 'logo.jpg',
+      },
       extra_fields: {
         game_summary: 'Game Review Summary',
       },
@@ -371,8 +380,8 @@ 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');
+    expect(json.review.publisher.name).toBeTruthy();
+    expect(json.review.publisher.logo).toEqual(`${process.env.IMAGE_CDN_URL}/logo.jpg`);
   });
 
   test('schemaGenerator()', () => {

package/src/helpers/strings.js

@@ -55,3 +55,13 @@ export function truncateString(str, num, dots = '...') {
 export function cleanHTML(string) {
   return string && string.replace(/(<([^>]+)>)/gi, '');
 }
+
+export function parseContentImageUrl(src) {
+  const srcArr = src.split('//');
+  if (srcArr.length === 2) {
+    const refUrl = srcArr[1].substring(srcArr[1].indexOf('/'));
+    return process.env.IMAGE_CDN_URL + refUrl;
+  }
+
+  return src;
+}

package/src/helpers/strings.test.js

@@ -33,4 +33,12 @@ describe('Strings Helper', () => {
   test('cleanHTML()', () => {
     expect(Strings.cleanHTML('<p>hello <a>i</a> think</p>')).toEqual('hello i think');
   });
+
+  test('parseContentImageUrl()', () => {
+    expect(
+      Strings.parseContentImageUrl(
+        'https://assets-srv.s3.eu-west-1.amazonaws.com/irishluck-jackpot.jpeg'
+      )
+    ).toEqual('https://cdn.images.com/irishluck-jackpot.jpeg');
+  });
 });