gatsby-matrix-theme 3.1.1 → 3.2.2

package/CHANGELOG.md

@@ -1,3 +1,65 @@
+## [3.2.2](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v3.2.1...v3.2.2) (2022-01-04)
+
+
+### Bug Fixes
+
+* comparison table styling ([8ced0c7](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/8ced0c7171c3afb95c66b4419ae050942c6c4dda))
+
+
+* Merge branch 'master' of git.ilcd.rocks:team-floyd/themes/matrix-theme ([1f875a4](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/1f875a475402a80d735f22fa27cbbfe2dcde681f))
+
+## [3.2.1](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v3.2.0...v3.2.1) (2022-01-04)
+
+
+### Bug Fixes
+
+* comparison table configurations ([97d1bd6](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/97d1bd6fb267ca43a251b9c748aee14244ee9f7e))
+
+# [3.2.0](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v3.1.2...v3.2.0) (2022-01-03)
+
+
+### Bug Fixes
+
+* add storybook and fix some style issue ([40db75b](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/40db75b3d61109ab835053ff8ca9fa52a9625cbc))
+* added scss vars for comparison table and minor fixes ([fe23268](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/fe23268f258709c0f43742261fb152d506e7a48e))
+* fixed name and style also added the deposit method ([b075d1e](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/b075d1ed2ffcfafc27860a6cdde653866ac24929))
+* second line fix ([ede14f5](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/ede14f52526d6d09ae415c164d7fa0c0fc13e4f6))
+
+
+### Config
+
+* updated core version ([bfbdce6](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/bfbdce6a196a09cd5ee6befccb3fd36900306a41))
+
+
+* Merge branch 'STK-2585-Casino-comparison-module' into 'master' ([9376eb2](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/9376eb220a8b99a175667ea4f1308c498ae0a2e6))
+* Merge branch 'master' into STK-2585-Casino-comparison-module ([b3c2149](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/b3c2149636ae1e46bb96b6843ea2ea7333b90d6c))
+
+
+### Features
+
+* add the comparison table ([7decb55](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/7decb557e543b7307dad0edc78677158bdfb7ced))
+
+## [3.1.2](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v3.1.1...v3.1.2) (2021-12-23)
+
+
+### Bug Fixes
+
+*  operator bonus added dividor ([98538a9](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/98538a94160ef27a2a4d33334f8534aa6baff32e))
+* fixed parsing metadescription ([f3f7568](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/f3f75682e88341ebc90f3f532594e4a816605fc9))
+* new testimonials styling ([7f16177](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/7f1617700a339d7e0edd183769b040fb9a419255))
+* removed an useless line ([6320358](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/63203585e3ee6362f1250033b0b41a1180f61ad2))
+* tests ([0d2794f](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/0d2794feb4f5a93eb08f40c1776330a25aed0850))
+
+
+### Config
+
+* updated core theme version ([8ead1a7](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/8ead1a7c4fec1a4f30acced891b9eaa262d2c104))
+
+
+* Merge branch 'tm-2629-spotlight-testimonials' into 'master' ([52f20ab](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/52f20abf60df594d49e7eac3c4a5a099e7c2842a))
+* Merge branch 'tm-2610-operator-bonus' into 'master' ([8c80938](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/8c80938101df09f25d6458c423f4eaf09e8da5ca))
+* Merge branch 'fix-parse-metadescription' into 'master' ([fbed07c](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/fbed07cb84ba1d34a296ebc5cbf059eadfecdd72))
+
 ## [3.1.1](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v3.1.0...v3.1.1) (2021-12-17)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-matrix-theme",
-  "version": "3.1.1",
+  "version": "3.2.2",
   "main": "index.js",
   "description": "Matrix Theme NPM Package",
   "author": "",
@@ -31,7 +31,7 @@
     "cross-env": "^7.0.2",
     "dotenv": "8.2.0",
     "gatsby": "^3.3.1",
-    "gatsby-core-theme": "^2.0.2",
+    "gatsby-core-theme": "^2.0.10",
     "gatsby-image": "^3.3.0",
     "gatsby-plugin-image": "^1.3.1",
     "gatsby-plugin-postcss": "^4.3.0",

package/src/components/atoms/cards/comparison-table/comparison-table.module.scss

