gatsby-core-theme 33.1.0 → 33.1.2

package/CHANGELOG.md

@@ -1,3 +1,30 @@
+## [33.1.2](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v33.1.1...v33.1.2) (2024-06-25)
+
+
+### Bug Fixes
+
+* removed unused styling ([9b054cd](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/9b054cd636f45d89fcc55965c8918c872c666269))
+* search logic ([7d59fb6](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/7d59fb63ef167e6273dd704936d3794d351487b4))
+
+## [33.1.1](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v33.1.0...v33.1.1) (2024-06-25)
+
+
+### Bug Fixes
+
+* fix relation pick keys for email and url ([a3cff32](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/a3cff3220c99d07e84de76d27e179113027b6164))
+* search logic ([214d773](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/214d77330cdeb0a09fc7232a1d05903072995611))
+
+
+### Code Refactoring
+
+* add games amount to operator relation ([d20e0dc](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/d20e0dcfaacf439f2717b2cebe4953062c0516ae))
+* change to button titles ([1a430e1](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/1a430e19b831d1e23b8edacbc67263b7b7464317))
+* changes to aria-labels and buttons ([4d57af5](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/4d57af5349b06ae606b58c1a2c015488f98fe605))
+* changes to search button ([f0f0e9f](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/f0f0e9ffbe25a10c4c1e0584bac696e09b06f480))
+
+
+* Merge branch 'tm-4505' into 'master' ([d085a9e](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/d085a9e467dc3f139e99e05281186022f012dfcd))
+
 # [33.1.0](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v33.0.2...v33.1.0) (2024-06-20)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-core-theme",
-  "version": "33.1.0",
+  "version": "33.1.2",
   "description": "Gatsby Theme NPM Package",
   "author": "",
   "license": "ISC",

package/src/components/atoms/author-box/template-three/expertion/index.js

