Skip to content

Commit

Permalink
Update a few things
Browse files Browse the repository at this point in the history
  • Loading branch information
@ferdinandsalis
ferdinandsalis committed Oct 15, 2024
1 parent da58f2a commit 28163b5
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 47 deletions.
16 changes: 8 additions & 8 deletions app/data/dates.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,24 +66,24 @@ export const events: SchoolEvent[] = [
links: [],
},
{
title: 'Infoabend',
startDate: '2024-11-21',
startTime: null,
title: 'TikTok, Vapen, Liken & Zocken',
startDate: '2024-11-19',
startTime: '19:00',
endDate: null,
endTime: null,
description:
'Interessierten Eltern stellen wir das pädagogische Konzept und das Programm der Walz vor, die Aufnahmevoraussetzungen und der Ablauf des Aufnahmetags wird erklärt und die Schulbeiträge werden erläutert. Natürlich bleibt auch Zeit für Fragen und Gespräche. Interessierte Jugendliche können selbstverständlich mitkommen.',
'Eine Podiumsdiskussion mit Expert:innen zu Suchtverhalten im Jugendalter.',
type: 'internal',
links: [],
},
{
title: 'TikTok, Vapen, Liken & Zocken',
startDate: '2024-11-19',
startTime: '19:00',
title: 'Infoabend',
startDate: '2024-11-21',
startTime: null,
endDate: null,
endTime: null,
description:
'Eine Podiumsdiskussion mit Expert:innen zu Suchtverhalten im Jugendalter.',
'Interessierten Eltern stellen wir das pädagogische Konzept und das Programm der Walz vor, die Aufnahmevoraussetzungen und der Ablauf des Aufnahmetags wird erklärt und die Schulbeiträge werden erläutert. Natürlich bleibt auch Zeit für Fragen und Gespräche. Interessierte Jugendliche können selbstverständlich mitkommen.',
type: 'internal',
links: [],
},
Expand Down
4 changes: 2 additions & 2 deletions app/routes/_index/route.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -315,12 +315,12 @@ export default function Home() {
className="space-y-8 rounded-md bg-muted/30 py-8"
opts={{ loop: true }}
>
<CarouselContent className="py-2">
<CarouselContent className="-ml-8 px-8 py-2 lg:-ml-20">
{testimonials.map((testimonial, idx) => {
return (
<CarouselItem
key={idx}
className="flex items-start justify-center px-8 md:items-center md:px-8 lg:px-20"
className="flex items-start justify-center pl-8 md:items-center lg:pl-20"
>
<TestimonialCard idx={idx} {...testimonial} />
</CarouselItem>
Expand Down
3 changes: 2 additions & 1 deletion app/routes/aktuelles/route.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import {
events as datesData,
} from '#app/data/dates.ts'
import { urlFor } from '#app/sanity/instance.ts'
import { alphabetMap } from '#app/sanity/schema/year.ts'
import year, { alphabetMap } from '#app/sanity/schema/year.ts'

Check warning on line 30 in app/routes/aktuelles/route.tsx

View workflow job for this annotation

GitHub Actions / ⬣ EsLint 

'year' is defined but never used. Allowed unused vars must match /^ignored/u
import { cn } from '#app/utils/misc.tsx'
import { calculateCurrentYear } from '#app/utils/years.js'
import {
Expand Down Expand Up @@ -348,6 +348,7 @@ function YearCard({ letter, startedAt, mentor, photos, plan }: Year) {
<div className="mt-4 flex items-center gap-1">
<a
href={plan}
download={`${letter}-${new Date().getFullYear()}.pdf`}
className="text-body-xs text-muted-foreground underline underline-offset-2"
>
Jahresplan
Expand Down
51 changes: 17 additions & 34 deletions app/routes/curriculum/route.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,9 @@ export default function Curriculum() {
Projekte
</h2>
<ul className="list-inside list-disc" aria-label="Projekte">
<li>Landschaftspflege</li>
<li>Landwirtschaft</li>
<li>Handwerk</li>
<li>Schattentheater</li>
<li>Zeichnen</li>
<li>Tanz und Akrobatik</li>
{data.years[0].projects?.map(project => {
return <li key={project._id}>{project.name}</li>
})}
</ul>
</div>
<div className="space-y-2">
Expand Down Expand Up @@ -94,13 +91,9 @@ export default function Curriculum() {
Projekte
</h2>
<ul className="list-inside list-disc" aria-label="Projekte">
<li>Kamp</li>
<li>Holzschlag</li>
<li>Irland</li>
<li>Theaterwerkstatt</li>
<li>Kühtai</li>
<li>Steinhauen</li>
<li>Sprachpraktikum 2. Fremdsprache</li>
{data.years[1].projects?.map(project => {
return <li key={project._id}>{project.name}</li>
})}
</ul>
</div>
<div className="space-y-2">
Expand Down Expand Up @@ -143,15 +136,9 @@ export default function Curriculum() {
Projekte
</h2>
<ul className="list-inside list-disc" aria-label="Projekte">
<li>Palfau</li>
<li>Theaterwerkstatt</li>
<li>Shakespeare</li>
<li>Sprachpraktikum 2. Fremdsprache</li>
<li>Medienarbeit</li>
<li>Junior Company</li>
<li>Potenzialanalyse</li>
<li>Mann/Frau Projekt</li>
<li>Sozialpraktikum</li>
{data.years[2].projects?.map(project => {
return <li key={project._id}>{project.name}</li>
})}
</ul>
</div>
<div className="space-y-2">
Expand Down Expand Up @@ -194,12 +181,9 @@ export default function Curriculum() {
Projekte
</h2>
<ul className="list-inside list-disc" aria-label="Projekte">
<li>Autonomie</li>
<li>Theater</li>
<li>Sozialpraktikum</li>
<li>Kunst Toskana</li>
<li>Sprachpraktikum 2.Fremdsprache</li>
<li>Junior Company</li>
{data.years[3].projects?.map(project => {
return <li key={project._id}>{project.name}</li>
})}
</ul>
</div>
<div className="space-y-2">
Expand Down Expand Up @@ -242,10 +226,9 @@ export default function Curriculum() {
Projekte
</h2>
<ul className="list-inside list-disc" aria-label="Projekte">
<li>Kunst in Paris</li>
<li>Literaturwoche</li>
<li>Sprachpraktikum Englisch</li>
<li>Abschlussreise</li>
{data.years[4].projects?.map(project => {
return <li key={project._id}>{project.name}</li>
})}
</ul>
</div>
<div className="space-y-2">
Expand Down Expand Up @@ -285,7 +268,7 @@ function YearCarousel({ photos }: { photos: any[] }) {
duration: 20,
}}
>
<div className="-mx-4 w-full rounded bg-muted/30 px-4 py-4">
<div className="rounded bg-muted/30 px-4 py-4 md:-mx-4">
<CarouselContent className="-ml-2">
{photos?.map(photo =>
photo?.asset ? (
Expand All @@ -299,7 +282,7 @@ function YearCarousel({ photos }: { photos: any[] }) {
.width(512)
.format('webp')
.url()}
className="h-full rounded object-cover shadow"
className="rounded object-cover shadow"
/>
</CarouselItem>
) : null,
Expand Down
1 change: 1 addition & 0 deletions app/routes/jahrgaenge+/$year.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ export default function Year() {
<a
href={year.plan}
className="text-muted-foreground underline underline-offset-2"
download={`${year.letter}-${year.plan}.pdf`}
>
Jahresplan herunterladen
</a>
Expand Down
4 changes: 2 additions & 2 deletions app/routes/ueber-uns+/_index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ export default function UeberUns() {
<h1 className="font-condensed text-h2 font-bold text-primary">
Philosophie
</h1>
<div className="grid gap-8 md:grid-cols-2 lg:grid-cols-3">
<div className="grid gap-8 md:grid-cols-2 xl:grid-cols-3">
{pillars.map(pillar => (
<LinkPhotoCard
key={pillar.title}
Expand Down Expand Up @@ -426,7 +426,7 @@ function StaffRoll({ children }: { children: React.ReactNode }) {
</ScrollArea.Viewport>
<ScrollArea.Scrollbar
orientation="horizontal"
className="sm:rounded-md-full -mx-4 flex h-[12px] items-center bg-stone-200/20 px-[3px] hover:bg-card"
className="-mx-4 flex h-[12px] items-center rounded-b-md bg-muted/20 px-[3px] shadow-inner hover:bg-muted-foreground/10"
>
<ScrollArea.Thumb className="relative !h-[8px] cursor-grab rounded-full bg-primary/50 hover:bg-primary" />
</ScrollArea.Scrollbar>
Expand Down

0 comments on commit 28163b5

Please sign in to comment.