Merge pull request #614 from hearchco/as/feat/categoryless

feat: frontend categories
hearchco · Nov 17, 2024 · 9a6923b · 9a6923b
2 parents ed59700 + e852a42
commit 9a6923b
Show file tree

Hide file tree

Showing 31 changed files with 805 additions and 157 deletions.
diff --git a/package.json b/package.json
@@ -22,6 +22,7 @@
 		"@sveltejs/kit": "^2.8.1",
 		"@sveltejs/vite-plugin-svelte": "^4.0.0",
 		"@types/eslint": "^9.6.1",
+		"@types/node": "^22.9.0",
 		"autoprefixer": "^10.4.20",
 		"eslint": "^9.14.0",
 		"eslint-config-prettier": "^9.1.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/lib/components/gadgets/timer/main.svelte b/src/lib/components/gadgets/timer/main.svelte
@@ -80,7 +80,7 @@
 		}
 	});
 
-	/** @type {number|undefined} */
+	/** @type {NodeJS.Timeout|undefined} */
 	let interval = $state(undefined);
 	function toggleState() {
 		if (beeping) {

diff --git a/src/lib/components/results/general/main.svelte b/src/lib/components/results/general/main.svelte
@@ -9,7 +9,7 @@
 	 * @property {string} query
 	 * @property {string} category
 	 * @property {number} currentPage
-	 * @property {ResultType[]} results
+	 * @property {WebResultType[]} results
 	 */
 
 	/** @type {Props} */

diff --git a/src/lib/components/results/general/single.svelte b/src/lib/components/results/general/single.svelte
@@ -4,7 +4,7 @@
 
 	/**
 	 * @typedef {object} Props
-	 * @property {ResultType} result
+	 * @property {WebResultType} result
 	 */
 
 	/** @type {Props} */

diff --git a/src/lib/components/results/images/main.svelte b/src/lib/components/results/images/main.svelte
@@ -10,8 +10,8 @@
 	 * @property {string} query
 	 * @property {string} category
 	 * @property {number} currentPage
-	 * @property {ResultType[]} results
-	 * @property {ResultType | undefined} imagePreview
+	 * @property {ImagesResultType[]} results
+	 * @property {ImagesResultType | undefined} imagePreview
 	 */
 
 	/** @type {Props} */

diff --git a/src/lib/components/results/images/preview.svelte b/src/lib/components/results/images/preview.svelte
@@ -3,8 +3,8 @@
 
 	/**
 	 * @typedef {object} Props
-	 * @property {ResultType} result
-	 * @property {ResultType | undefined} imagePreview
+	 * @property {ImagesResultType} result
+	 * @property {ImagesResultType | undefined} imagePreview
 	 */
 
 	/** @type {Props} */

diff --git a/src/lib/components/results/images/single.svelte b/src/lib/components/results/images/single.svelte
@@ -3,8 +3,8 @@
 
 	/**
 	 * @typedef {object} Props
-	 * @property {ResultType} result
-	 * @property {ResultType | undefined} imagePreview
+	 * @property {ImagesResultType} result
+	 * @property {ImagesResultType | undefined} imagePreview
 	 */
 
 	/** @type {Props} */

diff --git a/src/lib/components/results/infiniteloading/main.svelte b/src/lib/components/results/infiniteloading/main.svelte
@@ -1,14 +1,19 @@
 <script>
 	import { concatSearchParams } from '$lib/functions/api/concatparams';
-	import { fetchAdditionalResults } from '$lib/functions/api/additionalresults';
-	import { fetchResults } from '$lib/functions/api/fetchapi';
+	import {
+		fetchAdditionalWebResults,
+		fetchAdditionalImagesResults
+	} from '$lib/functions/api/additionalresults';
+	import { fetchWebResults, fetchImagesResults } from '$lib/functions/api/fetchapi';
+	import { assertImagesResultType } from '$lib/types/search/assert';
+	import { getCategoryConfigBase64 } from '$lib/functions/categories/convert';
 
 	/**
 	 * @typedef {object} Props
 	 * @property {string} query
 	 * @property {string} category
 	 * @property {number} currentPage
-	 * @property {ResultType[]} results
+	 * @property {WebResultType[] | ImagesResultType[]} results
 	 */
 
 	/** @type {Props} */
@@ -20,21 +25,28 @@
 		event.preventDefault();
 		const params = concatSearchParams([
 			['q', query],
-			['category', category],
+			['category', getCategoryConfigBase64(category)],
 			['start', nextPage.toString()]
 		]);
-		const newResults = await fetchAdditionalResults(results, params);
+		const newResults = assertImagesResultType(results, category)
+			? await fetchAdditionalImagesResults(results, params)
+			: await fetchAdditionalWebResults(results, params);
 		results = newResults;
 		nextPage = nextPage + 1;
 	}
 
 	async function preloadResults() {
 		const params = concatSearchParams([
 			['q', query],
-			['category', category],
+			['category', getCategoryConfigBase64(category)],
 			['start', nextPage.toString()]
 		]);
-		await fetchResults(params);
+
+		if (assertImagesResultType(results, category)) {
+			await fetchImagesResults(params);
+		} else {
+			await fetchWebResults(params);
+		}
 	}
 </script>
 

diff --git a/src/lib/components/searchbox/main.svelte b/src/lib/components/searchbox/main.svelte
@@ -1,7 +1,7 @@
 <script>
-	import { CategoryEnum } from '$lib/types/search/category';
+	import { CategoryEnum } from '$lib/types/search/categoryenum';
 	import { getQueryWithoutCategory } from '$lib/functions/query/category';
-	import { fetchSuggestions } from '$lib/functions/api/fetchapi';
+	import { fetchSuggestionsResults } from '$lib/functions/api/fetchapi';
 
 	/**
 	 * @typedef {object} Props
@@ -36,7 +36,7 @@
 	// Whether to show suggestions or not.
 	let shouldShowSuggs = $state(homepage);
 
-	/** @type {SuggestionType[]} */
+	/** @type {SuggestionsResultType[]} */
 	let suggestions = $state([]);
 
 	// Determines if the suggestions can be shown.
@@ -47,7 +47,7 @@
 		if (getQueryWithoutCategory(currQuery) === '') {
 			suggestions = [];
 		} else if (currentIndex === -1) {
-			fetchSuggestions(getQueryWithoutCategory(currQuery)).then((resp) => {
+			fetchSuggestionsResults(getQueryWithoutCategory(currQuery)).then((resp) => {
 				const maxSize = 10;
 				if (resp.suggestions.length > maxSize)
 					resp.suggestions.splice(maxSize, resp.suggestions.length - maxSize);