fix searchbar accuracy #6

Author: akielbowicz

plugins/flexsearch_plugin/flexsearch_plugin.py

@@ -27,6 +27,9 @@
 
 
 class FlexSearchPlugin(LateTask):
+    '''iterea sobre todos los post
+    saca el titulo y el contenido del tituo y el url
+    '''
     name = "flexsearch_plugin"
 
     def set_site(self, site):
@@ -40,7 +43,7 @@ def gen_tasks(self):
         yield self.group_task()
 
         output_path = self.site.config['OUTPUT_FOLDER']
-        index_file_path = os.path.join(output_path, 'search_index.json')
+        index_file_path = os.path.join(output_path, 'assets', 'search_index.json')
 
         def build_index():
             """Build the entire search index from scratch."""

themes/pyar/assets/css/custom.css

@@ -112,6 +112,12 @@ iframe#google {
 	padding-top:0;
 }
 
+#boton_cerrar {
+    border-style: groove;
+    border-width: thin;
+    width: fit-content;
+    align-self: self-end;
+}
 
 /*
  * Panels
@@ -593,19 +599,19 @@ small, .small {
     align-items: center;
 }
 
-#search_content {
-    display: flex;
-    flex-direction: column;
-    justify-content: space-around;
-    justify-items: center;
-    overflow: hidden;
-    background: white;
-    padding: 20px;
-    width: 90%;
-    max-width: 90%; /* Limit the width on larger screens */
-    max-height: 90%;
-    border-radius: 5px;
-    box-shadow: 0 4px 6px rgba(0,0,0,0.1);
+#search_content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-around;
+    justify-items: center;
+    overflow: hidden;
+    background: white;
+    padding: 20px;
+    width: 90%;
+    max-width: 90%; /* Limit the width on larger screens */
+    max-height: 90%;
+    border-radius: 5px;
+    box-shadow: 0 4px 6px rgba(0,0,0,0.1);
 }
 
 #search_results {

themes/pyar/assets/js/flexsearch.js

@@ -1,12 +1,30 @@
 // Basado en https://plugins.getnikola.com/#flexsearch_plugin
 
+
 document.addEventListener('DOMContentLoaded', function() {
-    var searchIndex = new FlexSearch.Index();  // Initialize FlexSearch
-    var index = {};  // This will store the index data globally within this script block
+
+    const wiki_host_for_dev_or_prod = ['127.0.0.1', 'localhost', '0.0.0.0', 'wiki.python.org.ar'];
+
+    var searchIndex = new FlexSearch.Index({ 
+        tokenize: "full",
+        async: true,
+    });  // Initialize FlexSearch
+    var index = {};
 
     // Fetch the generated JSON file
-    const basePath = "" //document.location.hostname == "localhost" ? "": "/wiki" //Parche para probar en las GHP de mi fork ak.saxa.xyz/wiki
-    var indexPath = document.location.origin + basePath + "/search_index.json"
+    function get_basePath() {
+        // evalua si el url.host NO es igual a wiki.python.org.ar para setear el basepath de los links
+        if (wiki_host_for_dev_or_prod.includes(window.location.hostname)) {
+            return basePath = window.location.host
+        } else {
+            // asumimos que el wiki esta alojado bajo /wiki por la relación de las github_pages
+            return basePath = window.location.host + "/wiki";
+        } 
+    };
+    
+    get_basePath()
+    var indexPath = `//${basePath}/assets/search_index.json`;
+
     fetch(indexPath)
     .then(response => response.json())
     .then(data => {
@@ -42,7 +60,7 @@ document.addEventListener('DOMContentLoaded', function() {
         results.forEach(function(result) {
             var li = document.createElement('li'); // Create a LI element for each result
             var link = document.createElement('a');
-            link.href = basePath + index[result].url;
+            link.href = `//${basePath}${index[result].url}`;   
             link.textContent = index[result].title;
             li.appendChild(link);
             ul.appendChild(li); // Append the LI to the UL
@@ -60,13 +78,6 @@ document.addEventListener('DOMContentLoaded', function() {
     // Event listener for each change in the input field 
     input.addEventListener('input', performSearch);
 
-// Function to close the search overlay
-    function closeSearch() {
-        document.getElementById('search_overlay').style.display = 'none';
-        document.getElementById('search_input_base').disabled = false;
-        document.getElementById('search_input').value === ""
-    }
-
     document.addEventListener('keydown', function(event) {
         if (event.key === 'Escape') {
             var searchOverlay = document.getElementById('search_overlay');
@@ -77,4 +88,11 @@ document.addEventListener('DOMContentLoaded', function() {
     });
 });
 
+// Function to close the search overlay
+function closeSearch() {
+    document.getElementById('search_overlay').style.display = 'none';
+    document.getElementById('search_input_base').disabled = false;
+    document.getElementById('search_input').value === ""
+};
+
 

themes/pyar/templates/base.tmpl

@@ -102,9 +102,9 @@
             return element.getElementsByTagName('img')[0].alt;
     }});
     </script>
-    <script src="https://rawcdn.githack.com/nextapps-de/flexsearch/0.7.31/dist/flexsearch.bundle.js"></script>
+    <script src="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.bundle.min.js"></script>
     <script src="/assets/js/flexsearch.js"></script>
 {{ body_end }}
 {{ template_hooks['body_end']() }}
 </body>
-</html>
+</html>