Date: Tue, 14 May 2024 12:58:08 +0200
Subject: [PATCH 54/60] fix(preview): better check when to show button for
longer desc
---
src/lib/components/results/general/single.svelte | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/components/results/general/single.svelte b/src/lib/components/results/general/single.svelte
index afcb2f73..4f121793 100644
--- a/src/lib/components/results/general/single.svelte
+++ b/src/lib/components/results/general/single.svelte
@@ -28,7 +28,7 @@
>
{result.title}
- {#if shortDesc !== result.description}
+ {#if shortDesc.length < result.description.length}
Date: Tue, 14 May 2024 17:06:51 +0200
Subject: [PATCH 55/60] fix(stats): add a separate timing for measuring SSR
time and latency to that alongside API fetch
---
src/lib/components/header/stats.svelte | 10 ++++++----
src/routes/search/+page.js | 8 +++++++-
src/routes/search/+page.server.js | 17 ++++++++++++++---
src/routes/search/+page.svelte | 5 +++--
4 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/src/lib/components/header/stats.svelte b/src/lib/components/header/stats.svelte
index 08fe4c97..2da1f0e7 100644
--- a/src/lib/components/header/stats.svelte
+++ b/src/lib/components/header/stats.svelte
@@ -2,16 +2,18 @@
/**
* @typedef {object} Props
* @property {number} numOfResults
- * @property {number} timing
+ * @property {number} timingRender
+ * @property {number} timingApi
*/
/** @type {Props} */
- let { numOfResults, timing } = $props();
- const timingString = $derived((timing / 1000).toFixed(2));
+ let { numOfResults, timingRender, timingApi } = $props();
+ const timingRenderString = $derived((timingRender / 1000).toFixed(2));
+ const timingApiString = $derived((timingApi / 1000).toFixed(2));
- Hearched {numOfResults} results in {timingString}s 🐹
+ Hearched {numOfResults} results in {timingRenderString}s (API took {timingApiString}s) 🐹
diff --git a/src/routes/search/+page.js b/src/routes/search/+page.js
index b1c4cd5e..ce4ccedd 100644
--- a/src/routes/search/+page.js
+++ b/src/routes/search/+page.js
@@ -9,6 +9,12 @@ export async function load({ data }) {
maxPages: data.maxPages,
category: data.category,
results: data.results,
- timing: data.timing
+ timing: {
+ render: {
+ start: data.timing.render.start,
+ end: Date.now()
+ },
+ api: data.timing.api
+ }
};
}
diff --git a/src/routes/search/+page.server.js b/src/routes/search/+page.server.js
index 274c48d9..53c6c571 100644
--- a/src/routes/search/+page.server.js
+++ b/src/routes/search/+page.server.js
@@ -34,6 +34,8 @@ function getCategory(query, params) {
/** @type {import('./$types').PageServerLoad} */
export async function load({ url, fetch }) {
+ const renderStart = Date.now();
+
// Get query, current page, and max pages from URL
const query = url.searchParams.get('q') ?? '';
const currentPage = parseInt(url.searchParams.get('start') ?? '1', 10);
@@ -72,9 +74,9 @@ export async function load({ url, fetch }) {
});
// Fetch results
- const timerStart = Date.now();
+ const fetchStart = Date.now();
const results = await fetchResults(newSearchParams, fetch);
- const timerEnd = Date.now();
+ const fetchEnd = Date.now();
return {
query: queryWithoutCategory,
@@ -82,6 +84,15 @@ export async function load({ url, fetch }) {
maxPages: maxPages,
category: category,
results: results,
- timing: timerEnd - timerStart
+ timing: {
+ render: {
+ start: renderStart,
+ end: Date.now()
+ },
+ api: {
+ start: fetchStart,
+ end: fetchEnd
+ }
+ }
};
}
diff --git a/src/routes/search/+page.svelte b/src/routes/search/+page.svelte
index 2856bca0..d2b8cb62 100644
--- a/src/routes/search/+page.svelte
+++ b/src/routes/search/+page.svelte
@@ -24,7 +24,8 @@
// const maxPages = $derived(data.maxPages);
const category = $derived(data.category);
const results = $derived(data.results);
- const timing = $derived(data.timing);
+ const timingRender = $derived(data.timing.render.end - data.timing.render.start);
+ const timingApi = $derived(data.timing.api.end - data.timing.api.start);
/** @type {ResultType | undefined} */
let imagePreview = $state(undefined);
@@ -40,7 +41,7 @@
{#if results.length !== 0}
-
- Hearched {numOfResults} results in {timingRenderString}s (API took {timingApiString}s) 🐹
+ Hearched {numOfResults} results in {timingString}s 🐹
diff --git a/src/routes/search/+page.js b/src/routes/search/+page.js
index ce4ccedd..b1c4cd5e 100644
--- a/src/routes/search/+page.js
+++ b/src/routes/search/+page.js
@@ -9,12 +9,6 @@ export async function load({ data }) {
maxPages: data.maxPages,
category: data.category,
results: data.results,
- timing: {
- render: {
- start: data.timing.render.start,
- end: Date.now()
- },
- api: data.timing.api
- }
+ timing: data.timing
};
}
diff --git a/src/routes/search/+page.server.js b/src/routes/search/+page.server.js
index 53c6c571..274c48d9 100644
--- a/src/routes/search/+page.server.js
+++ b/src/routes/search/+page.server.js
@@ -34,8 +34,6 @@ function getCategory(query, params) {
/** @type {import('./$types').PageServerLoad} */
export async function load({ url, fetch }) {
- const renderStart = Date.now();
-
// Get query, current page, and max pages from URL
const query = url.searchParams.get('q') ?? '';
const currentPage = parseInt(url.searchParams.get('start') ?? '1', 10);
@@ -74,9 +72,9 @@ export async function load({ url, fetch }) {
});
// Fetch results
- const fetchStart = Date.now();
+ const timerStart = Date.now();
const results = await fetchResults(newSearchParams, fetch);
- const fetchEnd = Date.now();
+ const timerEnd = Date.now();
return {
query: queryWithoutCategory,
@@ -84,15 +82,6 @@ export async function load({ url, fetch }) {
maxPages: maxPages,
category: category,
results: results,
- timing: {
- render: {
- start: renderStart,
- end: Date.now()
- },
- api: {
- start: fetchStart,
- end: fetchEnd
- }
- }
+ timing: timerEnd - timerStart
};
}
diff --git a/src/routes/search/+page.svelte b/src/routes/search/+page.svelte
index d2b8cb62..2856bca0 100644
--- a/src/routes/search/+page.svelte
+++ b/src/routes/search/+page.svelte
@@ -24,8 +24,7 @@
// const maxPages = $derived(data.maxPages);
const category = $derived(data.category);
const results = $derived(data.results);
- const timingRender = $derived(data.timing.render.end - data.timing.render.start);
- const timingApi = $derived(data.timing.api.end - data.timing.api.start);
+ const timing = $derived(data.timing);
/** @type {ResultType | undefined} */
let imagePreview = $state(undefined);
@@ -41,7 +40,7 @@
{#if results.length !== 0}
-
@@ -17,7 +17,7 @@
-
diff --git a/src/lib/components/searchbox/main.svelte b/src/lib/components/searchbox/main.svelte
index 19592009..cc7599b5 100644
--- a/src/lib/components/searchbox/main.svelte
+++ b/src/lib/components/searchbox/main.svelte
@@ -13,7 +13,7 @@
/** @type {Props} */
let {
homepage = false,
- query = $bindable(''),
+ query = '',
category = CategoryEnum.GENERAL,
// eslint-disable-next-line no-unused-vars
loading = $bindable(false)
diff --git a/src/routes/search/+page.svelte b/src/routes/search/+page.svelte
index 2856bca0..dbef36f5 100644
--- a/src/routes/search/+page.svelte
+++ b/src/routes/search/+page.svelte
@@ -10,8 +10,7 @@
const javascript = $derived(data.browser);
- const originalQuery = $derived(data.query);
- let query = $state(data.query);
+ const query = $derived(data.query);
const title = $derived(
query === ''
? 'Hearchco Search'
@@ -38,7 +37,7 @@
{title}
-
+
{#if results.length !== 0}
{/if}
@@ -46,7 +45,7 @@
{#if results.length === 0}
{:else if toDisplayCategory(category) === CategoryEnum.IMAGES}
-
+
{:else}
-
+
{/if}
diff --git a/src/routes/searchbad/+page.svelte b/src/routes/searchbad/+page.svelte
index 2856bca0..dbef36f5 100644
--- a/src/routes/searchbad/+page.svelte
+++ b/src/routes/searchbad/+page.svelte
@@ -10,8 +10,7 @@
const javascript = $derived(data.browser);
- const originalQuery = $derived(data.query);
- let query = $state(data.query);
+ const query = $derived(data.query);
const title = $derived(
query === ''
? 'Hearchco Search'
@@ -38,7 +37,7 @@
{title}
-
+
{#if results.length !== 0}
{/if}
@@ -46,7 +45,7 @@
{#if results.length === 0}
{:else if toDisplayCategory(category) === CategoryEnum.IMAGES}
-
+
{:else}
-
+
{/if}
From e766ade56a6a6a313dbac76f0896a745937b93b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksa=20Siri=C5=A1ki?=
<31509435+aleksasiriski@users.noreply.github.com>
Date: Wed, 15 May 2024 00:50:10 +0200
Subject: [PATCH 60/60] fix(infiniteloading): less work for preload
---
src/lib/components/results/infiniteloading/main.svelte | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/lib/components/results/infiniteloading/main.svelte b/src/lib/components/results/infiniteloading/main.svelte
index be3ea9e5..11688c3b 100644
--- a/src/lib/components/results/infiniteloading/main.svelte
+++ b/src/lib/components/results/infiniteloading/main.svelte
@@ -1,6 +1,7 @@