gatsby-matrix-theme 51.0.0 → 51.0.2

package/CHANGELOG.md

@@ -1,3 +1,32 @@
+## [51.0.2](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v51.0.1...v51.0.2) (2024-09-05)
+
+
+### Bug Fixes
+
+* removed reading time meta fields + fixed sportstake only prevMonth case ([94337be](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/94337be5453059ed48e21c2804795b732e592ab6))
+* updated tests with new PrettyLink implementation ([75f37db](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/75f37dbcebc8bee77800ddfad776f864b3e29b69))
+
+
+### Code Refactoring
+
+* add user count on desktop ([3834947](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/3834947c7932cf51b0e22807bb77029ea8eb4a76))
+
+
+### Config
+
+* update theme ([a4c7a35](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/a4c7a3534e7bc22da7b358d2510a271c3b975535))
+
+
+* Merge branch 'tm-4567-feedback-modal' into 'master' ([6375a84](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/6375a849de8497acf2e00c49f08fb70a3768c4ac))
+* Merge branch 'tm-4696-reading-time' into 'master' ([c6701e8](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/c6701e8dc55c9acf32e17297d81a0f4fbcb8f6af))
+
+## [51.0.1](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v51.0.0...v51.0.1) (2024-09-04)
+
+
+### Bug Fixes
+
+* fix verifyicon ([a4e5521](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/a4e55219daf5aa89cec3eca3f49f6e77ace73987))
+
 # [51.0.0](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v50.0.7...v51.0.0) (2024-09-04)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-matrix-theme",
-  "version": "51.0.0",
+  "version": "51.0.2",
   "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": "39.0.0",
+    "gatsby-core-theme": "39.0.3",
     "gatsby-plugin-sharp": "^5.11.0",
     "gatsby-transformer-sharp": "^5.11.0",
     "prop-types": "15.7.2",

package/src/components/atoms/cards/article-card/variables/index.js

