- {#each data.results as result}
+ {#each data.results as result (result.URL)}
{result.URL}
diff --git a/src/routes/search/+page.ts b/src/routes/search/+page.ts
index bf7d732b..6508b482 100644
--- a/src/routes/search/+page.ts
+++ b/src/routes/search/+page.ts
@@ -1,13 +1,16 @@
import { env } from '$env/dynamic/public';
import { browser } from '$app/environment';
+
import type { PageLoad } from './$types';
+import type { Result } from './types';
-export const load: PageLoad = async ({ fetch, url }) => {
+export const load: PageLoad = async ({ fetch, url, setHeaders }) => {
const q = url.searchParams.get('q');
if (q === null || q === '') {
+ const results: Result[] = [];
return {
query: '',
- results: []
+ results: results
};
}
@@ -17,21 +20,22 @@ export const load: PageLoad = async ({ fetch, url }) => {
} else {
apiUri = env.PUBLIC_API_URL_CSR;
}
+
const apiUrl = `${apiUri}/search?${url.searchParams}`;
+ const response = await fetch(apiUrl);
+ const results: Result[] = await response.json();
- // it's important to use the included fetch so that the fetch is not run again in the browser
- const resultsP = new Promise((resolve, reject) => {
- fetch(apiUrl)
- .then((res) => {
- resolve(res.json());
- })
- .catch((err) => {
- reject(err);
- });
- });
+ const age = response.headers.get('age');
+ const cacheControl = response.headers.get('cache-control');
+ if (age != null && cacheControl != null) {
+ setHeaders({
+ age: age,
+ 'cache-control': cacheControl
+ });
+ }
return {
query: q,
- results: browser ? resultsP : await resultsP
+ results: results
};
};
diff --git a/src/routes/search/types.ts b/src/routes/search/types.ts
new file mode 100644
index 00000000..cdda8b78
--- /dev/null
+++ b/src/routes/search/types.ts
@@ -0,0 +1,17 @@
+type EngineRank = {
+ SearchEngine: string;
+ Rank: number;
+ Page: number;
+ OnPageRank: number;
+};
+
+export type Result = {
+ URL: string;
+ Rank: number;
+ Score: number;
+ Title: string;
+ Description: string;
+ EngineRanks: EngineRank[];
+ TimesReturned: number;
+ Response: any;
+};