gatsby-core-theme 8.0.6 → 8.0.9

package/CHANGELOG.md

@@ -1,3 +1,47 @@
+## [8.0.9](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v8.0.8...v8.0.9) (2022-07-18)
+
+
+### Bug Fixes
+
+* bugfix on search page dropdown ([924e930](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/924e93093f05b0f666118aead993e600016d5958))
+* react-icons ([6fa92e4](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/6fa92e4b10650de5003da15218aa9659ab42634e))
+* react-icons theme ([474b747](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/474b7471943a9e564560f1c4d971037694a8889d))
+
+
+### Code Refactoring
+
+* add content intro class ([10eb36e](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/10eb36e847576c3c4ec7c0db1984b68427a45784))
+* margin for dropdown ([a4ad1a7](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/a4ad1a7fc32947cbccfd816c595c1b16113f151d))
+
+
+* Merge branch 'tm-2963-react-icons' into 'master' ([75648e5](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/75648e57e50660d84bdf7ea926060629ce9b22f9))
+* Update pros-cons.stories.js ([1be02f7](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/1be02f7d0bfe05674c994adc6705ec8ee512568f))
+* Merge branch 'tm-2986-tablist-bugfix' into 'master' ([f51224d](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/f51224decd5594db644717354771f5da55ed59ce))
+* Merge branch 'tm-2967-bug-fixing' into 'master' ([1be5831](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/1be5831839d71a5dfe1d670e117504b363703179))
+
+## [8.0.8](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v8.0.7...v8.0.8) (2022-07-12)
+
+
+### Bug Fixes
+
+* filter out inactive/blacklisted operator fix ([0e40044](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/0e4004444f356de7a3cd58d11a429c21335835dd))
+* fixes tests ([be3007e](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/be3007ea3628b244287f15341b23c1031e1084c4))
+* hasArchive ([3a47982](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/3a479824658fe7b73eae89cdfdbb4a51f406f6e3))
+
+
+* Merge branch 'tm-2939-cards-v2-filters' into 'master' ([1cbd408](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/1cbd4086826ea8fcd272e82af738bfbe88e57ed6))
+* Merge branch 'tm-2833-schema-bible' into 'master' ([b288f2d](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/b288f2dcdd7bd29bb506f581026cc45b72ebe6e6))
+
+## [8.0.7](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v8.0.6...v8.0.7) (2022-07-08)
+
+
+### Bug Fixes
+
+* author box new props ([19073c7](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/19073c7dc36ceb3eddbf435b7f78f73c4ff7ff2a))
+
+
+* Merge branch 'tm-2928-author-box-props' into 'master' ([5d00333](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/5d0033339528449731be000c428006e80db8eb79))
+
 ## [8.0.6](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v8.0.5...v8.0.6) (2022-07-06)
 
 

package/gatsby-node.esm.js

