chore(deps): update dependency cryptography to v45.0.7

.beans/nuzlocke-tracker-532i--ux-remove-level-field-from-boss-defeat-modal.md

@@ -1,11 +1,11 @@
 ---
 # nuzlocke-tracker-532i
 title: 'UX: Make level field optional in boss defeat modal'
-status: completed
+status: todo
 type: feature
 priority: normal
 created_at: 2026-03-21T21:50:48Z
-updated_at: 2026-03-22T09:16:12Z
+updated_at: 2026-03-21T22:04:08Z
 ---
 
 ## Problem
@@ -22,17 +22,8 @@ When recording which team members beat a boss, users must manually enter a level
 
 Remove the level field entirely from the UI and make it optional in the backend:
 
-- [x] Remove level input from `BossDefeatModal.tsx`
-- [x] Make `level` column nullable in the database (alembic migration)
-- [x] Update the API schema to make level optional (default to null)
-- [x] Update any backend validation that requires level
-- [x] Verify boss result display still works without level data
-
-
-## Summary of Changes
-
-- Removed level input field from BossDefeatModal.tsx, simplifying team selection to just checkboxes
-- Created alembic migration to make boss_result_team.level column nullable
-- Updated SQLAlchemy model and Pydantic schemas to make level optional (defaults to null)
-- Updated RunEncounters.tsx to conditionally render level only when present
-- Updated frontend TypeScript types for BossResultTeamMember and BossResultTeamMemberInput
+- [ ] Remove level input from `BossDefeatModal.tsx`
+- [ ] Make `level` column nullable in the database (alembic migration)
+- [ ] Update the API schema to make level optional (default to null)
+- [ ] Update any backend validation that requires level
+- [ ] Verify boss result display still works without level data

.beans/nuzlocke-tracker-lkro--ux-make-team-section-a-floating-sidebar-on-desktop.md

@@ -1,11 +1,11 @@
 ---
 # nuzlocke-tracker-lkro
 title: 'UX: Make team section a floating sidebar on desktop'
-status: completed
+status: todo
 type: feature
 priority: normal
 created_at: 2026-03-21T21:50:48Z
-updated_at: 2026-03-22T09:11:58Z
+updated_at: 2026-03-22T08:08:13Z
 ---
 
 ## Problem
@@ -28,31 +28,9 @@ Alternative: A floating action button (FAB) that opens the team in a slide-over
 
 ## Checklist
 
-- [x] Add responsive 2-column layout to RunEncounters page (desktop only)
-- [x] Move team section into a sticky sidebar column
-- [x] Ensure sidebar scrolls independently if team is taller than viewport
-- [x] Keep current stacked layout on mobile/tablet
-- [x] Test with various team sizes (0-6 pokemon)
-- [x] Test evolution/nickname editing still works from sidebar
-
-## Summary of Changes
-
-Implemented a responsive 2-column layout for the RunEncounters page:
-
-**Desktop (lg, ≥1024px):**
-- Encounters list on the left in a flex column
-- Team section in a 256px sticky sidebar on the right
-- Sidebar stays visible while scrolling through routes and bosses
-- Independent scrolling for sidebar when team is taller than viewport (max-h-[calc(100vh-6rem)] overflow-y-auto)
-- 2-column grid for pokemon cards in sidebar
-
-**Mobile/Tablet (<1024px):**
-- Original stacked layout preserved (team above encounters)
-- Collapsible team section with expand/collapse toggle
-
-**Technical changes:**
-- Page container widened from max-w-4xl to lg:max-w-6xl
-- Added lg:flex lg:gap-6 wrapper for 2-column layout
-- Mobile team section hidden on lg with lg:hidden
-- Desktop sidebar hidden below lg with hidden lg:block
-- Sidebar styled with bg-surface-1 border and rounded corners
+- [ ] Add responsive 2-column layout to RunEncounters page (desktop only)
+- [ ] Move team section into a sticky sidebar column
+- [ ] Ensure sidebar scrolls independently if team is taller than viewport
+- [ ] Keep current stacked layout on mobile/tablet
+- [ ] Test with various team sizes (0-6 pokemon)
+- [ ] Test evolution/nickname editing still works from sidebar

