diff --git a/src/routes/council/+page.server.ts b/src/routes/council/+page.server.ts index ed402f4..ff6497a 100644 --- a/src/routes/council/+page.server.ts +++ b/src/routes/council/+page.server.ts @@ -4,25 +4,26 @@ import { getFromCMS } from '$lib/utils.js'; // Note: council member image has height of 200px for // CouncilCard: image is `size-32` ~ 128px // CouncilCardPopUp: image is `size-42` ~ 168px -const councilQuery = `*[_type == "members"]{ - name, - email, - position, - positionDescription, - "image": image.asset->url+"?h=300&fm=webp", - yearProgram +const councilQuery = `{ + "members": *[_type == "members"]{ + name, + email, + position, + positionDescription, + "image": image.asset->url+"?h=300&fm=webp", + yearProgram + }, + "councilGoofyPic": *[_type == "homepage"]{ + "url": councilGoofyPic.asset->url+"?h=1200&fm=webp" + }[0] }`; -const councilGoofyPicQuery = `*[_type == "homepage"]{ - "url": councilGoofyPic.asset->url+"?h=1200&fm=webp" -}[0]`; - export const load = async ({ url }) => { - let councilMembers: CouncilMember[] = await getFromCMS(councilQuery); + const { members, councilGoofyPic }: { members: CouncilMember[], councilGoofyPic: { url: string } } = await getFromCMS(councilQuery); return { - members: councilMembers, - councilGoofyPic: await getFromCMS(councilGoofyPicQuery), + members: members, + councilGoofyPic, canonical: url.href }; };