Merge branch 'worktree-agent-a5f48334696288159'

# Conflicts:
#	gerbil-manager-web/e2e/mock-data.ts
This commit is contained in:
2026-06-22 22:54:50 +02:00
16 changed files with 2360 additions and 0 deletions

View File

@@ -10,6 +10,7 @@ import { ALL_TRAITS, TRAIT_CATEGORIES } from '../format/traits'
import { fromDisplayString, genotypeToFarbschlag, displayGenotypeSafe } from '../genetics'
import type { Gender, GerbilStatus } from '../api/types'
import FarbschlagImage from '../components/FarbschlagImage'
import GerbilAcquisitionSection from '../components/GerbilAcquisitionSection'
import GerbilHealthTab from '../components/GerbilHealthTab'
import GerbilPhotosTab from '../components/GerbilPhotosTab'
import GerbilProfilePhoto from '../components/GerbilProfilePhoto'
@@ -336,6 +337,8 @@ export default function GerbilDetailPage() {
</dl>
</section>
<GerbilAcquisitionSection gerbilId={g.id} />
<section className="ak-card">
<h2 className="ak-h2">{t.detail.genetics}</h2>
{geno ? (