gatsby-core-theme 5.0.1 → 5.1.1

package/CHANGELOG.md

@@ -1,3 +1,50 @@
+## [5.1.1](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v5.1.0...v5.1.1) (2022-03-09)
+
+
+### Bug Fixes
+
+* test ([75ad3f0](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/75ad3f0c3a0d12a0355f3c632a2a209f6b19dc95))
+* tracker links redirect logic ([3694cfc](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/3694cfc6b208fc07f223a1ddc054f2a2b50dea1c))
+
+
+* Merge branch 'tracker-links-fix' into 'master' ([7394d4d](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/7394d4d9d947cc0b7ab4e50e92de912687b6a4ba))
+
+# [5.1.0](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v5.0.2...v5.1.0) (2022-03-07)
+
+
+### Bug Fixes
+
+* add reading time to header ([1365dc5](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/1365dc5f84c0a89b37188df97dfb627f16ed058e))
+* added hash with style ([828111a](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/828111ac4d2a0e860556f50b09ffcdbda4ee2a41))
+* toplist fixtures added links ([1912625](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/1912625a4e2053f996f39279e11bbd80b810f9ff))
+
+
+### Code Refactoring
+
+* move calculatetimeread to processsections ([0792827](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/0792827f2ec099db480586c8fd267bb19132c3fc))
+* move logic to processor ([3d2c426](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/3d2c426d85b938dd055beee3067d351f3de4d117))
+
+
+* Merge branch 'master' of git.ilcd.rocks:team-floyd/themes/gatsby-themes ([c368a8c](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/c368a8c94797c05e953c43bff5ce75b477378ebf))
+* Merge branch 'tm-2756-reading-time' into 'master' ([88e138d](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/88e138dcef2c3535cc2b6e9b929f1c876daa4333))
+* Merge branch 'tm-2762-style-sheet-hash' into 'master' ([db5c54d](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/db5c54dd0df9b419ff4e8f69273203043126a71d))
+
+
+### Features
+
+* add reading time functions ([77655bc](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/77655bc491ef43a249ff5c518f9696d5c3cbeb55))
+
+## [5.0.2](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v5.0.1...v5.0.2) (2022-03-03)
+
+
+### Bug Fixes
+
+* disabled lighthouse ([cb06eaf](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/cb06eaf1cd70de80cfc4eabc17bea8effde1d4d3))
+* tracker link default to main if toplist custom tracker name not exist ([8f9b25f](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/8f9b25f284d779f57e53edb05533feec78d71207))
+
+
+* Merge branch 'master' of git.ilcd.rocks:team-floyd/themes/gatsby-themes ([591ffa4](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/591ffa4a83cfc72d3dd11bb9b453b0296fe6d792))
+
 ## [5.0.1](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v5.0.0...v5.0.1) (2022-03-02)
 
 

package/gatsby-node.esm.js

@@ -331,23 +331,21 @@ exports.onCreatePage = ({ page, actions }) => {
   }
 };
 
