d9858084dd
CI / go-lint (push) Has been skipped
CI / python-lint (push) Has been skipped
CI / nodejs-lint (push) Has been skipped
CI / test-go-school (push) Successful in 31s
CI / test-go-edu-search (push) Successful in 30s
CI / test-python-klausur (push) Failing after 2m36s
CI / test-python-agent-core (push) Successful in 21s
CI / test-nodejs-website (push) Successful in 26s
Backend (school-service):
- parent_account, parent_child, parent_magic_link, parent_session
tables. Tokens are sha256-hashed in DB; raw goes back exactly
once to the inviting teacher.
- InviteParent upserts the parent account, links a child to a tt_
class, mints a 7-day magic link. Returns the link path so the
teacher can paste it into Matrix/Email.
- RedeemMagicLink validates + marks used + mints a 30-day session,
sets HttpOnly bp_parent_session cookie.
- ParentSessionMiddleware reads the cookie and resolves the parent.
Lives in its own router group /api/v1/parent — totally separate
from the teacher JWT path.
- ParentMe returns the account + list of children (with class name).
- ParentTimetable returns the latest completed tt_solution's lessons
for the requested child's class, with full authorization check
(parent must own a child in that class).
Frontend (studio-v2):
- lib/calendar/subject-i18n.ts maps 22 German subject names to 8
parent locales (de/en/tr/ar/uk/ru/pl/fr). Falls back to German
for custom subjects.
- ParentManager component on the Schulkalender page lets the teacher
invite parents via email + child name + class + language. Newly
minted magic-link is shown with a copy-to-clipboard button.
- app/api/parent/[...path]/route.ts proxies parent-side endpoints
via the cookie so HttpOnly survives the Next.js round-trip.
- /eltern/login?token=… redeems and redirects to /eltern.
- /eltern shows a Wochengrid with German days + translated subject
names in the parent's preferred language. Headings and weekday
labels also localised (de/en/tr/ar/uk/ru/pl/fr).
Tests:
- 3 new Go unit tests (random token, hash stability, invite-request
validator). 83 subtests gesamt.
- studio-v2: e2e/eltern.spec.ts mit 7 tests across ParentManager,
/eltern/login, /eltern overview, subject-i18n end-to-end.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
183 lines
7.0 KiB
TypeScript
183 lines
7.0 KiB
TypeScript
'use client'
|
|
|
|
import { useState, useEffect, useCallback } from 'react'
|
|
import { useTheme } from '@/lib/ThemeContext'
|
|
import { Sidebar } from '@/components/Sidebar'
|
|
import { ThemeToggle } from '@/components/ThemeToggle'
|
|
import { LanguageDropdown } from '@/components/LanguageDropdown'
|
|
import { calendarApi } from '@/lib/schulkalender/api'
|
|
import type { PublicEvent, SchoolCalendarConfig, SchoolEvent } from './types'
|
|
import { BUNDESLAENDER } from './types'
|
|
import { MonthView } from './_components/MonthView'
|
|
import { BundeslandWizard } from './_components/BundeslandWizard'
|
|
import { EventModal } from './_components/EventModal'
|
|
import { DayDetail } from './_components/DayDetail'
|
|
import { RolloverWizard } from './_components/RolloverWizard'
|
|
import { ParentManager } from './_components/ParentManager'
|
|
|
|
function monthRange(year: number, month: number): { from: string; to: string } {
|
|
// Render the visible 6-week grid worth of holidays (covers prev/next month edges).
|
|
const from = new Date(Date.UTC(year, month - 1, 1))
|
|
from.setUTCDate(from.getUTCDate() - 7)
|
|
const to = new Date(Date.UTC(year, month, 0))
|
|
to.setUTCDate(to.getUTCDate() + 14)
|
|
return { from: from.toISOString().slice(0, 10), to: to.toISOString().slice(0, 10) }
|
|
}
|
|
|
|
export default function SchulkalenderPage() {
|
|
const { isDark } = useTheme()
|
|
const today = new Date()
|
|
const [year, setYear] = useState(today.getFullYear())
|
|
const [month, setMonth] = useState(today.getMonth() + 1)
|
|
const [config, setConfig] = useState<SchoolCalendarConfig | null>(null)
|
|
const [holidays, setHolidays] = useState<PublicEvent[]>([])
|
|
const [schoolEvents, setSchoolEvents] = useState<SchoolEvent[]>([])
|
|
const [configLoading, setConfigLoading] = useState(true)
|
|
const [error, setError] = useState<string | null>(null)
|
|
const [openDay, setOpenDay] = useState<string | null>(null)
|
|
const [showAddModal, setShowAddModal] = useState(false)
|
|
const [showRollover, setShowRollover] = useState(false)
|
|
|
|
const loadConfig = useCallback(async () => {
|
|
setConfigLoading(true)
|
|
try {
|
|
const cfg = await calendarApi.getConfig()
|
|
setConfig(cfg)
|
|
setError(null)
|
|
} catch (e) {
|
|
setError(e instanceof Error ? e.message : 'Config laden fehlgeschlagen')
|
|
} finally {
|
|
setConfigLoading(false)
|
|
}
|
|
}, [])
|
|
|
|
useEffect(() => { loadConfig() }, [loadConfig])
|
|
|
|
const loadHolidays = useCallback(async () => {
|
|
if (!config?.bundesland) return
|
|
const { from, to } = monthRange(year, month)
|
|
try {
|
|
const [hd, ev] = await Promise.all([
|
|
calendarApi.listHolidays(config.bundesland, from, to),
|
|
calendarApi.listEvents(from, to),
|
|
])
|
|
setHolidays(hd || [])
|
|
setSchoolEvents(ev || [])
|
|
setError(null)
|
|
} catch (e) {
|
|
setError(e instanceof Error ? e.message : 'Ferien/Events laden fehlgeschlagen')
|
|
}
|
|
}, [config, year, month])
|
|
|
|
useEffect(() => { loadHolidays() }, [loadHolidays])
|
|
|
|
const handleSaveBundesland = async (bundesland: string) => {
|
|
const cfg = await calendarApi.upsertConfig({ bundesland })
|
|
setConfig(cfg)
|
|
}
|
|
|
|
const goPrev = () => {
|
|
if (month === 1) { setYear(y => y - 1); setMonth(12) }
|
|
else setMonth(m => m - 1)
|
|
}
|
|
const goNext = () => {
|
|
if (month === 12) { setYear(y => y + 1); setMonth(1) }
|
|
else setMonth(m => m + 1)
|
|
}
|
|
const goToday = () => {
|
|
const t = new Date()
|
|
setYear(t.getFullYear())
|
|
setMonth(t.getMonth() + 1)
|
|
}
|
|
|
|
const bundeslandName = config
|
|
? BUNDESLAENDER.find(b => b.code === config.bundesland)?.name || config.bundesland
|
|
: ''
|
|
|
|
return (
|
|
<div className={`min-h-screen flex relative overflow-hidden ${
|
|
isDark ? 'bg-gradient-to-br from-indigo-900 via-purple-900 to-pink-800'
|
|
: 'bg-gradient-to-br from-slate-100 via-blue-50 to-indigo-100'
|
|
}`}>
|
|
<div className={`absolute -top-40 -right-40 w-96 h-96 rounded-full mix-blend-multiply filter blur-3xl animate-blob ${isDark ? 'bg-purple-500 opacity-30' : 'bg-purple-300 opacity-40'}`} />
|
|
<div className={`absolute top-1/2 -left-40 w-96 h-96 rounded-full mix-blend-multiply filter blur-3xl animate-blob animation-delay-2000 ${isDark ? 'bg-pink-500 opacity-30' : 'bg-pink-300 opacity-40'}`} />
|
|
<div className={`absolute -bottom-40 right-1/3 w-96 h-96 rounded-full mix-blend-multiply filter blur-3xl animate-blob animation-delay-4000 ${isDark ? 'bg-blue-500 opacity-30' : 'bg-blue-300 opacity-40'}`} />
|
|
|
|
<div className="relative z-10 p-4"><Sidebar selectedTab="schulkalender" /></div>
|
|
|
|
<main className="flex-1 relative z-10 p-6 overflow-y-auto">
|
|
<div className="max-w-6xl mx-auto">
|
|
<header className="flex items-center justify-between mb-6">
|
|
<div>
|
|
<h1 className={`text-3xl font-bold ${isDark ? 'text-white' : 'text-slate-900'}`}>
|
|
Schulkalender
|
|
</h1>
|
|
<p className={`text-sm mt-1 ${isDark ? 'text-white/60' : 'text-slate-500'}`}>
|
|
{config ? `Ferien und Feiertage fuer ${bundeslandName}` : 'Ferien, Feiertage und Schultermine'}
|
|
</p>
|
|
</div>
|
|
<div className="flex items-center gap-3">
|
|
<ThemeToggle />
|
|
<LanguageDropdown />
|
|
</div>
|
|
</header>
|
|
|
|
{error && (
|
|
<div className="mb-4 p-3 rounded-xl bg-red-500/20 border border-red-500/40 text-red-300">{error}</div>
|
|
)}
|
|
|
|
{configLoading ? (
|
|
<div className={`text-center py-12 opacity-60 ${isDark ? 'text-white' : 'text-slate-700'}`}>Laedt…</div>
|
|
) : !config ? (
|
|
<BundeslandWizard onSave={handleSaveBundesland} />
|
|
) : (
|
|
<>
|
|
<MonthView
|
|
year={year}
|
|
month={month}
|
|
holidays={holidays}
|
|
schoolEvents={schoolEvents}
|
|
onPrev={goPrev}
|
|
onNext={goNext}
|
|
onToday={goToday}
|
|
onDayClick={(iso) => setOpenDay(iso)}
|
|
onAddEvent={() => setShowAddModal(true)}
|
|
onRollover={() => setShowRollover(true)}
|
|
/>
|
|
|
|
{openDay && (
|
|
<DayDetail
|
|
iso={openDay}
|
|
holidays={holidays}
|
|
events={schoolEvents}
|
|
onClose={() => setOpenDay(null)}
|
|
onDeleted={() => { loadHolidays(); setOpenDay(null) }}
|
|
/>
|
|
)}
|
|
|
|
{showAddModal && (
|
|
<EventModal
|
|
defaultDate={openDay || new Date().toISOString().slice(0, 10)}
|
|
onClose={() => setShowAddModal(false)}
|
|
onCreated={() => { setShowAddModal(false); loadHolidays() }}
|
|
/>
|
|
)}
|
|
|
|
{showRollover && (
|
|
<RolloverWizard
|
|
onClose={() => setShowRollover(false)}
|
|
onDone={() => { setShowRollover(false); loadHolidays() }}
|
|
/>
|
|
)}
|
|
|
|
<div className="mt-6">
|
|
<ParentManager />
|
|
</div>
|
|
</>
|
|
)}
|
|
</div>
|
|
</main>
|
|
</div>
|
|
)
|
|
}
|