gatsby-core-theme 2.0.15 → 2.0.19

package/CHANGELOG.md

@@ -1,3 +1,48 @@
+## [2.0.19](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v2.0.18...v2.0.19) (2022-01-11)
+
+
+### Bug Fixes
+
+* bonus and selleing points extra divs ([892d6a4](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/892d6a4542efeb16717136472b0422ca5e089ca8))
+* make key dynamic cta ([a7b883c](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/a7b883cfa2010d5e95d54137e1cb7f86a92115ac))
+
+
+* Merge branch 'tm-2473-lottery-fixes' into 'master' ([fbc331c](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/fbc331c1d3f8ff3276b56e518e6de3e359393fc2))
+* Merge branch 'master' of git.ilcd.rocks:team-floyd/themes/gatsby-themes ([86b2be9](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/86b2be99241420c6fb77fb3bea3e22f69a1ddb98))
+
+## [2.0.18](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v2.0.17...v2.0.18) (2022-01-10)
+
+
+### Config
+
+* reverted gatsby upgrade ([4155578](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/415557860165a0e9fa5a327470cea2570d0d57ed))
+
+## [2.0.17](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v2.0.16...v2.0.17) (2022-01-10)
+
+
+### Bug Fixes
+
+* removing cards extra divs ([7096d88](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/7096d88b480a43d4d8bd5245cf403b07f194fae0))
+* updated html parser package ([332b237](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/332b237bc728bfe57766fab1bced598ad18ceeb6))
+
+
+### Config
+
+* updated gatsby packages ([cdfc9c3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/cdfc9c3681db2603061b0fcc1f4ef634ce12e7a1))
+
+
+* Merge branch 'upgrade' into 'master' ([e38a936](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/e38a936bc76221072c5d0e89c66fccd3df3cbad7))
+
+## [2.0.16](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v2.0.15...v2.0.16) (2022-01-05)
+
+
+### Bug Fixes
+
+* update-placeholder-generation-with-title ([92e3cf2](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/92e3cf2663345ddaffb040504f4830d445d2f73c))
+
+
+* Merge branch 'hotfix-update-placeholder-generation-with-title' into 'master' ([44d05d6](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/44d05d648d49bdb2d5776d7133e3b569ac1f6353))
+
 ## [2.0.15](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v2.0.14...v2.0.15) (2022-01-05)
 
 

package/gatsby-node.esm.js

@@ -5,7 +5,7 @@
 import { cloneDeep, chunk, pick } from 'lodash';
 import chalk from 'chalk';
 import { getData, getLocalData } from './src/helpers/api';
-import { generateMetaString, generateTrackerLink } from './src/helpers/generators';
+import { generatePlaceholderString, generateTrackerLink } from './src/helpers/generators';
 import processor, { processSitemapPages } from './src/helpers/processor';
 import { pickAuthorsPageKeys } from './src/constants/pick-keys';
 
@@ -204,16 +204,22 @@ exports.createPages = async ({ actions: { createPage } }, themeOptions) => {
           pick(authors[key], pickAuthorsPageKeys)
         );
 
-        // replacing meta placehoders with year, month, date, etc.
+        // replacing string placehoders with year, month, date, etc.
+        page.title =
+          page.title &&
+          generatePlaceholderString(page.title, translations, {
+            siteName: response.general.site_name,
+            siteTitle: page.title,
+          });
         page.meta_title =
           page.meta_title &&
