Leave only localized code on localized_scripts.js

Signed-off-by: George Araújo <[email protected]>
levxyca · Feb 4, 2025 · 76b8ef5 · 76b8ef5
1 parent a5e7a17
commit 76b8ef5
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 16 deletions.
diff --git a/_scripts/localized_scripts.js.liquid b/_scripts/localized_scripts.js.liquid
@@ -1,32 +1,25 @@
 ---
 permalink: /assets/js/localized_scripts.js
 ---
-import { addFavoriteTag, filterCards, getTagsFromCards, insertCardsIntoHtml, loadFavoriteCardsId, searchCards, sortCardsByTitle } from '
-{{- '/assets/js/cards.js' | relative_url -}}
-';
+import { addFavoriteTag, filterCards, getCardsFromJson, getTagsFromCards, insertCardsIntoHtml, loadFavoriteCardsId, searchCards, sortCardsByTitle }
+from '{{ '/assets/js/cards.js' | relative_url }}';
 
 {% if site.active_lang == site.default_lang -%}
   const res = await fetch('{{ '/assets/data/cards.json' | relative_url }}');
 {%- else -%}
   const res = await fetch('{{ '/assets/data/cards.json' | prepend: site.active_lang | prepend: '/' | relative_url }}');
 {%- endif %}
 
-// variables that need to be set by jekyll const allTag = '{{ site.data[site.active_lang].strings.all }}'; const favoriteTag = '
-{{- site.data[site.active_lang].strings.favorites -}}
-'; const noResultsAlt = '{{ site.data[site.active_lang].strings.no_results.alt }}'; const noResultsText = `
+{% comment %} variables that need to be set by jekyll {% endcomment %}
+const allTag = '{{ site.data[site.active_lang].strings.all }}'; const favoriteTag = '{{ site.data[site.active_lang].strings.favorites }}'; const
+noResultsAlt = '{{ site.data[site.active_lang].strings.no_results.alt }}'; const noResultsText = `
 {{- site.data[site.active_lang].strings.no_results.text -}}
 `;
-
-async function getCardsFromJson() { try {
 {% if site.active_lang == site.default_lang -%}
-  const res = await fetch('{{ '/assets/data/cards.json' | relative_url }}');
+  const jsonPath = '{{ '/assets/data/cards.json' | relative_url }}';
 {%- else -%}
-  const res = await fetch('{{ '/assets/data/cards.json' | prepend: site.active_lang | prepend: '/' | relative_url }}');
+  const jsonPath = '{{ '/assets/data/cards.json' | prepend: site.active_lang | prepend: '/' | relative_url }}';
 {%- endif %}
-const data = await res.json(); const sortedCards = await sortCardsByTitle(data); document.getElementById('total-terms').textContent =
-sortedCards.length; await loadFavoriteCardsId(); await addFavoriteTag(sortedCards, favoriteTag); getTagsFromCards(sortedCards, favoriteTag);
-insertCardsIntoHtml(sortedCards, favoriteTag, allTag, noResultsAlt, noResultsText); } catch (error) { console.error('An error occurred while fetching
-card data.', error); } }
 
 document.querySelector('#search-input').addEventListener('input', searchCards); document.querySelector('#tags-filter').addEventListener('change',
-filterCards(allTag)); getCardsFromJson();
+filterCards(allTag)); getCardsFromJson(jsonPath, favoriteTag, allTag, noResultsAlt, noResultsText);
diff --git a/assets/js/cards.js b/assets/js/cards.js
@@ -317,4 +317,19 @@ function generateContentId(title = "", description = "", hash = 5381) {
   return hashString;
 }
 
-export { addFavoriteTag, filterCards, getTagsFromCards, insertCardsIntoHtml, loadFavoriteCardsId, searchCards, sortCardsByTitle };
+async function getCardsFromJson(jsonPath, favoriteTag, allTag, noResultsAlt, noResultsText) {
+  try {
+    const res = await fetch(jsonPath);
+    const data = await res.json();
+    const sortedCards = await sortCardsByTitle(data);
+    document.getElementById("total-terms").textContent = sortedCards.length;
+    await loadFavoriteCardsId();
+    await addFavoriteTag(sortedCards, favoriteTag);
+    getTagsFromCards(sortedCards, favoriteTag);
+    insertCardsIntoHtml(sortedCards, favoriteTag, allTag, noResultsAlt, noResultsText);
+  } catch (error) {
+    console.error("An error occurred while fetching card data.", error);
+  }
+}
+
+export { addFavoriteTag, filterCards, getCardsFromJson, getTagsFromCards, insertCardsIntoHtml, loadFavoriteCardsId, searchCards, sortCardsByTitle };