word-games-theme 3.1.5 → 3.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a238d3783e4893850462bf51872d2439aaaa6d19f0d20a1cc745a359c0ee5bd5
-  data.tar.gz: 65ed0fcee738368e2e20f3f700edd9943f0ca195ed024ce0d2b69e15f188de56
+  metadata.gz: f5a3ee85b4117adf5dfb61c935d85e42797072e0d88260bedf911be60203f8f8
+  data.tar.gz: 368c661dedab31a6cbc017a31b7a9eaa27b1cb5f00079cc0cd6555068349df56
 SHA512:
-  metadata.gz: b12a7150f4c2eb980d10ef0af6cff427e3135f9d7c9d30662bbaa313ca9d57b3a82767dd2900294f85b28d1f716b78bc5a86913080c41bbc83963b5e7bbc5c81
-  data.tar.gz: de4cbfc060955c81ff4ff554a5e188e5ca481c6d34e751e1e0b1310f84f4630e9afea551f9daf927d2c1fc7d5a277f062ca6306fa7f3bb4106718d853291d609
+  metadata.gz: ec348039e2e3c9ca412cdee09f900eeeb36a6a43a100004d85707c62d0c0081b332d385475250f03e86ad4df8974e907c747dd86af2a735f4394abd51c908116
+  data.tar.gz: 44263306fe7867366235b84bdd77ced77ca915cb1f77f4a3a67e722d52031fdec32481baefd48a786fbe3814c3a1c43e6d684d5428844a060cb807628480fd09

data/_includes/wordgames/advanced-filter/advanced-filter.html

@@ -7,7 +7,7 @@
 
 
 
-<div class="fillterWrapper my-5 filterShow">
+<div class="fillterWrapper my-4 filterShow">
     <div class="startsWith">
         <input class="filter_val textBoxes" autocomplete="off" type="text" id="startsWith" placeholder="Starts with" value=""
             name="prefix">
@@ -23,6 +23,15 @@
             <img width="30px" height="30px" src="/assets/images/questionmark.svg" alt="Question Mark" />
         </div>
     </div>
+    <div class="mustInclude">
+        <input class="filter_val textBoxes" autocomplete="off" type="text" id="mustInclude" placeholder="Contains"
+            name="contains">
+        <div class="filter-tooltip" data-tip="Words that contain letters in this order(ab)"
+            id="Words that contain letters in this order(ab)">
+            <img width="30px" height="30px" src="/assets/images/questionmark.svg" alt="Question Mark" />
+        </div>
+
+    </div>
     <div class="wordLength same">
         <input autocomplete="off" type="number" class="filter_val textBoxes" id="wordLength" placeholder="Length" name="length"
             value="{{page.letter}}">
@@ -41,15 +50,7 @@
             <img width="30px" height="30px" src="/assets/images/questionmark.svg" alt="Question Mark" />
         </div>
     </div>
-    <div class="mustInclude">
-        <input class="filter_val textBoxes" autocomplete="off" type="text" id="mustInclude" placeholder="Contains"
-            name="contains">
-        <div class="filter-tooltip" data-tip="Words that contain letters in this order(ab)"
-            id="Words that contain letters in this order(ab)">
-            <img width="30px" height="30px" src="/assets/images/questionmark.svg" alt="Question Mark" />
-        </div>
-
-    </div>
+   
 
     <div class="exculdeWith">
         <input class="filter_val textBoxes" autocomplete="off" type="text" id="exculdeWith" placeholder="Exclude" value=""

data/_includes/wordgames/words-data/words-data.html

@@ -1,4 +1,15 @@
 {% assign dataToShow = site.data[page.folderName][page.lang][page.fileName] %}
+{%- if page.letter -%}
+<style>
+    .letter-length {
+        display: none;
+    }
+
+    .sortingFilters {
+        display: flex !important;
+    }
+</style>
+{%- endif -%}
 <div class="row pad m-0">
     <div class="col-md-12">
         {%- if page.letter -%}
