cdransf/coryd.dev-eleventy
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "chore: search cleanup"

Browse source 
This reverts commit 52897f58e6.
This commit is contained in:
Cory Dransfeldt 2024-10-19 20:22:47 -07:00
parent 52897f58e6
commit 72676659be
No known key found for this signature in database
3 changed files with 109 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package-lock.json generated
View file

@ -1,12 +1,12 @@
{
"name": "coryd.dev",
"version": "1.5.14",
"version": "1.5.13",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "coryd.dev",
"version": "1.5.14",
"version": "1.5.13",
"license": "MIT",
"dependencies": {
"@cdransf/api-text": "^1.5.0",

2
package.json
View file

@ -1,6 +1,6 @@
{
"name": "coryd.dev",
"version": "1.5.14",
"version": "1.5.13",
"description": "The source for my personal site. Built using 11ty (and other tools).",
"type": "module",
"engines": {

163
src/assets/scripts/index.js
View file

@ -106,41 +106,58 @@ window.addEventListener("load", () => {
"tags",
"total_plays",
],
searchOptions: {
fields: ["title", "tags"],
prefix: true,
fuzzy: 0.1,
boost: { title: 3, tags: 1.5 },
},
});
const $form = document.querySelector(".search__form");
const $input = document.querySelector(".search__form--input");
const $fallback = document.querySelector(".search__form--fallback");
const $typeCheckboxes = document.querySelectorAll(
'.search__form--type input[type="checkbox"]'
);
const $results = document.querySelector(".search__results");
const $loadMoreButton = document.querySelector(".search__load-more");
$form.removeAttribute("action");
$form.removeAttribute("method");
if ($fallback) $fallback.remove();
const PAGE_SIZE = 10;
let currentPage = 1;
let currentResults = [];
let total = 0;
let resultsById = {};
let debounceTimeout;
const getSearchResults = (query) => {
return miniSearch.search(query, {
fields: ["title", "tags"],
prefix: true,
fuzzy: 0.1,
boost: { title: 4, tags: 2 },
});
const parseMarkdown = (markdown) => {
if (!markdown) return "";
return markdown
.replace(/\*\*(.*?)\*\*/g, "<strong>$1</strong>")
.replace(/\*(.*?)\*/g, "<em>$1</em>")
.replace(/\[(.*?)\]\((.*?)\)/g, '<a href="$2">$1</a>')
.replace(/\n/g, "<br>")
.replace(/[#*_~`]/g, "");
};
const updateSearchResults = (results) => {
if (currentPage === 1) {
renderSearchResults(results);
} else {
appendSearchResults(results);
}
const moreResultsToShow = currentPage * PAGE_SIZE < total;
$loadMoreButton.style.display = moreResultsToShow ? "block" : "none";
const truncateDescription = (markdown, maxLength = 150) => {
const htmlDescription = parseMarkdown(markdown);
const tempDiv = document.createElement("div");
tempDiv.innerHTML = htmlDescription;
const plainText = tempDiv.textContent || tempDiv.innerText || "";
return plainText.length > maxLength
? `${plainText.substring(0, maxLength)}...`
: plainText;
};
const formatArtistTitle = (title, totalPlays) =>
totalPlays > 0
? `${title} <strong class="highlight-text">${totalPlays} plays</strong>`
: title;
const renderSearchResults = (results) => {
if (results.length > 0) {
const resultHTML = results
@ -148,14 +165,17 @@ window.addEventListener("load", () => {
const truncatedDesc = truncateDescription(description);
const formattedTitle =
type === "artist" && total_plays !== undefined
? `${title} <strong class="highlight-text">${total_plays} plays</strong>`
? formatArtistTitle(title, total_plays)
: title;
return `
<li class="search__results--result">
<a href="${url}"><h3>${formattedTitle}</h3></a>
<p>${truncatedDesc}</p>
</li>`;
<li class="search__results--result">
<a href="${url}">
<h3>${formattedTitle}</h3>
</a>
<p>${truncatedDesc}</p>
</li>
`;
})
.join("");
@ -174,20 +194,63 @@ window.addEventListener("load", () => {
const truncatedDesc = truncateDescription(description);
const formattedTitle =
type === "artist" && total_plays !== undefined
? `${title} <strong class="highlight-text">${total_plays} plays</strong>`
? formatArtistTitle(title, total_plays)
: title;
return `
<li class="search__results--result">
<a href="${url}"><h3>${formattedTitle}</h3></a>
<p>${truncatedDesc}</p>
</li>`;
<li class="search__results--result">
<a href="${url}"><h3>${formattedTitle}</h3></a>
<p>${truncatedDesc}</p>
</li>
`;
})
.join("");
$results.insertAdjacentHTML("beforeend", newResults);
};
const loadSearchIndex = async (query = "", types = [], page = 1) => {
const typeQuery = types.join(",");
try {
const response = await fetch(
`https://coryd.dev/api/search?q=${query}&type=${typeQuery}&page=${page}&pageSize=${PAGE_SIZE}`
);
const index = await response.json();
const results = index.results || [];
total = index.total || results.length;
resultsById = results.reduce((acc, item) => {
acc[item.id] = item;
return acc;
}, {});
miniSearch.removeAll();
miniSearch.addAll(results);
return results;
} catch (error) {
console.error("Error fetching search data:", error);
return [];
}
};
const getSelectedTypes = () =>
Array.from($typeCheckboxes)
.filter((checkbox) => checkbox.checked)
.map((checkbox) => checkbox.value);
const updateSearchResults = (results) => {
if (currentPage === 1) {
renderSearchResults(results);
} else {
appendSearchResults(results);
}
const moreResultsToShow = currentPage * PAGE_SIZE < total;
$loadMoreButton.style.display = moreResultsToShow ? "block" : "none";
};
$input.addEventListener("input", () => {
const query = $input.value.trim();
clearTimeout(debounceTimeout);
@ -198,8 +261,8 @@ window.addEventListener("load", () => {
return;
}
debounceTimeout = setTimeout(() => {
const results = getSearchResults(query);
debounceTimeout = setTimeout(async () => {
const results = await loadSearchIndex(query, getSelectedTypes(), 1);
currentResults = results;
currentPage = 1;
@ -208,8 +271,12 @@ window.addEventListener("load", () => {
});
$typeCheckboxes.forEach((checkbox) => {
checkbox.addEventListener("change", () => {
const results = getSearchResults($input.value.trim());
checkbox.addEventListener("change", async () => {
const results = await loadSearchIndex(
$input.value.trim(),
getSelectedTypes(),
1
);
currentResults = results;
currentPage = 1;
@ -217,34 +284,16 @@ window.addEventListener("load", () => {
});
});
$loadMoreButton.addEventListener("click", () => {
$loadMoreButton.addEventListener("click", async () => {
currentPage++;
const nextResults = getSearchResults($input.value.trim()).slice(
(currentPage - 1) * PAGE_SIZE,
currentPage * PAGE_SIZE
const nextResults = await loadSearchIndex(
$input.value.trim(),
getSelectedTypes(),
currentPage
);
currentResults = [...currentResults, ...nextResults];
appendSearchResults(nextResults);
const moreResultsToShow = currentPage * PAGE_SIZE < total;
$loadMoreButton.style.display = moreResultsToShow ? "block" : "none";
updateSearchResults(nextResults);
});
const truncateDescription = (markdown, maxLength = 150) => {
const htmlDescription = markdown
.replace(/\*\*(.*?)\*\*/g, "<strong>$1</strong>")
.replace(/\*(.*?)\*/g, "<em>$1</em>")
.replace(/\[(.*?)\]\((.*?)\)/g, '<a href="$2">$1</a>')
.replace(/\n/g, "<br>")
.replace(/[#*_~`]/g, "");
const tempDiv = document.createElement("div");
tempDiv.innerHTML = htmlDescription;
const plainText = tempDiv.textContent || tempDiv.innerText || "";
return plainText.length > maxLength
? `${plainText.substring(0, maxLength)}...`
: plainText;
};
})();
});