diff --git a/src/app.css b/src/app.css index 37371dfc..406273b8 100644 --- a/src/app.css +++ b/src/app.css @@ -34,7 +34,7 @@ body { font-family: -apple-system, BlinkMacSystemFont, Segoe UI, sans-serif; line-height: 1.5; /* https://modern-fluid-typography.vercel.app */ - font-size: clamp(1rem, 0.5vw + 1rem, 1.4rem); + font-size: clamp(1rem, 0.5vw + 1rem, 1.2rem); transition: 0.3s; background: var(--body-bg); color: var(--text-color); diff --git a/src/lib/ChapterList.svelte b/src/lib/ChapterList.svelte index 8f4d42f5..5cb498e1 100644 --- a/src/lib/ChapterList.svelte +++ b/src/lib/ChapterList.svelte @@ -6,7 +6,8 @@ export let chapters: Chapter[] const openChapters = chapters.filter((ch) => ch.acceptsSignups) - const startingChapters = chapters.filter((ch) => !ch.acceptsSignups) + const startingChapters = chapters.filter((ch) => ch.status == `starting`) + const partnerChapters = chapters.filter((ch) => ch.status == `partner`)

@@ -29,6 +30,17 @@ {/each} {/if} +{#if partnerChapters.length > 2} +

+ + {$microcopy?.chapterList?.partner} +

+
    + {#each partnerChapters as { title, slug }} +
  1. {title}
  2. + {/each} +
+{/if} diff --git a/src/lib/fetch.ts b/src/lib/fetch.ts index 007c39a5..2878d001 100644 --- a/src/lib/fetch.ts +++ b/src/lib/fetch.ts @@ -68,6 +68,7 @@ const chapters_query = `{ } baseId acceptsSignups + status token } } diff --git a/src/lib/types.ts b/src/lib/types.ts index 9ef55688..dcb1e186 100644 --- a/src/lib/types.ts +++ b/src/lib/types.ts @@ -7,6 +7,7 @@ export type Chapter = { } baseId: string acceptsSignups: boolean + status: 'active' | 'starting' | 'partner' | null token: string } diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts index cf9e1a19..76d75e7c 100644 --- a/src/routes/+layout.ts +++ b/src/routes/+layout.ts @@ -6,7 +6,10 @@ export const load = async () => { const nav = await fetch_yaml(`Nav`) const footer = await fetch_yaml(`Footer`) const social = await fetch_yaml(`Social`) - const chapters = await fetch_chapters() + // don't show partner orgs in nav + const chapters = (await fetch_chapters()).filter( + (chap) => chap.status != `partner` + ) const smallTexts = await fetch_yaml(`smallTexts`) microcopy.set(smallTexts) diff --git a/src/signup-form/de/smallTexts.yml b/src/signup-form/de/smallTexts.yml index 4969c41d..a12e78e3 100644 --- a/src/signup-form/de/smallTexts.yml +++ b/src/signup-form/de/smallTexts.yml @@ -46,6 +46,7 @@ location: linkStudentInfo: '/mitmachen/nachhilfelehrer' infoStudentButton: 'Infos für Studierende' joinPupil: 'Suchst du Nachhilfe?' + declinePupil: 'Leider ist die Warteliste voll' registerPupil: 'Als Schüler:in anmelden' linkPupilInfo: '/mitmachen/schueler' infoPupilButton: 'Infos für Schüler:innen'