@@ -6,7 +17,7 @@
             onclick="gtag('event', 'click', {'event_category': 'Link click', 'event_label': 'Home Page Search Result'});"></a>
         {%- endif -%}
         <div class="filters d-flex justify-content-between align-items-center">
-            <div class="wordCount">{{dataToShow.wordLength}}</div>
+            <div class="wordCount font-weight-bolder">{{dataToShow.wordLength}}</div>
             <div class="filterSortedIcons">
                 <div class="filter-icon" onclick="myFunction()">
                     <i class="bi bi-filter"></i>
@@ -40,14 +51,11 @@
                 </div>
             </div>
             <div class="sortingFilters wrapper_dropDown  justify-content-end" style="gap:10px; display: none;">
-
-               
                 <div class="letter-length">
                     <select class="form-select length-select">
                         <option selected="true" hidden>Letter Length</option>
                     </select>
                 </div>
-            
                 <div id="sort-select">
                     <select class="form-select sort-select" id="select_dropDown">
                         <option selected="true" hidden id="alpha" value="alpha">Sort by</option>
@@ -59,8 +67,6 @@
             </div>
         </div>
 
-
-
         {%- if page.letter -%}
         <div id="get-value" data-fileName="{{page.fileName}}" data-lang="{{page.lang}}"
             data-folderName="{{page.folderName}}" class="main">
@@ -73,7 +79,7 @@
                 </div>
                 <div class="wordList">
                     <ul class="ul list-unstyled">
-                        {%- for item in scrabblewords limit: 25 %}
+                        {%- for item in scrabblewords limit: 97 %}
                         {%- assign value = item.word -%}
                         <a class="anchor__style" target="_blank" href="/word-meaning?search={{item.word | strip_html}}">
                             <div class="tool-tip" data-toggle="tooltip" data-placement="top"
@@ -107,7 +113,6 @@
         <div class="main"></div>
         {%- endif -%}
 
-
         <div class="errorMsg"></div>
 
     </div>

data/_layouts/wordgames-home.html

@@ -5,6 +5,16 @@
 
 {%- if site.noResultPage or page.noResultPage -%}
 {%- if page.letter -%}
+
+{%- if page.permalink == "/five-letter-words-with-these-letters" -%}
+<style>
+    .serachSection {
+        position: relative !important;
+        top: 0px !important;
+    }
+</style>
+{%- endif -%}
+
 <style>
     .main-header {
         padding-top: 12vh;
@@ -102,7 +112,8 @@
 
     <script data-lang="{{page.lang}}" defer src="/assets/js/theme.js"></script>
     {%- if site.noResultPage -%}
-    <script data-url="{{site.url}}" data-blanktilerange="{{page.blanktilerange}}" defer src="/assets/js/wordfinder-home.js"></script>
+    <script data-url="{{site.url}}" data-blanktilerange="{{page.blanktilerange}}" defer
+        src="/assets/js/wordfinder-home.js"></script>
     {%- else -%}
     <script defer src="/assets/js/wordgames-home.js"></script>
     {%- endif -%}

data/assets/css/wordGroup.css

@@ -289,7 +289,7 @@ input:-webkit-autofill:active {
 }
 
 .wordCount {
-  text-indent: 10px;
+  /* text-indent: 10px; */
   font-size: 18px;
 }
 

data/assets/css/wordfinder-result.css

@@ -356,7 +356,7 @@
    }
    
    .wordCount {
-     text-indent: 10px;
+     /* text-indent: 10px; */
      font-size: 18px;
    }
    

data/assets/css/wordgames-result.css

@@ -360,7 +360,7 @@ input:-webkit-autofill:active {
 }
 
 .wordCount {
-  text-indent: 10px;
+  /* text-indent: 10px; */
   font-size: 18px;
 }
 
