gatsby-core-theme 12.0.0 → 12.0.2

package/CHANGELOG.md

@@ -1,3 +1,34 @@
+## [12.0.2](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v12.0.1...v12.0.2) (2022-10-05)
+
+
+### Bug Fixes
+
+* add transaltions ([b1917f4](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/b1917f404ce311b472caa064cbac09f7f60e28a7))
+* add translation key for description ([56b7c73](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/56b7c732249f3903beeadd48fea696f9935f6914))
+* generate meta title ([afb477d](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/afb477de9d0be11dcc971a0c8cd1732f2af03b68))
+* new schema bible ([1ad952a](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/1ad952a8149604a5402191e4c1a53d683d3ae46e))
+* update jest test ([82b8d88](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/82b8d8868f21c1a8dd689a7bce6e88c82607cf3a))
+
+
+* Merge branch 'tm-3058-meta-title' into 'master' ([81f56d7](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/81f56d7fe0e45c5e0ce925908e9db93b0935e17b))
+* Merge branch 'tm-2833-schema-bible-core' into 'master' ([8e3563e](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/8e3563e8a678f2136265f6dea55a3bf28725e5eb))
+
+## [12.0.1](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v12.0.0...v12.0.1) (2022-09-29)
+
+
+### Bug Fixes
+
+* add rating fro payment method ([0382efa](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/0382efa08b331f535fa7a3298edc35d7528ef708))
+
+
+### Code Refactoring
+
+* add react helmet to head component ([7d8526f](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/7d8526ff335f52cdbb6b9a9e2120928b939236d9))
+
+
+* Merge branch 'tm-3004-cards-v2' into 'master' ([8ea7d31](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/8ea7d313e7ae1ca788094c43cc5ebd86075d58e1))
+* Merge branch 'tm-3026-add-react-helmet' into 'master' ([0375240](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/0375240e870658cb5029359f10cae6c2ac66bd0a))
+
 # [12.0.0](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v11.0.9...v12.0.0) (2022-09-28)
 
 

package/gatsby-node.esm.js

@@ -9,6 +9,7 @@ import { getData, getLocalData } from './src/helpers/api';
 import { generateTrackerLink } from './src/helpers/generators';
 import processor, { processSitemapPages } from './src/helpers/processor';
 import { pickAuthorsPageKeys } from './src/constants/pick-keys';
+import { translate } from './src/helpers/getters';
 
 const fs = require('fs');
 
@@ -69,10 +70,24 @@ function createArchivePage(pageObject, marketSections, prefilledModules, createP
         archive.rootPath =
           pageObject.path.charAt(0) !== '/' ? `/${pageObject.path}` : pageObject.path;
         archive.items = value.map((item) => processor.clonePage(item));
-        page.path =
-          archive.currentPage === 1
-            ? pageObject.path
-            : `${pageObject.path}/page/${archive.currentPage}`;
+        switch (archive.currentPage) {
+          case 1:
+            page.path = pageObject.path;
+            break;
+          default:
+            page.path = `${pageObject.path}/page/${archive.currentPage}`;
+            page.meta_title += translate(
+              translations,
+              'archive_title_suffix',
+              '- Page [number]'
+            ).replace('[number]', archive.currentPage);
+            page.meta_description += translate(
+              translations,
+              'archive_description_suffix',
+              '- Page [number]'
+            ).replace('[number]', archive.currentPage);
+            break;
+        }
         page.sections.main.modules[archiveModuleIndex] = archive;
 
         createPage({

package/package.json

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

package/src/components/organisms/head/index.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import { Helmet } from 'react-helmet';
 
 import { schemaGenerator } from '~helpers/schema';
 import { getUrl, getPageImage, imagePrettyUrl } from '~helpers/getters';
@@ -40,7 +41,7 @@ const Head = ({ page = {}, siteInfo }) => {
   const pageImage = getPageImage(page) ? getPageImage(page) : imagePrettyUrl(siteInfo?.site_logo);
   // When google re-indexes dev NSA and IRL, remove lines 28, 41, 42, 43 and process.env.GATSBY_ACTIVE_ENV !== 'development' from lines 24, 25, 27, 29, 43
   return (
-    <>
+    <Helmet>
       <title>{page.meta_title}</title>
       <html lang={getLanguage(page.language)} />
       <meta name="description" content={page.meta_description} />
@@ -75,7 +76,7 @@ const Head = ({ page = {}, siteInfo }) => {
             </script>
           )
       )}
-    </>
+    </Helmet>
   );
 };
 

package/src/constants/pick-keys.js

@@ -67,7 +67,7 @@ export const pickRelationKeys = {
     'thumbnail_filename_object',
   ],
   software_provider: ['logo_object', 'logo', 'games_count', 'name'],
-  payment_method: ['logo_object', 'logo', 'name'],
+  payment_method: ['logo_object', 'logo', 'name', 'rating'],
 };
 
 export const pickHTMLSitemapPageKeys = ['title', 'path', 'template_id'];

package/src/helpers/schema.js

@@ -1,27 +1,6 @@
-import { getGameRating, getUrl, getLanguage } from './getters';
+import { getUrl, getLanguage, imagePrettyUrl } from './getters';
 import { cleanHTML } from './strings';
 