backend/pyproject.toml

@@ -14,7 +14,7 @@ dependencies = [
     "asyncpg==0.31.0",
     "alembic==1.18.4",
     "PyJWT==2.12.1",
-    "cryptography==45.0.3",
+    "cryptography==45.0.7",
 ]
 
 [project.optional-dependencies]

backend/src/app/alembic/versions/903e0cdbfe5a_make_boss_result_team_level_nullable.py

@@ -1,37 +0,0 @@
-"""make_boss_result_team_level_nullable
-
-Revision ID: 903e0cdbfe5a
-Revises: p7e8f9a0b1c2
-Create Date: 2026-03-22 10:13:41.828406
-
-"""
-
-from collections.abc import Sequence
-
-import sqlalchemy as sa
-from alembic import op
-
-# revision identifiers, used by Alembic.
-revision: str = "903e0cdbfe5a"
-down_revision: str | Sequence[str] | None = "p7e8f9a0b1c2"
-branch_labels: str | Sequence[str] | None = None
-depends_on: str | Sequence[str] | None = None
-
-
-def upgrade() -> None:
-    op.alter_column(
-        "boss_result_team",
-        "level",
-        existing_type=sa.SmallInteger(),
-        nullable=True,
-    )
-
-
-def downgrade() -> None:
-    op.execute("UPDATE boss_result_team SET level = 1 WHERE level IS NULL")
-    op.alter_column(
-        "boss_result_team",
-        "level",
-        existing_type=sa.SmallInteger(),
-        nullable=False,
-    )

backend/src/app/models/boss_result_team.py

@@ -14,7 +14,7 @@ class BossResultTeam(Base):
     encounter_id: Mapped[int] = mapped_column(
         ForeignKey("encounters.id", ondelete="CASCADE"), index=True
     )
-    level: Mapped[int | None] = mapped_column(SmallInteger, nullable=True)
+    level: Mapped[int] = mapped_column(SmallInteger)
 
     boss_result: Mapped[BossResult] = relationship(back_populates="team")
     encounter: Mapped[Encounter] = relationship()

backend/src/app/schemas/boss.py

@@ -57,7 +57,7 @@ class BossBattleResponse(CamelModel):
 class BossResultTeamMemberResponse(CamelModel):
     id: int
     encounter_id: int
-    level: int | None
+    level: int
 
 
 class BossResultResponse(CamelModel):
@@ -120,7 +120,7 @@ class BossPokemonInput(CamelModel):
 
 class BossResultTeamMemberInput(CamelModel):
     encounter_id: int
-    level: int | None = None
+    level: int
 
 
 class BossResultCreate(CamelModel):

frontend/src/components/BossDefeatModal.tsx

@@ -23,7 +23,10 @@ function matchVariant(labels: string[], starterName?: string | null): string | n
   return matches.length === 1 ? (matches[0] ?? null) : null
 }
 