@@ -422,12 +422,12 @@ input:-webkit-autofill:active {
 }
 
 .wordList>ul li {
-  padding: 8px 0;
+  padding: 8px 10px;
   background: #f8f9fa;
   border-radius: 5px;
-  margin: 6px 6px;
+  margin: 6px 5px;
   width: auto;
-  min-width: 100px;
+  /* min-width: 100px; */
   text-align: center;
   border: solid 1px var(--black-color);
   box-shadow: 2px 2px 1px 0px var(--black-color);
@@ -445,6 +445,9 @@ input:-webkit-autofill:active {
 }
 
 .points {
+  position: relative;
+    top: 4px;
+    font-size: 12px;
   color: #73716e;
   font-weight: 600;
 }

data/assets/js/scrabbleDictonary.js

@@ -11,7 +11,7 @@ defintions.innerHTML  = `Defintion(s) for ${serachValue}`
 // DICTONARY
 const fetchMeaning = async (serachValue) => {
   try {
-    let resMeaning = await fetch(`http://127.0.0.1:9000/wordMeaning?search=${serachValue}`)
+    let resMeaning = await fetch(`/.netlify/functions/wordMeaning?search=${serachValue}`)
     let getDef = await resMeaning.text()
 
     if (getDef && resMeaning.status == 200) {
@@ -147,7 +147,7 @@ const fetchTWL06Dic = async (serachValue) => {
   }
 
   try {
-    let res = await fetch(`http://127.0.0.1:9000/gettwl06?search=${serachValue}`)
+    let res = await fetch(`/.netlify/functions/gettwl06?search=${serachValue}`)
 
     let getData = await res.text()
 
@@ -204,7 +204,7 @@ const fetchSOWPODSDic = async (serachValue) => {
     sum += newAlphabet[item[i]] || 0 // for unknown characters
   }
 
-  let res = await fetch(`http://127.0.0.1:9000/getsowpods?search=${serachValue}`)
+  let res = await fetch(`/.netlify/functions/getsowpods?search=${serachValue}`)
 
   let getData = await res.text()
 
@@ -257,7 +257,7 @@ const fetchEnableDic = async (serachValue) => {
     sum += newAlphabet[item[i]] || 0 // for unknown characters
   }
 
-  let res = await fetch(`http://127.0.0.1:9000/getenable?search=${serachValue}`)
+  let res = await fetch(`/.netlify/functions/getenable?search=${serachValue}`)
 
   let getData = await res.text()
 

data/assets/js/show-more-words.js

@@ -1,5 +1,5 @@
 
-let data_indexs = 25;
+let data_indexs = 98;
 function ShowMoreWords(e) {
     let showmore = e.parentElement.children[0];
     let script = document.getElementById("get-value");
@@ -28,7 +28,7 @@ function ShowMoreWords(e) {
             }
         }
         if (data_indexs < full_words.length) {
-            for (let d = data_indexs; d < data_indexs + 25; d++) {
+            for (let d = data_indexs; d < data_indexs + 98; d++) {
                 if (full_words[d] != undefined) {
                     // $('[data-toggle="tooltip"]').tooltip();
                     let li = document.createElement("li");
@@ -61,7 +61,7 @@ function ShowMoreWords(e) {
                 }
             }
             document.getElementById(id).innerHTML = `See More Words`;
-            data_indexs += 25;
+            data_indexs += 98;
         } else {
             document.getElementById(id).style.display = "none";
         }

data/assets/js/wordfinder-home.js

@@ -350,7 +350,6 @@ const worker = new Worker('/assets/js/wordfinder-worker.js');
 const getData = async (serachValue) => {
     try {
         let selectedDictionary = document.querySelector(".select_dropDown2").value;
-
         if (letterLen) {
             home_page_search_result = document.querySelector("#home_page_search_result")
             homePageSearchResult = `/?search=${serachValue}&dictionary=Dictionary&prefix=&contains=&suffix=&exculde=&inculde=&length=`;
@@ -359,10 +358,13 @@ const getData = async (serachValue) => {
         document.querySelector(".main-header").style.background = "#fff"
         document.querySelector(".heading-h2").style.display = "none"
         document.querySelector(".sortingFilters").style.display = "none"
-
         errorMsg.innerHTML = "";
         wordCount.innerHTML = "";
 
+
+        if (serachValue) {
+            serachValue = serachValue + startsWith.value + endsWith.value + mustInclude.value + inculdeWith.value + exculdeWith.value
+        }
         worker.postMessage({
             type: "api",
             serachValue: serachValue,
@@ -372,7 +374,7 @@ const getData = async (serachValue) => {
         worker.onmessage = (event) => {
             main.innerHTML = "";
             serachBtn.style.background = 'url(/assets/images/search.svg) no-repeat center center';
-            getWords(event.data.data);
+            getWords(serachValue, event.data.data);
         }
     } catch (error) {
         console.log(error);
@@ -405,20 +407,28 @@ let previousDataIndex = null
 let previousID = null;
 let storepreviousIndex = []
 let moreData = []
-let data_index = 25;
-function getWords(data) {
-    data_index = 25
+let data_index = 98;
+function getWords(serachValue, data) {
+    data_index = 98
     moreData = []
     storepreviousIndex = []
     main.innerHTML = "";
     lengthSelect.innerHTML = ""
     if (typeof data === "string") {
+        const params = new URLSearchParams(window.location.search);
         errorMsg.innerHTML = "no words found";
+
+        if (!letterLen) {
+            let serachValue = params.get("search").toLowerCase();
+            txtBox.value = serachValue + "?"
+            logSubmit(new Event('submit'))
+        }
+
     } else {
         worker.postMessage({
             type: 'filterwords',
             data: data,
-            serachValue: txtBox.value.toLowerCase(),
+            serachValue: serachValue,
             prefixValue: startsWith.value,
             containsValue: mustInclude.value,
             suffixValue: endsWith.value,
@@ -483,6 +493,7 @@ function getWords(data) {
                             home_page_search_result.innerHTML = `See words of any length with letters ${serachValue.split("")}`
                         }
 
+
                         main.innerHTML += `
                     <div class="allGroupWords wordlistContainer" id="alpha_${i}">
                         <h3 class="wordListHeading lead">${i} Letter Words</h3>
@@ -504,7 +515,6 @@ function getWords(data) {
                     }
                 }
                 if (newWordsLength === 0) {
-                    console.log(newdata);
                     errorMsg.innerHTML = "No Words Found";
                     document.querySelector(".sortingFilters").style.display = "none"
                 } else {
@@ -552,11 +562,11 @@ async function showMoreWords(e) {
         let id = showmore.id;
 
         if (previousID !== null && parseInt(previousID) !== parseInt(id)) {
-            data_index = 25
+            data_index = 98
             const filteredIndexes = storepreviousIndex.filter(item => item.id === id);
             if (filteredIndexes.length > 0) {
                 const lastItem = filteredIndexes[filteredIndexes.length - 1];
-                data_index = lastItem.data_index + 25;
+                data_index = lastItem.data_index + 98;
                 lastItem.data_index = data_index;
             }
         }
@@ -566,16 +576,21 @@ async function showMoreWords(e) {
             id
         })
         console.log("Current data_index:", data_index);
-
         document.getElementById(id).innerHTML = `Loading...`;
         let content_area = document.getElementById("alpha_" + id).getElementsByClassName("wordList")[0];
         const result = await getMoreWords();
         let full_words = result.filter((item) => item.length === Number(id));
 
         if (data_index < full_words.length) {
-            for (let d = data_index; d < data_index + 25; d++) {
+            for (let d = data_index; d < data_index + 98; d++) {
                 if (full_words[d] != undefined) {
                     let itemHtml = "";
+                    let points
+                    let ScrabbleLetterScore = ScrabbleScore();
+
+                    if (serachValue) {
+                        serachValue = serachValue + startsWith.value + endsWith.value + mustInclude.value + inculdeWith.value + exculdeWith.value
+                    }
                     if (serachValue) {
                         var text1 = serachValue.replace("?", "");
                         var text2 = full_words[d];
@@ -591,24 +606,33 @@ async function showMoreWords(e) {
                                 indexs = [...indexs, ...findIndexes];
                             }
                         });
+                        let n1 = false
                         text2.split("").map((itemValue, index) => {
                             let check = indexs.find((i) => i === index);
                             if (check !== undefined) {
                                 itemHtml += `${itemValue}`;
+                                n1 = true
                             } else {
                                 itemHtml += `<span class='highlight'>${itemValue}</span>`;
                             }
                         });
+                        if (n1 == true) {
+                            let parsedText = itemHtml.replace(/<span[^>]*>.*?<\/span>/g, '');
+                            // console.log(parsedText);
+                            points = 0
+                            for (let i = 0; i < parsedText.length; i++) {
+                                points += ScrabbleLetterScore[parsedText[i]] || 0; // for unknown characters
+                            }
+                        }
                     } else {
                         itemHtml = full_words[d]
-                    }
-                    let ScrabbleLetterScore = ScrabbleScore();
-                    let points = 0;
-                    full_words[d] = full_words[d].toLowerCase();
-                    for (let i = 0; i < full_words[d].length; i++) {
-                        points += ScrabbleLetterScore[full_words[d][i]] || 0; // for unknown characters
+                        points = 0;
+                        for (let i = 0; i < full_words[d].length; i++) {
+                            points += ScrabbleLetterScore[full_words[d][i]] || 0; // for unknown characters
+                        }
                     }
 
+                    full_words[d] = full_words[d].toLowerCase();
                     let span = document.createElement("span");
                     span.setAttribute("class", "points");
                     span.setAttribute("value", `${points}`);
@@ -625,7 +649,7 @@ async function showMoreWords(e) {
                 }
             }
             document.getElementById(id).innerHTML = `More Words`;
-            data_index += 25;
+            data_index += 98;
         } else {
             document.getElementById(id).style.display = "none";
         }
@@ -703,7 +727,7 @@ function showMoreLimit() {
     for (let i = 0; i < showmore.length; i++) {
         let data_of_button = document.getElementById("alpha_" + showmore[i].getAttribute("id"));
         let final_data = data_of_button.getElementsByClassName("anchor__style");
-        if (final_data.length < 25) {
+        if (final_data.length < 98) {
             tableFooter[i].style.display = "none";
         }
     }

data/assets/js/wordfinder-worker.js

@@ -88,14 +88,20 @@ self.onmessage = async (event) => {
 
             } else {
                 newWordsLength += newdata.length;
-                newdata = sortWords(sortingFilter, newdata, dictonary);
+                newdata = sortWords(serachValue, sortingFilter, newdata, dictonary);
+                console.log(newdata);
+                
                 let result = newdata.map((item) => {
                     let itemHtml = "";
+                    let ScrabbleLetterScore = ScrabbleScore();
+                    let sum = 0
+
                     if (serachValue) {
                         var text1 = serachValue.replace("?", "");
                         var text2 = item;
                         var text3 = item;
                         let chars = text1.split("");
+
                         let indexs = [];
                         chars.map((i) => {
                             let findIndexes = findIndex(text3, i);
@@ -106,27 +112,37 @@ self.onmessage = async (event) => {
                                 indexs = [...indexs, ...findIndexes];
                             }
                         });
+                        
+                        let n1 = false
                         text2.split("").map((itemValue, index) => {
                             let check = indexs.find((i) => i === index);
                             if (check !== undefined) {
                                 itemHtml += `${itemValue}`;
+                                n1 = true
                             } else {
                                 itemHtml += `<span class='highlight'>${itemValue}</span>`;
                             }
                         });
+
+                        if (n1 == true) {
+                            let parsedText = itemHtml.replace(/<span[^>]*>.*?<\/span>/g, '');
+                            sum = 0
+                            for (let i = 0; i < parsedText.length; i++) {
+                                sum += ScrabbleLetterScore[parsedText[i]] || 0; // for unknown characters
+                            }
+                        }
                     } else {
                         itemHtml = item
+                        sum = 0
+                        for (let i = 0; i < itemHtml.length; i++) {
+                            sum += ScrabbleLetterScore[itemHtml[i]] || 0; // for unknown characters
+                        }
                     }
                     if (item.length === 1) {
                         ok = false;
                         newWordsLength = newWordsLength - 1;
                     } else {
-                        let ScrabbleLetterScore = ScrabbleScore();
-                        sum = 0;
                         item = item.toLowerCase();
-                        for (let i = 0; i < item.length; i++) {
-                            sum += ScrabbleLetterScore[item[i]] || 0; // for unknown characters
-                        }
                         return `
                     <a class="anchor__style" title="Lookup ${item} in Dictionary" target="_blank" href="/word-meaning?search=${item.toLowerCase()}">
                     ${itemHtml}
@@ -135,7 +151,7 @@ self.onmessage = async (event) => {
                     `;
                     }
                 });
-                result = result.slice(0, 25)
+                result = result.slice(0, 98)
                 self.postMessage({
                     type: "filterwords",
                     prefixValue: prefixValue,
@@ -155,7 +171,7 @@ self.onmessage = async (event) => {
 };
 
 
-function sortWords(sortingFilter, data, dictonary) {
+function sortWords(serachValue, sortingFilter, data, dictonary) {
     if (sortingFilter == 0) {
         return data;
     } else if (sortingFilter == 1) {
@@ -174,12 +190,54 @@ function sortWords(sortingFilter, data, dictonary) {
                 let ScrabbleLetterScore = ScrabbleScore(dictonary);
                 let points = 0;
                 item = item.toLowerCase();
-                for (let i = 0; i < item.length; i++) {
-                    points += ScrabbleLetterScore[item[i]] || 0; // for unknown characters
+                let itemHtml = "";
+                let sum = 0
+
+                if (serachValue) {
+                    var text1 = serachValue.replace("?", "");
+                    var text2 = item;
+                    var text3 = item;
+                    let chars = text1.split("");
+
+                    let indexs = [];
+                    chars.map((i) => {
+                        let findIndexes = findIndex(text3, i);
+                        if (findIndexes.length > 0) {
+                            text3 = text3.split("");
+                            text3[findIndexes] = "$";
+                            text3 = text3.join("");
+                            indexs = [...indexs, ...findIndexes];
+                        }
+                    });
+                    
+                    let n1 = false
+                    text2.split("").map((itemValue, index) => {
+                        let check = indexs.find((i) => i === index);
+                        if (check !== undefined) {
+                            itemHtml += `${itemValue}`;
+                            n1 = true
+                        } else {
+                            itemHtml += `<span class='highlight'>${itemValue}</span>`;
+                        }
+                    });
+
+                    if (n1 == true) {
+                        let parsedText = itemHtml.replace(/<span[^>]*>.*?<\/span>/g, '');
+                        sum = 0
+                        for (let i = 0; i < parsedText.length; i++) {
+                            sum += ScrabbleLetterScore[parsedText[i]] || 0; // for unknown characters
+                        }
+                    }
+                }else{
+                    itemHtml = item
+                    sum = 0
+                    for (let i = 0; i < itemHtml.length; i++) {
+                        sum += ScrabbleLetterScore[itemHtml[i]] || 0; // for unknown characters
+                    }
                 }
                 const value = {
                     words: item,
-                    points: points,
+                    points: sum,
                 };
                 newArray.push(value);
             }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: word-games-theme
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.1.6
 platform: ruby
 authors:
 - manpreet-appscms
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-30 00:00:00.000000000 Z
+date: 2024-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll