Merge branch 'worktree-playable-slice-0.5-first-upgrade'

# Conflicts: # apps/web/src/app/core/api/game-api.service.ts # apps/web/src/app/features/combat/combat-page/combat-page.component.html # apps/web/src/app/features/combat/combat-page/combat-page.component.scss # apps/web/src/app/features/combat/combat-page/combat-page.component.spec.ts # apps/web/src/app/features/combat/combat-page/combat-page.component.ts
2026-08-20 19:42:10 +02:00
parent 9cb0158d80 0ce3b420e6
commit 49a0008a2b
46 changed files with 3051 additions and 74 deletions
--- a/apps/web/src/app/app.routes.ts
+++ b/apps/web/src/app/app.routes.ts
@@ -35,6 +35,13 @@ export const routes: Routes = [
            (module) => module.CombatPageComponent,
          ),
      },
+      {
+        path: 'inventory',
+        loadComponent: () =>
+          import('./features/inventory/inventory-page.component').then(
+            (module) => module.InventoryPageComponent,
+          ),
+      },
    ],
  },
  { path: '**', redirectTo: 'location' },