@@ -61,6 +61,7 @@ function createArchivePage(pageObject, marketSections, prefilledModules, createP
     if (chunked) {
       chunked.forEach((value, index) => {
         const page = cloneDeep(pageObject);
+        page.hasArchive = true;
         const numOfPages = chunked.length;
         const archive = cloneDeep(page.sections.main.modules[archiveModuleIndex]);
         archive.currentPage = 1 + index; // 0 skip 0
@@ -82,6 +83,7 @@ function createArchivePage(pageObject, marketSections, prefilledModules, createP
       });
     } else {
       const page = cloneDeep(pageObject);
+      page.hasArchive = true;
       createPage({
         path: page.path,
         component: require.resolve(appName),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-core-theme",
-  "version": "8.0.6",
+  "version": "8.0.9",
   "description": "Gatsby Theme NPM Package",
   "main": "index.js",
   "GATSBY_RECAPTCHA_SITEKEY": "6LfoyvMUAAAAAO4nl_MQnqHb4XdHxEiu5cXgIqeB",
@@ -22,6 +22,7 @@
     "@loadable/server": "^5.14.2",
     "@loadable/webpack-plugin": "^5.14.2",
     "@reach/router": "^1.3.3",
+    "@react-icons/all-files": "^4.1.0",
     "axios": "^0.21.1",
     "chalk": "^4.1.0",
     "cross-env": "^7.0.3",
@@ -54,7 +55,6 @@
     "react-dom": "^17.0.2",
     "react-google-recaptcha": "^2.1.0",
     "react-helmet": "^6.0.0",
-    "react-icons": "^4.3.1",
     "react-lazyload": "^3.2.0",
     "react-masonry-css": "^1.0.16",
     "sass": "^1.49.9"

package/src/components/atoms/author/author.stories.js

@@ -6,7 +6,7 @@ import {
   PRIMARY_STORY,
   ArgsTable,
 } from '@storybook/addon-docs/blocks';
-import { FaTwitter } from 'react-icons/fa';
+import { FaTwitter } from '@react-icons/all-files/fa/FaTwitter';
 
 import Author from '.';
 

package/src/components/atoms/author-box/index.js

@@ -1,6 +1,9 @@
 /* eslint-disable react/no-danger */
 import React, { useContext } from 'react';
-import { FaInstagram, FaFacebookSquare, FaTwitter, FaLinkedin } from 'react-icons/fa';
+import { FaInstagram } from '@react-icons/all-files/fa/FaInstagram';
+import { FaFacebookSquare } from '@react-icons/all-files/fa/FaFacebookSquare';
+import { FaTwitter } from '@react-icons/all-files/fa/FaTwitter';
+import { FaLinkedin } from '@react-icons/all-files/fa/FaLinkedin';
 import PropTypes from 'prop-types';
 import { translate, imagePrettyUrl, getAltText } from '~helpers/getters';
 import styles from './author-box.module.scss';
@@ -8,7 +11,7 @@ import LazyImage from '~hooks/lazy-image';
 import Link from '~hooks/link';
 import { Context } from '~context/TranslationsProvider';
 
-export default function AuthorBox({ author }) {
+export default function AuthorBox({ author, preElement = null }) {
   const { translations } = useContext(Context) || {};
   const socialLinks = [
     { id: 'fb', link: author.facebook_profile, icon: <FaFacebookSquare /> },
@@ -99,6 +102,7 @@ export default function AuthorBox({ author }) {
           )}
         </div>
       </div>
+      {preElement}
     </div>
   );
 }
@@ -125,6 +129,7 @@ AuthorBox.propTypes = {
     biography: PropTypes.string,
     profile_page_path: PropTypes.string,
   }),
+  preElement: PropTypes.node,
   translations: PropTypes.shape({
     read_more: PropTypes.string,
   }),

package/src/components/atoms/custom-select/custom-select.module.scss

@@ -1,8 +1,11 @@
 .customSelectContainer {
   width: 100%;
-  max-width: 30rem;
   height: 4.8rem;
   position: relative;
+  @include min(tablet) {
+    max-width: 30rem;
+    margin-left: auto;
+  }
   .select {
     position: relative;
     display: block;

package/src/components/atoms/module-title/index.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { FaAngleRight } from 'react-icons/fa';
+import { FaAngleRight } from '@react-icons/all-files/fa/FaAngleRight';
 
 import Link from '~hooks/link';
 import styles from './module-title.module.scss';

package/src/components/atoms/open-graph/index.js

@@ -1,6 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { FaFacebookF, FaTwitter } from 'react-icons/fa';
+import { FaFacebookF } from '@react-icons/all-files/fa/FaFacebookF';
+import { FaTwitter } from '@react-icons/all-files/fa/FaTwitter';
+
 import { getUrl } from '~helpers/getters';
 
 import styles from './open-graph.module.scss';

package/src/components/atoms/search/autocomplete/article.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { IoMdArrowRoundForward } from 'react-icons/io';
+import { IoMdArrowRoundForward } from '@react-icons/all-files/io/IoMdArrowRoundForward';
 
 import styles from './article.module.scss';
 

package/src/components/atoms/selling-points/selling-points.stories.js

@@ -6,7 +6,7 @@ import {
   PRIMARY_STORY,
   ArgsTable,
 } from '@storybook/addon-docs/blocks';
-import { MdCheck } from 'react-icons/md';
+import { MdCheck } from '@react-icons/all-files/md/MdCheck';
 
 import SellingPoints from '.';
 

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

@@ -2,8 +2,8 @@
 /* eslint-disable react/forbid-prop-types */
 import React, { useContext } from 'react';
 import PropTypes from 'prop-types';
-import { BiSitemap } from 'react-icons/bi';
-import { IoMdLink } from 'react-icons/io';
+import { BiSitemap } from '@react-icons/all-files/bi/BiSitemap';
+import { IoMdLink } from '@react-icons/all-files/io/IoMdLink';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import Masonry from 'react-masonry-css';
 import { Context } from '~context/TranslationsProvider';

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

@@ -3,7 +3,7 @@
 /* eslint-disable camelcase */
 import React from 'react';
 import PropTypes from 'prop-types';
-import { GrFormNextLink } from 'react-icons/gr';
+import { GrFormNextLink } from '@react-icons/all-files/gr/GrFormNextLink';
 import Button from '~atoms/button';
 import LazyImage from '~hooks/lazy-image';
 import keygen from '~helpers/keygen';

package/src/components/molecules/content-intro/content-intro.scss

@@ -0,0 +1,2 @@
+.contentIntro {
+}

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

@@ -5,6 +5,8 @@ import LazyImage from '~hooks/lazy-image';
 import { parseCss } from '~helpers/css-parser';
 import { parseContentImageUrl } from '~helpers/strings';
 
+import styles from './content-intro.scss';
+
 export default function index({ content }) {
   const replaceMedia = (node) => {
     if (node.name === 'iframe') {
@@ -26,7 +28,7 @@ export default function index({ content }) {
   };
 
   return (
-    <div>
+    <div className={styles.contentIntro}>
       {parse(content, {
         replace: replaceMedia,
       })}

package/src/components/molecules/link-list/link-list.stories.js

@@ -8,7 +8,7 @@ import {
   ArgsTable,
   // eslint-disable-next-line import/no-extraneous-dependencies
 } from '@storybook/addon-docs/blocks';
-import { FaChevronRight } from 'react-icons/fa';
+import { FaChevronRight } from '@react-icons/all-files/fa/FaChevronRight';
 
 import LinkList from '.';
 import styles from './link-list.module.scss';

package/src/components/molecules/pagination/with-midpoints.js

@@ -1,6 +1,10 @@
 import React, { useContext } from 'react';
 import PropTypes from 'prop-types';
-import { MdLastPage, MdFirstPage, MdChevronRight, MdChevronLeft } from 'react-icons/md';
+import { MdLastPage } from '@react-icons/all-files/md/MdLastPage';
+import { MdFirstPage } from '@react-icons/all-files/md/MdFirstPage';
+import { MdChevronRight } from '@react-icons/all-files/md/MdChevronRight';
+import { MdChevronLeft } from '@react-icons/all-files/md/MdChevronLeft';
+
 import { translate } from '~helpers/getters';
 import Link from '~hooks/link';
 import { Context } from '~context/TranslationsProvider';

package/src/components/molecules/pros-cons/pros-cons.stories.js

@@ -6,12 +6,15 @@ import {
   PRIMARY_STORY,
   ArgsTable,
 } from '@storybook/addon-docs/blocks';
-import { FaRegThumbsUp, FaRegThumbsDown } from 'react-icons/fa';
-import { MdCheck, MdClose } from 'react-icons/md';
+import { FaRegThumbsUp } from '@react-icons/all-files/fa/FaRegThumbsUp';
+import { FaRegThumbsDown } from '@react-icons/all-files/fa/FaRegThumbsDown';
+
+import { MdCheck } from '@react-icons/all-files/md/MdCheck';
+import { MdClose } from '@react-icons/all-files/md/MdClose';
 
 import ProsCons from '.';
 
-const icons = [
+const iconsSvg = [
   <FaRegThumbsUp size="50" />,
   <FaRegThumbsDown size="50" />,
   <MdCheck size="25" color="#17d670" />,
@@ -92,5 +95,5 @@ Default.args = {
   },
   pros: 'Pros',
   cons: 'Cons',
-  icons: icons,
+  icons: iconsSvg,
 };

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

@@ -1,7 +1,7 @@
 import React, { useState, useEffect, useRef, useCallback, useContext } from 'react';
 import PropTypes from 'prop-types';
 import { navigate } from 'gatsby';
-import { FaSearch } from 'react-icons/fa';
+import { FaSearch } from '@react-icons/all-files/fa/FaSearch';
 import loadable from '@loadable/component';
 import LazyImage from '~hooks/lazy-image';
 import ConditionalWrapper from '~atoms/conditional-wrapper';
@@ -396,7 +396,7 @@ Search.propTypes = {
   pageSearchOptions: PropTypes.shape({
     useArchive: PropTypes.bool,
     archiveOptions: PropTypes.shape({
-      titles: PropTypes.arrayOf(PropTypes.object),
+      titles: PropTypes.arrayOf(PropTypes.shape({})),
       includeOptions: PropTypes.objectOf(PropTypes.string),
     }),
     tabs: PropTypes.bool,

package/src/components/molecules/toplist/default-row/index.js

@@ -1,6 +1,6 @@
 import React, { useContext } from 'react';
 import PropTypes from 'prop-types';
-import { MdCheck } from 'react-icons/md';
+import { MdCheck } from '@react-icons/all-files/md/MdCheck';
 import Bonus from '~atoms/bonus';
 import { Context } from '~context/TranslationsProvider';
 import SellingPoints from '~atoms/selling-points';

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

@@ -1,7 +1,7 @@
 import React, { useContext } from 'react';
 import PropTypes from 'prop-types';
 import loadable from '@loadable/component';
-import { FaSearch } from 'react-icons/fa';
+import { FaSearch } from '@react-icons/all-files/fa/FaSearch';
 
 import { toggleScroll } from '~helpers/scroll';
 

package/src/helpers/getters.test.js

@@ -21,7 +21,7 @@ describe('Getters Helper', () => {
 
   test('getPageTitle()', () => {
     window.location.search = 's=hello';
-    expect(Getters.getPageTitle({ path: 's' })).toEqual('You searched for hello - Irishluck.ie');
+    expect(Getters.getPageTitle({ path: 's' })).toEqual('You searched for hello - irishluck.ie');
   });
 
   test('getExtraField()', () => {

package/src/helpers/processor/modules.js

@@ -85,10 +85,19 @@ export function filterGames(pages, selectedCategories, selectedProviders) {
   return pagesFiltered;
 }
 
+export function filterInactiveOperators(items) {
+  return items.filter(
+    (page) =>
+      !settings.filter_cards_modules[process.env.GATSBY_SITE_NAME].includes(
+        page.relation && page.relation.status
+      )
+  );
+}
+
 export function filterOperators(pages, selectedProviders, selectedTypes) {
   const pagesFiltered = [];
   if (!selectedTypes && !selectedProviders) {
-    return pages;
+    return filterInactiveOperators(pages);
   }
 
   pages.forEach((page) => {
@@ -104,7 +113,7 @@ export function filterOperators(pages, selectedProviders, selectedTypes) {
     });
   });
 
-  return pagesFiltered;
+  return filterInactiveOperators(pagesFiltered);
 }
 
 export function processCardsV2(module, pagesCloned, pagesMappedById, pageId) {
@@ -198,16 +207,7 @@ export function processCardsV2(module, pagesCloned, pagesMappedById, pageId) {
 
       // Applying sorting
       if (sortType === 'random') {
-        const samplePages =
-          module.cards_page_type !== 'operator'
-            ? uniquePages
-            : uniquePages.filter(
-                (page) =>
-                  !settings.filter_cards_modules[process.env.GATSBY_SITE_NAME].includes(
-                    page.relation && page.relation.status
-                  )
-              );
-        module.items = sampleSize(samplePages, itemLimit);
+        module.items = sampleSize(uniquePages, itemLimit);
       } else if (sortType === 'latest') {
         if (uniquePages.length > 0) {
           uniquePages.sort((a, b) => (a.created_at > b.created_at ? -1 : 1));
@@ -217,7 +217,7 @@ export function processCardsV2(module, pagesCloned, pagesMappedById, pageId) {
     }
   }
 
-  if (styleName === 'comparison_table' && pageId !== null) {
+  if (styleName === 'comparison_table' && pageId !== null && pageType === 'operator') {
     shiftFirstOperator(pageId, module, pagesMappedById);
   }
 

package/src/hooks/lazy-image/lazy-image.stories.js

@@ -9,7 +9,7 @@ import {
   ArgsTable,
   // eslint-disable-next-line import/no-extraneous-dependencies
 } from '@storybook/addon-docs/blocks';
-import { FaRegFrownOpen } from 'react-icons/fa';
+import { FaRegFrownOpen } from '@react-icons/all-files/fa/FaRegFrownOpen';
 
 import { imagePrettyUrl } from '~helpers/getters';
 import LazyImage from '.';

package/src/hooks/modal/modal.stories.js

@@ -6,7 +6,7 @@ import {
   PRIMARY_STORY,
   ArgsTable,
 } from '@storybook/addon-docs/blocks';
-import { MdClose } from 'react-icons/md';
+import { MdClose } from '@react-icons/all-files/md/MdClose';
 
 import Modal from '.';
 import ModalProvider from './modalContext';

package/src/hooks/modal/modal.test.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { render, cleanup, fireEvent } from '@testing-library/react';
 import '@testing-library/jest-dom/extend-expect';
-import { MdClose } from 'react-icons/md';
+import { MdClose } from '@react-icons/all-files/md/MdClose';
 
 import Modal from '.';
 import ModalProvider from './modalContext';

package/tests/envVars.js

@@ -1,4 +1,4 @@
-process.env.GATSBY_SITE_NAME = 'Irishluck.ie';
+process.env.GATSBY_SITE_NAME = 'irishluck.ie';
 process.env.GATSBY_SITE_URL = 'http://urltest.com/';
 process.env.IMAGE_CDN_URL = 'https://cdn.images.com';
 process.env.TRACKER_LINK_FORMAT_MAIN = '[no],[visit],short_name';