gatsby-matrix-theme 45.0.3 → 45.0.5

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+## [45.0.5](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v45.0.4...v45.0.5) (2024-06-26)
+
+
+### Bug Fixes
+
+* changes site for testing ([32e1a6e](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/32e1a6e754edffbadc917b28c6605ec4ec34b747))
+* update core version and .env ([af948ef](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/af948efd85662243c3eac47169b1ef8735677810))
+
+## [45.0.4](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v45.0.3...v45.0.4) (2024-06-25)
+
+
+### Bug Fixes
+
+* search refactoring ([909d273](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/909d273084b4e1f185dd6bb4dab3087127060139))
+* updated with latest version ([4ab185c](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/4ab185c55aa17bf563d4f50d91260e0467639b25))
+
 ## [45.0.3](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v45.0.2...v45.0.3) (2024-06-25)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-matrix-theme",
-  "version": "45.0.3",
+  "version": "45.0.5",
   "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": "33.1.1",
+    "gatsby-core-theme": "33.1.4",
     "gatsby-plugin-sharp": "^5.11.0",
     "gatsby-transformer-sharp": "^5.11.0",
     "prop-types": "15.7.2",

package/src/gatsby-core-theme/components/molecules/main/index.js

@@ -148,7 +148,7 @@ const Main = ({
         ))}
       {SearchPage && (
         <Suspense fallback={<></>}>
-          <SearchPage page={page} />
+          <SearchPage page={page} serverData={serverData} allMarkets={pageContext.allMarkets} />
         </Suspense>
       )}
       {showAuthorBox && (

package/src/gatsby-core-theme/components/molecules/search/search.module.scss

@@ -1,39 +1,25 @@
-.form {
-  width: 50%;
-  display: flex;
-  flex-direction: column;
-  position: absolute;
-  top: 10%;
-  left: 50%;
-  transform: translateX(-50%);
+.container {
+  form {
+    position: relative;
+    margin-bottom: 2.4rem;
 
-  input {
-    width: 100%;
-    padding: 3rem 2rem;
-  }
+    input {
+      width: 100%;
+      background-color: #ececec;
+      border-radius: .8rem;
+      padding: 2.4rem;
 
-  .searchButton {
-    position: absolute;
-    right: 0;
-    top: 0.6rem;
-    padding: 2rem;
+      
+    }
 
-    svg {
-      font-size: 3rem;
+    button {
+      position: absolute;
+      right: 3rem;
+      top: calc(50% - .8rem); 
     }
   }
 }
 
-.searchGrid {
-  display: grid;
-  grid-template-columns: repeat(3, 1fr);
-}
-
-.loading {
-  width: 150px;
-  height: 20px;
-  display: block;
-}
-.selectwrapper {
-  position: relative;
-}
+.results {
+  
+}

package/src/gatsby-core-theme/components/pages/search/index.js

@@ -9,13 +9,15 @@ import { Context } from 'gatsby-core-theme/src/context/MainProvider';
 import Search from 'gatsby-core-theme/src/components/molecules/search';
 import styles from './search.module.scss';
 
-const SearchContent = ({ page }) => {
+const SearchContent = ({ page, serverData, allMarkets }) => {
   const { translations } = useContext(Context) || {};
   const searchURLPageName = page.path;
   return (
     <div className={`${styles.searchPage} ${moduleStyles.module} module`}>
       {page.path && <Breadcrumbs page={page} />}
       <Search
+        serverData={serverData}
+        allMarkets={allMarkets}
         searchURLPageName={searchURLPageName}
         page={page}
         searchIcon="../../../../../../images/search.svg"
@@ -87,6 +89,8 @@ const SearchContent = ({ page }) => {
 };
 
 SearchContent.propTypes = {
+  serverData: PropTypes.shape({}),
+  allMarkets: PropTypes.shape({}),
   page: PropTypes.shape({
     template: PropTypes.string,
     path: PropTypes.string,

package/src/gatsby-core-theme/components/pages/search/search.module.scss

@@ -1,44 +1,5 @@
 .searchPage {
-  margin-top: 6rem;
-  @include min(tablet){
-    div {
-      div{
-        div{
-          button{
-            margin-top: 2rem;
-          }
-          ol{
-            button{
-              margin-top: 0rem;
-            }
-          }
-        }
-      }
+  margin-top: var(--nav-height);
+
     
-    }
-  }
-  @include min(laptop){
-    div{
-        button{
-          margin-top: 2rem;
-        }
-        ol{
-          display: block !important;
-          li{
-            margin-bottom: 1rem;
-            display: inline-block;
-            button{
-              margin: 0;
-            }
-          }
-        }
-    }
-    div:nth-child(2){
-      ol{
-        li{
-          margin-bottom: 0rem;
-        }
-      }
-    }
-  }
 }

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

@@ -1,17 +1,42 @@
+/* eslint-disable no-prototype-builtins */
+/* eslint-disable no-nested-ternary */
 /* eslint-disable import/prefer-default-export */
 import { getApiQueryParams } from './sportstake';
 import { getApiBasedNames } from './lotto';
 import { getFixtures, getLatestResults, getAvailableDrawDays } from './services';
-
-export async function getAPIData(page) {
-  let responseFixtures = {};
-  let responseResults = {};
-  let responseLotto = {};
+import loadSource from '~helpers/search-source';
+import { deparam } from '~helpers/strings';
+
+export async function getAPIData(page, url) {
+  if (page.path.endsWith('/s') || page.path === 's') {
+    const results = await loadSource(page.market);
+    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: searchData,
+        searchParam: urlParams ? urlParams.s : null,
+      },
+    };
+  }
 
   const containsFixtures = page.categories.filter((category) => category.short_name === 'fixtures');
   const containsResults = page.categories.filter((category) => category.short_name === 'results');
   const containsLotto = page.categories.filter((category) => category.short_name === 'lotto');
 
+  let responseFixtures = {};
+  let responseResults = {};
+  let responseLotto = {};
+
   if (containsFixtures.length >= 1) {
     const filteredArray = page?.sections?.main?.modules.filter(
       (x) => x.value_type === 'template_block'

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

@@ -6,7 +6,7 @@
     margin-bottom: 2rem;
   }
   @include min(tablet) {
-    grid-template-columns: 1fr 0.4fr;
+    grid-template-columns: 1fr 1fr;
     &.tabsonly {
       grid-template-columns: 1fr;
     }