-          generateMetaString(page.meta_title, translations, {
+          generatePlaceholderString(page.meta_title, translations, {
             siteName: response.general.site_name,
             siteTitle: page.title,
           });
         page.meta_description =
           page.meta_description &&
-          generateMetaString(page.meta_description, translations, {
+          generatePlaceholderString(page.meta_description, translations, {
             siteName: response.general.site_name,
             siteTitle: page.title,
           });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-core-theme",
-  "version": "2.0.15",
+  "version": "2.0.19",
   "description": "Gatsby Theme NPM Package",
   "main": "index.js",
   "GATSBY_RECAPTCHA_SITEKEY": "6LfoyvMUAAAAAO4nl_MQnqHb4XdHxEiu5cXgIqeB",
@@ -45,7 +45,7 @@
     "gatsby-plugin-webfonts": "^2.1.0",
     "gatsby-source-filesystem": "^3.3.0",
     "gatsby-transformer-sharp": "^3.3.0",
-    "html-react-parser": "^1.2.5",
+    "html-react-parser": "^1.3.0",
     "js-search": "^2.0.0",
     "lodash": "^4.17.15",
     "node-sass": "5.0.0",

package/src/components/atoms/bonus/bonus.module.scss

@@ -1,15 +1,12 @@
-.bonus {
-  @include flex-direction(column);
-  div:first-child {
-    font-size: 2rem;
-    font-weight: 700;
-    color: var(--primary-color);
-    padding-right: 1rem;
-  }
-  div:nth-child(2) {
-    font-size: 1.6rem;
-    color: var(--color-22);
-    font-weight: 700;
-    padding: 0.5rem 0;
-  }
+.title {
+  font-size: 2rem;
+  font-weight: 700;
+  color: var(--primary-color);
+  padding-right: 1rem;
+}
+.desc {
+  font-size: 1.6rem;
+  color: var(--color-22);
+  font-weight: 700;
+  padding: 0.5rem 0;
 }

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

@@ -14,12 +14,10 @@ const Bonus = ({ item, tracker = 'main' }) => {
   const onelinerSplitted = oneLiner.one_liner.split('+');
 
   return (
-    <div className={styles.bonus}>
-      <div className={styles.title}>{onelinerSplitted[0]}</div>
-      {onelinerSplitted.length === 2 && (
-        <div className={styles.desc}>{`+${onelinerSplitted[1]}`}</div>
-      )}
-    </div>
+    <>
+      <p className={styles.title}>{onelinerSplitted[0]}</p>
+      {onelinerSplitted.length === 2 && <p className={styles.desc}>{`+${onelinerSplitted[1]}`}</p>}
+    </>
   );
 };
 

package/src/components/atoms/operator-cta/index.js

@@ -12,6 +12,7 @@ export default function OperatorCta({
   placeholderText = 'Coming Soon',
   closedCasinoText = 'This Casino has closed',
   playText = 'Visit',
+  translationKey = 'play_now',
   tracker = 'main',
   gtmClass = '',
 }) {
@@ -46,7 +47,7 @@ export default function OperatorCta({
 
     const trackerType = tracker.toLowerCase().replace(' ', '_');
     const prettyLink = prettyTracker(operator, trackerType);
-    const translateBtn = translate(translations, 'play_now', playText);
+    const translateBtn = translate(translations, translationKey, playText);
     return (
       <Button
         to={prettyLink}

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

@@ -11,9 +11,8 @@ const SellingPoints = ({ sellingPoints, icon, limit = 3 }) => {
   return (
     <ul className={styles.sellingPoint}>
       {sellingPoints.slice(0, limit).map((item) => (
-        <li key={keygen()}>
-          <span className={`${icon && styles.tick}`}>{` `}</span>
-          <span>{item}</span>
+        <li className={`${icon && styles.tick}`} key={keygen()}>
+          {item}
         </li>
       ))}
     </ul>

package/src/components/atoms/selling-points/selling-points.module.scss

@@ -7,7 +7,7 @@
     font-size: 1.4rem;
     width: 100%;
 
-    .tick {
+    &.tick {
       position: relative;
       margin-left: 2rem;
       &::before {
@@ -16,7 +16,6 @@
         padding: 0px 0px .8rem .32rem;
         border-right-width: .18rem;
         border-bottom-width: .18rem;
-        bottom: -.3rem;
         left: -1.8rem;
       }
     }

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

@@ -43,7 +43,14 @@ const Row = ({ item, oneliner = 'main', layout = 'list', tracker = 'main' }) =>
           height={40}
         />
       </a>
-      <Bonus item={item} tracker={oneliner} />
+      <a
+        href={prettyLink}
+        target="_blank"
+        rel="noreferrer"
+        className="toplist-variant-one-gtm bonus-cta"
+      >
+        <Bonus item={item} tracker={oneliner} />
+      </a>
       <StarRating numOfStars={5} rating={itemRating} />
       <SellingPoints icon={<MdCheck />} sellingPoints={item.selling_points} />
       <div>

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

@@ -12,6 +12,7 @@ const CardsGridStyles = ({
   mobileColumns = 2,
   tabletColumns = 3,
   desktopColumns = 4,
+  className = '',
 }) => {
   const divStyle = {
     '--cards-mob-column': `${
@@ -24,10 +25,15 @@ const CardsGridStyles = ({
       module.desktop_num_of_columns ? module.desktop_num_of_columns : desktopColumns
     }`,
   };
-  return <div style={divStyle}>{children}</div>;
+  return (
+    <div className={className} style={divStyle}>
+      {children}
+    </div>
+  );
 };
 
 CardsGridStyles.propTypes = {
+  className: PropTypes.string,
   module: PropTypes.shape({
     mobile_num_of_columns: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
     tablet_num_of_columns: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
@@ -53,25 +59,23 @@ const Cards = ({
     desktopColumns={desktopColumns}
     tabletColumns={tabletColumns}
     mobileColumns={mobileColumns}
+    className={styles.cardsContainer}
   >
-    <div className={styles.cardsContainer}>
-      {module.items &&
-        module.items.map((item, index) => (
-          <div key={keygen()}>
-            {CustomCardComponent ? (
-              <CustomCardComponent
-                featured={module.style === 'featured'}
-                item={item}
-                type={item.type}
-                number={index + 1}
-                page={page}
-              />
-            ) : (
-              <Card item={item} />
-            )}
-          </div>
-        ))}
-    </div>
+    {module.items &&
+      module.items.map((item, index) =>
+        CustomCardComponent ? (
+          <CustomCardComponent
+            key={keygen()}
+            featured={module.style === 'featured'}
+            item={item}
+            type={item.type}
+            number={index + 1}
+            page={page}
+          />
+        ) : (
+          <Card key={keygen()} item={item} />
+        )
+      )}
   </CardsGridStyles>
 );
 

package/src/helpers/generators.js

@@ -21,7 +21,7 @@ export function generateTrackerLink(operator, trackerType) {
   }
 }
 
-export function generateMetaString(metaString, translations, props) {
+export function generatePlaceholderString(string, translations, props) {
   const date = new Date();
   const day = date.getDate();
   const month = months[date.getMonth()];
@@ -29,7 +29,7 @@ export function generateMetaString(metaString, translations, props) {
   const regex =
     /\[MONTH\]|\[YEAR\]|\[currentyear\]|\[sitename\]|\[currentmonth\]|\[title\]|\[currentdate\]/gi;
 
-  return metaString.replace(
+  return string.replace(
     regex,
     (match) =>
       ({

package/src/helpers/generators.test.js

@@ -1,4 +1,4 @@
-import { generateTrackerLink, generateMetaString } from './generators';
+import { generateTrackerLink, generatePlaceholderString } from './generators';
 import { months } from '~constants/common';
 
 describe('Generate Tracker Link Helper', () => {
@@ -16,19 +16,19 @@ describe('Generate Tracker Link Helper', () => {
   });
 });
 
-describe('Generate Meta Title Helper', () => {
-  test('generateMetaString uppercase', () => {
-    const metaString = generateMetaString('meta title [MONTH] [YEAR]');
+describe('Generate Placeholders String', () => {
+  test('generatePlaceholderString uppercase', () => {
+    const string = generatePlaceholderString('Some title [MONTH] [YEAR]');
     const date = new Date();
 
-    expect(metaString).not.toContain('[MONTH]');
-    expect(metaString).not.toContain('[YEAR]');
-    expect(metaString).toContain(date.getFullYear());
-    expect(metaString).toContain(months[date.getMonth()]);
+    expect(string).not.toContain('[MONTH]');
+    expect(string).not.toContain('[YEAR]');
+    expect(string).toContain(date.getFullYear());
+    expect(string).toContain(months[date.getMonth()]);
   });
-  test('generateMetaString lowercase', () => {
-    const metaString = generateMetaString(
-      'meta title [currentdate] [currentmonth] [currentyear] [sitename] [title]',
+  test('generatePlaceholderString lowercase', () => {
+    const string = generatePlaceholderString(
+      'Some title [currentdate] [currentmonth] [currentyear] [sitename] [title]',
       null,
       {
         siteName: 'Site Name',
@@ -37,26 +37,26 @@ describe('Generate Meta Title Helper', () => {
     );
     const date = new Date();
 
-    expect(metaString).not.toContain('[currentdate]');
-    expect(metaString).not.toContain('[currentmonth]');
-    expect(metaString).not.toContain('[currentyear]');
-    expect(metaString).not.toContain('[sitename]');
-    expect(metaString).not.toContain('[title]');
-    expect(metaString).toContain(date.getDate());
-    expect(metaString).toContain(months[date.getMonth()]);
-    expect(metaString).toContain(date.getFullYear());
-    expect(metaString).toContain('Site Name');
-    expect(metaString).toContain('Site Title');
+    expect(string).not.toContain('[currentdate]');
+    expect(string).not.toContain('[currentmonth]');
+    expect(string).not.toContain('[currentyear]');
+    expect(string).not.toContain('[sitename]');
+    expect(string).not.toContain('[title]');
+    expect(string).toContain(date.getDate());
+    expect(string).toContain(months[date.getMonth()]);
+    expect(string).toContain(date.getFullYear());
+    expect(string).toContain('Site Name');
+    expect(string).toContain('Site Title');
   });
-  test('generateMetaString translated', () => {
+  test('generatePlaceholderString translated', () => {
     const translateMonths = months.reduce(
       (translated, month) => ({ ...translated, [month]: `translate${month.substring(0, 1)}` }),
       {}
     );
-    const metaString = generateMetaString('meta title [MONTH]', translateMonths);
+    const string = generatePlaceholderString('Some title [MONTH]', translateMonths);
     const date = new Date();
 
-    expect(metaString).not.toContain('[MONTH]');
-    expect(metaString).toContain(translateMonths[months[date.getMonth()]]);
+    expect(string).not.toContain('[MONTH]');
+    expect(string).toContain(translateMonths[months[date.getMonth()]]);
   });
 });