From f880486fea0f66152978eb700229f7420d06da0d Mon Sep 17 00:00:00 2001 From: florian Date: Fri, 24 Mar 2023 20:22:03 +0100 Subject: [PATCH 1/5] adds partner organizations to map and list --- src/lib/ChapterList.svelte | 14 +++++++++++++- src/lib/ChapterMap.svelte | 12 +++++++++++- src/lib/fetch.ts | 1 + src/lib/types.ts | 3 ++- src/routes/+layout.ts | 5 ++++- src/signup-form/de/smallTexts.yml | 1 + 6 files changed, 32 insertions(+), 4 deletions(-) diff --git a/src/lib/ChapterList.svelte b/src/lib/ChapterList.svelte index 8f4d42f5..4fb52da3 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.acceptsSignups && !ch.partnerAssociation) + const partnerChapters = chapters.filter((ch) => ch.partnerAssociation)

@@ -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..8af65988 100644 --- a/src/lib/fetch.ts +++ b/src/lib/fetch.ts @@ -68,6 +68,7 @@ const chapters_query = `{ } baseId acceptsSignups + partnerAssociation token } } diff --git a/src/lib/types.ts b/src/lib/types.ts index 9ef55688..d26cb50f 100644 --- a/src/lib/types.ts +++ b/src/lib/types.ts @@ -7,6 +7,7 @@ export type Chapter = { } baseId: string acceptsSignups: boolean + partnerAssociation: boolean token: string } @@ -62,7 +63,7 @@ export const BlogTags = [ `Auszeichnung`, ] as const // use const assertion to turn BlogTags into readonly tuple -export type BlogTag = (typeof BlogTags)[number] +export type BlogTag = typeof BlogTags[number] export type Post = Page & { author: Author diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts index 8109b6b5..b85ea6bd 100644 --- a/src/routes/+layout.ts +++ b/src/routes/+layout.ts @@ -7,13 +7,16 @@ export const load: LayoutLoad = async () => { const nav = await fetch_yaml(`Nav`) const footer = await fetch_yaml(`Footer`) const social = await fetch_yaml(`Social`) - const chapters = await fetch_chapters() + var chapters = await fetch_chapters() const smallTexts = await fetch_yaml(`smallTexts`) microcopy.set(smallTexts) // ensure the non-chapter link spans all chapter subnav columns nav.find((el: NavLink) => el.url === `/standorte`).subNav[0].spanCols = true + // filter out partner organizations from the menu + chapters = chapters.filter((chap) => !chap.partnerAssociation) + // create { title, url } array containing all chapters const chapterLinks = chapters.map((chapter: Chapter) => { const { title, slug, acceptsSignups } = chapter 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' From 244d6f22620098702a3dabfe5cfb04993b2c8ee7 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 24 Mar 2023 19:26:36 +0000 Subject: [PATCH 2/5] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/lib/ChapterList.svelte | 4 +++- src/lib/ChapterMap.svelte | 5 ++++- src/lib/types.ts | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/lib/ChapterList.svelte b/src/lib/ChapterList.svelte index 4fb52da3..e9b0b6bc 100644 --- a/src/lib/ChapterList.svelte +++ b/src/lib/ChapterList.svelte @@ -6,7 +6,9 @@ export let chapters: Chapter[] const openChapters = chapters.filter((ch) => ch.acceptsSignups) - const startingChapters = chapters.filter((ch) => !ch.acceptsSignups && !ch.partnerAssociation) + const startingChapters = chapters.filter( + (ch) => !ch.acceptsSignups && !ch.partnerAssociation + ) const partnerChapters = chapters.filter((ch) => ch.partnerAssociation) diff --git a/src/lib/ChapterMap.svelte b/src/lib/ChapterMap.svelte index db9c8200..81d37810 100644 --- a/src/lib/ChapterMap.svelte +++ b/src/lib/ChapterMap.svelte @@ -19,7 +19,10 @@ ({ ...chap.coords, // contains { lng, lat } - classes: [`chapter`, chap.acceptsSignups ? `active` : chap.partnerAssociation? 'partner': `starting`], + classes: [ + `chapter`, + chap.acceptsSignups ? `active` : chap.partnerAssociation ? 'partner' : `starting`, + ], title: chap.token, url: chap.slug, }))} diff --git a/src/lib/types.ts b/src/lib/types.ts index d26cb50f..ab0de409 100644 --- a/src/lib/types.ts +++ b/src/lib/types.ts @@ -63,7 +63,7 @@ export const BlogTags = [ `Auszeichnung`, ] as const // use const assertion to turn BlogTags into readonly tuple -export type BlogTag = typeof BlogTags[number] +export type BlogTag = (typeof BlogTags)[number] export type Post = Page & { author: Author From 68711e983d7accbce887c2090a491245199b6b42 Mon Sep 17 00:00:00 2001 From: Janosh Riebesell Date: Fri, 24 Mar 2023 13:23:44 -0700 Subject: [PATCH 3/5] refactor src/routes/+layout.ts --- src/app.css | 2 +- src/lib/ChapterMap.svelte | 2 +- src/routes/+layout.ts | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) 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/ChapterMap.svelte b/src/lib/ChapterMap.svelte index 81d37810..a864e58d 100644 --- a/src/lib/ChapterMap.svelte +++ b/src/lib/ChapterMap.svelte @@ -21,7 +21,7 @@ ...chap.coords, // contains { lng, lat } classes: [ `chapter`, - chap.acceptsSignups ? `active` : chap.partnerAssociation ? 'partner' : `starting`, + chap.acceptsSignups ? `active` : chap.partnerAssociation ? `partner` : `starting`, ], title: chap.token, url: chap.slug, diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts index b85ea6bd..a2147e86 100644 --- a/src/routes/+layout.ts +++ b/src/routes/+layout.ts @@ -7,16 +7,16 @@ export const load: LayoutLoad = async () => { const nav = await fetch_yaml(`Nav`) const footer = await fetch_yaml(`Footer`) const social = await fetch_yaml(`Social`) - var chapters = await fetch_chapters() + // don't show partner orgs in nav + const chapters = (await fetch_chapters()).filter( + (chap) => !chap.partnerAssociation + ) const smallTexts = await fetch_yaml(`smallTexts`) microcopy.set(smallTexts) // ensure the non-chapter link spans all chapter subnav columns nav.find((el: NavLink) => el.url === `/standorte`).subNav[0].spanCols = true - // filter out partner organizations from the menu - chapters = chapters.filter((chap) => !chap.partnerAssociation) - // create { title, url } array containing all chapters const chapterLinks = chapters.map((chapter: Chapter) => { const { title, slug, acceptsSignups } = chapter From 8caa1ed5b8514c1f69f3a704fd1e0494c2987c74 Mon Sep 17 00:00:00 2001 From: florian Date: Wed, 7 Jun 2023 23:48:14 +0200 Subject: [PATCH 4/5] uses single select status instead of boolean values --- src/lib/ChapterList.svelte | 6 ++---- src/lib/ChapterMap.svelte | 2 +- src/lib/fetch.ts | 2 +- src/lib/types.ts | 2 +- src/routes/+layout.ts | 2 +- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/lib/ChapterList.svelte b/src/lib/ChapterList.svelte index e9b0b6bc..9a3f27b2 100644 --- a/src/lib/ChapterList.svelte +++ b/src/lib/ChapterList.svelte @@ -6,10 +6,8 @@ export let chapters: Chapter[] const openChapters = chapters.filter((ch) => ch.acceptsSignups) - const startingChapters = chapters.filter( - (ch) => !ch.acceptsSignups && !ch.partnerAssociation - ) - const partnerChapters = chapters.filter((ch) => ch.partnerAssociation) + const startingChapters = chapters.filter((ch) => ch.status == 'starting') + const partnerChapters = chapters.filter((ch) => ch.status == 'partner')

diff --git a/src/lib/ChapterMap.svelte b/src/lib/ChapterMap.svelte index a864e58d..b81fcee7 100644 --- a/src/lib/ChapterMap.svelte +++ b/src/lib/ChapterMap.svelte @@ -21,7 +21,7 @@ ...chap.coords, // contains { lng, lat } classes: [ `chapter`, - chap.acceptsSignups ? `active` : chap.partnerAssociation ? `partner` : `starting`, + chap.status, ], title: chap.token, url: chap.slug, diff --git a/src/lib/fetch.ts b/src/lib/fetch.ts index 8af65988..2878d001 100644 --- a/src/lib/fetch.ts +++ b/src/lib/fetch.ts @@ -68,7 +68,7 @@ const chapters_query = `{ } baseId acceptsSignups - partnerAssociation + status token } } diff --git a/src/lib/types.ts b/src/lib/types.ts index ab0de409..dcb1e186 100644 --- a/src/lib/types.ts +++ b/src/lib/types.ts @@ -7,7 +7,7 @@ export type Chapter = { } baseId: string acceptsSignups: boolean - partnerAssociation: boolean + status: 'active' | 'starting' | 'partner' | null token: string } diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts index 8e5dbd47..20c87690 100644 --- a/src/routes/+layout.ts +++ b/src/routes/+layout.ts @@ -8,7 +8,7 @@ export const load = async () => { const social = await fetch_yaml(`Social`) // don't show partner orgs in nav const chapters = (await fetch_chapters()).filter( - (chap) => !chap.partnerAssociation + (chap) => chap.status != 'partner' ) const smallTexts = await fetch_yaml(`smallTexts`) microcopy.set(smallTexts) From 29af13467b56828692265913c9e9203810f4238d Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 7 Jun 2023 21:48:40 +0000 Subject: [PATCH 5/5] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/lib/ChapterList.svelte | 4 ++-- src/lib/ChapterMap.svelte | 5 +---- src/routes/+layout.ts | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/lib/ChapterList.svelte b/src/lib/ChapterList.svelte index 9a3f27b2..5cb498e1 100644 --- a/src/lib/ChapterList.svelte +++ b/src/lib/ChapterList.svelte @@ -6,8 +6,8 @@ export let chapters: Chapter[] const openChapters = chapters.filter((ch) => ch.acceptsSignups) - const startingChapters = chapters.filter((ch) => ch.status == 'starting') - const partnerChapters = chapters.filter((ch) => ch.status == 'partner') + const startingChapters = chapters.filter((ch) => ch.status == `starting`) + const partnerChapters = chapters.filter((ch) => ch.status == `partner`)

diff --git a/src/lib/ChapterMap.svelte b/src/lib/ChapterMap.svelte index b81fcee7..08fa83fd 100644 --- a/src/lib/ChapterMap.svelte +++ b/src/lib/ChapterMap.svelte @@ -19,10 +19,7 @@ ({ ...chap.coords, // contains { lng, lat } - classes: [ - `chapter`, - chap.status, - ], + classes: [`chapter`, chap.status], title: chap.token, url: chap.slug, }))} diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts index 20c87690..76d75e7c 100644 --- a/src/routes/+layout.ts +++ b/src/routes/+layout.ts @@ -8,7 +8,7 @@ export const load = async () => { const social = await fetch_yaml(`Social`) // don't show partner orgs in nav const chapters = (await fetch_chapters()).filter( - (chap) => chap.status != 'partner' + (chap) => chap.status != `partner` ) const smallTexts = await fetch_yaml(`smallTexts`) microcopy.set(smallTexts)