-type TeamSelection = number
+interface TeamSelection {
+  encounterId: number
+  level: number
+}
 
 export function BossDefeatModal({
   boss,
@@ -33,15 +36,26 @@ export function BossDefeatModal({
   isPending,
   starterName,
 }: BossDefeatModalProps) {
-  const [selectedTeam, setSelectedTeam] = useState<Set<TeamSelection>>(new Set())
+  const [selectedTeam, setSelectedTeam] = useState<Map<number, TeamSelection>>(new Map())
 
-  const toggleTeamMember = (encounterId: number) => {
+  const toggleTeamMember = (enc: EncounterDetail) => {
     setSelectedTeam((prev) => {
-      const next = new Set(prev)
-      if (next.has(encounterId)) {
-        next.delete(encounterId)
+      const next = new Map(prev)
+      if (next.has(enc.id)) {
+        next.delete(enc.id)
       } else {
-        next.add(encounterId)
+        next.set(enc.id, { encounterId: enc.id, level: enc.catchLevel ?? 1 })
+      }
+      return next
+    })
+  }
+
+  const updateLevel = (encounterId: number, level: number) => {
+    setSelectedTeam((prev) => {
+      const next = new Map(prev)
+      const existing = next.get(encounterId)
+      if (existing) {
+        next.set(encounterId, { ...existing, level })
       }
       return next
     })
@@ -73,9 +87,7 @@ export function BossDefeatModal({
 
   const handleSubmit = (e: FormEvent) => {
     e.preventDefault()
-    const team: BossResultTeamMemberInput[] = Array.from(selectedTeam).map((encounterId) => ({
-      encounterId,
-    }))
+    const team: BossResultTeamMemberInput[] = Array.from(selectedTeam.values())
     onSubmit({
       bossBattleId: boss.id,
       result: 'won',
@@ -122,17 +134,11 @@ export function BossDefeatModal({
                   return (
                     <div key={bp.id} className="flex flex-col items-center">
                       {bp.pokemon.spriteUrl ? (
-                        <img
-                          src={bp.pokemon.spriteUrl}
-                          alt={bp.pokemon.name}
-                          className="w-10 h-10"
-                        />
+                        <img src={bp.pokemon.spriteUrl} alt={bp.pokemon.name} className="w-10 h-10" />
                       ) : (
                         <div className="w-10 h-10 bg-surface-3 rounded-full" />
                       )}
-                      <span className="text-xs text-text-tertiary capitalize">
-                        {bp.pokemon.name}
-                      </span>
+                      <span className="text-xs text-text-tertiary capitalize">{bp.pokemon.name}</span>
                       <span className="text-xs font-medium text-text-secondary">Lv.{bp.level}</span>
                       <ConditionBadge condition={bp.conditionLabel} size="xs" />
                       {bp.ability && (
@@ -160,6 +166,7 @@ export function BossDefeatModal({
             <div className="grid grid-cols-2 sm:grid-cols-3 gap-2 max-h-48 overflow-y-auto">
               {aliveEncounters.map((enc) => {
                 const isSelected = selectedTeam.has(enc.id)
+                const selection = selectedTeam.get(enc.id)
                 const displayPokemon = enc.currentPokemon ?? enc.pokemon
                 return (
                   <div
@@ -169,12 +176,12 @@ export function BossDefeatModal({
                         ? 'border-accent-500 bg-accent-500/10'
                         : 'border-border-default hover:bg-surface-2'
                     }`}
-                    onClick={() => toggleTeamMember(enc.id)}
+                    onClick={() => toggleTeamMember(enc)}
                   >
                     <input
                       type="checkbox"
                       checked={isSelected}
-                      onChange={() => toggleTeamMember(enc.id)}
+                      onChange={() => toggleTeamMember(enc)}
                       className="sr-only"
                     />
                     {displayPokemon.spriteUrl ? (
@@ -186,9 +193,26 @@ export function BossDefeatModal({
                     ) : (
                       <div className="w-8 h-8 bg-surface-3 rounded-full" />
                     )}
-                    <p className="flex-1 min-w-0 text-xs font-medium truncate">
+                    <div className="flex-1 min-w-0">
+                      <p className="text-xs font-medium truncate">
                         {enc.nickname ?? displayPokemon.name}
                       </p>
+                      {isSelected && (
+                        <input
+                          type="number"
+                          min={1}
+                          max={100}
+                          value={selection?.level ?? enc.catchLevel ?? 1}
+                          onChange={(e) => {
+                            e.stopPropagation()
+                            updateLevel(enc.id, Number.parseInt(e.target.value, 10) || 1)
+                          }}
+                          onClick={(e) => e.stopPropagation()}
+                          className="w-14 text-xs px-1 py-0.5 mt-1 rounded border border-border-default bg-surface-1"
+                          placeholder="Lv"
+                        />
+                      )}
+                    </div>
                   </div>
                 )
               })}

frontend/src/pages/RunEncounters.tsx

@@ -922,7 +922,7 @@ export function RunEncounters() {
   })
 
   return (
-    <div className="max-w-4xl lg:max-w-6xl mx-auto p-8">
+    <div className="max-w-4xl mx-auto p-8">
       {/* Header */}
       <div className="mb-6">
         <Link
@@ -1246,12 +1246,9 @@ export function RunEncounters() {
       {/* Encounters Tab */}
       {activeTab === 'encounters' && (
         <>
-          <div className="lg:flex lg:gap-6">
-            {/* Main content column */}
-            <div className="flex-1 min-w-0">
-              {/* Team Section - Mobile/Tablet only */}
+          {/* Team Section */}
           {(alive.length > 0 || dead.length > 0) && (
-                <div className="mb-6 lg:hidden">
+            <div className="mb-6">
               <div className="flex items-center justify-between mb-3">
                 <button
                   type="button"
@@ -1301,9 +1298,7 @@ export function RunEncounters() {
                           key={enc.id}
                           encounter={enc}
                           onClick={
-                                isActive && canEdit
-                                  ? () => setSelectedTeamEncounter(enc)
-                                  : undefined
+                            isActive && canEdit ? () => setSelectedTeamEncounter(enc) : undefined
                           }
                         />
                       ))}
@@ -1319,9 +1314,7 @@ export function RunEncounters() {
                             encounter={enc}
                             showFaintLevel
                             onClick={
-                                  isActive && canEdit
-                                    ? () => setSelectedTeamEncounter(enc)
-                                    : undefined
+                              isActive && canEdit ? () => setSelectedTeamEncounter(enc) : undefined
                             }
                           />
                         ))}
@@ -1354,9 +1347,7 @@ export function RunEncounters() {
                   <PokemonCard
                     key={enc.id}
                     encounter={enc}
-                        onClick={
-                          isActive && canEdit ? () => setSelectedTeamEncounter(enc) : undefined
-                        }
+                    onClick={isActive && canEdit ? () => setSelectedTeamEncounter(enc) : undefined}
                   />
                 ))}
               </div>
@@ -1481,9 +1472,7 @@ export function RunEncounters() {
                       >
                         <span className={`w-2.5 h-2.5 rounded-full shrink-0 ${si.dot}`} />
                         <div className="flex-1 min-w-0">
-                              <div className="text-sm font-medium text-text-primary">
-                                {route.name}
-                              </div>
+                          <div className="text-sm font-medium text-text-primary">{route.name}</div>
                           {encounter ? (
                             <div className="flex items-center gap-2 mt-0.5">
                               {encounter.pokemon.spriteUrl && (
@@ -1497,9 +1486,7 @@ export function RunEncounters() {
                                 {encounter.nickname ?? encounter.pokemon.name}
                                 {encounter.status === 'caught' &&
                                   encounter.faintLevel !== null &&
-                                      (encounter.deathCause
-                                        ? ` — ${encounter.deathCause}`
-                                        : ' (dead)')}
+                                  (encounter.deathCause ? ` — ${encounter.deathCause}` : ' (dead)')}
                               </span>
                               {giftEncounter && (
                                 <>
@@ -1611,11 +1598,7 @@ export function RunEncounters() {
                                 />
                               </svg>
                               {boss.spriteUrl && (
-                                    <img
-                                      src={boss.spriteUrl}
-                                      alt={boss.name}
-                                      className="h-10 w-auto"
-                                    />
+                                <img src={boss.spriteUrl} alt={boss.name} className="h-10 w-auto" />
                               )}
                               <div>
                                 <div className="flex items-center gap-2">
@@ -1625,9 +1608,7 @@ export function RunEncounters() {
                                   <span className="px-2 py-0.5 text-xs font-medium rounded-full bg-surface-2 text-text-secondary">
                                     {bossTypeLabel[boss.bossType] ?? boss.bossType}
                                   </span>
-                                      {boss.specialtyType && (
-                                        <TypeBadge type={boss.specialtyType} />
-                                      )}
+                                  {boss.specialtyType && <TypeBadge type={boss.specialtyType} />}
                                 </div>
                                 <p className="text-xs text-text-tertiary">
                                   {boss.location} &middot; Level Cap: {boss.levelCap}
@@ -1682,11 +1663,9 @@ export function RunEncounters() {
                                           <span className="text-[10px] text-text-tertiary capitalize">
                                             {enc.nickname ?? dp.name}
                                           </span>
-                                              {tm.level != null && (
                                           <span className="text-[10px] text-text-muted">
                                             Lv.{tm.level}
                                           </span>
-                                              )}
                                         </div>
                                       )
                                     })}
@@ -1711,70 +1690,6 @@ export function RunEncounters() {
               )
             })}
           </div>
-            </div>
-
-            {/* Team Sidebar - Desktop only */}
-            {(alive.length > 0 || dead.length > 0) && (
-              <div className="hidden lg:block w-64 shrink-0">
-                <div className="sticky top-20 max-h-[calc(100vh-6rem)] overflow-y-auto">
-                  <div className="bg-surface-1 border border-border-default rounded-lg p-4">
-                    <div className="flex items-center justify-between mb-3">
-                      <h2 className="text-lg font-semibold text-text-primary">
-                        {isActive ? 'Team' : 'Final Team'}
-                      </h2>
-                      <span className="text-xs text-text-muted">
-                        {alive.length}/{alive.length + dead.length}
-                      </span>
-                    </div>
-                    {alive.length > 1 && (
-                      <select
-                        value={teamSort}
-                        onChange={(e) => setTeamSort(e.target.value as TeamSortKey)}
-                        className="w-full text-sm border border-border-default rounded-lg px-3 py-1.5 bg-surface-0 text-text-primary mb-3"
-                      >
-                        <option value="route">Route Order</option>
-                        <option value="level">Catch Level</option>
-                        <option value="species">Species Name</option>
-                        <option value="dex">National Dex</option>
-                      </select>
-                    )}
-                    {alive.length > 0 && (
-                      <div className="grid grid-cols-2 gap-2 mb-3">
-                        {alive.map((enc) => (
-                          <PokemonCard
-                            key={enc.id}
-                            encounter={enc}
-                            onClick={
-                              isActive && canEdit ? () => setSelectedTeamEncounter(enc) : undefined
-                            }
-                          />
-                        ))}
-                      </div>
-                    )}
-                    {dead.length > 0 && (
-                      <>
-                        <h3 className="text-sm font-medium text-text-tertiary mb-2">Graveyard</h3>
-                        <div className="grid grid-cols-2 gap-2">
-                          {dead.map((enc) => (
-                            <PokemonCard
-                              key={enc.id}
-                              encounter={enc}
-                              showFaintLevel
-                              onClick={
-                                isActive && canEdit
-                                  ? () => setSelectedTeamEncounter(enc)
-                                  : undefined
-                              }
-                            />
-                          ))}
-                        </div>
-                      </>
-                    )}
-                  </div>
-                </div>
-              </div>
-            )}
-          </div>
 
           {/* Encounter Modal */}
           {selectedRoute && (

frontend/src/types/game.ts

@@ -238,7 +238,7 @@ export interface BossBattle {
 export interface BossResultTeamMember {
   id: number
   encounterId: number
-  level: number | null
+  level: number
 }
 
 export interface BossResult {
@@ -253,7 +253,7 @@ export interface BossResult {
 
 export interface BossResultTeamMemberInput {
   encounterId: number
-  level?: number | null
+  level: number
 }
 
 export interface CreateBossResultInput {