gatsby-matrix-theme 48.0.10 → 49.0.0

package/CHANGELOG.md

@@ -1,3 +1,46 @@
+# [49.0.0](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v48.0.11...v49.0.0) (2024-08-02)
+
+
+### Code Refactoring
+
+* correction to reviewer name ([6792e5a](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/6792e5a4a86d22592b9e5ee7bda1f036ee5bd98b))
+
+
+### Config
+
+* update theme ([87b1c9b](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/87b1c9b70b45c0d04084f9287b247c7193f7457e))
+
+
+* Merge branch 'tm-4654-multiple-contributor' into 'master' ([d3f1aff](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/d3f1affaa67657c93bc59a2bc34bc7f8735fa3db))
+* Merge branch 'master' into tm-4654-multiple-contributor ([e83e6d5](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/e83e6d50cfc3d3e59d222e84d0471bbb9aa65b95))
+* Merge branch 'master' into tm-4654-multiple-contributor ([1f9855e](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/1f9855e1b104922cd770663b1510dabe90ca9c52))
+
+
+### Features
+
+* show author review if author, else show bio ([97d0160](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/97d01609fdbfa3d05bd33ed03bf6f9afdca99492))
+
+
+### Tests
+
+* fix storybook ([1f91c53](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/1f91c53ccfd683ce563b6f917adb8aadece3c93c))
+
+## [48.0.11](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v48.0.10...v48.0.11) (2024-08-02)
+
+
+### Bug Fixes
+
+* eslint and lighthuse ([fbc9737](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/fbc973767bd040b1b94851ab8c16c7de8de1f87a))
+* eslint and lighthuse ([15ddae3](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/15ddae342ea5a98b5b56532566f4d4aaacde40e9))
+* eslint and lighthuse ([066c684](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/066c684602bc501172e91a53d0f7110f24dedc51))
+* fix tests ([990dd87](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/990dd874d853b383251145b6108d819abfa90509))
+* update theme ([d4b63aa](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/d4b63aab5c0305e1ec55cd466408f6e1a8595547))
+
+
+### Config
+
+* update theme ([1c92d27](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/1c92d27f40f9a13d41b69ef06c44e758926a7800))
+
 ## [48.0.10](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v48.0.9...v48.0.10) (2024-07-29)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-matrix-theme",
-  "version": "48.0.10",
+  "version": "49.0.0",
   "main": "index.js",
   "description": "Matrix Theme NPM Package",
   "author": "",