-exports.onCreateWebpackConfig = ({ actions, plugins, getConfig }) => {
-  const config = getConfig();
-  const miniCssExtractPluginIndex = config.plugins.findIndex(
-    (plugin) => plugin.constructor.name === 'MiniCssExtractPlugin'
-  );
-
-  if (miniCssExtractPluginIndex > -1) {
-    config.plugins.splice(miniCssExtractPluginIndex, 1);
-    config.plugins.push(
-      plugins.extractText({
-        ignoreOrder: true,
-      })
+exports.onCreateWebpackConfig = ({ actions, stage, getConfig }) => {
+  if (stage === 'build-javascript') {
+    const config = getConfig();
+    // Get the mini-css-extract-plugin
+    const miniCssExtractPlugin = config.plugins.find(
+      (plugin) => plugin.constructor.name === 'MiniCssExtractPlugin'
     );
+    // Set the option here to true.
+    if (miniCssExtractPlugin) {
+      miniCssExtractPlugin.options.ignoreOrder = true;
+    }
+    // Update the config.
+    actions.replaceWebpackConfig(config);
   }
 
-  actions.replaceWebpackConfig(config);
-
   actions.setWebpackConfig({
     resolve: {
       alias: {

package/package.json

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

package/src/components/molecules/header/header.module.scss

@@ -25,5 +25,11 @@
   .headerContent {
     z-index: 1;
     padding: 2.4rem;
+
+    .readingTime {
+      > span {
+        font-weight: bold;
+      }
+    }
   }
 }

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(1);
+    expect(container.querySelectorAll('p')).toHaveLength(2);
     expect(container.querySelectorAll('i')).toHaveLength(1);
 
     // Testing image

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

@@ -72,6 +72,9 @@ function Header({ section, content = null, backgroundImage = true }) {
           section.page.template !== 'article_casino' &&
           section.page.template !== 'article_sports' &&
           section.page.template !== 'game_review' && <h1>{section.page.title}</h1>}
+        <p className={styles.readingTime}>
+          Reading Time: <span>{section.page.reading_time}</span>
+        </p>
         <div className={!content && styles.headerText}>{headerContent()}</div>
       </div>
     </header>
@@ -86,6 +89,7 @@ Header.propTypes = {
       path: PropTypes.string,
       updated_at: PropTypes.string,
       created_at: PropTypes.string,
+      reading_time: PropTypes.string,
       author: PropTypes.shape({
         name: PropTypes.string,
         profile_page_path: PropTypes.string,

package/src/components/pages/tracker/index.js

@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import Button from '~atoms/button';
 import LazyImage from '~hooks/lazy-image';
 import { prettyTracker } from '~helpers/getters';
+import { generateTrackerLink } from '~helpers/generators';
 import { isMobileDevice } from '~helpers/device-detect';
 import styles from './tracker.module.scss';
 
@@ -26,7 +27,8 @@ const Tracker = ({
   let tracker = '';
   for (let i = 0; i < trackerLinks.length; i += 1) {
     const trackerLink = trackerLinks[i].toLowerCase().replace(' ', '_');
-    if (path.includes(trackerLink)) {
+
+    if (generateTrackerLink(operator, trackerLink) === path) {
       tracker =
         operator.links[
           Object.keys(operator.links).find((key) => key.toLowerCase() === trackerLink.toLowerCase())

package/src/helpers/getters.js

@@ -152,6 +152,11 @@ export function prettyTracker(operator, trackerType = 'main') {
     return null;
   }
 
+  // if tracker is not main, check if the tracker exists,  if not use main
+  if (trackerType !== 'main' && operator.links[trackerType] === undefined) {
+    trackerType = 'main';
+  }
+
   return generateTrackerLink(operator, trackerType);
 }
 

package/src/helpers/processor/common.js

@@ -88,3 +88,8 @@ export function removeDuplicates(list, key) {
     return filtered;
   }, []);
 }
+
+export function removeTags(str) {
+  if (str === null || str === '') return '';
+  return str.toString().replace(/(<([^>]+)>)/gi, '');
+}

package/src/helpers/processor/index.js

@@ -12,8 +12,9 @@ import { generatePlaceholderString } from '../generators';
 // eslint-disable-next-line import/no-cycle
 import { processModule } from './modules';
 // eslint-disable-next-line import/no-cycle
-import { clonePageForCards, groupBy } from './common';
+import { clonePageForCards, groupBy, removeTags } from './common';
 import { prepareSportsData, addSportsDataToPage, addExtraFieldsToShowcaseEvents } from './sports';
+import { zeroPadding } from '../schedule';
 
 const previewMode = process.env.GATSBY_PREVIEW_MODE || false;
 const postSectionsMap = {
@@ -74,7 +75,10 @@ export function transform(response) {
   return transformed;
 }
 
-export function processSections(sections, skipPost = false) {
+export function processSections(sections, skipPost = false, page) {
+  let minutes = 0;
+  let seconds = 0;
+
   Object.keys(sections).forEach((sectionKey) => {
     if (skipPost && sectionKey.includes('post_main')) {
       return;
@@ -93,9 +97,32 @@ export function processSections(sections, skipPost = false) {
           menus,
           previewMode
         );
+
+        // calculate reading time
+        if (module.name === 'content') {
+          const nrOfWords = removeTags(module.value).split(' ').length / 250;
+          const minPerModule = Math.floor(nrOfWords);
+          const secPerModule = Math.floor((nrOfWords % 1) * 60);
+
+          minutes += minPerModule;
+          seconds += secPerModule;
+        }
       });
     }
   });
+  // transform seconds to minutes as last step
+  if (seconds > 60) {
+    const mins = Math.floor(seconds / 60);
+    const decimalSeconds = seconds % 60;
+
+    minutes += mins;
+    seconds = decimalSeconds;
+  }
+
+  if (page) {
+    page.reading_time = `${zeroPadding(minutes, 2)}:${zeroPadding(seconds, 2)}`;
+  }
+
   return sections;
 }
 
@@ -290,7 +317,7 @@ export default {
               });
 
               transformedPages[market][pageType][index] = Object.assign(page, {
-                sections: processSections(page.sections),
+                sections: processSections(page.sections, false, page),
               });
             }
           });

package/tests/factories/modules/toplist.factory.js

@@ -441,6 +441,10 @@ export const singleToplistData = {
           rating: '4',
           review_link: '/slotum',
           selling_points: ['200% Bonus', 'Nice design'],
+          links: {
+            main: 'https://media.dunderaffiliates.com/redirect.aspx?pid=630524&bid=1477',
+            'PPC Fallback': 'https://media.dunderaffiliates.com/redirect.aspx?pid=740444&bid=1803',
+          },
           one_liners: {
             main: {
               one_liner: '90% Bonus + 50 free spins',
@@ -467,6 +471,10 @@ export const singleToplistData = {
           rating: '4',
           review_link: '/rizk',
           selling_points: ['100% Bonus', 'User-friendly', 'Welcome bonus', 'Nice design'],
+          links: {
+            main: 'https://media.dunderaffiliates.com/redirect.aspx?pid=630524&bid=1477',
+            'PPC Fallback': 'https://media.dunderaffiliates.com/redirect.aspx?pid=740444&bid=1803',
+          },
           one_liners: {
             main: {
               one_liner: '100% Bonus + 50 free spins',
@@ -493,6 +501,10 @@ export const singleToplistData = {
           rating: '3',
           review_link: '/casoola',
           selling_points: ['25 free spins', 'Loyalty scheme'],
+          links: {
+            main: 'https://media.dunderaffiliates.com/redirect.aspx?pid=630524&bid=1477',
+            'PPC Fallback': 'https://media.dunderaffiliates.com/redirect.aspx?pid=740444&bid=1803',
+          },
           one_liners: {
             main: {
               one_liner: '80% Bonus + 25 free spins',
@@ -514,6 +526,10 @@ export const singleToplistData = {
           rating: '3',
           review_link: '/bet365',
           selling_points: ['Loyalty programme', 'Wager-free free spins'],
+          links: {
+            main: 'https://media.dunderaffiliates.com/redirect.aspx?pid=630524&bid=1477',
+            'PPC Fallback': 'https://media.dunderaffiliates.com/redirect.aspx?pid=740444&bid=1803',
+          },
           one_liners: {
             main: {
               one_liner: 'Up to £100 New Player Bonus!',
@@ -533,6 +549,10 @@ export const singleToplistData = {
           bonus: {
             deposit_methods: [],
           },
+          links: {
+            main: 'https://media.dunderaffiliates.com/redirect.aspx?pid=630524&bid=1477',
+            'PPC Fallback': 'https://media.dunderaffiliates.com/redirect.aspx?pid=740444&bid=1803',
+          },
           short_name: 'captain-spins',
           logo_url: 'captain-spins-logopng07b24ceb59-original.png',
           rating: '4',
@@ -557,6 +577,10 @@ export const singleToplistData = {
           bonus: {
             deposit_methods: [],
           },
+          links: {
+            main: 'https://media.dunderaffiliates.com/redirect.aspx?pid=630524&bid=1477',
+            'PPC Fallback': 'https://media.dunderaffiliates.com/redirect.aspx?pid=740444&bid=1803',
+          },
           short_name: 'casino-gods',
           logo_url: 'casino-gods-logopng3bfc0d51-original.png',
           rating: '3',
@@ -581,6 +605,10 @@ export const singleToplistData = {
           bonus: {
             deposit_methods: [],
           },
+          links: {
+            main: 'https://media.dunderaffiliates.com/redirect.aspx?pid=630524&bid=1477',
+            'PPC Fallback': 'https://media.dunderaffiliates.com/redirect.aspx?pid=740444&bid=1803',
+          },
           short_name: 'jinni-lotto',
           logo_url: 'jinnilotto-logopng464964d6b0-original.png',
           rating: '4',
@@ -605,6 +633,10 @@ export const singleToplistData = {
           bonus: {
             deposit_methods: [],
           },
+          links: {
+            main: 'https://media.dunderaffiliates.com/redirect.aspx?pid=630524&bid=1477',
+            'PPC Fallback': 'https://media.dunderaffiliates.com/redirect.aspx?pid=740444&bid=1803',
+          },
           short_name: 'betfair',
           logo_url: '5aedeb23bb-original.png',
           rating: '5',
@@ -629,6 +661,10 @@ export const singleToplistData = {
           bonus: {
             deposit_methods: [],
           },
+          links: {
+            main: 'https://media.dunderaffiliates.com/redirect.aspx?pid=630524&bid=1477',
+            'PPC Fallback': 'https://media.dunderaffiliates.com/redirect.aspx?pid=740444&bid=1803',
+          },
           short_name: 'casoola',
           logo_url: 'casoola-logopng381ab5c04f-original.png',
           rating: '3',
@@ -653,6 +689,10 @@ export const singleToplistData = {
           bonus: {
             deposit_methods: [],
           },
+          links: {
+            main: 'https://media.dunderaffiliates.com/redirect.aspx?pid=630524&bid=1477',
+            'PPC Fallback': 'https://media.dunderaffiliates.com/redirect.aspx?pid=740444&bid=1803',
+          },
           short_name: 'bet365',
           logo_url: 'image-63.png',
           rating: '3',
@@ -677,6 +717,10 @@ export const singleToplistData = {
           bonus: {
             deposit_methods: [],
           },
+          links: {
+            main: 'https://media.dunderaffiliates.com/redirect.aspx?pid=630524&bid=1477',
+            'PPC Fallback': 'https://media.dunderaffiliates.com/redirect.aspx?pid=740444&bid=1803',
+          },
           short_name: 'captain-spins',
           logo_url: 'captain-spins-logopng07b24ceb59-original.png',
           rating: '4',
@@ -701,6 +745,10 @@ export const singleToplistData = {
           bonus: {
             deposit_methods: [],
           },
+          links: {
+            main: 'https://media.dunderaffiliates.com/redirect.aspx?pid=630524&bid=1477',
+            'PPC Fallback': 'https://media.dunderaffiliates.com/redirect.aspx?pid=740444&bid=1803',
+          },
           short_name: 'slotum',
           logo_url: 'slotum-casino-logo-transparentpng6b10407566-original.png',
           rating: '4',
@@ -725,6 +773,10 @@ export const singleToplistData = {
           bonus: {
             deposit_methods: [],
           },
+          links: {
+            main: 'https://media.dunderaffiliates.com/redirect.aspx?pid=630524&bid=1477',
+            'PPC Fallback': 'https://media.dunderaffiliates.com/redirect.aspx?pid=740444&bid=1803',
+          },
           short_name: 'casoola',
           logo_url: 'casoola-logopng381ab5c04f-original.png',
           rating: '3',