Skip to content

Commit

Permalink
Update dates
Browse files Browse the repository at this point in the history
  • Loading branch information
ferdinandsalis committed Nov 22, 2024
1 parent 68f546a commit 6fd09ea
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 15 deletions.
7 changes: 4 additions & 3 deletions app/data/dates.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export const events: SchoolEvent[] = [
{
title: 'Infoabend',
startDate: '2024-11-21',
startTime: null,
startTime: '19:00',
endDate: null,
endTime: null,
description:
Expand All @@ -102,10 +102,11 @@ export const events: SchoolEvent[] = [
{
title: 'Schattentheater',
startDate: '2024-12-18',
startTime: null,
startTime: '18:00',
endDate: null,
endTime: null,
description: null,
description:
'Menschen-Schattentheater vor und hinter der Leinwand, in seiner Schlichtheit magisch und zauberhaft - gleich einem riesigen, lebendig gewordenen Bilderbuch aus Scherenschnitten. Der Jahrgang Gamma inszeniert “Die Schneekönigin” : Wenn nach einer kalten Winternacht Eisblumen die Fenster schmücken, war die Schneekönigin unterwegs - erzählt die Großmutter Gerda und Kai. Da wissen die beiden Freunde noch nicht, dass die Schneekönigin ihr Leben schon bald verändern wird. Sie entführt Kai in ihr Schloss im hohen Norden Gerda macht sich auf den Weg ihren Freund zu retten und besteht dabei viele Abenteuer!\n\nDas Stück ist für Kinder ab 6 Jahren geeignet',
type: 'internal',
links: [],
},
Expand Down
4 changes: 2 additions & 2 deletions app/routes/aktuelles/route.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ function YearCard({ letter, startedAt, mentor, photos, plan }: Year) {
className="flex flex-wrap rounded-md bg-card shadow-md"
>
<div className="relative flex flex-1 flex-col p-6">
<div className="text-1xl font-greek absolute right-14 top-10 scale-[7] font-black lowercase text-primary opacity-10">
<div className="text-1xl absolute right-14 top-10 scale-[7] font-greek font-black lowercase text-primary opacity-10">
{alphabetMap[letter]}
</div>

Expand Down Expand Up @@ -358,7 +358,7 @@ function YearCard({ letter, startedAt, mentor, photos, plan }: Year) {
)}
</div>
<Link
to={`/jahrgaenge/${letter}`}
to={`/jahrgaenge/${letter}-${startedAt.getFullYear()}`}
className="group relative flex aspect-video flex-1 rounded-r-md"
>
{photos ? (
Expand Down
1 change: 0 additions & 1 deletion app/routes/aktuelles_.beitraege+/$slug.query.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { defineQuery } from 'groq'

// @ts-ignore
export const beitraegeSlugQuery = defineQuery(`
*[_type == "post" && slug.current == $slug][0] {
_id,
Expand Down
1 change: 0 additions & 1 deletion app/routes/curriculum/route.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { useLoaderData } from '@remix-run/react'
import { InfoIcon } from 'lucide-react'
import React from 'react'
import {
Carousel,
Expand Down
3 changes: 1 addition & 2 deletions app/routes/jahrgaenge+/$year.query.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@ import { z } from 'zod'
import { PhotoSchema } from '#app/sanity/schema/year.ts'
import { PersonSchema } from '../ueber-uns+/_index.query.ts'

// @ts-ignore
export const yearQuery = defineQuery(`
*[_type == "year" && letter == $year][0] {
*[_type == "year" && letter == $letter && startedAt match $startedAt + "*"][0] {
_id,
_type,
startedAt,
Expand Down
11 changes: 8 additions & 3 deletions app/routes/jahrgaenge+/$year.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,14 @@ export function meta({ data }: MetaArgs<typeof loader>) {
}

export async function loader({ params }: LoaderFunctionArgs) {
const queryResult = await loadQuery(yearQuery, params, {
perspective: 'published',
})
const [letter, startedAt] = params?.year?.split('-') ?? []
const queryResult = await loadQuery(
yearQuery,
{ letter, startedAt },
{
perspective: 'published',
},
)

return {
query: yearQuery,
Expand Down
6 changes: 3 additions & 3 deletions app/routes/ueber-uns+/philosophie+/_layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ export function meta() {

export default function Philosophie() {
const matches = useMatches()
const current = matches.at(-1)
const current = matches?.at(-1)?.handle

return (
<div className="md:mt-12">
<div className="md:mt-12 lg:col-span-2">
<h1 className="absolute left-0 origin-top-left rotate-90 scale-[4] font-condensed text-xl font-bold text-stone-500 opacity-10">
Über uns
</h1>
Expand All @@ -34,7 +34,7 @@ export default function Philosophie() {
<section id="philosophie">
<div className="grid gap-8 md:grid-cols-2 lg:grid-cols-3">
{pillars
.filter(pillar => pillar !== current?.handle)
.filter(pillar => pillar !== current)
.map(pillar => (
<LinkPhotoCard
key={pillar.title}
Expand Down

0 comments on commit 6fd09ea

Please sign in to comment.