@@ -25,7 +25,7 @@
   "dependencies": {
     "@react-icons/all-files": "^4.1.0",
     "gatsby": "^5.11.0",
-    "gatsby-core-theme": "35.0.8",
+    "gatsby-core-theme": "35.1.1",
     "gatsby-plugin-sharp": "^5.11.0",
     "gatsby-transformer-sharp": "^5.11.0",
     "prop-types": "15.7.2",

package/src/components/molecules/header/variants/operator/template-four/template-four.test.js

@@ -2,17 +2,16 @@
 import React from 'react';
 import { render, cleanup } from '@testing-library/react';
 import '@testing-library/jest-dom/extend-expect';
-import getOperatorData from '../../../../../../../tests/factories/pages/operator.factory';
+import getOperatorData from 'gatsby-core-theme/tests/factories/relations/operator.factory';
 import TemplateFour from '.';
 
 describe('Operator template four component', () => {
   const data = getOperatorData();
 
   test('Template Four Status Active', () => {
-    const { container, getByText } = render(<TemplateFour {...data} />);
+    const { container, getByText } = render(<TemplateFour {...data} type='operator' />);
     expect(getByText('Ice Casino')).toBeTruthy();
     expect(container.querySelectorAll('h1')).toHaveLength(1);
-    expect(getByText('New')).toBeTruthy();
     expect(container.querySelectorAll('a')).toHaveLength(3);
     expect(getByText('100% Bonus')).toBeTruthy();
     expect(getByText('+ Big Promotions')).toBeTruthy();

package/src/components/molecules/header/variants/operator/template-three/template-three.test.js

@@ -2,17 +2,16 @@
 import React from 'react';
 import { render, cleanup, waitFor } from '@testing-library/react';
 import '@testing-library/jest-dom/extend-expect';
-import getOperatorData from '../../../../../../../tests/factories/pages/operator.factory';
+import getOperatorData from 'gatsby-core-theme/tests/factories/relations/operator.factory';
 import TemplateThree from '.';
 
 describe('Operator template three component', () => {
   const data = getOperatorData();
 
   test('Template Three Status Active', () => {
-    const { container, getByText } = render(<TemplateThree {...data} />);
+    const { container, getByText } = render(<TemplateThree {...data}  type="operator" />);
     expect(getByText('Ice Casino')).toBeTruthy();
     expect(container.querySelectorAll('h1')).toHaveLength(1);
-    expect(getByText('New')).toBeTruthy();
     expect(container.querySelectorAll('a')).toHaveLength(3);
     expect(getByText('100% Bonus')).toBeTruthy();
     expect(getByText('+ Big Promotions')).toBeTruthy();
@@ -20,7 +19,7 @@ describe('Operator template three component', () => {
     expect(container.querySelectorAll('li')).toHaveLength(6);
   });
   test('Template Three variable component', async () => {
-    const { container } = render(<TemplateThree {...data} hasVariableComponent />);
+    const { container } = render(<TemplateThree {...data} hasVariableComponent  type="operator"  />);
 
     await waitFor(() => {
       expect(container.querySelector('.variable')).toBeTruthy();

package/src/components/molecules/multiple-contributors/contributor/contributor.test.js

@@ -91,9 +91,18 @@ describe('Author Component', () => {
       );
     });
   });
-  test('Author bio', async () => {
+  test('Author review', async () => {
     const { container } = render(<Contributor contributor={authorData} />);
 
+    await waitFor(() => {
+      expect(container.querySelector('.bottomContainer')).toBeTruthy();
+      expect(container.querySelector('.biography')).toBeTruthy();
+      expect(container.querySelector('.biography')).toHaveTextContent(authorData.author_review);
+    });
+  });
+  test('Reviewer bio', async () => {
+    const { container } = render(<Contributor contributor={authorData} isReviewer />);
+
     await waitFor(() => {
       expect(container.querySelector('.bottomContainer')).toBeTruthy();
       expect(container.querySelector('.biography')).toBeTruthy();

package/src/components/molecules/multiple-contributors/contributor/index.js

@@ -23,6 +23,7 @@ const Contributor = ({
     pages_count: pageCount,
     experience,
     biography,
+    author_review: authorReview,
   } = contributor || {};
 
   return (
@@ -58,12 +59,12 @@ const Contributor = ({
           </div>
         )}
       </div>
-      {biography && (
+      {((isReviewer && biography) || (!isReviewer && authorReview)) && (
         <div className={styles.bottomContainer || ''}>
           <div
             className={styles?.biography || ''}
             // eslint-disable-next-line react/no-danger
-            dangerouslySetInnerHTML={{ __html: biography }}
+            dangerouslySetInnerHTML={{ __html: isReviewer ? biography : authorReview }}
           />
         </div>
       )}

package/src/components/molecules/multiple-contributors/multiple-contributors.stories.js

@@ -11,8 +11,21 @@ import getAuthorList from '../../../../tests/factories/authors/author.factory';
 
 import Author from '.';
 
-const authorData = getAuthorList({})[1];
-const reviewerData = getAuthorList({})[1];
+const author1Props = {
+  pages_count: 6,
+  name: 'John Doe', 
+  author_review: 'Ice Casino offers an exhilarating gaming experience with its extensive selection of slots and live dealer games, ensuring hours of entertainment for every type of player. The user-friendly interface and generous bonuses make it a standout choice for both new and seasoned online casino enthusiasts.',
+  experience: 4,
+}
+
+const author2Props = {
+  pages_count: 60,
+  name: 'Jack Smith', 
+  author_review: `Ice Casino stands out for its commitment to player satisfaction, offering a wide array of games and frequent promotions that keep the excitement levels high. The platform's robust security measures and fair play policies ensure a safe and trustworthy environment, making it a top choice for online gaming aficionados.`,
+  experience: 10,
+}
+
+const reviewerData = getAuthorList({ name: 'Matthew Webb' })[1];
 
 export default {
   title: 'Theme/Modules/Template Blocks/Multiple Contributors',
@@ -21,7 +34,7 @@ export default {
     authors: {
       name: 'author',
       type: { name: 'object', required: true },
-      defaultValue: [authorData, reviewerData],
+      defaultValue: [getAuthorList({ ...author1Props })[1], getAuthorList({ ...author2Props })[1]],
       description: 'Author Data',
       table: {
         type: { summary: 'object' },

package/src/gatsby-core-theme/hooks/tabs/tabs.module.scss

@@ -1,76 +1,81 @@
+.titleAndTab {
+  width: 100%;
+
+  @include flex-direction(column);
+  @include flex-align(center, space-between);
+
+  gap: 0.8rem;
+  flex-wrap: wrap;
+
+  > * {
+    flex: 0 0 30%;
+
+    @include min(tablet) {
+      flex: unset;
+    }
+  }
+  
+  > h2 {
+    flex: 0 0 58%;
+
+    @include min(tablet) {
+      flex: 1;
+    }
+  }
+}
+
 .tabsHeader {
   display: grid;
   grid-template-columns: auto;
-  &.invertOrder {
-    grid-template-columns: max-content;
-    margin-bottom: 2rem;
-  }
+
   @include min(tablet) {
     grid-template-columns: 1fr 1fr;
+
     &.tabsonly {
       grid-template-columns: 1fr;
     }
+  }
 
-    &.invertOrder {
-      grid-template-columns: max-content;
-      margin-bottom: 2rem;
-    }
+  h2 {
+    margin: 0;
   }
-  &.invertOrder {
-    display: flex;
-    justify-content: space-between;
-    flex-direction: column;
-    > div:first-child {
-      grid-column: 2;
-    }
-    @include min(laptop) {
-      // flex-direction: row;
-      align-items: center;
-    }
+}
 
-    > div:nth-child(2) {
-      grid-column: 1;
-      @include flex-align(center, flex-start);
-      display: block;
-    }
+.invertOrder {
+  display: flex;
+  justify-content: space-between;
+  flex-direction: column;
+  margin-bottom: 2rem;
 
-    .titleAndTab {
-      flex-direction: row;
+  @include min(tablet) {
+    grid-template-columns: max-content;
+    margin-bottom: 2rem;
+  }
 
-      button,
-      ol {
-        @include min(tablet) {
-          width: 100%;
-        }
-      }
-    }
+  @include min(laptop) {
+    align-items: center;
   }
 
-  h2 {
-    margin: 0;
+  > div:first-child {
+    grid-column: 2;
   }
-}
 
-.titleAndTab {
-  width: 100%;
-  @include flex-direction(column);
-  @include flex-align(center, space-between);
-  gap: 0.8rem;
-  flex-wrap: wrap;
+  > div:nth-child(2) {
+    grid-column: 1;
 
-  > * {
-    flex: 0 0 30%;
+    @include flex-align(center, flex-start);
 
-    @include min(tablet) {
-      flex: unset;
-    }
+    display: block;
   }
-  
-  > h2 {
-    flex: 0 0 58%;
 
-    @include min(tablet) {
-      flex: 1;
+  .titleAndTab {
+    flex-direction: row;
+
+    button,
+    ol {
+      @include min(tablet) {
+        width: 100%;
+      }
     }
   }
 }
@@ -82,7 +87,7 @@
     padding: 0.9rem 2rem;
     border: 0;
     border-radius: 0.4rem;
-    box-shadow: 0 0.1rem 0.2rem 0 rgba(0, 0, 0, 0.2);
+    box-shadow: 0 0.1rem 0.2rem 0 rgb(0 0 0 / 20%);
     background: var(--color-9);
     color: var(--color-22);
     font-weight: 700;