@@ -0,0 +1,27 @@
+.comparisonTable {
+  
+  .contentTable {
+    border-right: 1px solid var(--body-border-color);
+    overflow-x: scroll;
+    cursor: grabbing;
+    &::-webkit-scrollbar {
+      height: 5px;
+    }
+
+    /* Track */
+    &::-webkit-scrollbar-track {
+      background: #f1f1f1;
+    }
+
+    /* Handle */
+    &::-webkit-scrollbar-thumb {
+      background: rgb(216, 216, 216);
+      border-radius: 10px;
+    }
+
+    /* Handle on hover */
+    &::-webkit-scrollbar-thumb:hover {
+      background: rgb(187, 187, 187);
+    }
+  }
+}

package/src/components/atoms/cards/comparison-table/comparison-table.stories.js

@@ -0,0 +1,39 @@
+import React from 'react';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import {
+  Title,
+  Description,
+  Primary,
+  PRIMARY_STORY,
+  ArgsTable,
+} from '@storybook/addon-docs/blocks';
+import { getSampleOperatorCards } from 'gatsby-core-theme/tests/factories/modules/card.factory';
+
+import ComparisonTable from '.';
+
+export default {
+  title: 'Matrix-Theme/Atoms/Comparison Table',
+  component: ComparisonTable,
+
+  parameters: {
+    docs: {
+      description: {
+        component: 'A component that displays a single Popup Card',
+      },
+      page: () => (
+        <>
+          <Title />
+          <Description />
+          <Primary />
+          <ArgsTable story={PRIMARY_STORY} />
+        </>
+      ),
+    },
+  },
+};
+
+const Template = (args) => <ComparisonTable {...args} />;
+export const Default = Template.bind({});
+Default.args = {
+  module: getSampleOperatorCards(),
+};

package/src/components/atoms/cards/comparison-table/index.js

