diff --git a/dl_external_imgs.js b/dl_external_imgs.js index 8a3be881..330406a5 100644 --- a/dl_external_imgs.js +++ b/dl_external_imgs.js @@ -122,7 +122,7 @@ async function findUrls(fileContent, filePath) { const timeoutPromise = new Promise((resolve, reject) => { setTimeout(() => { reject(new Error(`Request for ${url} timed out`)); - }, 15000); + }, 25000); }); try { @@ -144,6 +144,7 @@ async function findUrls(fileContent, filePath) { // Retry the request only if it is a timeout error and the maximum number of retries has not been reached if ( error.message === `Request for ${url} timed out` || + error.code === 'UND_ERR_CONNECT_TIMEOUT' || error.message === `API may be under pressure` ) { if (retryCount < maxRetries) { @@ -155,6 +156,7 @@ async function findUrls(fileContent, filePath) { throw error; } } else { + console.log('here'); throw error; } } diff --git a/src/lib/components/Avatar.svelte b/src/lib/components/Avatar.svelte index 49ca3598..82c0d2fe 100755 --- a/src/lib/components/Avatar.svelte +++ b/src/lib/components/Avatar.svelte @@ -1,17 +1,25 @@
- {procDate} - {#each blogPostPage.contentCreators as person, i} - {person.name} - {person.pronouns ? `(${person.pronouns})` : ''} - {#if i < blogPostPage.contentCreators.length - 1}{', '} {/if}{/each} -
- {/if} ++ {blogPost.pubDate} - {#each blogPost.contentCreators as person, i} + {person.name} + {person.pronouns ? `(${person.pronouns})` : ''} + {#if i < blogPost.contentCreators.length - 1}{', '} {/if}{/each} +
@@ -49,7 +49,7 @@
{#if jobs.past.length !== 0}
{#each jobs.past as job}
-
diff --git a/src/routes/[[locale=locale]]/jobs/[slug]/+page.server.js b/src/routes/[[locale=locale]]/jobs/[slug]/+page.server.js
index 3d83078d..64b4a44b 100755
--- a/src/routes/[[locale=locale]]/jobs/[slug]/+page.server.js
+++ b/src/routes/[[locale=locale]]/jobs/[slug]/+page.server.js
@@ -1,9 +1,8 @@
import directusFetch from '$lib/js/directusFetch';
-import {getLang} from '$lib/js/helpers';
+import {getLang, getLocale} from '$lib/js/helpers';
import {jobDetailQuery} from './queries.js';
import {error} from '@sveltejs/kit';
-import {parseJobPage} from '$lib/js/parseCms';
-import {handleLang} from '$lib/js/helpers';
+import {parse} from '$lib/js/parseCms';
import {getAllowedStatus} from '$lib/js/directusFetch.js';
export const prerender = 'auto';
@@ -12,7 +11,7 @@ export const prerender = 'auto';
export async function load({params}) {
const vars = {
slug: params.slug,
- language: getLang(params),
+ language: getLang(getLocale(params)),
status: getAllowedStatus(),
};
const data = await directusFetch(jobDetailQuery, vars);
@@ -21,8 +20,5 @@ export async function load({params}) {
throw error(404);
}
- // Modifies Jobs in place
- handleLang(data.Jobs, params);
-
- return parseJobPage(data);
+ return {job: await parse(data.Jobs[0], 'single', 'job', params)};
}
diff --git a/src/routes/[[locale=locale]]/jobs/[slug]/+page.svelte b/src/routes/[[locale=locale]]/jobs/[slug]/+page.svelte
index 88fbd78e..0609cd06 100755
--- a/src/routes/[[locale=locale]]/jobs/[slug]/+page.svelte
+++ b/src/routes/[[locale=locale]]/jobs/[slug]/+page.svelte
@@ -1,26 +1,22 @@