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 @@
- {#if src} - + {#if imageSrc} + {imageAlt} {:else} -
+ {/if} diff --git a/src/lib/components/Awards.svelte b/src/lib/components/Awards.svelte index a0337ca0..d2bb152e 100755 --- a/src/lib/components/Awards.svelte +++ b/src/lib/components/Awards.svelte @@ -1,7 +1,7 @@ @@ -32,7 +30,9 @@ {title}
- +
+ +
- {#if localChapters.length !== 0} - {#each localChapters as lc, i} + {#if procLocalChapters.length !== 0} + {#each procLocalChapters as lc, i} CorrelAidX {lc.city}{#if i < localChapters.length - 1}{', '} {/if} + >{#if i < procLocalChapters.length - 1}{', '} {/if} {/each} {/if}
diff --git a/src/lib/components/Hero.spec.js b/src/lib/components/Hero.spec.js index ada33d7f..ce62a7fe 100755 --- a/src/lib/components/Hero.spec.js +++ b/src/lib/components/Hero.spec.js @@ -7,8 +7,8 @@ describe('Hero', () => { props: { height: 'full', text: 'Hello World', - gradient_only: true, - image_alt: 'No image for testing', + gradientOnly: true, + imageAlt: 'No image for testing', }, }); @@ -22,8 +22,8 @@ describe('Hero', () => { height: 'full', text: 'Hello World', correlaidx: true, - gradient_only: true, - image_alt: 'No image for testing', + gradientOnly: true, + imageAlt: 'No image for testing', }, }); diff --git a/src/lib/components/Hero.svelte b/src/lib/components/Hero.svelte index 74911131..fe1e6091 100755 --- a/src/lib/components/Hero.svelte +++ b/src/lib/components/Hero.svelte @@ -8,7 +8,7 @@ export let text; export let buttons = []; export let correlaidx = false; - export let image = void 0; + export let imageSrc = void 0; export let imageAlt = void 0; export let imageDesc = void 0; @@ -33,7 +33,7 @@ {#if gradientOnly === false} diff --git a/src/lib/components/JobCard.svelte b/src/lib/components/JobCard.svelte index d440ee1e..dbfe2605 100755 --- a/src/lib/components/JobCard.svelte +++ b/src/lib/components/JobCard.svelte @@ -1,13 +1,12 @@ -
- {#if langs.length !== 2} - {#each langs as lang} - {#if lang == 'de-DE'} - - {$t(`access.language_`).text} {lang} - {:else} - - {$t(`access.language_`).text} {lang} - {/if} - {/each} - {:else} - - Bilingual - {/if} -
+{#if langs.length !== 2} + {#each langs as lang} + {#if lang == 'de-DE'} + + {$t(`access.language_`).text} {lang} + {:else} + + {$t(`access.language_`).text} {lang} + {/if} + {/each} +{:else} + + Bilingual +{/if} diff --git a/src/lib/components/Links.svelte b/src/lib/components/Links.svelte index ea8ca129..173855ee 100755 --- a/src/lib/components/Links.svelte +++ b/src/lib/components/Links.svelte @@ -4,19 +4,18 @@ import Linkedin from '../svg/Linkedin.svelte'; import Mastodon from '../svg/Mastodon.svelte'; import ExternalLink from '../svg/External_Link.svelte'; - export let mastodon = ''; - export let website = ''; - export let twitter = ''; - export let linkedin = ''; - export let github = ''; - export let name; + export let mastodon = void 0; + export let website = void 0; + export let twitter = void 0; + export let linkedin = void 0; + export let github = void 0; const iconSize = 25;
- {#if website != ''}{/if} - {#if twitter != ''}{/if} - {#if mastodon != ''}{/if} - {#if linkedin != ''}{/if} - {#if github != ''}{/if} diff --git a/src/lib/components/Partner.spec.js b/src/lib/components/Partner.spec.js index e97a69ef..450a172c 100755 --- a/src/lib/components/Partner.spec.js +++ b/src/lib/components/Partner.spec.js @@ -7,7 +7,8 @@ describe('Partner', () => { props: { name: 'NPO A', description: 'a very cool NPO', - img: 'expected.image.url', + imageSrc: 'expected.image.url', + website: 'npoa.website.org', }, }); @@ -20,12 +21,9 @@ describe('Partner', () => { props: { name: 'NPO A', description: 'a very cool NPO', - img: 'fakeimgurl.org ', + imageSrc: 'fakeImgSrc.org ', website: 'npoa.website.org', }, }); - - // const image = screen.getByAltText('NPO A'); - // expect(image.closest('a')).toHaveAttribute('href', 'npoa.website.org'); }); }); diff --git a/src/lib/components/Partner.svelte b/src/lib/components/Partner.svelte index d6aa9018..4c9f81a3 100755 --- a/src/lib/components/Partner.svelte +++ b/src/lib/components/Partner.svelte @@ -1,24 +1,18 @@
- {#if img} -
-
- {#if website !== ''} - - Logo: {name} - - {:else} - Logo: {name} - {/if} -
+
+ - {/if} +
{#if website !== ''} + import Person from '$lib/components/Person.svelte'; + export let people; + + +
+ {#each people as person} + + {/each} +
diff --git a/src/lib/components/Person.svelte b/src/lib/components/Person.svelte index 1de3a5b3..9ba1a675 100755 --- a/src/lib/components/Person.svelte +++ b/src/lib/components/Person.svelte @@ -2,11 +2,12 @@ export let name; export let position = ''; export let description = ''; - export let img = void 0; + export let imageSrc = void 0; export let links; export let email = ''; export let pronouns = ''; export let imageDesc = void 0; + export let imageAlt; import Avatar from '$lib/components/Avatar.svelte'; import Links from '$lib/components/Links.svelte'; @@ -15,7 +16,7 @@
- +
@@ -38,6 +39,6 @@

{/if} - +
diff --git a/src/lib/components/ProjectLinks.svelte b/src/lib/components/ProjectLinks.svelte index f59b3c7f..300de685 100755 --- a/src/lib/components/ProjectLinks.svelte +++ b/src/lib/components/ProjectLinks.svelte @@ -16,7 +16,7 @@ {#each projectOutputs as output} {#if output.outputType === 'blogPost'}
{$t('project_output.blogpost').text}{$t('projectOutput.blogpost').text} {:else if output.outputType === 'podcastEpisode'} - {$t('project_output.podcast').text} + {$t('projectOutput.podcast').text} {$t(`project_output.${output['outputType']}`).text}{output[ + >{$t(`projectOutput.${output['outputType']}`).text}{output[ 'outputNumber' ] > 0 ? ` ${output['outputNumber']}` diff --git a/src/lib/components/ProjectsCard.svelte b/src/lib/components/ProjectsCard.svelte index 00ddcb8c..b0fd6195 100755 --- a/src/lib/components/ProjectsCard.svelte +++ b/src/lib/components/ProjectsCard.svelte @@ -2,9 +2,7 @@ import Nonprofit from '$lib/svg/Nonprofit.svelte'; import CorrelAidLogo from '$lib/svg/CorrelaidLogoMin.svelte'; import ProjectLinks from '$lib/components/ProjectLinks.svelte'; - import {page} from '$app/stores'; import Html from '$lib/components/Html.svelte'; - import {genLcHref} from '$lib/js/helpers'; import {t} from '$lib/stores/i18n'; import Cursor from '$lib/svg/Cursor.svelte'; @@ -14,7 +12,7 @@ export let isInternal; export let organization; export let summary; - export let localChapters = []; + export let procLocalChapters = []; export let href; export let projectOutputs = []; @@ -85,13 +83,12 @@ {/each}
- {#if localChapters.length !== 0} + {#if procLocalChapters.length !== 0} diff --git a/src/lib/components/QuoteCarousel.svelte b/src/lib/components/QuoteCarousel.svelte index 7dc38e29..8733b493 100755 --- a/src/lib/components/QuoteCarousel.svelte +++ b/src/lib/components/QuoteCarousel.svelte @@ -27,7 +27,7 @@ {#if textOnly === false}
- {#if quote.image} + {#if quote.imageSrc}
- {#if quote.image.description} + {#if quote.imageDesc}
{quote.image.description}{quote.imageDesc}
{/if} diff --git a/src/lib/components/WorkshopCard.svelte b/src/lib/components/WorkshopCard.svelte index e8225e89..176c2ca7 100755 --- a/src/lib/components/WorkshopCard.svelte +++ b/src/lib/components/WorkshopCard.svelte @@ -40,7 +40,10 @@
- +
+ +
+ diff --git a/src/lib/components/singleUse/Map.svelte b/src/lib/components/singleUse/Map.svelte index acee032e..42cefb46 100755 --- a/src/lib/components/singleUse/Map.svelte +++ b/src/lib/components/singleUse/Map.svelte @@ -1,6 +1,4 @@ - -
- - -
- {#each remoteOffice as person} - - {/each} -
- - - -
- {#each board as person} - - {/each} -
-
diff --git a/src/routes/[[locale=locale]]/[education=education]/[resources=resources]/+page.server.js b/src/routes/[[locale=locale]]/[education=education]/[resources=resources]/+page.server.js index 8f3d658a..4039c77b 100755 --- a/src/routes/[[locale=locale]]/[education=education]/[resources=resources]/+page.server.js +++ b/src/routes/[[locale=locale]]/[education=education]/[resources=resources]/+page.server.js @@ -1,12 +1,12 @@ import directusFetch from '$lib/js/directusFetch'; -import {getLang} from '$lib/js/helpers'; +import {getLang, getLocale} from '$lib/js/helpers'; import {workshopQuery} from './queries.js'; import {parse} from '$lib/js/parseCms'; /** @type {import('./$types').PageLoad} */ export async function load({params}) { const data = await directusFetch(workshopQuery, { - language: getLang(params), + language: getLang(getLocale(params)), }); return {workshops: await parse(data.Workshops, 'cards', 'workshops', params)}; diff --git a/src/routes/[[locale=locale]]/[events=events]/+page.server.js b/src/routes/[[locale=locale]]/[events=events]/+page.server.js index 8a6c644f..98c0aa99 100755 --- a/src/routes/[[locale=locale]]/[events=events]/+page.server.js +++ b/src/routes/[[locale=locale]]/[events=events]/+page.server.js @@ -1,12 +1,12 @@ import {directusFetch, getAllowedStatus} from '$lib/js/directusFetch'; -import {getLang} from '$lib/js/helpers'; +import {getLang, getLocale} from '$lib/js/helpers'; import {eventQuery} from './queries.js'; import {parse} from '$lib/js/parseCms'; /** @type {import('./$types').PageLoad} */ export async function load({params}) { const data = await directusFetch(eventQuery, { - language: getLang(params), + language: getLang(getLocale(params)), status: getAllowedStatus(), }); diff --git a/src/routes/[[locale=locale]]/[events=events]/+page.svelte b/src/routes/[[locale=locale]]/[events=events]/+page.svelte index 5e6fac72..b1f96c57 100755 --- a/src/routes/[[locale=locale]]/[events=events]/+page.svelte +++ b/src/routes/[[locale=locale]]/[events=events]/+page.svelte @@ -45,7 +45,7 @@ title: 'Local Chapters', searchable: false, multiple: true, - param: 'correlaidx', + param: 'localChapterNames', }, { title: $t('filter.language').text, @@ -93,7 +93,9 @@
{#if trimmedFutureData} {#each trimmedFutureData as event, i} - rest)(event)} /> + rest)(event)} + /> {/each} {/if} {#if trimmedPastData} {#each trimmedPastData as event} - rest)(event)} /> + rest)(event)} + /> {/each} {/if} import {pageKey} from '$lib/stores/pageKey'; - import {page} from '$app/stores'; - import {genLcHref} from '$lib/js/helpers'; - import {genDate, genTime} from '$lib/js/helpers'; import {t} from '$lib/stores/i18n'; - import {locale} from '$lib/stores/i18n'; import {onMount} from 'svelte'; import Html from '$lib/components/Html.svelte'; import TextContainer from '$lib/components/TextContainer.svelte'; @@ -13,10 +9,8 @@ import Location from '$lib/svg/Location.svelte'; import Headset from '$lib/svg/Headset.svelte'; import SignUp from '$lib/svg/Sign_Up.svelte'; + import Langs from '$lib/components/Langs.svelte'; import Box from '$lib/components/Box.svelte'; - import De from '$lib/svg/DE.svelte'; - import En from '$lib/svg/EN.svelte'; - const iconSize = 22; onMount(() => { $pageKey = 'navbar.events'; @@ -25,7 +19,7 @@ /** @type {import('./$types').PageData} */ export let data; - $: event = data; + $: event = data.event; @@ -35,12 +29,9 @@ {#each event.localChapters as lc, i} - CorrelAidX {lc.localChapters_id.translations[0].city}{#if i < event.localChapters.length - 1}{', '} {/if} {/each}

@@ -53,9 +44,7 @@ > {$t('access.date').text} {genDate(event.date, $locale)}{event.endDate - ? ` - ${genDate(event.endDate, $locale)}` - : ''}{event.date}{event.endDate ? ` - ${event.endDate}` : ''} {#if !event.endDate} @@ -64,11 +53,7 @@ >
diff --git a/src/routes/[[locale=locale]]/[events=events]/calendar.ics/+server.js b/src/routes/[[locale=locale]]/[events=events]/calendar.ics/+server.js index b1638d38..d3694ab0 100644 --- a/src/routes/[[locale=locale]]/[events=events]/calendar.ics/+server.js +++ b/src/routes/[[locale=locale]]/[events=events]/calendar.ics/+server.js @@ -2,9 +2,9 @@ import directusFetch from '$lib/js/directusFetch'; import {PUBLIC_PRERENDER} from '$env/static/public'; import {getAllowedStatus} from '$lib/js/directusFetch.js'; import {createCalendar} from '$lib/js/helpers'; -import {getLang} from '$lib/js/helpers'; +import {getLang, getLocale} from '$lib/js/helpers'; import {icalEventQuery} from './queries.js'; -import {parseEntries} from '$lib/js/parseCms.js'; +import {parse} from '$lib/js/parseCms.js'; let pr; @@ -20,11 +20,11 @@ export async function GET({params}) { const filename = 'calendar.ics'; const data = await directusFetch(icalEventQuery, { - language: getLang(params), + language: getLang(getLocale(params)), status: getAllowedStatus(), }); - const Events = parseEntries(data.Events, 'icalEvents'); + const Events = await parse(data.Events, 'misc', 'ical', params); const calendar = createCalendar(Events, params, ''); diff --git a/src/routes/[[locale=locale]]/[events=events]/calendar.ics/queries.js b/src/routes/[[locale=locale]]/[events=events]/calendar.ics/queries.js index a32d103c..4261a96b 100644 --- a/src/routes/[[locale=locale]]/[events=events]/calendar.ics/queries.js +++ b/src/routes/[[locale=locale]]/[events=events]/calendar.ics/queries.js @@ -1,6 +1,6 @@ export const icalEventQuery = ` query Events { - Events(sort: ["date"], filter: {_and: [{date: {_gte: "$NOW"}},{ local_chapters: { id : { _null: true } } }]}) { + Events(sort: ["date"], filter: {_and: [{date: {_gte: "$NOW"}}]}) { id date start_time @@ -8,13 +8,13 @@ query Events { end_date title teaser - registration_link target_group language type slug tags - + location + online } } `; diff --git a/src/routes/[[locale=locale]]/[using_data=using_data]/[consulting=consulting]/+page.server.js b/src/routes/[[locale=locale]]/[using_data=using_data]/[consulting=consulting]/+page.server.js index 3b9b4452..b5bcb22a 100755 --- a/src/routes/[[locale=locale]]/[using_data=using_data]/[consulting=consulting]/+page.server.js +++ b/src/routes/[[locale=locale]]/[using_data=using_data]/[consulting=consulting]/+page.server.js @@ -1,13 +1,13 @@ import directusFetch from '$lib/js/directusFetch'; -import {getLang} from '$lib/js/helpers'; +import {getLang, getLocale} from '$lib/js/helpers'; import {expertsQuery} from './queries.js'; import {parse} from '$lib/js/parseCms'; /** @type {import('./$types').PageLoad} */ export async function load({params}) { - const data = await directusFetch(expertsQuery, {language: getLang(params)}); + const data = await directusFetch(expertsQuery, { + language: getLang(getLocale(params)), + }); - const experts = parse(data.Experts, 'cards', 'experts'); - - return {experts: experts}; + return {experts: await parse(data.Experts, 'cards', 'experts')}; } diff --git a/src/routes/[[locale=locale]]/[using_data=using_data]/[project_database=project_database]/+page.server.js b/src/routes/[[locale=locale]]/[using_data=using_data]/[project_database=project_database]/+page.server.js index 5ee67a29..171c9a83 100755 --- a/src/routes/[[locale=locale]]/[using_data=using_data]/[project_database=project_database]/+page.server.js +++ b/src/routes/[[locale=locale]]/[using_data=using_data]/[project_database=project_database]/+page.server.js @@ -1,12 +1,12 @@ import {directusFetch, getAllowedStatus} from '$lib/js/directusFetch'; -import {getLang} from '$lib/js/helpers'; +import {getLang, getLocale} from '$lib/js/helpers'; import {projectOverviewQuery} from './queries.js'; import {parse} from '$lib/js/parseCms'; /** @type {import('./$types').PageLoad} */ export async function load({params}) { const data = await directusFetch(projectOverviewQuery, { - language: getLang(params), + language: getLang(getLocale(params)), status: getAllowedStatus(), }); diff --git a/src/routes/[[locale=locale]]/[using_data=using_data]/[project_database=project_database]/+page.svelte b/src/routes/[[locale=locale]]/[using_data=using_data]/[project_database=project_database]/+page.svelte index 7ecb86d3..3e81924a 100755 --- a/src/routes/[[locale=locale]]/[using_data=using_data]/[project_database=project_database]/+page.svelte +++ b/src/routes/[[locale=locale]]/[using_data=using_data]/[project_database=project_database]/+page.svelte @@ -22,13 +22,13 @@ title: 'Local Chapters', searchable: false, multiple: true, - param: 'correlaidx', + param: 'localChapterNames', }, { title: $t('filter.type').text, searchable: false, multiple: true, - param: 'type', + param: 'projectTypes', }, { title: $t('filter.organization_sector').text, @@ -40,7 +40,7 @@ title: $t('filter.data_type').text, searchable: false, multiple: true, - param: 'data', + param: 'dataTypes', }, ]; @@ -61,7 +61,9 @@
{#if trimmedData} {#each trimmedData as project} - + rest)(project)} + /> {/each} {/if} {#if filteredData} diff --git a/src/routes/[[locale=locale]]/[using_data=using_data]/[project_database=project_database]/[slug]/+page.server.js b/src/routes/[[locale=locale]]/[using_data=using_data]/[project_database=project_database]/[slug]/+page.server.js index e1b3b5fe..eb974931 100755 --- a/src/routes/[[locale=locale]]/[using_data=using_data]/[project_database=project_database]/[slug]/+page.server.js +++ b/src/routes/[[locale=locale]]/[using_data=using_data]/[project_database=project_database]/[slug]/+page.server.js @@ -1,15 +1,14 @@ import {directusFetch, getAllowedStatus} from '$lib/js/directusFetch'; -import {getLang} from '$lib/js/helpers'; +import {getLang, getLocale} from '$lib/js/helpers'; import {projectDetailsQuery} from './queries.js'; -import {handleLang} from '$lib/js/helpers'; import {error} from '@sveltejs/kit'; -import {parseProject} from '$lib/js/parseCms'; +import {parse} from '$lib/js/parseCms'; /** @type {import('./$types').PageLoad} */ export async function load({params}) { const data = await directusFetch(projectDetailsQuery, { slug: params.slug, - language: getLang(params), + language: getLang(getLocale(params)), status: getAllowedStatus(), }); @@ -17,14 +16,5 @@ export async function load({params}) { throw error(404); } - const blogPosts = handleLang( - data.Projects[0].Blog_Posts.map((data) => data.Blog_Posts_id).filter( - (data) => data !== null, - ), - params, - ); - - data.Projects[0].Blog_Posts = blogPosts; - - return parseProject(data.Projects[0], params); + return {project: await parse(data.Projects[0], 'single', 'project', params)}; } diff --git a/src/routes/[[locale=locale]]/[using_data=using_data]/[project_database=project_database]/[slug]/+page.svelte b/src/routes/[[locale=locale]]/[using_data=using_data]/[project_database=project_database]/[slug]/+page.svelte index 813488bc..c1ec6bf3 100755 --- a/src/routes/[[locale=locale]]/[using_data=using_data]/[project_database=project_database]/[slug]/+page.svelte +++ b/src/routes/[[locale=locale]]/[using_data=using_data]/[project_database=project_database]/[slug]/+page.svelte @@ -1,9 +1,7 @@ {#if project} - +
{#if project.type || project.data}
@@ -47,7 +45,7 @@ {#each project.localChapters as lc} CorrelAidX {lc}CorrelAidX {lc} {/each}
@@ -57,8 +55,6 @@
@@ -96,12 +92,7 @@

Outputs:

- +
diff --git a/src/routes/[[locale=locale]]/[using_data=using_data]/[project_database=project_database]/[slug]/queries.js b/src/routes/[[locale=locale]]/[using_data=using_data]/[project_database=project_database]/[slug]/queries.js index 4d4d15a3..bba57fad 100755 --- a/src/routes/[[locale=locale]]/[using_data=using_data]/[project_database=project_database]/[slug]/queries.js +++ b/src/routes/[[locale=locale]]/[using_data=using_data]/[project_database=project_database]/[slug]/queries.js @@ -11,8 +11,6 @@ query Project( ) { status is_internal - end_date - end_date_predicted Podcast { soundcloud_link } diff --git a/src/routes/[[locale=locale]]/[volunteering=volunteering]/correlaidx/+page.server.js b/src/routes/[[locale=locale]]/[volunteering=volunteering]/correlaidx/+page.server.js index e8e291c2..40bc5d18 100755 --- a/src/routes/[[locale=locale]]/[volunteering=volunteering]/correlaidx/+page.server.js +++ b/src/routes/[[locale=locale]]/[volunteering=volunteering]/correlaidx/+page.server.js @@ -1,33 +1,27 @@ import {directusFetch, getAllowedStatus} from '$lib/js/directusFetch'; -import {getLang} from '$lib/js/helpers'; +import {getLang, getLocale} from '$lib/js/helpers'; import {localChapterQuery} from './queries.js'; +import {parse} from '$lib/js/parseCms'; /** @type {import('./$types.js').PageServerLoad} */ export async function load({params}) { const data = await directusFetch(localChapterQuery, { - language: getLang(params), + language: getLang(getLocale(params)), status: getAllowedStatus(), }); - const geoJson = { - type: 'FeatureCollection', - features: [], + return { + geoJson: await parse( + data.Local_Chapters, + 'misc', + 'localChaptersMap', + params, + ), + localChapters: await parse( + data.Local_Chapters, + 'cards', + 'localChapters', + params, + ), }; - - const localChapters = data.Local_Chapters; - - for (let i = 0; i < localChapters.length; i++) { - const obj = { - type: 'Feature', - geometry: localChapters[i].location, - properties: { - founded: localChapters[i].founded, - name: `CorrelAidX ${localChapters[i].translations[0].city}`, - short_id: localChapters[i].short_id, - }, - }; - geoJson.features.push(obj); - } - - return {geoJson: geoJson, localChapters: data.Local_Chapters}; } diff --git a/src/routes/[[locale=locale]]/[volunteering=volunteering]/correlaidx/+page.svelte b/src/routes/[[locale=locale]]/[volunteering=volunteering]/correlaidx/+page.svelte index be1e7093..05b9f9cc 100755 --- a/src/routes/[[locale=locale]]/[volunteering=volunteering]/correlaidx/+page.svelte +++ b/src/routes/[[locale=locale]]/[volunteering=volunteering]/correlaidx/+page.svelte @@ -1,6 +1,4 @@
- +
- - {#if lcPage['projects'].length !== 0} + + {#if projects.length !== 0}

@@ -35,13 +40,15 @@

- {#each lcPage['projects'] as project} - + {#each projects as project} + rest)(project)} + /> {/each}
{/if} - {#if lcPage['events'].length !== 0} + {#if events.length !== 0}
@@ -66,24 +73,24 @@ > - {#each lcPage['events'] as event} + {#each events as event} {/each}
{/if} - {#if lcPage['local_admins'].length != 0} + {#if localAdministrators.length != 0}

Team

- {#each lcPage['local_admins'] as person} - + {#each localAdministrators as person} + {/each}
{/if} - {#if lcPage.howToGetInTouch} + {#if iconText}
- +
{/if}
diff --git a/src/routes/[[locale=locale]]/[volunteering=volunteering]/correlaidx/[slug]/calendar.ics/+server.js b/src/routes/[[locale=locale]]/[volunteering=volunteering]/correlaidx/[slug]/calendar.ics/+server.js index 8764ce1d..b298b670 100644 --- a/src/routes/[[locale=locale]]/[volunteering=volunteering]/correlaidx/[slug]/calendar.ics/+server.js +++ b/src/routes/[[locale=locale]]/[volunteering=volunteering]/correlaidx/[slug]/calendar.ics/+server.js @@ -2,9 +2,9 @@ import directusFetch from '$lib/js/directusFetch'; import {PUBLIC_PRERENDER} from '$env/static/public'; import {getAllowedStatus} from '$lib/js/directusFetch.js'; import {createCalendar} from '$lib/js/helpers'; -import {getLang} from '$lib/js/helpers'; +import {getLang, getLocale} from '$lib/js/helpers'; import {icalLcEvents} from './queries.js'; -import {parseEntries} from '$lib/js/parseCms.js'; +import {parse} from '$lib/js/parseCms.js'; let pr; @@ -19,18 +19,17 @@ export const prerender = pr; export async function GET({params}) { const data = await directusFetch(icalLcEvents, { slug: params.slug, - language: getLang(params), + language: getLang(getLocale(params)), status: getAllowedStatus(), }); - const Events = parseEntries(data.Events, 'icalEvents'); + const events = await parse(data.Events, 'misc', 'ical', params); const city = data.Local_Chapters[0].translations[0].city; - const email = data.Local_Chapters[0].lc_email; const filename = `calendar.ics`; - const calendar = createCalendar(Events, params, city, email); + const calendar = createCalendar(events, params, city); return new Response(calendar, { headers: { diff --git a/src/routes/[[locale=locale]]/[volunteering=volunteering]/correlaidx/[slug]/calendar.ics/queries.js b/src/routes/[[locale=locale]]/[volunteering=volunteering]/correlaidx/[slug]/calendar.ics/queries.js index 051cf985..be4e0c78 100644 --- a/src/routes/[[locale=locale]]/[volunteering=volunteering]/correlaidx/[slug]/calendar.ics/queries.js +++ b/src/routes/[[locale=locale]]/[volunteering=volunteering]/correlaidx/[slug]/calendar.ics/queries.js @@ -17,6 +17,8 @@ query icalLcEvents($slug: String, $language: String = "de-DE") { registration_link target_group language + location + online type slug tags diff --git a/src/routes/[[locale=locale]]/blog/+page.server.js b/src/routes/[[locale=locale]]/blog/+page.server.js index a0ece767..65306b8b 100755 --- a/src/routes/[[locale=locale]]/blog/+page.server.js +++ b/src/routes/[[locale=locale]]/blog/+page.server.js @@ -1,18 +1,17 @@ import directusFetch from '$lib/js/directusFetch'; import {getAllowedStatus} from '$lib/js/directusFetch.js'; -import {handleLang} from '$lib/js/helpers'; -import {getLang} from '$lib/js/helpers'; +import {getLang, getLocale} from '$lib/js/helpers'; import {blogQuery} from './queries.js'; import {parse} from '$lib/js/parseCms.js'; /** @type {import('./$types').PageLoad} */ export async function load({params}) { const data = await directusFetch(blogQuery, { - language: getLang(params), + language: getLang(getLocale(params)), status: getAllowedStatus(), }); - const blogPosts = handleLang(data.Blog_Posts, params); - - return {blogPosts: parse(blogPosts, 'cards', 'blogPosts')}; + return { + blogPosts: await parse(data.Blog_Posts, 'cards', 'blogPosts', params), + }; } diff --git a/src/routes/[[locale=locale]]/blog/[slug]/+page.server.js b/src/routes/[[locale=locale]]/blog/[slug]/+page.server.js index d4694989..a1a50757 100755 --- a/src/routes/[[locale=locale]]/blog/[slug]/+page.server.js +++ b/src/routes/[[locale=locale]]/blog/[slug]/+page.server.js @@ -1,15 +1,15 @@ import directusFetch from '$lib/js/directusFetch'; import {getAllowedStatus} from '$lib/js/directusFetch.js'; -import {getLang} from '$lib/js/helpers'; +import {getLang, getLocale} from '$lib/js/helpers'; import {blogPostQuery} from './queries.js'; import {error} from '@sveltejs/kit'; -import {parseBlogPostPage} from '$lib/js/parseCms'; +import {parse} from '$lib/js/parseCms'; /** @type {import('./$types').PageLoad} */ export async function load({params}) { const vars = { slug: params.slug, - language: getLang(params), + language: getLang(getLocale(params)), status: getAllowedStatus(), }; const data = await directusFetch(blogPostQuery, vars); @@ -18,5 +18,7 @@ export async function load({params}) { throw error(404); } - return parseBlogPostPage(data); + return { + blogPost: await parse(data.Blog_Posts[0], 'single', 'blogPost', params), + }; } diff --git a/src/routes/[[locale=locale]]/blog/[slug]/+page.svelte b/src/routes/[[locale=locale]]/blog/[slug]/+page.svelte index 58a9a3cc..340ce92d 100755 --- a/src/routes/[[locale=locale]]/blog/[slug]/+page.svelte +++ b/src/routes/[[locale=locale]]/blog/[slug]/+page.svelte @@ -2,59 +2,37 @@ import Html from '$lib/components/Html.svelte'; import {onMount} from 'svelte'; import {pageKey} from '$lib/stores/pageKey'; - import {locale} from '$lib/stores/i18n'; import TextContainer from '$lib/components/TextContainer.svelte'; import Person from '$lib/components/Person.svelte'; - import _ from 'lodash'; - import {localeToLang, genDate} from '$lib/js/helpers'; onMount(() => { $pageKey = 'navbar.blog'; }); - function getLanguageContent(contentAllLanguages, locale) { - let langContent = _.find( - contentAllLanguages, - (el) => el.languages_code.code === localeToLang(locale), - ); - - if (typeof langContent === 'undefined') { - langContent = contentAllLanguages[0]; - } - return langContent; - } - /** @type {import('./$types').PageData} */ export let data; - $: blogPostPage = data; - $: langContent = getLanguageContent( - blogPostPage.contentAllLanguages, - $locale, - ); - $: procDate = genDate(blogPostPage.pubDate, $locale, true); + $: blogPost = data.blogPost;
- {#if procDate} -

- {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} +

- +
-{#if blogPostPage.contentCreators.length != 0} +{#if blogPost.contentCreators.length != 0}
- {#each blogPostPage.contentCreators as person} + {#each blogPost.contentCreators as person} {/each}
diff --git a/src/routes/[[locale=locale]]/blog/[slug]/queries.js b/src/routes/[[locale=locale]]/blog/[slug]/queries.js index c1e3da35..f1eb87b7 100755 --- a/src/routes/[[locale=locale]]/blog/[slug]/queries.js +++ b/src/routes/[[locale=locale]]/blog/[slug]/queries.js @@ -29,6 +29,7 @@ query BlogPostQuery( ) { pronouns } + email website twitter linkedin diff --git a/src/routes/[[locale=locale]]/jobs/+page.server.js b/src/routes/[[locale=locale]]/jobs/+page.server.js index 0ce153af..32245885 100755 --- a/src/routes/[[locale=locale]]/jobs/+page.server.js +++ b/src/routes/[[locale=locale]]/jobs/+page.server.js @@ -1,8 +1,7 @@ import directusFetch from '$lib/js/directusFetch'; import {getAllowedStatus} from '$lib/js/directusFetch.js'; import {jobsOverviewQuery} from './queries.js'; -import {parseEntries} from '$lib/js/parseCms.js'; -import {handleLang} from '$lib/js/helpers'; +import {parse} from '$lib/js/parseCms.js'; /** @type {import('./$types').PageLoad} */ export async function load({params}) { @@ -10,7 +9,5 @@ export async function load({params}) { status: getAllowedStatus(), }); - const jobs = handleLang(data.Jobs, params); - - return {jobs: parseEntries(jobs, 'jobs')}; + return {jobs: await parse(data.Jobs, 'cards', 'jobs', params)}; } diff --git a/src/routes/[[locale=locale]]/jobs/+page.svelte b/src/routes/[[locale=locale]]/jobs/+page.svelte index dcc8d9c6..a433a7ad 100755 --- a/src/routes/[[locale=locale]]/jobs/+page.svelte +++ b/src/routes/[[locale=locale]]/jobs/+page.svelte @@ -36,7 +36,7 @@ {#if jobs.future.length !== 0} {#each jobs.future as job} - + rest)(job)} /> {/each} {:else}

@@ -49,7 +49,7 @@ {#if jobs.past.length !== 0} {#each jobs.past as job} - + rest)(job)} /> {/each} {:else}

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 @@