@@ -40,16 +40,7 @@ const VariableComponent = ({
               height={imgSize}
               src={imagePrettyUrl(author?.image, imgSize, imgSize)}
             />
-            {verifyIcon && (
-              <span className={styles.verifyIcon}>
-                <LazyImage
-                  src={verifyIcon}
-                  alt={useTranslate('verified', 'Verified')}
-                  width={10}
-                  height={10}
-                />
-              </span>
-            )}
+            {verifyIcon && verifyIcon}
           </div>
           <div className={styles.authorContainer}>
             {showAuthorOnOneLine && (

package/src/components/atoms/feedback/template-three/index.js

@@ -136,6 +136,7 @@ const FeedBack = ({
             casinoTitle
           )}
         </span>
+        {userCount()}
         <ModalProvider>
           {voted === null ? (
             <Modal customCss={styles.modalChildren || ''}>

package/src/components/atoms/feedback/template-three/template-three.module.scss

@@ -174,33 +174,38 @@
     font-style: normal;
     font-weight: 600;
     line-height: 2.8rem;
+    display: none;
 
     @include min(tablet) {
         grid-column: 2;
         grid-row: 1 / span 2;
         height: 100%;
-        margin-left: 4.8rem;
-        margin-right: 2.4rem;
+        min-width: 15.6rem;
+        align-self: flex-end;
 
         @include flex-align(center, flex-start);
     }
+}
 
-    .recommentText {
-        color: #515156;
-        font-size: 1.6rem;
-        font-style: normal;
-        font-weight: 400;
-        line-height: 2.6rem;
-        flex-basis: 100%;
+.recommentText {
+    color: #515156;
+    font-size: 1.6rem;
+    font-style: normal;
+    font-weight: 400;
+    line-height: 2.6rem;
+    flex-basis: 100%;
 
-        @include min(tablet){
-            font-size: 1.4rem;
-        }
+    @include min(tablet) {
+        font-size: 1.4rem;
     }
 }
 
 .showCounter {
-    display: flex;
+    display: none;
+
+    @include min(tablet) {
+        display: flex;
+    }
 }
 
 .feedbackModalContainer {
@@ -267,6 +272,10 @@
         }
     }
 
+    .showCounter {
+        display: flex;
+    }
+
     .formBox {
         @include min(tablet) {
             grid-column: 4;

package/src/components/molecules/header/variants/payment/template-five/template-five.module.test.js

@@ -10,37 +10,37 @@ describe('Payment template one three component', () => {
   const data = getPaymentData();
 
   test('Template One Status Active', () => {
-    const { container, getByText } = render(<TemplateOneThree {...data} />);
-    expect(getByText('Next')).toBeTruthy();
+    const { container, queryByText } = render(<TemplateOneThree {...data} />);
+    expect(queryByText('Next')).toBeInTheDocument();
     expect(container.querySelectorAll('h1')).toHaveLength(1);
-    expect(getByText('20 Free Spins No Deposit Bonus')).toBeTruthy();
-    expect(getByText('+ 300% & 555 Spins Welcome Bonus')).toBeTruthy();
-    expect(getByText('Visit')).toBeTruthy();
-    expect(container.querySelectorAll('a')).toHaveLength(2);
-    expect(container.getElementsByClassName('desc')).toBeTruthy();
+    expect(queryByText('20 Free Spins No Deposit Bonus')).toBeInTheDocument();
+    expect(queryByText('+ 300% & 555 Spins Welcome Bonus')).toBeInTheDocument();
+    expect(queryByText('Visit')).toBeInTheDocument();
+    expect(container.querySelectorAll('a')).toHaveLength(1);
+    expect(container.getElementsByClassName('desc')).toHaveLength(1);
     expect(container.querySelectorAll('li')).toHaveLength(4);
   });
 
   test('Template Three Status Active', () => {
-    const { container, getByText } = render(
+    const { container, queryByText } = render(
       <TemplateOneThree {...data} template="template_three" />
     );
-    expect(getByText('Next')).toBeTruthy();
+    expect(queryByText('Next')).toBeInTheDocument();
     expect(container.querySelectorAll('h1')).toHaveLength(1);
-    expect(getByText('20 Free Spins No Deposit Bonus')).toBeTruthy();
-    expect(getByText('+ 300% & 555 Spins Welcome Bonus')).toBeTruthy();
-    expect(getByText('Visit')).toBeTruthy();
-    expect(container.querySelectorAll('a')).toHaveLength(2);
-    expect(container.getElementsByClassName('desc')).toBeTruthy();
+    expect(queryByText('20 Free Spins No Deposit Bonus')).toBeInTheDocument();
+    expect(queryByText('+ 300% & 555 Spins Welcome Bonus')).toBeInTheDocument();
+    expect(queryByText('Visit')).toBeInTheDocument();
+    expect(container.querySelectorAll('a')).toHaveLength(1);
+    expect(container.getElementsByClassName('desc')).toHaveLength(1);
     expect(container.querySelectorAll('li')).toHaveLength(4);
   });
   test('Template five toggle read more button', async () => {
     const { container } = render(<TemplateOneThree {...data} />);
 
     await waitFor(() => {
-      expect(container.querySelector('.desc')).toBeTruthy();
-      expect(container.querySelector('.showReadMore')).toBeTruthy();
-      expect(container.querySelector('.showReadMore span')).toBeTruthy();
+      expect(container.querySelector('.desc')).toBeInTheDocument();
+      expect(container.querySelector('.showReadMore')).toBeInTheDocument();
+      expect(container.querySelector('.showReadMore span')).toBeInTheDocument();
       expect(container.querySelector('.desc')).toHaveTextContent(
         `${textWordsLimit(data.description, 60)} Continue reading`
       );

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

@@ -9,14 +9,14 @@ describe('Payment template four component', () => {
   const data = getPaymentData();
 
   test('Template Four Active', () => {
-    const { container, getByText } = render(<TemplateFour {...data} />);
-    expect(getByText('Next')).toBeTruthy();
+    const { container, queryByText } = render(<TemplateFour {...data} />);
+    expect(queryByText('Next')).toBeInTheDocument();
     expect(container.querySelectorAll('h1')).toHaveLength(1);
-    expect(getByText('20 Free Spins No Deposit Bonus')).toBeTruthy();
-    expect(getByText('+ 300% & 555 Spins Welcome Bonus')).toBeTruthy();
-    expect(getByText('Visit')).toBeTruthy();
-    expect(container.querySelectorAll('a')).toHaveLength(2);
-    expect(container.getElementsByClassName('desc')).toBeTruthy();
+    expect(queryByText('20 Free Spins No Deposit Bonus')).toBeInTheDocument();
+    expect(queryByText('+ 300% & 555 Spins Welcome Bonus')).toBeInTheDocument();
+    expect(queryByText('Visit')).toBeInTheDocument();
+    expect(container.querySelectorAll('a')).toHaveLength(1);
+    expect(container.getElementsByClassName('desc')).toHaveLength(0);
     expect(container.querySelectorAll('li')).toHaveLength(4);
   });
 });

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

@@ -9,28 +9,28 @@ describe('Payment template one three component', () => {
   const data = getPaymentData();
 
   test('Template One Status Active', () => {
-    const { container, getByText } = render(<TemplateOneThree {...data} />);
-    expect(getByText('Next')).toBeTruthy();
+    const { container, queryByText } = render(<TemplateOneThree {...data} />);
+    expect(queryByText('Next')).toBeInTheDocument();
     expect(container.querySelectorAll('h1')).toHaveLength(1);
-    expect(getByText('20 Free Spins No Deposit Bonus')).toBeTruthy();
-    expect(getByText('+ 300% & 555 Spins Welcome Bonus')).toBeTruthy();
-    expect(getByText('Visit')).toBeTruthy();
-    expect(container.querySelectorAll('a')).toHaveLength(2);
-    expect(container.getElementsByClassName('desc')).toBeTruthy();
+    expect(queryByText('20 Free Spins No Deposit Bonus')).toBeInTheDocument();
+    expect(queryByText('+ 300% & 555 Spins Welcome Bonus')).toBeInTheDocument();
+    expect(queryByText('Visit')).toBeInTheDocument();
+    expect(container.querySelectorAll('a')).toHaveLength(1);
+    expect(container.getElementsByClassName('desc')).toHaveLength(1);
     expect(container.querySelectorAll('li')).toHaveLength(4);
   });
 
   test('Template Three Status Active', () => {
-    const { container, getByText } = render(
+    const { container, queryByText } = render(
       <TemplateOneThree {...data} template="template_three" />
     );
-    expect(getByText('Next')).toBeTruthy();
+    expect(queryByText('Next')).toBeInTheDocument();
     expect(container.querySelectorAll('h1')).toHaveLength(1);
-    expect(getByText('20 Free Spins No Deposit Bonus')).toBeTruthy();
-    expect(getByText('+ 300% & 555 Spins Welcome Bonus')).toBeTruthy();
-    expect(getByText('Visit')).toBeTruthy();
-    expect(container.querySelectorAll('a')).toHaveLength(2);
-    expect(container.getElementsByClassName('desc')).toBeTruthy();
+    expect(queryByText('20 Free Spins No Deposit Bonus')).toBeInTheDocument();
+    expect(queryByText('+ 300% & 555 Spins Welcome Bonus')).toBeInTheDocument();
+    expect(queryByText('Visit')).toBeInTheDocument();
+    expect(container.querySelectorAll('a')).toHaveLength(1);
+    expect(container.getElementsByClassName('desc')).toHaveLength(0);
     expect(container.querySelectorAll('li')).toHaveLength(4);
   });
 });

package/src/components/molecules/header/variants/payment/template-two/template-two.test.js

@@ -9,14 +9,14 @@ describe('Payment Header template two  component', () => {
   const data = getPaymentData();
 
   test('Payment Template two Active', () => {
-    const { container, getByText } = render(<TemplateTwo {...data} />);
-    expect(getByText('Next')).toBeTruthy();
+    const { container, queryByText } = render(<TemplateTwo {...data} />);
+    expect(queryByText('Next')).toBeInTheDocument();
     expect(container.querySelectorAll('h1')).toHaveLength(1);
-    expect(getByText('20 Free Spins No Deposit Bonus')).toBeTruthy();
-    expect(getByText('+ 300% & 555 Spins Welcome Bonus')).toBeTruthy();
-    expect(getByText('Visit')).toBeTruthy();
-    expect(container.querySelectorAll('a')).toHaveLength(2);
-    expect(container.getElementsByClassName('desc')).toBeTruthy();
+    expect(queryByText('20 Free Spins No Deposit Bonus')).toBeInTheDocument();
+    expect(queryByText('+ 300% & 555 Spins Welcome Bonus')).toBeInTheDocument();
+    expect(queryByText('Visit')).toBeInTheDocument();
+    expect(container.querySelectorAll('a')).toHaveLength(1);
+    expect(container.getElementsByClassName('desc')).toHaveLength(1);
   });
 });
 

package/src/gatsby-core-theme/components/organisms/head/index.js

@@ -110,8 +110,6 @@ const HeadData = ({ page = {}, siteInfo }) => {
           <meta name="twitter:creator" content={`@${twitterUsername}`} />
           <meta name="twitter:card" content="summary" />
           <meta name="twitter:image" content={pageImage.replace('/filters:format(webp)', '')} />
-          <meta property="twitter:label1" content="Reading time" />
-          <meta property="twitter:data1" content={`${page.reading_time}`} />
         </>
       )}
     </>

package/src/gatsby-core-theme/helpers/server-data.js

@@ -65,10 +65,16 @@ export async function getAPIData(page, url) {
         const calendarData = await getCalendarData(query.lotteryName, date.getMonth() + 1, date.getFullYear());
         const prevMonth = (calendarData.length <= 2) ? await getCalendarData(query.lotteryName, date.getMonth(), date.getFullYear()) : [];
 
+        const orderedPrevMonth = calendarData.length === 0 ? 
+          [
+            prevMonth[prevMonth.length - 1],
+            ...prevMonth.slice(0, prevMonth.length - 1),
+          ] : prevMonth;
+
         const reorderedResultData = [
           calendarData[calendarData.length - 1],
           ...calendarData.slice(0, calendarData.length - 1),
-          ...prevMonth
+          ...orderedPrevMonth
         ].filter(item => item && !Array.isArray(item));
 
         // eslint-disable-next-line no-underscore-dangle
@@ -100,10 +106,16 @@ export async function getAPIData(page, url) {
         const calendarData = await getCalendarData(query.lotteryName, date.getMonth() + 1, date.getFullYear());
         const prevMonth = (calendarData.length <= 2) ? await getCalendarData(query.lotteryName, date.getMonth(), date.getFullYear()) : [];
 
+        const orderedPrevMonth = calendarData.length === 0 ? 
+          [
+            prevMonth[prevMonth.length - 1],
+            ...prevMonth.slice(0, prevMonth.length - 1),
+          ] : prevMonth;
+
         const reorderedResultData = [
           calendarData[calendarData.length - 1],
           ...calendarData.slice(0, calendarData.length - 1),
-          ...prevMonth
+          ...orderedPrevMonth
         ].filter(item => item && !Array.isArray(item));
 
         // eslint-disable-next-line no-underscore-dangle
@@ -143,10 +155,17 @@ export async function getAPIData(page, url) {
           new Date().getFullYear()
         ) : [];
 
+        const orderedPrevMonth = availableDates.length === 0 ? 
+          [
+            prevMonth[prevMonth.length - 1],
+            ...prevMonth.slice(0, prevMonth.length - 1),
+          ] : prevMonth;
+        
+
         const reorderedDates = [
           availableDates[availableDates.length - 1],
           ...availableDates.slice(0, availableDates.length - 1),
-          ...prevMonth
+          ...orderedPrevMonth
         ].filter(item => item && !Array.isArray(item));
 
         const latestDrawResults = await Promise.all(