@@ -9,9 +9,9 @@ export default function Expertion({ expertise }) {
       {expertise && (
         <div className={styles.expertion}>
           <p>Expert on:</p>
-          {expertise?.map((res) => (
+          {expertise?.map((res, index) => (
             <span>
-              <Check />
+              <Check id={`${res}_${index}`} />
               {res}
             </span>
           ))}

package/src/components/atoms/button/button.js

@@ -28,6 +28,13 @@ function Button({
   }
 
   const linkAttr = to ? { href: to } : { onClick };
+  let extraProps;
+
+  if (onClick) {
+    extraProps = {
+      role: 'button',
+    };
+  }
 
   return (
     <a
@@ -37,6 +44,7 @@ function Button({
       rel="nofollow noreferrer"
       className={`${classes || ''}`}
       {...linkAttr}
+      {...extraProps}
     >
       {btnText}
       {icon && icon}

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

@@ -94,9 +94,6 @@ const OperatorCtaButton = ({
       title={`${typeof translateBtn === 'string' ? translateBtn : ''} ${
         titleSuffix || ''
       }`.trimEnd()}
-      aria-label={`${typeof translateBtn === 'string' ? translateBtn : ''} ${
-        titleSuffix || ''
-      }`.trimEnd()}
       className={`${classes || ''} ${gtmClass || ''}`}
     >
       {translateBtn}

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

@@ -78,10 +78,13 @@ const Content = ({
       {mainContent(module.value)}
       <button
         type="button"
-        className={`${isContentCollapsible ? styles.showMoreTwoButton : styles.showMoreButton} ${
-          !isContentCollapsible && showMore && styles.hide
-        } ${showMore && isContentCollapsible && styles.showMoreTwoButtonOpen}`}
+        className={`${
+          isContentCollapsible ? styles.showMoreTwoButton || '' : styles.showMoreButton || ''
+        } ${(!isContentCollapsible && showMore && styles.hide) || ''} ${
+          (showMore && isContentCollapsible && styles.showMoreTwoButtonOpen) || ''
+        }`}
         onClick={handleChange}
+        title="showMoreContentButton"
       >
         {show_more_label}
         {icon && isContentCollapsible && icon}

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

@@ -101,12 +101,12 @@ const Search = ({
             }
           }}
         />
-        <button type="button" label className={styles.searchButton}>
+        <button type="button" aria-label="Search" className={styles.searchButton}>
           <FaSearch title="Search Icon" />
         </button>
       </form>
 
-      {searchData ? (
+      {data.length > 0 ? (
         <div className={styles.results}>
           <Tabs
             activeTabClass="searchActive"
@@ -128,7 +128,7 @@ const Search = ({
               }
 
               return (
-                <div results={2} label={item} tabId="scas" key={keygen()}>
+                <div results={data.length} label={item} tabId="scas" key={keygen()}>
                   {Object.keys(searchData).map((item2) => getItems(item2))}
                 </div>
               );

package/src/components/molecules/spotlights_v2/image-text/template-one/index.js

@@ -39,7 +39,9 @@ export default function TemplateOne({
                 {res.subtitle && <span>{res.subtitle}</span>}
                 {res?.text && (
                   <div
+                    tabIndex={`${scrollableContent ? 0 : -1}`}
                     className={`${styles.desc} ${scrollableContent ? styles.scroll : ''}`}
+                    // eslint-disable-next-line react/no-danger
                     dangerouslySetInnerHTML={{ __html: res?.text }}
                   />
                 )}

package/src/components/molecules/spotlights_v2/image-text/template-three/item/index.js

@@ -38,9 +38,11 @@ export default function TemplateOne({
         {item?.label && <TitleTag>{item?.label}</TitleTag>}
         {item?.text && (
           <div
+            tabIndex={`${scrollableContent ? 0 : -1}`}
             className={`${styles.desc} ${scrollableContent ? styles.scroll : ''} ${
               readMore && !scrollableContent && !showMore ? styles.readMore : ''
             }`}
+            // eslint-disable-next-line react/no-danger
             dangerouslySetInnerHTML={{ __html: item?.text }}
           />
         )}

package/src/components/molecules/spotlights_v2/image-text/template-two/index.js

@@ -40,7 +40,9 @@ export default function TemplateOne({
                 {res.subtitle && <span>{res.subtitle}</span>}
                 {res?.text && (
                   <div
+                    tabIndex={`${scrollableContent ? 0 : -1}`}
                     className={`${styles.desc} ${scrollableContent ? styles.scroll : ''}`}
+                    // eslint-disable-next-line react/no-danger
                     dangerouslySetInnerHTML={{ __html: res?.text }}
                   />
                 )}

package/src/components/organisms/accordion/variants/template-one/index.js

@@ -1,3 +1,4 @@
+/* eslint-disable react/no-danger */
 import React, { useRef, useEffect } from 'react';
 import PropTypes from 'prop-types';
 
@@ -66,6 +67,7 @@ const TemplateOne = ({ module, openAll = false, openItem, closeOthers = false })
                   onClick={() => toggle(index)}
                   className={`${styles.title || ''} accordion-gtm btn-cta`}
                   type="button"
+                  aria-label={`${keygen()}_accordionButton`}
                   ref={(el) => {
                     btnRefs.current[index] = btnRefs.current[index] || [];
                     btnRefs.current[index].push(el);

package/src/components/organisms/anchor/template-one/index.js

@@ -154,6 +154,7 @@ function Anchor({
             className={`${styles.buttLeft} ${scrollX <= 0 ? styles.disabled : ''}`}
             onClick={() => scroll(-buttonScroll)}
             type="button"
+            title="anchorButtonLeft"
           >
             {leftButtonIcon}
           </button>
@@ -166,6 +167,7 @@ function Anchor({
             className={`${styles.buttRight} ${!scrollEnd ? '' : styles.disabled}`}
             onClick={() => scroll(buttonScroll)}
             type="button"
+            title="anchorButtonRight"
           >
             {rightButtonIcon}
           </button>

package/src/components/organisms/carousel/template-one/index.js

@@ -16,7 +16,12 @@ const Carousel = ({ page = {}, module = {}, gtmClass = '' }) => {
 
   return (
     <ScrollX refTag={container} scroll={scroll}>
-      <div ref={container} className={styles.carouselContainer || ''}>
+      <div
+        ref={container}
+        className={styles.carouselContainer || ''}
+        // eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex
+        tabIndex={0}
+      >
         {module.items.map((item, index) => (
           <div key={keygen()} className={styles.carouselItem || ''}>
             <Slide

package/src/components/organisms/form/fields/index.js

@@ -134,6 +134,7 @@ const getField = (field, handleChange, elements, state) => {
           name={id}
           id={id}
           type={type}
+          aria-label={translate(translations, translationKey, label)}
           aria-describedby={id}
           placeholder={translate(translations, placeholder?.translationKey, placeholder?.label)}
           {...props}

package/src/components/organisms/form/form.module.scss

@@ -227,34 +227,4 @@
       }
     }
   }
-}
-
-button{
-  padding: 0.4rem 1.6rem;
-  font-weight: 700;
-  font-size: 1.4rem;
-  line-height: 2rem;
-  border-width: 1.5px;
-  @include buttonsColor(
-    var(--primary-button-color, #6e33e5),
-    var(--primary-button-color-hover, #331079),
-    var(--primary-button-color-active, #998fcb),
-    var(--primary-button-color-text, #ffffff)
-  );
-  white-space: nowrap;
-  border-radius: 100px;
-  max-width: 15rem;
-
-  > svg {
-    flex: none;
-    height: 1.8rem;
-    width: 1.8rem;
-    margin-left: 1rem;
-    padding: 0.2rem;
-  }
-  &:disabled{
-  border: 1px solid #999999;
-  background-color: #cccccc;
-  color: #666666;
-  }
 }

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

@@ -40,7 +40,6 @@ const SearchForm = ({
         marketPrefix !== '/'
           ? `/${marketPrefix}/s${process.env.TRAILING_SLASH ? '/' : ''}?s=${e.target.value}`
           : `/s${process.env.TRAILING_SLASH ? '/' : ''}?s=${e.target.value}`;
-      console.log(searchUrl);
       window.location = `${window.location.origin}${searchUrl}`;
     }
   };

package/src/constants/forms.js

@@ -151,7 +151,7 @@ export const newsLetterForm = {
         options: [
           {
             label: 'Test test ',
-            id: 'checkbox',
+            id: 'checkbox_1',
             type: 'checkbox_1',
             translationKey: 'newsletter_form_privacy_text_1',
           },

package/src/constants/pick-keys.mjs

@@ -68,6 +68,9 @@ export const pickRelationKeys = {
     'extra_fields',
     'status',
     'ribbons',
+    'email',
+    'url',
+    'games_amount',
   ],
   game: [
     'game_provider',

package/src/helpers/server-data.js

@@ -5,19 +5,22 @@ import loadSource from '~helpers/search-source';
 import { deparam } from '~helpers/strings';
 
 export async function getAPIData(page, url) {
-  const results = await loadSource('id', ['title', 'market'], page.market);
+  const results = await loadSource(page.market);
   if (page.path.endsWith('/s') || page.path === 's') {
     let urlParams = null;
     if (url && url.split('?').length === 2) {
       urlParams = deparam(`${url.split('?')[1]}`);
     }
+
+    const searchData = urlParams
+      ? urlParams.hasOwnProperty('s')
+        ? results.filter((item) => item.title.toLowerCase().includes(urlParams.s.toLowerCase()))
+        : null
+      : null;
+
     return {
       props: {
-        data: urlParams
-          ? urlParams.hasOwnProperty('s')
-            ? results.search(urlParams.s)
-            : null
-          : null,
+        data: searchData,
         searchParam: urlParams ? urlParams.s : null,
       },
     };

package/src/images/icons/check.js

@@ -1,17 +1,17 @@
 import React from 'react';
 
-export default function check() {
+export default function check(id = 1) {
   return (
     <svg
       role="img"
-      aria-labelledby="checkIcon"
+      aria-labelledby={`checkIcon_${id}`}
       width="16"
       height="16"
       viewBox="0 0 16 16"
       fill="none"
       xmlns="http://www.w3.org/2000/svg"
     >
-      <title id="checkIcon">check icon</title>
+      <title id={`checkIcon_${id}`}>check icon</title>
       <path
         d="M12.4663 4.8C12.1997 4.53333 11.7997 4.53333 11.533 4.8L6.53301 9.8L4.46634 7.73333C4.19967 7.46667 3.79967 7.46667 3.53301 7.73333C3.26634 8 3.26634 8.4 3.53301 8.66667L6.06634 11.2C6.19967 11.3333 6.33301 11.4 6.53301 11.4C6.73301 11.4 6.86634 11.3333 6.99967 11.2L12.4663 5.73333C12.733 5.46667 12.733 5.06667 12.4663 4.8Z"
         fill="#3C3C40"