-
Notifications
You must be signed in to change notification settings - Fork 3
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
deactivates the pupil signup for selected chapters #98
Draft
kleinicke
wants to merge
15
commits into
main
Choose a base branch
from
feature/deactivate_pupils
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
288ba09
deactivates the pupil signup for selected chapters
kleinicke f880486
adds partner organizations to map and list
kleinicke 8b82776
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 244d6f2
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 68711e9
refactor src/routes/+layout.ts
janosh c538710
Merge branch 'main' into feature/external_orgs
kleinicke 8caa1ed
uses single select status instead of boolean values
kleinicke 29af134
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 2731f79
adds minor visualization improvements using the new chapter status
kleinicke 81a66e0
Merge branch 'main' into feature/deactivate_pupils
kleinicke 4e398d3
Merge branch 'feature/external_orgs' into feature/deactivate_pupils
kleinicke ba0fed0
Merge branch 'main' into feature/deactivate_pupils
kleinicke 7e383c7
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 5c4f712
added option for signups at chapter view. These are used for visualiz…
kleinicke ae997a3
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -68,7 +68,9 @@ const chapters_query = `{ | |
} | ||
baseId | ||
acceptsSignups | ||
deactivatePupils | ||
status | ||
signup | ||
token | ||
} | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,17 @@ | ||
import { fetch_page } from '$lib/fetch' | ||
import { error } from '@sveltejs/kit' | ||
import { fetch_chapters } from '$lib/fetch' | ||
|
||
export const load = async ({ params }) => { | ||
const { slug } = params | ||
|
||
const page = await fetch_page(`standorte/${slug}`) | ||
|
||
const chapters = await fetch_chapters() | ||
|
||
const selectedChapter = chapters.find((ch) => ch.slug == `/standorte/${slug}`) | ||
|
||
if (!page) throw error(404) | ||
|
||
return { page, slug } | ||
return { page, slug, selectedChapter } | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,93 @@ | ||
comment: This yaml is both on github and on contentful for versioning and checking of correctness. Only the version on contentful is actually used! | ||
|
||
country: at | ||
|
||
indexPage: | ||
title: Studenten bilden Schüler | ||
theme: Kostenlose Nachhilfe von ehrenamtlichen Studierenden für finanziell benachteiligte Kinder | ||
chooseLocation: 'Wähle deinen <a sveltekit:prefetch href="/standorte"><strong>Standort</strong></a> auf der Karte!' | ||
|
||
register: | ||
'Oder melde dich direkt <a sveltekit:prefetch href="/signup-student"> | ||
<strong>bei uns an.</strong> | ||
</a>' | ||
boxes: | ||
locationsName: Standorte | ||
studentsName: Studierende | ||
studentsNumber: 3 | ||
pupilsName: Schüler:innen | ||
pupilsNumber: 5 | ||
scholarshipName: Gründung | ||
scholarshipNumber: 2023 | ||
organizationMemberName: Vereinsmitglieder | ||
organizationMemberNumber: 10 | ||
|
||
footer: | ||
name: 'Studenten bilden Schüler e.V.' | ||
siteInfos: 'Diese Seite ist | ||
<a href="https://github.com/sbsev/svelte-site"> | ||
<OpenSource | ||
height="2.5ex" | ||
style="vertical-align: bottom; padding-right: 3pt;" | ||
/>open source | ||
</a> | ||
und verwendet keine | ||
<a href="https://de.wikipedia.org/wiki/HTTP-Cookie"> | ||
use | ||
<Cookie height="2.2ex" style="vertical-align: middle;" /> | ||
cookies. | ||
</a>' | ||
site: 'Diese Seite ist' | ||
uses: 'und verwendet keine' | ||
|
||
map: | ||
location: | ||
lng: 13.55 | ||
lat: 47.71 | ||
zoom: 6.00 | ||
minZoom: 4 | ||
maxZoom: 10 | ||
text: | ||
active: 'aktiver Standort' | ||
inSetup: 'in Gründung' | ||
partner: 'Partner' | ||
|
||
chapterList: | ||
locations: 'Unsere Standorte' | ||
inSetup: 'Standorte in Gründung' | ||
partner: 'Partner Standorte' | ||
|
||
location: | ||
register: 'Anmeldungen' | ||
joinStudent: 'Willst du bei uns mitmachen?' | ||
registerStudent: 'Als Student:in anmelden' | ||
linkStudentInfo: '/mitmachen/nachhilfelehrer' | ||
infoStudentButton: 'Infos für Studierende' | ||
joinPupil: 'Suchst du Nachhilfe?' | ||
registerPupil: 'Als Schüler:in anmelden' | ||
linkPupilInfo: '/mitmachen/schueler' | ||
infoPupilButton: 'Infos für Schüler:innen' | ||
locationManagement: 'Interesse an Standortleitung?' | ||
mailTo: 'mailto:info.{slug}@studenten-bilden-schueler.de?subject=Interesse an Standortleitung in {page.title}' | ||
writeMailButton: 'Schreib uns' | ||
linkLeadingInfo: '/mitmachen/standortleiter' | ||
infoLeadingButton: 'Infos für Standortleitende' | ||
contact: 'Kontakt' | ||
questions: 'Noch Fragen? Schreib uns eine Mail!' | ||
url: 'studenten-bilden-schueler.de' | ||
student: 'studenten' | ||
forStudents: 'für Studierende' | ||
pupil: 'schueler' | ||
info: 'info' | ||
forPartner: 'für Soziale Einrichtungen und Nachhilfeanfragen' | ||
generalRequests: 'für Allgemeine Anfragen' | ||
|
||
basepage: | ||
last: 'Zuletzt bearbeitet:' | ||
feedback: 'Feedback zu dieser Seite?' | ||
email: 'it@studenten-bilden-schueler.de?subject=Feedback zu Seite:' | ||
|
||
meta: | ||
name: 'Studenten bilden Schüler e.V.' | ||
description: 'Ehrenamtliche Nachhilfe von Studierenden für Schüler:innen in deutschlandweit über 50 Unistädten.' | ||
url: studenten-bilden-schueler.de |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is maybe not the most future-proof interface for managing signup state of chapters.
How about we use
acceptsSignups: Record<'students' | 'pupils', boolean> = {students: true, pupils: false}
?