@@ -0,0 +1,57 @@
+import React, { useEffect, useRef } from 'react';
+import PropTypes from 'prop-types';
+
+import styles from './comparison-table.module.scss';
+import Table from './table';
+
+export default function ComparisonTable({ module }) {
+  const ele = useRef('');
+
+  let pos = { top: 0, left: 0, x: 0, y: 0 };
+
+  const mouseMoveHandler = (e) => {
+    const dx = e.clientX - pos.x;
+    ele.current.scrollLeft = pos.left - dx;
+  };
+
+  const mouseLeftHandler = () => {
+    ele.current.style.cursor = 'grab';
+    ele.current.style.removeProperty('user-select');
+
+    document.removeEventListener('mousemove', mouseMoveHandler);
+    document.removeEventListener('mouseup', mouseLeftHandler);
+  };
+
+  const mouseRightHandler = (e) => {
+    ele.current.style.cursor = 'grabbing';
+    ele.current.style.userSelect = 'none';
+
+    pos = {
+      left: ele.current.scrollLeft,
+      x: e.clientX,
+    };
+
+    document.addEventListener('mousemove', mouseMoveHandler);
+    document.addEventListener('mouseup', mouseLeftHandler);
+  };
+
+  useEffect(() => {
+    ele.current.style.cursor = 'grab';
+    ele.current.addEventListener('mousedown', mouseRightHandler);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  return (
+    <div className={styles.comparisonTable}>
+      <div ref={ele} className={styles.contentTable}>
+        <Table items={module?.items} />
+      </div>
+    </div>
+  );
+}
+
+ComparisonTable.propTypes = {
+  module: PropTypes.shape({
+    items: PropTypes.shape({}),
+  }),
+};

package/src/components/atoms/cards/comparison-table/table/index.js

@@ -0,0 +1,196 @@
+import React, { useContext } from 'react';
+import PropTypes from 'prop-types';
+import { AiOutlineCheckCircle } from 'react-icons/ai';
+import { imagePrettyUrl, translate } from 'gatsby-core-theme/src/helpers/getters';
+import LazyImg from 'gatsby-core-theme/src/hooks/lazy-image';
+import OperatorCta from 'gatsby-core-theme/src/components/atoms/operator-cta';
+import StarRating from 'gatsby-core-theme/src/components/molecules/star-rating';
+import Link from 'gatsby-core-theme/src/hooks/link';
+import Bonus from 'gatsby-core-theme/src/components/atoms/bonus';
+import { Context } from 'gatsby-core-theme/src/context/TranslationsProvider';
+
+import styles from './table.module.scss';
+
+export default function ComparisonTable({ items }) {
+  const { translations } = useContext(Context) || {};
+
+  const tabelInfo = [
+    {
+      defaultValue: 'Casino name',
+      key: 'casino_name',
+    },
+    {
+      defaultValue: 'Rating',
+      key: 'rating',
+    },
+    {
+      defaultValue: 'Bonus',
+      key: 'bonus',
+    },
+    {
+      defaultValue: 'Top Features',
+      key: 'top_features',
+    },
+    {
+      defaultValue: 'Payment Methods',
+      key: 'payment_methods',
+    },
+    {
+      defaultValue: 'Banking',
+      key: 'banking',
+    },
+    {
+      defaultValue: 'Currencies',
+      key: 'currencies',
+    },
+    {
+      defaultValue: 'Licenses',
+      key: 'licenses',
+    },
+  ];
+
+  const cell = (heading, item, index) => {
+    switch (heading) {
+      case 'casino_name':
+        return (
+          <td key={index} className={styles.casinoName}>
+            <LazyImg
+              src={imagePrettyUrl(item?.relation?.logo_url)}
+              height={89}
+              width={89}
+              alt={item.title}
+            />
+            <div>
+              <span>{item.title}</span>
+              <OperatorCta
+                tracker="main"
+                operator={item?.relation}
+                playText={translate(translations, 'play_now', 'Play Now')}
+                gtmClass="operator-card-gtm btn-cta"
+              />
+            </div>
+          </td>
+        );
+      case 'rating':
+        return (
+          <td key={index} className={styles.raiting}>
+            <StarRating numOfStars={5} rating={item?.relation?.rating} />
+            <Link to={item.path}> {translate(translations, 'review', 'Read Review')} </Link>
+          </td>
+        );
+      case 'bonus':
+        return (
+          <td key={index} className={styles.bonus}>
+            <Bonus tracker="main" item={item?.relation} />
+          </td>
+        );
+      case 'top_features':
+        return (
+          <td key={index} className={styles.topFeatures}>
+            {item?.relation?.selling_points &&
+              item?.relation?.selling_points.map((sellingPoint) => (
+                <span key={sellingPoint}>
+                  <AiOutlineCheckCircle size={27} /> {sellingPoint}
+                </span>
+              ))}
+          </td>
+        );
+      case 'payment_methods':
+        return (
+          <td key={index} className={styles.paymentMethods}>
+            {item?.relation?.bonus?.deposit_methods &&
+              item?.relation?.bonus?.deposit_methods.slice(0, 5).map((deposit) => (
+                <span key={deposit.name}>
+                  <LazyImg
+                    src={imagePrettyUrl(deposit?.logo_filename)}
+                    width={72}
+                    height={72}
+                    alt={deposit.name}
+                  />
+                </span>
+              ))}
+            {item?.relation?.bonus?.deposit_methods?.length > 5 && (
+              <span>+{item?.relation?.bonus?.deposit_methods.length - 5}</span>
+            )}
+          </td>
+        );
+      case 'banking':
+        return (
+          <td key={index} className={styles.banking}>
+            <p>
+              {translate(translations, 'min_deposit', 'Min Deposit')}
+              <span>{item?.relation?.bonus?.min_deposit}</span>
+            </p>
+            <p>
+              {translate(translations, 'max_withdrawal', 'Max Withdrawal')}
+              <span>{item?.relation?.bonus?.max_withdrawal}</span>
+            </p>
+            <p>
+              {translate(translations, 'currency_support', 'Currency Support')}
+              <span>
+                {item?.relation?.bonus?.currencies &&
+                  item?.relation?.bonus?.currencies
+                    .slice(0, 3)
+                    .map((currencies) => currencies.iso_code)}
+              </span>
+            </p>
+          </td>
+        );
+      case 'currencies':
+        return (
+          <td key={index} className={styles.currencies}>
+            {item?.relation?.bonus?.currencies &&
+              item?.relation?.bonus?.currencies.map((currencies) => (
+                // eslint-disable-next-line react/no-array-index-key
+                <span key={currencies.iso_code}>{currencies.iso_code} </span>
+              ))}
+          </td>
+        );
+      case 'licenses':
+        return (
+          <td key={index} className={styles.licenses}>
+            {item?.relation?.bonus?.license_objects &&
+              item?.relation?.bonus?.license_objects.map((license) => (
+                <LazyImg
+                  src={imagePrettyUrl(license?.logo_filename)}
+                  height={32}
+                  alt={license.name}
+                />
+              ))}
+          </td>
+        );
+      default:
+        return '';
+    }
+  };
+
+  const table = () => {
+    const row = [];
+    tabelInfo.forEach((heading) => {
+      const cells = [];
+
+      items.forEach((item, index) => {
+        cells.push(cell(heading.key, item, `${heading}-${index}`));
+      });
+
+      row.push(
+        <tr>
+          <th>{translate(translations, heading.key, heading.defaultValue)}</th>
+          {cells}
+        </tr>
+      );
+    });
+
+    return (
+      <table className={styles.table}>
+        <tbody>{row}</tbody>
+      </table>
+    );
+  };
+
+  return table();
+}
+
+ComparisonTable.propTypes = {
+  items: PropTypes.arrayOf(PropTypes.object),
+};

package/src/components/atoms/cards/comparison-table/table/table.module.scss

@@ -0,0 +1,137 @@
+.table {
+  cursor: grabbing;
+  tr {
+    grid-template-columns: 15.2rem 27rem;
+    grid-auto-columns: 27rem;
+    grid-auto-flow: column;
+    display: grid;
+
+    &:first-child {
+      th {
+        border-top-left-radius: 0.8rem;
+      }
+    }
+
+    &:last-child {
+      th {
+        border-bottom-left-radius: 0.8rem;
+        border-bottom: 1px solid var(--comparison-header-border-color);
+      }
+    }
+
+    th {
+      @include flex-align(center, center);
+      background-color: var(--comparison-header-background-color);
+      border: 1px solid var(--comparison-header-border-color);
+      border-bottom: none;
+      box-sizing: border-box;
+      color: var(--comparison-header-text-color);
+      text-transform: var(--comparison-header-text-transform);
+      font-size: 1.4rem;
+
+      @include min(laptop) {
+        position: sticky;
+        z-index: 1;
+        left: 0;
+      }
+    }
+    td {
+      border: 1px solid var(--comparison-body-border-color);
+      background-color: var(--comparison-body-background-color);
+      box-sizing: border-box;
+      padding: 1.6rem;
+    }
+    .casinoName {
+      @include flex-direction(row);
+      @include flex-align(center, space-between);
+      padding: 1.6rem;
+      img {
+        border: 1px solid var(--color-9);
+        box-sizing: border-box;
+        margin-right: 1.6rem;
+      }
+      span {
+        font-weight: bold;
+        font-size: 18px;
+        line-height: 25px;
+      }
+    }
+
+    .bonus {
+      div:first-child {
+        font-size: 1.6rem;
+        font-weight: bold;
+      }
+      div:nth-child(2) {
+        font-size: 1.4rem;
+        font-weight: bold;
+      }
+    }
+    
+    .raiting {
+      @include flex-align(center, space-between);
+
+      a {
+        font-weight: bold;
+        font-size: 1.6rem;
+      }
+    }
+    .topFeatures {
+      @include flex-direction(column);
+      @include flex-align(flex-start, center);
+      span {
+        @include flex-direction(row);
+        @include flex-align(center, center);
+        margin-bottom: 0.8rem;
+        svg {
+          color: var(--comparison-top-features-icon-color);
+          margin-right: 0.93rem;
+        }
+      }
+    }
+    .banking {
+      @include flex-direction(column);
+      @include flex-align(center, center);
+      p {
+        width: 100%;
+        @include flex-align(center, space-between);
+        font-weight: 500;
+        font-size: 1.4rem;
+        line-height: 2.4rem;
+        margin-bottom: 1rem;
+        span {
+          font-weight: bold;
+        }
+      }
+    }
+    .currencies {
+      span {
+        margin-left: 0.4rem;
+        background: var(--comparison-currencies-background-color);
+        color: var(--comparison-currencies-text-color);
+        border-radius: 2px;
+        padding: 0.3rem 0.79rem;
+        font-weight: bold;
+        font-size: 12px;
+        line-height: 18px;
+      }
+    }
+    .paymentMethods {
+      display: grid;
+      grid-template-columns: repeat(3, 1fr);
+      span {
+        @include flex-direction(row);
+        @include flex-align(center, center);
+        font-weight: bold;
+        font-size: 14px;
+        line-height: 18px;
+      }
+    }
+
+    .licenses {
+      img {
+        max-height: 3.2rem;
+      }
+    }
+  }
+}

package/src/components/atoms/cards/comparison-table/table/table.test.js

@@ -0,0 +1,22 @@
+/* eslint-disable array-callback-return */
+import React from 'react';
+import { render, cleanup } from '@testing-library/react';
+import '@testing-library/jest-dom/extend-expect';
+import { getSampleOperatorCards } from 'gatsby-core-theme/tests/factories/modules/card.factory';
+
+import ComparisonTable from '.';
+
+const module = getSampleOperatorCards();
+
+describe('Comparison table test component', () => {
+  test('render', () => {
+    const { getByText } = render(<ComparisonTable items={module.items} />);
+
+    module.items.map((item) => {
+      expect(getByText(item.title));
+    });
+  });
+});
+afterEach(() => {
+  cleanup();
+});

package/src/components/atoms/cards/operators-table/index.js

@@ -14,8 +14,11 @@ const CasinosTable = ({ module }) => {
     const [firstLine, secondLine] = one_liner.split('+');
     return (
       <>
-        <span className={styles.firstLine}>{firstLine}<br /></span>
-        <span className={styles.secondLine}>{`+${secondLine}`}</span>
+        <span className={styles.firstLine}>
+          {firstLine}
+          <br />
+        </span>
+        {secondLine && <span className={styles.secondLine}>{`+${secondLine}`}</span>}
       </>
     );
   };

package/src/components/atoms/cards/popup-card/index.js

@@ -23,7 +23,7 @@ const PopupCard = ({ item, tracker }) => {
         </div>
         <div className={styles.textContainer}>
           <p className={styles.primaryText}>{one}</p>
-          <p className={styles.secondaryText}>{second}</p>
+          <p className={styles.secondaryText}>{`+${second}`}</p>
         </div>
       </div>
       <div className={styles.buttonContainer}>

package/src/components/molecules/toplist/row/variant-one.test.js

@@ -17,7 +17,7 @@ describe('toplist row component', () => {
 
     // Bonus
     expect(getByText('€100 welcome bonus')).toBeTruthy();
-    expect(getByText('150 free spins')).toBeTruthy();
+    expect(getByText('+150 free spins')).toBeTruthy();
 
     // Rating & Logo
     // expect(container.querySelector('img')).toBeFalsy();
@@ -47,7 +47,7 @@ describe('toplist row component', () => {
 
     // Bonus
     expect(getByText('€100 welcome bonus')).toBeTruthy();
-    expect(getByText('150 free spins')).toBeTruthy();
+    expect(getByText('+150 free spins')).toBeTruthy();
 
     // Rating & Logo
     // expect(container.querySelector('img')).toBeFalsy();

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

@@ -99,8 +99,9 @@ const Popup = ({ module, isStorybook = false }) => {
                 <MdClose />
               </button>
             </div>
-            {shownItems?.map((item) => (
-              <PopupCard item={item} tracker={tracker} />
+            {shownItems?.map((item, index) => (
+              // eslint-disable-next-line react/no-array-index-key
+              <PopupCard key={index} item={item} tracker={tracker} />
             ))}
           </div>
         </div>
@@ -111,7 +112,7 @@ const Popup = ({ module, isStorybook = false }) => {
 
 Popup.propTypes = {
   module: PropTypes.shape({
-    items: PropTypes.arrayOf({}),
+    items: PropTypes.arrayOf(PropTypes.object),
     style: PropTypes.string,
   }).isRequired,
   isStorybook: PropTypes.bool,

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

@@ -1,25 +1,16 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import loadable from '@loadable/component';
 import keygen from '~helpers/keygen';
 import List from './list';
 import Tabs from '~hooks/tabs';
 import Row from '../../molecules/toplist/row/variant-one';
 
+// eslint-disable-next-line no-unused-vars
 const TopList = ({ module, toplistHeading, CustomRow, page }) => {
   const template = page?.template;
-  const ComparisonTable =
-    module?.style === 'comparison_table' ? loadable(() => import('./comparison-table')) : null;
 
-  return ComparisonTable ? (
-    <ComparisonTable
-      module={module}
-      toplistHeading={toplistHeading}
-      CustomRow={CustomRow}
-      page={page}
-    />
-  ) : (
+  return (
     <Tabs title={module.title} module={module} tabsAlign="right" gtmClass="toplist-tabs-menu-gtm">
       {module.items.map((toplist) => (
         <div label={toplist.title} key={keygen()}>

package/src/gatsby-core-theme/components/atoms/bonus/bonus.test.js

@@ -10,7 +10,6 @@ describe('Bonus Component', () => {
     const item = getToplistItem();
     const { getByText } = render(<Bonus item={item} tracker="main" />);
     expect(getByText('€100 welcome bonus')).toBeTruthy();
-    expect(getByText('150 free spins')).toBeTruthy();
   });
   test('without oneLiner', () => {
     const { container } = render(

package/src/gatsby-core-theme/components/atoms/bonus/index.js

@@ -22,7 +22,7 @@ export default function Bonus({ item, tracker }) {
   return (
     <div className={styles.bonus}>
       {!isInoperative && <div className={styles.title}>{mainLine && mainLine}</div>}
-      {!isInoperative && <div className={styles.desc}>{secondLine && secondLine}</div>}
+      {!isInoperative && <div className={styles.desc}>{secondLine && `+${secondLine}`}</div>}
     </div>
   );
 }