-/* HardCoded Start */
-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',
-};
-
 const socialLinks = [
   'facebook',
   'instagram',
@@ -31,6 +10,13 @@ const socialLinks = [
   'wikipedia',
   'youtube',
 ];
+
+const socialAuthorLinks = [
+  'facebook_profile',
+  'twitter_profile',
+  'instagram_profile',
+  'linkedin_profile',
+];
 /* HardCoded End */
 
 function checkSchemaProp(prop) {
@@ -42,6 +28,106 @@ function checkSchemaProp(prop) {
   );
 }
 
+const authorObj = (page) => ({
+  '@type': 'Person',
+  name: page?.author?.name || '',
+  url: getUrl(page?.author?.profile_page_path),
+  image: page?.author?.image ? imagePrettyUrl(page?.author?.image) : '',
+  sameAs: socialAuthorLinks
+    .map((socialLink) => page?.author?.[socialLink])
+    .filter((socialLink) => socialLink),
+});
+
+const webSiteAndWebPageAuthor = (page) => ({
+  '@type': 'Organization',
+  name: page?.siteSchema?.site_name,
+  alternateName: page?.siteSchema?.alias_site_name,
+  sameAs: socialLinks
+    .map((socialLink) => page.siteSchema?.[socialLink])
+    .filter((socialLink) => socialLink),
+  parentOrganization: {
+    '@type': 'Organization',
+    logo: {
+      '@type': 'imageObject',
+      url: 'https://www.gig.com/wp-content/themes/gig.com-child/assets/images/logo.svg',
+    },
+    name: 'Gaming Innovation Group',
+    alternateName: 'GIG',
+    address: {
+      '@type': 'PostalAddress',
+      streetAddress: '@GiG Beach, Triq Id-Dragunara',
+      addressLocality: "Saint Julian's",
+      postalCode: 'STJ 3148',
+      addressCountry: 'Malta',
+    },
+    knowsAbout: {
+      '@type': 'Thing',
+      name: 'IGaming Business',
+      sameAs: [
+        'https://en.wikipedia.org/wiki/IGaming_Business',
+        'https://www.google.com/search?q=igaming+business',
+      ],
+    },
+    sameAs: [
+      'https://www.facebook.com/GamingInnovationGroup/',
+      'https://twitter.com/GIG_online/',
+      'https://www.linkedin.com/company/gig-gaming-innovation-group/',
+      'https://www.instagram.com/gig_online/',
+      'https://en.wikipedia.org/wiki/Gaming_Innovation_Group',
+      'https://medium.com/@Gaminginnovationgroup',
+      'https://www.gig.com',
+    ],
+  },
+  contactPoint: page?.authors?.map((author) => ({
+    '@type': 'ContactPoint',
+    email: author?.email_address || '',
+    contactType: 'author',
+    url: getUrl(author?.profile_page_path),
+  })),
+  logo: {
+    '@type': 'imageObject',
+    url:
+      (page.siteInfo?.site_logo && `${process.env.IMAGE_CDN_URL}/${page.siteInfo.site_logo}`) ||
+      page.featured_image_object?.url,
+  },
+  publishingPrinciples: page?.siteSchema?.publishing_principles,
+  foundingDate: page?.siteSchema?.organization_founding_date,
+});
+
+const about = (url) => ({
+  '@type': 'Thing',
+  name: 'game',
+  sameAs: url,
+});
+
+const prosAndConsData = (pageObj) => {
+  const prosAndConstObj =
+    pageObj?.sections?.main?.modules?.find((elm) => elm?.name === 'pros_and_cons') || {};
+
+  return (
+    Object.keys(prosAndConstObj).length > 0 && {
+      positiveNotes: {
+        '@type': 'ItemList',
+        itemListElement:
+          prosAndConstObj?.pros?.map((elm, index) => ({
+            '@type': 'ListItem',
+            position: index + 1,
+            name: elm,
+          })) || [],
+      },
+      negativeNotes: {
+        '@type': 'ItemList',
+        itemListElement:
+          prosAndConstObj?.cons?.map((elm, index) => ({
+            '@type': 'ListItem',
+            position: index + 1,
+            name: elm,
+          })) || [],
+      },
+    }
+  );
+};
+
 export function generateSchemaObject(schema) {
   return Object.keys(schema).reduce((obj, key) => {
     if (
@@ -59,89 +145,50 @@ export function generateSchemaObject(schema) {
   }, {});
 }
 
-export function breadcrumbsSchema(breadcrumbs, path) {
+// completed
+export function breadcrumbsSchema({
+  path,
+  title,
+  breadcrumbs = [],
+  siteSchema: { site_name: siteName } = {},
+}) {
   const schema = {
     '@context': 'https://schema.org',
     '@type': 'BreadcrumbList',
-    '@id': `${getUrl(path)}#breadcrumblist`,
-    itemListElement: breadcrumbs.map((breadcrumb, index) => ({
-      '@type': 'ListItem',
-      name: breadcrumb.path,
-      position: index + 1,
-      item: {
-        '@id': `${getUrl(breadcrumb.path)}#webpage`,
-      },
-    })),
-  };
-
-  return JSON.stringify(generateSchemaObject(schema));
-}
-
-export function webPageSchema(page, pageImage) {
-  const schema = {
-    '@context': 'https://schema.org',
-    '@type': 'WebPage',
-    '@id': `${getUrl(page.path)}#webpage`,
-    url: getUrl(page.path),
-    name: page.meta_title || '',
-    description: page.meta_description || '',
-    inLanguage: getLanguage(page.language),
-    datePublished: page.created_at,
-    dateModified: page.updated_at,
-    isPartOf: {
-      '@type': 'WebSite',
-      '@id': `${process.env.GATSBY_SITE_URL}#website`,
-      url: `${process.env.GATSBY_SITE_URL}`,
-      inLanguage: getLanguage(page.language),
-    },
-    author: {
-      '@type': 'Organization',
-      name: page.siteSchema?.site_name || '',
-      alternateName: page.siteSchema?.alias_site_name || '',
-      foundingDate: page.siteSchema?.organization_founding_date || '',
-      publishingPrinciples: page.siteSchema?.publishing_principles,
-      logo: {
-        '@type': 'ImageObject',
-        url: pageImage,
+    itemListElement: [
+      {
+        '@type': 'ListItem',
+        position: 1,
+        name: siteName,
+        item: getUrl('/'),
       },
-      contactPoint: page.authors?.map((author) => ({
-        '@type': 'ContactPoint',
-        contactType: 'Author',
-        name: author.name || '',
-        email: author.email_address || '',
-        url: getUrl(author.profile_page_path || '/'),
+      ...breadcrumbs.map((breadcrumb, index) => ({
+        '@type': 'ListItem',
+        position: index + 2,
+        name: breadcrumb?.label,
+        item: getUrl(breadcrumb?.path),
       })),
-      sameAs: socialLinks
-        .map((socialLink) => page.siteSchema?.[socialLink])
-        .filter((socialLink) => socialLink),
-      ...(page.knowsAbout ? { knowsAbout: page.knowsAbout } : {}),
-    },
+      {
+        '@type': 'ListItem',
+        name: title,
+        position: breadcrumbs.length + 2,
+        item: getUrl(path),
+      },
+    ],
   };
 
-  if (pageImage) {
-    schema.primaryImageOfPage = {
-      '@type': 'ImageObject',
-      '@id': `${getUrl(page.path)}#primaryimage`,
-      url: pageImage,
-      inLanguage: getLanguage(page.language),
-    };
-  }
-
-  if (page.seo_keywords) {
-    schema.keywords = page.seo_keywords;
-  }
-
   return JSON.stringify(generateSchemaObject(schema));
 }
 
-export function organizationSchema(page, pageImage) {
+// completed
+export function organizationSchema(page, pageImage, webSiteImage) {
   const schema = {
     '@context': 'https://schema.org',
     '@type': 'Organization',
-    '@id': `${getUrl(page.path)}#organization`,
-    url: process.env.GATSBY_SITE_URL,
-    name: page.siteSchema?.site_name,
-    logo: pageImage,
+    name: page?.siteSchema?.site_name || '',
+    alternateName: page?.siteSchema?.alias_site_name || '',
+    url: getUrl('/'),
+    logo: webSiteImage,
     sameAs: socialLinks
       .map((socialLink) => page.siteSchema?.[socialLink])
       .filter((socialLink) => socialLink),
@@ -150,72 +197,29 @@ export function organizationSchema(page, pageImage) {
   return JSON.stringify(generateSchemaObject(schema));
 }
 
-export function moduleSchemas(modules, path) {
-  const schema = modules.map((module, index) => {
-    switch (module.name) {
-      case 'faq': {
-        const moduleSchema = {
-          '@context': 'https://schema.org',
-          '@type': 'FAQPage',
-          '@id': `${getUrl(path)}#faqpage${index === 0 ? '' : index}`,
-          mainEntity: module.items?.map((item) => ({
-            '@type': 'Question',
-            acceptedAnswer: {
-              '@type': 'Answer',
-              text: cleanHTML(item.answer),
-            },
-            name: cleanHTML(item.question),
-          })),
-        };
-
-        return JSON.stringify(generateSchemaObject(moduleSchema));
-      }
-      default: {
-        return null;
-      }
-    }
-  });
-
-  const filteredSchema = schema.filter((item) => item !== null);
-
-  return filteredSchema;
-}
-
-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:
-        page.siteSchema?.owned_by ||
-        customSchema[process.env.GATSBY_SITE_NAME] ||
-        page.siteInfo?.site_name ||
-        process.env.GATSBY_SITE_NAME,
-      logo:
-        (page.siteInfo?.site_logo && `${process.env.IMAGE_CDN_URL}/${page.siteInfo.site_logo}`) ||
-        page.featured_image_object?.url ||
-        pageImage,
-    },
-  };
+export function templateSchemas(page, pageImage, webSiteImage) {
   switch (page.type) {
     case 'article': {
       const schema = {
         '@context': 'https://schema.org',
-        '@type': 'Article',
-        '@id': `${getUrl(page.path)}#article`,
-        url: getUrl(page.path),
-        headline: page.title,
-        datePublished: page.created_at,
-        dateModified: page.updated_at,
+        '@type': 'NewsArticle',
         mainEntityOfPage: {
           '@type': 'WebPage',
-          url: process.env.GATSBY_SITE_URL,
+          '@id': getUrl(page?.path),
+        },
+        headline: page?.title,
+        image: pageImage,
+        author: page?.author_id ? authorObj(page) : '',
+        publisher: {
+          '@type': 'Organization',
+          name: page?.siteSchema?.site_name,
+          logo: {
+            '@type': 'imageObject',
+            url: webSiteImage,
+          },
         },
-        ...sharedProps,
+        datePublished: page?.created_at?.split(' ')[0],
+        dateModified: page?.updated_at,
       };
 
       return JSON.stringify(generateSchemaObject(schema));
@@ -224,52 +228,65 @@ export function templateSchemas(page, pageImage) {
       const schema = {
         '@context': 'https://schema.org',
         '@type': 'Review',
-        '@id': `${getUrl(page.path)}#review`,
-        name: page.relation?.name || '',
-        reviewBody: page.extra_fields?.operator_summary || '',
+        ...prosAndConsData(page),
         itemReviewed: {
           '@type': 'Organization',
-          url: getUrl(page.path),
-          name: page.title || '',
-          image: page.relation?.logo_url_object?.url,
+          name: page?.title || '',
+          image: page?.relation?.logo_url_object?.url,
         },
+        description: page?.meta_description,
         reviewRating: {
           '@type': 'Rating',
-          bestRating: '5',
-          worstRating: '0',
-          ratingValue: page.relation?.rating?.toString() || '',
+          worstRating: Number('0'),
+          bestRating: Number('5'),
+          ratingValue: Number(page?.relation?.rating) || '',
+        },
+        author: {
+          '@type': 'Person',
+          name: page?.author?.name || '',
+          url: getUrl(page?.author?.profile_page_path),
+          image: imagePrettyUrl(page?.author?.image),
+          sameAs: socialAuthorLinks
+            .map((socialLink) => page?.author?.[socialLink])
+            .filter((socialLink) => socialLink),
+          jobTitle: 'igaming expert',
+          worksFor: {
+            '@type': 'Organization',
+            name: page?.siteSchema?.site_name,
+          },
+        },
+        publisher: {
+          '@type': 'Organization',
+          name: page?.siteSchema?.site_name,
+          url: getUrl('/'),
         },
-        ...sharedProps,
       };
 
       return JSON.stringify(generateSchemaObject(schema));
     }
     case 'game': {
-      const rating = Math.floor(getGameRating(page.relation) * 2);
+      // const rating = Math.floor(getGameRating(page.relation) * 2);
       const schema = {
         '@context': 'https://schema.org',
-        '@type': 'VideoGame',
-        '@id': `${getUrl(page.path)}#videogame`,
-        url: getUrl(page.path),
-        name: page.relation?.name || '',
-        description: page.extra_fields?.game_summary || '',
-        operatingSystem: 'Multi-platform',
-        applicationCategory: ['Game'],
-        author: {
-          '@type': 'Organization',
-          name: process.env.GATSBY_SITE_NAME,
-          url: process.env.GATSBY_SITE_URL,
+        '@type': 'Review',
+        ...prosAndConsData(page),
+        name: page?.relation?.name || '',
+        description: page?.meta_description,
+        about: [
+          about('https://en.wikipedia.org/wiki/Video_game'),
+          about('https://en.wikipedia.org/wiki/Slot_machine'),
+          about('https://www.wikidata.org/wiki/Q33972'),
+        ],
+        itemReviewed: {
+          '@type': 'game',
+          name: page?.relation?.name || '',
         },
-        review: {
-          '@type': 'Review',
-          name: page.relation?.name || '',
-          reviewRating: {
-            '@type': 'Rating',
-            bestRating: '10',
-            worstRating: '0',
-            ratingValue: rating?.toString() || '',
-          },
-          ...sharedProps,
+        author: page?.author_id ? authorObj(page) : '',
+        reviewRating: {
+          '@type': 'Rating',
+          worstRating: Number(0),
+          bestRating: Number(5),
+          ratingValue: Number(page?.relation?.rating) || '',
         },
       };
 
@@ -280,16 +297,187 @@ export function templateSchemas(page, pageImage) {
   }
 }
 
+export function personSchema(page, webSiteImage) {
+  const schema = {
+    '@context': 'https://schema.org',
+    '@type': 'Person',
+    name: page?.author?.name || '',
+    image: page?.author?.image ? imagePrettyUrl(page?.author?.image) : '',
+    url: getUrl(page?.author?.profile_page_path),
+    jobTitle: 'author',
+    email: page?.author?.email_address,
+    description: page?.meta_description,
+    sameAs: socialAuthorLinks
+      .map((socialLink) => page?.author?.[socialLink])
+      .filter((socialLink) => socialLink),
+    knowsLanguage: getLanguage(page?.language),
+    nationality: {
+      '@type': 'Country',
+      name: page?.siteSchema?.address,
+    },
+    worksFor: {
+      '@type': 'Organization',
+      name: page?.siteSchema?.site_name,
+      logo: webSiteImage,
+      url: getUrl('/'),
+      sameAs: socialLinks
+        .map((socialLink) => page.siteSchema?.[socialLink])
+        .filter((socialLink) => socialLink),
+    },
+    knowsAbout: page?.siteSchema?.knows_about?.map((elm, index) => ({
+      '@type': index === 0 ? 'Country' : 'Thing',
+      name: elm?.name,
+      sameAs: elm?.links,
+    })),
+  };
+  return JSON.stringify(generateSchemaObject(schema));
+}
+
+export function webPageSchema(page, pageImage) {
+  const webPageschema = {
+    '@context': 'https://schema.org',
+    '@type': 'WebPage',
+    '@id': `${getUrl(page?.path)}#webpage`,
+    name: page?.meta_title || '',
+    description: page.meta_description || '',
+    datePublished: page?.created_at,
+    dateModified: page?.updated_at,
+    inLanguage: getLanguage(page.language),
+    author: page?.author_id ? authorObj(page) : '',
+    reviewedBy: page?.author_id ? authorObj(page) : '',
+    image: {
+      '@type': 'imageObject',
+      '@id': pageImage,
+      description: page?.meta_title,
+    },
+    publisher: {
+      '@type': 'Organization',
+      url: getUrl('/'),
+      name: page?.meta_title,
+      publisher: {
+        '@id': `${getUrl('/')}#organization`,
+      },
+      potentialAction: {
+        '@type': 'SearchAction',
+        target: `${typeof window !== 'undefined' ? window.location.href : ''}`,
+        query: 'required name=search_term_string',
+      },
+      author: webSiteAndWebPageAuthor(page),
+      about: page?.siteSchema?.knows_about?.map((elm, index) => ({
+        '@type': index === 0 ? 'Country' : 'Thing',
+        name: elm?.name,
+        sameAs: elm?.links,
+      })),
+    },
+  };
+
+  return JSON.stringify(generateSchemaObject(webPageschema));
+}
+
+export function webSiteSchema(page) {
+  const schema = {
+    '@context': 'https://schema.org',
+    '@type': 'WebSite',
+    url: getUrl('/'),
+    name: page?.meta_title,
+    publisher: {
+      '@id': `${getUrl('/')}#organization`,
+    },
+    inLanguage: getLanguage(page?.language),
+    potentialAction: {
+      '@type': 'SearchAction',
+      target: `${typeof window !== 'undefined' ? window.location.href : ''}`,
+      'query-input': 'required name=search_term_string',
+    },
+    author: webSiteAndWebPageAuthor(page),
+    about: page?.siteSchema?.knows_about?.map((elm, index) => ({
+      '@type': index === 0 ? 'Country' : 'Thing',
+      name: elm?.name,
+      sameAs: elm?.links,
+    })),
+  };
+  return JSON.stringify(generateSchemaObject(schema));
+}
+
+// export function videoObject(data = {}) {
+//   const videoItem = data?.items[0];
+
+//   const VideoSchema = {
+//     '@context': 'https://schema.org',
+//     '@type': 'VideoObject',
+//     name: videoItem?.snippet?.title || '',
+//     duration: videoItem?.contentDetails?.duration || '',
+//     uploadDate: videoItem?.snippet?.publishedAt || '',
+//     thumbnailUrl: videoItem?.snippet?.thumbnails?.default?.url || '',
+//     description: videoItem?.snippet?.description || '',
+//     contentUrl: `https://youtu.be/${videoItem?.id}`,
+//     embedUrl: `https://www.youtube.com/embed/${videoItem?.id}`,
+//     interactionStatistic: {
+//       '@type': 'InteractionCounter',
+//       interactionType: {
+//         '@type': 'WatchAction',
+//       },
+//       userInteractionCount: Number(videoItem?.statistics?.viewCount) || '',
+//     },
+//   };
+
+//   return JSON.stringify(generateSchemaObject(VideoSchema));
+// }
+
+export function moduleSchemas(modules) {
+  const schema = modules.map((module) => {
+    switch (module.name) {
+      case 'faq': {
+        const moduleSchema = {
+          '@context': 'https://schema.org',
+          '@type': 'FAQPage',
+          mainEntity: module.items?.map((item) => ({
+            '@type': 'Question',
+            acceptedAnswer: {
+              '@type': 'Answer',
+              text: cleanHTML(item.answer),
+            },
+            name: cleanHTML(item.question),
+          })),
+        };
+
+        return JSON.stringify(generateSchemaObject(moduleSchema));
+      }
+      default: {
+        return null;
+      }
+    }
+  });
+
+  const filteredSchema = schema.filter((item) => item !== null);
+
+  return filteredSchema;
+}
+
 export function schemaGenerator(page = {}, pageImage) {
+  const webSiteImage =
+    (page.siteInfo?.site_logo && `${process.env.IMAGE_CDN_URL}/${page.siteInfo.site_logo}`) ||
+    page.featured_image_object?.url ||
+    pageImage;
+
+  const isHomepage = page.path === '/';
+  const hasOrganisationSchema = isHomepage || page.path === 'about-us';
+  const hasWebPageSchema =
+    page.type !== 'operator' && page.type !== 'game' && !hasOrganisationSchema && !page?.hasArchive;
+  const hasPerson = page?.author_id && !hasOrganisationSchema;
+
   const jsonSchema = [
     // Page Schema
     page.seo_json_schema,
-    // Breadcrumbs Schema
-    page.breadcrumbs?.length ? breadcrumbsSchema(page.breadcrumbs, page.path) : null,
+
+    !isHomepage ? breadcrumbsSchema(page) : null,
+    hasWebPageSchema ? webPageSchema(page, pageImage, webSiteImage) : null,
+    hasOrganisationSchema ? organizationSchema(page, pageImage, webSiteImage) : null,
+    templateSchemas(page, pageImage, webSiteImage),
+    isHomepage ? webSiteSchema(page) : null,
+    hasPerson ? personSchema(page, webSiteImage) : null,
+    // page?.siteSchema?.video?.items?.length ? videoObject(page?.siteSchema?.video) : null,
     // Modules Schemas
-    webPageSchema(page, pageImage),
-    organizationSchema(page, pageImage),
-    templateSchemas(page, pageImage),
     ...(page.sections?.main?.modules
       ? moduleSchemas(page.sections.main.modules, page.path)
       : [null]),

package/src/helpers/schema.test.js

@@ -1,4 +1,3 @@
-import { getUrl } from './getters';
 import * as Schema from './schema';
 
 const parseCheckSchema = (schema) => {
@@ -8,389 +7,141 @@ const parseCheckSchema = (schema) => {
   expect(json['@context']).toEqual('https://schema.org');
   return json;
 };
-const pageImage = 'pageImage/pageImage.jpg';
 
 describe('Schema Helper', () => {
   test('breadcrumbsSchema()', () => {
-    const output = Schema.breadcrumbsSchema([{ path: 'breadcrumb_a' }, { path: 'breadcrumb_b' }]);
+    const output = Schema.breadcrumbsSchema({
+      path: 'some_path',
+      title: 'Some Title Review',
+      breadcrumbs: [
+        { path: 'breadcrumbA', label: 'Breadcrumb A' },
+        { path: 'breadcrumbB', label: 'Breadcrumb B' },
+      ],
+      siteSchema: {
+        site_name: 'Site Name',
+      },
+    });
 
     const json = parseCheckSchema(output);
-    expect(json['@type']).toEqual('BreadcrumbList');
 
+    expect(json['@type']).toEqual('BreadcrumbList');
     expect(Object.prototype.toString.call(json.itemListElement)).toEqual('[object Array]');
-    expect(json.itemListElement).toHaveLength(2);
-    expect(Object.prototype.toString.call(json.itemListElement[0])).toEqual('[object Object]');
-    expect(Object.prototype.toString.call(json.itemListElement[1])).toEqual('[object Object]');
-    expect(json.itemListElement[0]['@type']).toEqual('ListItem');
-    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(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]');
-    expect(json.itemListElement[0].item['@id']).toEqual(`${getUrl('breadcrumb_a')}#webpage`);
-    expect(json.itemListElement[1].item['@id']).toEqual(`${getUrl('breadcrumb_b')}#webpage`);
+    expect(json.itemListElement).toHaveLength(4);
+    json.itemListElement.forEach((element, i) => {
+      expect(Object.prototype.toString.call(element)).toEqual('[object Object]');
+      // expect(Object.prototype.toString.call(element.item)).toBe('string');
+      expect(element['@type']).toEqual('ListItem');
+      expect(element.position).toEqual(i + 1);
+      switch (i) {
+        case 1:
+          expect(element.name).toEqual('Breadcrumb A');
+          expect(element.position).toEqual(2);
+
+          break;
+        case 2:
+          expect(element.name).toEqual('Breadcrumb B');
+          expect(element.position).toEqual(3);
+          break;
+        case 3:
+          expect(element.name).toEqual('Some Title Review');
+          expect(element.position).toEqual(4);
+          break;
+        default:
+          expect(element.name).toEqual('Site Name');
+          expect(element.position).toEqual(1);
+
+          break;
+      }
+    });
   });
 
-  test('webPageSchema()', () => {
-    const output = Schema.webPageSchema(
-      {
-        path: 'web_page',
-        meta_title: 'Meta Title',
-        meta_description: 'Meta Description',
-        language: 'site_lang',
-        created_at: '01/01/01',
-        updated_at: '02/02/02',
-        seo_keywords: ['keyword_a', 'keyword_b'],
-        authors: [
-          {
-            profile_page_path: 'author_a/author_page',
-            email_address: 'email_a@email.com',
-            name: 'Author_A',
-          },
-          {
-            profile_page_path: 'author_b/author_page',
-            email_address: 'email_b@email.com',
-            name: 'Author_B',
-          },
-        ],
-        siteSchema: {
-          site_name: 'Site Name',
-          alias_site_name: 'Alias Site Name',
-          organization_founding_date: '01/02/03',
-          linkedin: 'author_linkedin',
-          spotify: 'author_spotify',
-          wikipedia: 'author_wikipedia',
-        },
+  test('schemaGenerator(PCSA)', () => {
+    process.env.GATSBY_SITE_NAME = 'playcasino.co.za';
+    const output = Schema.schemaGenerator({
+      seo_json_schema: 'SEO JSON Schema',
+      author: {
+        name: 'Leo',
+        facebook_profile: 'url',
+        instagram_profile: 'url 2',
       },
-      pageImage
-    );
-
-    const json = parseCheckSchema(output);
-    expect(json['@type']).toEqual('WebPage');
-    expect(json['@id']).toEqual(`${getUrl('web_page')}#webpage`);
-    expect(json.url).toEqual(getUrl('web_page'));
-    expect(json.name).toEqual('Meta Title');
-    expect(json.description).toEqual('Meta Description');
-    expect(json.inLanguage).toEqual('site_lang');
-    expect(json.datePublished).toEqual('01/01/01');
-    expect(json.dateModified).toEqual('02/02/02');
-
-    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.inLanguage).toEqual('site_lang');
-
-    expect(Object.prototype.toString.call(json.primaryImageOfPage)).toEqual('[object Object]');
-    expect(json.primaryImageOfPage['@type']).toEqual('ImageObject');
-    expect(json.primaryImageOfPage['@id']).toEqual(`${getUrl('web_page')}#primaryimage`);
-    expect(json.primaryImageOfPage.url).toEqual(pageImage);
-    expect(json.primaryImageOfPage.inLanguage).toEqual('site_lang');
-
-    expect(Object.prototype.toString.call(json.author)).toEqual('[object Object]');
-    expect(json.author['@type']).toEqual('Organization');
-    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(undefined);
-
-    expect(Object.prototype.toString.call(json.author.logo)).toEqual('[object Object]');
-    expect(json.author.logo['@type']).toEqual('ImageObject');
-    expect(json.author.logo.url).toEqual(pageImage);
-
-    expect(Object.prototype.toString.call(json.author.contactPoint)).toEqual('[object Array]');
-    expect(json.author.contactPoint).toHaveLength(2);
-    expect(Object.prototype.toString.call(json.author.contactPoint[0])).toEqual('[object Object]');
-    expect(Object.prototype.toString.call(json.author.contactPoint[1])).toEqual('[object Object]');
-    expect(json.author.contactPoint[0]['@type']).toEqual('ContactPoint');
-    expect(json.author.contactPoint[1]['@type']).toEqual('ContactPoint');
-    expect(json.author.contactPoint[0].contactType).toEqual('Author');
-    expect(json.author.contactPoint[1].contactType).toEqual('Author');
-    expect(json.author.contactPoint[0].url).toEqual(`${getUrl('/')}author_a/author_page`);
-    expect(json.author.contactPoint[1].url).toEqual(`${getUrl('/')}author_b/author_page`);
-    expect(json.author.contactPoint[0].name).toEqual('Author_A');
-    expect(json.author.contactPoint[1].name).toEqual('Author_B');
-    expect(json.author.contactPoint[0].email).toEqual('email_a@email.com');
-    expect(json.author.contactPoint[1].email).toEqual('email_b@email.com');
-
-    expect(Object.prototype.toString.call(json.author.sameAs)).toEqual('[object Array]');
-    expect(json.author.sameAs).toHaveLength(3);
-    expect(json.author.sameAs[0]).toEqual('author_linkedin');
-    expect(json.author.sameAs[1]).toEqual('author_spotify');
-    expect(json.author.sameAs[2]).toEqual('author_wikipedia');
-    expect(json.author.knowsAbout).toEqual(undefined);
-
-    expect(Object.prototype.toString.call(json.keywords)).toEqual('[object Array]');
-    expect(json.keywords).toHaveLength(2);
-    expect(json.keywords[0]).toEqual('keyword_a');
-    expect(json.keywords[1]).toEqual('keyword_b');
-  });
-
-  test('organizationSchema()', () => {
-    const output = Schema.organizationSchema(
-      {
-        siteSchema: {
-          site_name: 'Site Name',
-          linkedin: 'organization_linkedin',
-          spotify: 'organization_spotify',
-          wikipedia: 'organization_wikipedia',
+      authors: [
+        {
+          email_address: 'email',
+          name: 'name',
+          profile_page_path: 'about-us/name',
         },
+      ],
+      breadcrumbs: [{ path: '/' }],
+      type: 'operator',
+      path: '/',
+      sections: { main: { modules: [{ name: 'faq' }] } },
+      siteSchema: {
+        site_name: 'Site Name',
       },
-      pageImage
-    );
+    });
 
-    const json = parseCheckSchema(output);
-    expect(json['@type']).toEqual('Organization');
-    expect(json.url).toEqual(process.env.GATSBY_SITE_URL);
-    expect(json.name).toEqual('Site Name');
-    expect(json.logo).toEqual(pageImage);
-
-    expect(Object.prototype.toString.call(json.sameAs)).toEqual('[object Array]');
-    expect(json.sameAs).toHaveLength(3);
-    expect(json.sameAs[0]).toEqual('organization_linkedin');
-    expect(json.sameAs[1]).toEqual('organization_spotify');
-    expect(json.sameAs[2]).toEqual('organization_wikipedia');
-  });
+    expect(Object.prototype.toString.call(output)).toEqual('[object Array]');
 
-  test('moduleSchemas(null)', () => {
-    const output = Schema.moduleSchemas([{ name: 'other' }], '/');
+    expect(Object.prototype.toString.call(output[0])).toEqual('[object String]');
+    expect(output[0]).toEqual('SEO JSON Schema');
 
-    expect(output).toHaveLength(0);
-    expect(output[0]).toEqual(undefined);
-  });
+    expect(output[2]).toEqual(null);
 
-  test('moduleSchemas(faq)', () => {
-    const output = Schema.moduleSchemas(
-      [
-        {
-          name: 'faq',
-          items: [
-            { answer: 'Answer A', question: 'Question A' },
-            { answer: 'Answer B', question: 'Question B' },
-            { answer: 'Answer C', question: 'Question C' },
-          ],
-        },
-      ],
-      '/'
-    )[0];
+    const jsonOrganization = parseCheckSchema(output[3]);
+    expect(jsonOrganization['@type']).toEqual('Organization');
 
-    const json = parseCheckSchema(output);
-    expect(json['@type']).toEqual('FAQPage');
-
-    expect(Object.prototype.toString.call(json.mainEntity)).toEqual('[object Array]');
-    expect(json.mainEntity).toHaveLength(3);
-    expect(Object.prototype.toString.call(json.mainEntity[0])).toEqual('[object Object]');
-    expect(Object.prototype.toString.call(json.mainEntity[1])).toEqual('[object Object]');
-    expect(Object.prototype.toString.call(json.mainEntity[2])).toEqual('[object Object]');
-    expect(json.mainEntity[0]['@type']).toEqual('Question');
-    expect(json.mainEntity[1]['@type']).toEqual('Question');
-    expect(json.mainEntity[2]['@type']).toEqual('Question');
-    expect(json.mainEntity[0].name).toEqual('Question A');
-    expect(json.mainEntity[1].name).toEqual('Question B');
-    expect(json.mainEntity[2].name).toEqual('Question C');
-
-    expect(Object.prototype.toString.call(json.mainEntity[0].acceptedAnswer)).toEqual(
-      '[object Object]'
-    );
-    expect(Object.prototype.toString.call(json.mainEntity[1].acceptedAnswer)).toEqual(
-      '[object Object]'
-    );
-    expect(Object.prototype.toString.call(json.mainEntity[2].acceptedAnswer)).toEqual(
-      '[object Object]'
-    );
-    expect(json.mainEntity[0].acceptedAnswer['@type']).toEqual('Answer');
-    expect(json.mainEntity[1].acceptedAnswer['@type']).toEqual('Answer');
-    expect(json.mainEntity[2].acceptedAnswer['@type']).toEqual('Answer');
-    expect(json.mainEntity[0].acceptedAnswer.text).toEqual('Answer A');
-    expect(json.mainEntity[1].acceptedAnswer.text).toEqual('Answer B');
-    expect(json.mainEntity[2].acceptedAnswer.text).toEqual('Answer C');
-  });
+    const jsonArticle = parseCheckSchema(output[4]);
+    expect(jsonArticle['@type']).toEqual('Review');
 
-  test('templateSchemas(null)', () => {
-    const output = Schema.templateSchemas({
-      type: 'other',
-      path: 'other_page',
-    });
+    const jsonWebSite = parseCheckSchema(output[5]);
+    expect(jsonWebSite['@type']).toEqual('WebSite');
 
-    expect(output).toEqual(null);
+    const jsonFaq = parseCheckSchema(output[7]);
+    expect(jsonFaq['@type']).toEqual('FAQPage');
   });
 
-  test('templateSchemas(article)', () => {
-    const output = Schema.templateSchemas({
+  test('schemaGenerator(IL)', () => {
+    process.env.GATSBY_SITE_NAME = 'irishluck.ie';
+    const output = Schema.schemaGenerator({
+      seo_json_schema: 'SEO JSON Schema',
       type: 'article',
-      path: 'article_page',
-      title: 'Article Title',
-      created_at: '01/01/01',
-      updated_at: '02/02/02',
-      featured_image_object: {
-        url: 'featured_image/image.jpg',
-      },
-      author: {
-        name: 'Very long name for the 100 characters Article Author test - ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ',
-        profile_page_path: 'article_author/author_page',
-      },
-      siteInfo: {
-        site_logo: 'logo.jpg',
-      },
+      path: '/test-path',
     });
 
-    const json = parseCheckSchema(output);
-    expect(json['@type']).toEqual('Article');
-    expect(json.url).toEqual(getUrl('article_page'));
-    expect(json.headline).toEqual('Article Title');
-    expect(json.datePublished).toEqual('01/01/01');
-    expect(json.dateModified).toEqual('02/02/02');
-
-    expect(Object.prototype.toString.call(json.mainEntityOfPage)).toEqual('[object Object]');
-    expect(json.mainEntityOfPage['@type']).toEqual('WebPage');
-    expect(json.mainEntityOfPage.url).toEqual(process.env.GATSBY_SITE_URL);
-
-    expect(Object.prototype.toString.call(json.author)).toEqual('[object Object]');
-    expect(json.author['@type']).toEqual('Person');
-    expect(json.author.name).toHaveLength(100);
-    expect(json.author.name).toEqual(
-      'Very long name for the 100 characters Article Author test - ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMN'
-    );
-    expect(json.author.url).toEqual(`${getUrl('/')}article_author/author_page`);
-
-    expect(Object.prototype.toString.call(json.publisher)).toEqual('[object Object]');
-    expect(json.publisher['@type']).toEqual('Organization');
-    expect(json.publisher.name).toBeTruthy();
-    expect(json.publisher.logo).toEqual(`${process.env.IMAGE_CDN_URL}/logo.jpg`);
-  });
+    expect(Object.prototype.toString.call(output)).toEqual('[object Array]');
 
-  test('templateSchemas(operator)', () => {
-    const output = Schema.templateSchemas({
-      type: 'operator',
-      path: 'operator_page',
-      title: 'Operator Title',
-      relation: {
-        name: 'Operator Relation Name',
-        rating: 3.5,
-        logo_url_object: {
-          url: 'logo_url/image.jpg',
-        },
-      },
-      featured_image_object: {
-        url: 'featured_image/image.jpg',
-      },
-      author: {
-        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',
-      },
-    });
+    expect(Object.prototype.toString.call(output[0])).toEqual('[object String]');
+    expect(output[0]).toEqual('SEO JSON Schema');
 
-    const json = parseCheckSchema(output);
-    expect(json['@type']).toEqual('Review');
-    expect(json.name).toEqual('Operator Relation Name');
-    expect(json.reviewBody).toEqual('Operator Review Summary');
-
-    expect(Object.prototype.toString.call(json.itemReviewed)).toEqual('[object Object]');
-    expect(json.itemReviewed['@type']).toEqual('Organization');
-    expect(json.itemReviewed.url).toEqual(getUrl('operator_page'));
-    expect(json.itemReviewed.name).toEqual('Operator Title');
-    expect(json.itemReviewed.image).toEqual('logo_url/image.jpg');
-
-    expect(Object.prototype.toString.call(json.reviewRating)).toEqual('[object Object]');
-    expect(json.reviewRating['@type']).toEqual('Rating');
-    expect(json.reviewRating.bestRating).toEqual('5');
-    expect(json.reviewRating.worstRating).toEqual('0');
-    expect(json.reviewRating.ratingValue).toEqual('3.5');
-
-    expect(Object.prototype.toString.call(json.author)).toEqual('[object Object]');
-    expect(json.author['@type']).toEqual('Person');
-    expect(json.author.name).toHaveLength(100);
-    expect(json.author.name).toEqual(
-      'Very long name for the 100 characters Article Author test - ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMN'
-    );
-    expect(json.author.url).toEqual(`${getUrl('/')}operator_review_author/author_page`);
-
-    expect(Object.prototype.toString.call(json.publisher)).toEqual('[object Object]');
-    expect(json.publisher['@type']).toEqual('Organization');
-    expect(json.publisher.name).toBeTruthy();
-    expect(json.publisher.logo).toEqual(`${process.env.IMAGE_CDN_URL}/logo.jpg`);
-  });
+    const jsonBreadcrumbs = parseCheckSchema(output[1]);
+    expect(jsonBreadcrumbs['@type']).toEqual('BreadcrumbList');
 
-  test('templateSchemas(game)', () => {
-    const output = Schema.templateSchemas({
-      type: 'game',
-      path: 'game_page',
-      relation: {
-        name: 'Game Relation Name',
-        first_rating: 3.5,
-        third_rating: 1.5,
-      },
-      featured_image_object: {
-        url: 'featured_image/image.jpg',
-      },
-      author: {
-        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',
-      },
-    });
+    const jsonWebpage = parseCheckSchema(output[2]);
 
-    const json = parseCheckSchema(output);
-    expect(json['@type']).toEqual('VideoGame');
-    expect(json.url).toEqual(getUrl('game_page'));
-    expect(json.name).toEqual('Game Relation Name');
-    expect(json.description).toEqual('Game Review Summary');
-    expect(json.operatingSystem).toEqual('Multi-platform');
-
-    expect(Object.prototype.toString.call(json.applicationCategory)).toEqual('[object Array]');
-    expect(json.applicationCategory).toHaveLength(1);
-    expect(json.applicationCategory[0]).toEqual('Game');
-
-    expect(Object.prototype.toString.call(json.author)).toEqual('[object Object]');
-    expect(json.author['@type']).toEqual('Organization');
-    expect(json.author.name).toEqual(process.env.GATSBY_SITE_NAME);
-    expect(json.author.url).toEqual(process.env.GATSBY_SITE_URL);
-
-    expect(Object.prototype.toString.call(json.review)).toEqual('[object Object]');
-    expect(json.review['@type']).toEqual('Review');
-    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');
-    expect(json.review.reviewRating.bestRating).toEqual('10');
-    expect(json.review.reviewRating.worstRating).toEqual('0');
-    expect(json.review.reviewRating.ratingValue).toEqual('2');
-
-    expect(Object.prototype.toString.call(json.review.author)).toEqual('[object Object]');
-    expect(json.review.author['@type']).toEqual('Person');
-    expect(json.review.author.name).toHaveLength(100);
-    expect(json.review.author.name).toEqual(
-      'Very long name for the 100 characters Article Author test - ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMN'
-    );
-    expect(json.review.author.url).toEqual(`${getUrl('/')}operator_review_author/author_page`);
-
-    expect(Object.prototype.toString.call(json.review.publisher)).toEqual('[object Object]');
-    expect(json.review.publisher['@type']).toEqual('Organization');
-    expect(json.review.publisher.name).toBeTruthy();
-    expect(json.review.publisher.logo).toEqual(`${process.env.IMAGE_CDN_URL}/logo.jpg`);
+    expect(jsonWebpage['@type']).toEqual('WebPage');
+    expect(jsonWebpage.keywords).toEqual(undefined);
+
+    expect(output[3]).toEqual(null);
+
+    expect(output[5]).toEqual(null);
   });
 
-  test('schemaGenerator()', () => {
+  test('schemaGenerator(NSA)', () => {
+    process.env.GATSBY_SITE_NAME = 'norskespilleautomater.com';
     const output = Schema.schemaGenerator({
       seo_json_schema: 'SEO JSON Schema',
-      breadcrumbs: [{ path: '/test' }],
-      type: 'article',
+      type: 'other',
       path: '/test-path',
-      sections: { main: { modules: [{ name: 'faq' }] } },
+      siteSchema: {
+        publishing_principles: 'https://www.norskespilleautomater.com/om-oss/prinsipper',
+        knows_about: [
+          {
+            links: ['link'],
+            name: 'name',
+            type: 'type',
+          },
+        ],
+      },
     });
 
     expect(Object.prototype.toString.call(output)).toEqual('[object Array]');
@@ -404,15 +155,57 @@ describe('Schema Helper', () => {
     const jsonWebpage = parseCheckSchema(output[2]);
     expect(jsonWebpage['@type']).toEqual('WebPage');
     expect(jsonWebpage.keywords).toEqual(undefined);
-    expect(jsonWebpage.knowsAbout).toEqual(undefined);
 
-    const jsonOrganization = parseCheckSchema(output[3]);
-    expect(jsonOrganization['@type']).toEqual('Organization');
+    expect(output[3]).toEqual(null);
 
-    const jsonArticle = parseCheckSchema(output[4]);
-    expect(jsonArticle['@type']).toEqual('Article');
+    expect(output[4]).toEqual(null);
 
-    const jsonFaq = parseCheckSchema(output[5]);
-    expect(jsonFaq['@type']).toEqual('FAQPage');
+    expect(output[5]).toEqual(null);
+  });
+
+  test('schemaGenerator(game)', () => {
+    // process.env.GATSBY_SITE_NAME = 'norskespilleautomater.com';
+    const output = Schema.schemaGenerator({
+      seo_json_schema: 'SEO JSON Schema',
+      author: {
+        name: 'Leo',
+        facebook_profile: 'url',
+        twitter_profile: 'url',
+      },
+      type: 'game',
+      author_id: 23,
+      path: '/test-path',
+      relation: {
+        rating: 4,
+      },
+      siteSchema: {
+        video: { items: [{}] },
+
+        knows_about: [
+          {
+            links: ['link'],
+            name: 'name',
+            type: 'type',
+          },
+        ],
+      },
+    });
+
+    expect(Object.prototype.toString.call(output)).toEqual('[object Array]');
+
+    expect(Object.prototype.toString.call(output[0])).toEqual('[object String]');
+    expect(output[0]).toEqual('SEO JSON Schema');
+
+    const jsonBreadcrumbs = parseCheckSchema(output[1]);
+    expect(jsonBreadcrumbs['@type']).toEqual('BreadcrumbList');
+
+    const jsonReviewer = parseCheckSchema(output[4]);
+    expect(jsonReviewer['@type']).toEqual('Review');
+
+    const jsonPerson = parseCheckSchema(output[6]);
+    expect(jsonPerson['@type']).toEqual('Person');
+
+    // const jsonVideoObject = parseCheckSchema(output[7]);
+    // expect(jsonVideoObject['@type']).toEqual('VideoObject');
   });
 });