buger
diff --git a/‎app/Http/Controllers/FlashcardController.php‎
Lines changed: 110 additions & 12 deletions b/‎app/Http/Controllers/FlashcardController.php‎
Lines changed: 110 additions & 12 deletions
diff --git a/‎app/Http/Controllers/PlanningController.php‎
Lines changed: 35 additions & 13 deletions b/‎app/Http/Controllers/PlanningController.php‎
Lines changed: 35 additions & 13 deletions
diff --git a/‎app/Http/Controllers/SubjectController.php‎
Lines changed: 1 addition & 1 deletion b/‎app/Http/Controllers/SubjectController.php‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎app/Http/Controllers/TopicController.php‎
Lines changed: 6 additions & 6 deletions b/‎app/Http/Controllers/TopicController.php‎
Lines changed: 6 additions & 6 deletions
diff --git a/‎app/Models/Child.php‎
Lines changed: 1 addition & 2 deletions b/‎app/Models/Child.php‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎app/Models/Flashcard.php‎
Lines changed: 2 additions & 2 deletions b/‎app/Models/Flashcard.php‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎app/Models/Subject.php‎
Lines changed: 3 additions & 3 deletions b/‎app/Models/Subject.php‎
Lines changed: 3 additions & 3 deletions
@@ -964,25 +964,27 @@ public function bulkUpdateTopicStatus(Request $request, int $topicId): JsonRespo
     /**
      * Display flashcards list view for HTMX.
      */
-    public function listView(Request $request, int $unitId): View|Response
+    public function listView(Request $request, int $topicId): View|Response
     {
         try {
             if (! auth()->check()) {
                 return response('Unauthorized', 401);
             }
 
-            // Verify unit exists and user has access
-            $unit = Unit::with(['subject'])->findOrFail($unitId);
-            if ((int) $unit->subject->user_id !== auth()->id()) {
+            // Verify topic exists and user has access
+            $topic = Topic::with(['unit.subject'])->findOrFail($topicId);
+            if ((int) $topic->unit->subject->user_id !== auth()->id()) {
                 return response('Access denied', 403);
             }
 
             // Get flashcards with pagination
-            $flashcards = $unit->allFlashcards()
+            $flashcards = $topic->flashcards()
                 ->orderBy('created_at', 'desc')
                 ->paginate(20);
 
-            return view('flashcards.partials.flashcard-list', compact('flashcards', 'unit'));
+            $unit = $topic->unit; // For backward compatibility with the template
+
+            return view('flashcards.partials.flashcard-list', compact('flashcards', 'topic', 'unit'));
 
         } catch (\Exception $e) {
             Log::error('Error fetching flashcards for list view: '.$e->getMessage());
@@ -1020,6 +1022,102 @@ public function create(Request $request, int $unitId): View|Response
         }
     }
 
+    /**
+     * Show the form for creating a new flashcard for a specific topic.
+     */
+    public function createForTopic(Request $request, int $topicId): View|Response
+    {
+        try {
+            if (! auth()->check()) {
+                return response('Unauthorized', 401);
+            }
+
+            // Verify topic exists and user has access
+            $topic = Topic::with(['unit.subject'])->findOrFail($topicId);
+            if ((int) $topic->unit->subject->user_id !== auth()->id()) {
+                return response('Access denied', 403);
+            }
+
+            return view('flashcards.partials.flashcard-modal', [
+                'unit' => $topic->unit,
+                'topic' => $topic,
+                'flashcard' => null, // Creating new
+                'isEdit' => false,
+            ]);
+
+        } catch (\Illuminate\Database\Eloquent\ModelNotFoundException $e) {
+            return response('Topic not found', 404);
+        } catch (\Exception $e) {
+            Log::error('Error loading topic flashcard creation form: '.$e->getMessage());
+
+            return response('Unable to load form', 500);
+        }
+    }
+
+    /**
+     * Store a flashcard for a specific topic and return the updated list view.
+     */
+    public function storeForTopic(FlashcardRequest $request, int $topicId): View|Response
+    {
+        try {
+            if (! auth()->check()) {
+                return response('Unauthorized', 401);
+            }
+
+            // Verify topic exists and user has access
+            $topic = Topic::with(['unit.subject'])->findOrFail($topicId);
+            if ((int) $topic->unit->subject->user_id !== auth()->id()) {
+                return response('Access denied', 403);
+            }
+
+            $validated = $request->validated();
+            \Log::info('Topic flashcard validation data:', $validated);
+
+            // Ensure topic_id is set for topic-only architecture
+            $validated['topic_id'] = $topicId;
+
+            $flashcard = new Flashcard($validated);
+
+            // Validate card-specific data
+            $cardErrors = $flashcard->validateCardData();
+            if (! empty($cardErrors)) {
+                return response('<div class="text-red-500">'.implode('<br>', $cardErrors).'</div>', 422);
+            }
+
+            if ($flashcard->save()) {
+                // Return updated topic flashcards list with count update
+                $flashcards = $topic->flashcards()
+                    ->where('is_active', true)
+                    ->orderBy('created_at', 'desc')
+                    ->paginate(20);
+
+                $flashcardCount = $topic->flashcards()->count();
+
+                // Include OOB update for the flashcard count in header
+                $unit = $topic->unit;
+                $listView = view('flashcards.partials.flashcard-list', compact('flashcards', 'topic', 'unit'))->render();
+                $countUpdate = '<span class="ml-2 text-sm font-normal text-gray-600" id="topic-flashcard-count" hx-swap-oob="true">('.$flashcardCount.')</span>';
+
+                return response($listView.$countUpdate)
+                    ->header('HX-Trigger', 'flashcardCreated');
+            }
+
+            return response('Failed to create flashcard', 500);
+
+        } catch (\Illuminate\Validation\ValidationException $e) {
+            $errors = collect($e->validator->errors()->all())->implode('<br>');
+            \Log::error('Topic flashcard validation errors:', $e->validator->errors()->toArray());
+
+            return response('<div class="text-red-500">'.htmlspecialchars($errors).'</div>', 422);
+        } catch (\Illuminate\Database\Eloquent\ModelNotFoundException $e) {
+            return response('Topic not found', 404);
+        } catch (\Exception $e) {
+            Log::error('Error creating topic flashcard: '.$e->getMessage());
+
+            return response('Unable to create flashcard', 500);
+        }
+    }
+
     /**
      * Show the form for editing a flashcard.
      */
@@ -1113,7 +1211,7 @@ public function storeView(FlashcardRequest $request, int $unitId): View|Response
             $errors = collect($e->validator->errors()->all())->implode('<br>');
             \Log::error('Flashcard validation errors:', $e->validator->errors()->toArray());
 
-            return response('<div class="text-red-500">'.$errors.'</div>', 422);
+            return response('<div class="text-red-500">'.htmlspecialchars($errors).'</div>', 422);
         } catch (\Exception $e) {
             Log::error('Error creating flashcard: '.$e->getMessage());
 
@@ -1198,7 +1296,7 @@ public function updateView(Request $request, int $unitId, int $flashcardId): Vie
         } catch (\Illuminate\Validation\ValidationException $e) {
             $errors = collect($e->validator->errors()->all())->implode('<br>');
 
-            return response('<div class="text-red-500">'.$errors.'</div>', 422);
+            return response('<div class="text-red-500">'.htmlspecialchars($errors).'</div>', 422);
         } catch (\Exception $e) {
             Log::error('Error updating flashcard: '.$e->getMessage());
 
@@ -1387,7 +1485,7 @@ public function previewImport(Request $request, int $unitId): View|Response
         } catch (\Illuminate\Validation\ValidationException $e) {
             $errors = collect($e->validator->errors()->all())->implode('<br>');
 
-            return response('<div class="text-red-500">'.$errors.'</div>', 422);
+            return response('<div class="text-red-500">'.htmlspecialchars($errors).'</div>', 422);
         } catch (\Exception $e) {
             Log::error('Error previewing import: '.$e->getMessage());
 
@@ -1470,7 +1568,7 @@ public function executeImport(Request $request, int $unitId): View|Response
         } catch (\Illuminate\Validation\ValidationException $e) {
             $errors = collect($e->validator->errors()->all())->implode('<br>');
 
-            return response('<div class="text-red-500">'.$errors.'</div>', 422);
+            return response('<div class="text-red-500">'.htmlspecialchars($errors).'</div>', 422);
         } catch (\Exception $e) {
             Log::error('Error executing import: '.$e->getMessage());
 
@@ -1596,7 +1694,7 @@ public function printPreview(Request $request, int $unitId): View|Response
         } catch (\Illuminate\Validation\ValidationException $e) {
             $errors = collect($e->validator->errors()->all())->implode('<br>');
 
-            return response('<div class="text-red-500">'.$errors.'</div>', 422);
+            return response('<div class="text-red-500">'.htmlspecialchars($errors).'</div>', 422);
         } catch (\Exception $e) {
             Log::error('Error generating print preview: '.$e->getMessage());
 
@@ -1875,7 +1973,7 @@ public function exportPreview(Request $request, int $unitId): View|Response|Json
         } catch (\Illuminate\Validation\ValidationException $e) {
             $errors = collect($e->validator->errors()->all())->implode('<br>');
 
-            return response('<div class="text-red-500">'.$errors.'</div>', 422);
+            return response('<div class="text-red-500">'.htmlspecialchars($errors).'</div>', 422);
         } catch (\Exception $e) {
             Log::error('Error generating export preview: '.$e->getMessage());
 
 
@@ -13,6 +13,7 @@
 use Carbon\Carbon;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 use Illuminate\View\View;
 
 class PlanningController extends Controller
@@ -42,7 +43,7 @@ public function index(Request $request): View
         }
 
         // Get all sessions for selected child organized by status
-        $allSessions = Session::forChild($selectedChild->id);
+        $allSessions = Session::forChild($selectedChild->id)->with('topic.unit.subject')->get();
         $sessionsByStatus = [
             'backlog' => $allSessions->where('status', 'backlog'),
             'planned' => $allSessions->where('status', 'planned'),
@@ -51,23 +52,24 @@ public function index(Request $request): View
         ];
 
         // Get catch-up sessions for selected child
-        $catchUpSessions = CatchUpSession::pending($selectedChild->id);
+        $catchUpSessions = CatchUpSession::pending($selectedChild->id)->with('topic.unit.subject')->get();
 
         // Get all topics for this child's subjects that don't have sessions yet
-        $subjects = Subject::where('user_id', $userId)->orderBy('name')->get();
+        $subjects = Subject::where('user_id', $userId)
+            ->with(['units.topics' => function ($query) {
+                $query->with('unit.subject');
+            }])
+            ->orderBy('name')
+            ->get();
+
         $availableTopics = collect([]);
+        $existingTopicIds = $allSessions->pluck('topic_id')->toArray();
 
         foreach ($subjects as $subject) {
-            /** @var \App\Models\Subject $subject */
-            $units = $subject->units;
-            foreach ($units as $unit) {
-                /** @var \App\Models\Unit $unit */
-                $topics = $unit->topics;
-                foreach ($topics as $topic) {
-                    /** @var \App\Models\Topic $topic */
+            foreach ($subject->units as $unit) {
+                foreach ($unit->topics as $topic) {
                     // Check if topic already has sessions for this child
-                    $existingSession = $allSessions->where('topic_id', $topic->id)->first();
-                    if (! $existingSession) {
+                    if (! in_array($topic->id, $existingTopicIds)) {
                         $availableTopics->push($topic);
                     }
                 }
@@ -157,7 +159,7 @@ public function createSession(Request $request): View|RedirectResponse
         }
 
         // Verify topic belongs to user's subjects (through unit -> subject)
-        $subject = $topic->subject;
+        $subject = $topic->unit->subject;
         if (! $subject || $subject->user_id != auth()->id()) {
             abort(403, 'Topic does not belong to user');
         }
@@ -667,4 +669,24 @@ private function getDayName(int $day): string
 
         return $days[$day] ?? '';
     }
+
+    public function destroySession(int $sessionId): Response
+    {
+        $session = Session::find($sessionId);
+        if (! $session) {
+            abort(404);
+        }
+
+        // Verify session belongs to user's child
+        $child = $session->child;
+        if (! $child || $child->user_id != auth()->id()) {
+            abort(403);
+        }
+
+        // Delete the session
+        $session->delete();
+
+        // Return empty content to remove the session card from the UI
+        return response('')->header('HX-Trigger', 'sessionDeleted');
+    }
 }
@@ -39,7 +39,7 @@ public function index(Request $request)
 
             // Get subjects for the selected child or show empty state
             if ($selectedChild) {
-                $subjects = $selectedChild->subjects()->orderBy('name')->get();
+                $subjects = $selectedChild->subjects()->withCount('units')->orderBy('name')->get();
             } else {
                 $subjects = collect([]);
             }
 
@@ -131,7 +131,7 @@ public function storeForUnit(Request $request, int $unitId)
         }
 
         $validated = $request->validate([
-            'name' => 'required|string|max:255',
+            'title' => 'required|string|max:255',
             'description' => 'nullable|string|max:10000',
             'estimated_minutes' => 'required|integer|min:5|max:480',
             'required' => 'boolean',
@@ -151,7 +151,7 @@ public function storeForUnit(Request $request, int $unitId)
             // Use 'name' field but store as 'title' in the model
             $topic = Topic::create([
                 'unit_id' => $unitId,
-                'title' => $validated['name'], // Store name as title
+                'title' => $validated['title'], // Store title as title
                 'description' => $description,
                 'content_format' => $contentFormat,
                 'content_metadata' => $contentMetadata,
@@ -202,7 +202,7 @@ public function store(Request $request, int $subjectId, int $unitId)
             }
 
             $validated = $request->validate([
-                'name' => 'required|string|max:255',
+                'title' => 'required|string|max:255',
                 'description' => 'nullable|string',
                 'content_format' => 'nullable|in:plain,markdown,html',
                 'estimated_minutes' => 'required|integer|min:5|max:480',
@@ -222,7 +222,7 @@ public function store(Request $request, int $subjectId, int $unitId)
             // Use 'name' field but store as 'title' in the model
             $topic = Topic::create([
                 'unit_id' => $unitId,
-                'title' => $validated['name'], // Store name as title
+                'title' => $validated['title'], // Store title as title
                 'description' => $description,
                 'content_format' => $contentFormat,
                 'content_metadata' => $contentMetadata,
@@ -354,7 +354,7 @@ public function update(Request $request, int $id)
             }
 
             $validated = $request->validate([
-                'name' => 'required|string|max:255',
+                'title' => 'required|string|max:255',
                 'description' => 'nullable|string',
                 'content_format' => 'nullable|in:plain,markdown,html',
                 'estimated_minutes' => 'required|integer|min:5|max:480',
@@ -373,7 +373,7 @@ public function update(Request $request, int $id)
 
             // Use 'name' field but store as 'title' in the model
             $topic->update([
-                'title' => $validated['name'], // Store name as title
+                'title' => $validated['title'], // Store title as title
                 'description' => $description,
                 'content_format' => $contentFormat,
                 'content_metadata' => $contentMetadata,
 
@@ -2,7 +2,6 @@
 
 namespace App\Models;
 
-use App\Services\SupabaseClient;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -96,7 +95,7 @@ public function scopeForUser($query, int|string $userId)
      *
      * @return \Illuminate\Database\Eloquent\Collection<int, Child>
      */
-    public static function forUser(int|string $userId, ?SupabaseClient $supabase = null): \Illuminate\Database\Eloquent\Collection
+    public static function forUser(int|string $userId): \Illuminate\Database\Eloquent\Collection
     {
         return self::where('user_id', $userId)->orderBy('name')->get();
     }
 
@@ -302,7 +302,7 @@ public function canBeAccessedBy(string $userId): bool
      *
      * @return \Illuminate\Database\Eloquent\Collection<int, \App\Models\Flashcard>
      */
-    public static function forUnit(int $unitId, $supabase = null): \Illuminate\Database\Eloquent\Collection
+    public static function forUnit(int $unitId): \Illuminate\Database\Eloquent\Collection
     {
         return self::where('unit_id', $unitId)
             ->whereNull('topic_id') // Only unit-scoped flashcards
@@ -316,7 +316,7 @@ public static function forUnit(int $unitId, $supabase = null): \Illuminate\Datab
      *
      * @return \Illuminate\Database\Eloquent\Collection<int, \App\Models\Flashcard>
      */
-    public static function forTopic(int $topicId, $supabase = null): \Illuminate\Database\Eloquent\Collection
+    public static function forTopic(int $topicId): \Illuminate\Database\Eloquent\Collection
     {
         return self::where('topic_id', $topicId)->where('is_active', true)->orderBy('created_at')->get();
     }
 
@@ -102,12 +102,12 @@ public function scopeForChild($query, int $childId)
      * Compatibility methods for existing controllers that expect SupabaseClient
      * These maintain API compatibility during migration
      */
-    public static function forUser(string $userId, $supabase = null): Collection
+    public static function forUser(string $userId): Collection
     {
         return self::where('user_id', $userId)->orderBy('name')->get();
     }
 
-    public static function forChild(int $childId, $supabase = null): Collection
+    public static function forChild(int $childId): Collection
     {
         return self::where('child_id', $childId)->orderBy('name')->get();
     }
@@ -129,7 +129,7 @@ public function getUnitCount(): int
     /**
      * Compatibility method for controllers that still pass SupabaseClient
      */
-    public function getUnitCount_compat($supabase = null): int
+    public function getUnitCount_compat(): int
     {
         return $this->getUnitCount();
     }
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public function index(Request $request)`
`39`	`39`
`40`	`40`	`// Get subjects for the selected child or show empty state`
`41`	`41`	`if ($selectedChild) {`
`42`		`- $subjects = $selectedChild->subjects()->orderBy('name')->get();`
	`42`	`+ $subjects = $selectedChild->subjects()->withCount('units')->orderBy('name')->get();`
`43`	`43`	`} else {`
`44`	`44`	`$subjects = collect([]);`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`
`3`	`3`	`namespace App\Models;`
`4`	`4`
`5`		`-use App\Services\SupabaseClient;`
`6`	`5`	`use Illuminate\Database\Eloquent\Factories\HasFactory;`
`7`	`6`	`use Illuminate\Database\Eloquent\Model;`
`8`	`7`	`use Illuminate\Database\Eloquent\Relations\BelongsTo;`
`@@ -96,7 +95,7 @@ public function scopeForUser($query, int\|string $userId)`
`96`	`95`	`*`
`97`	`96`	`* @return \Illuminate\Database\Eloquent\Collection<int, Child>`
`98`	`97`	`*/`
`99`		`- public static function forUser(int\|string $userId, ?SupabaseClient $supabase = null): \Illuminate\Database\Eloquent\Collection`
	`98`	`+ public static function forUser(int\|string $userId): \Illuminate\Database\Eloquent\Collection`
`100`	`99`	`{`
`101`	`100`	`return self::where('user_id', $userId)->orderBy('name')->get();`
`102`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,7 @@ public function canBeAccessedBy(string $userId): bool`
`302`	`302`	`*`
`303`	`303`	`* @return \Illuminate\Database\Eloquent\Collection<int, \App\Models\Flashcard>`
`304`	`304`	`*/`
`305`		`- public static function forUnit(int $unitId, $supabase = null): \Illuminate\Database\Eloquent\Collection`
	`305`	`+ public static function forUnit(int $unitId): \Illuminate\Database\Eloquent\Collection`
`306`	`306`	`{`
`307`	`307`	`return self::where('unit_id', $unitId)`
`308`	`308`	`->whereNull('topic_id') // Only unit-scoped flashcards`
`@@ -316,7 +316,7 @@ public static function forUnit(int $unitId, $supabase = null): \Illuminate\Datab`
`316`	`316`	`*`
`317`	`317`	`* @return \Illuminate\Database\Eloquent\Collection<int, \App\Models\Flashcard>`
`318`	`318`	`*/`
`319`		`- public static function forTopic(int $topicId, $supabase = null): \Illuminate\Database\Eloquent\Collection`
	`319`	`+ public static function forTopic(int $topicId): \Illuminate\Database\Eloquent\Collection`
`320`	`320`	`{`
`321`	`321`	`return self::where('topic_id', $topicId)->where('is_active', true)->orderBy('created_at')->get();`
`322`	`322`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,12 +102,12 @@ public function scopeForChild($query, int $childId)`
`102`	`102`	`* Compatibility methods for existing controllers that expect SupabaseClient`
`103`	`103`	`* These maintain API compatibility during migration`
`104`	`104`	`*/`
`105`		`- public static function forUser(string $userId, $supabase = null): Collection`
	`105`	`+ public static function forUser(string $userId): Collection`
`106`	`106`	`{`
`107`	`107`	`return self::where('user_id', $userId)->orderBy('name')->get();`
`108`	`108`	`}`
`109`	`109`
`110`		`- public static function forChild(int $childId, $supabase = null): Collection`
	`110`	`+ public static function forChild(int $childId): Collection`
`111`	`111`	`{`
`112`	`112`	`return self::where('child_id', $childId)->orderBy('name')->get();`
`113`	`113`	`}`
`@@ -129,7 +129,7 @@ public function getUnitCount(): int`
`129`	`129`	`/**`
`130`	`130`	`* Compatibility method for controllers that still pass SupabaseClient`
`131`	`131`	`*/`
`132`		`- public function getUnitCount_compat($supabase = null): int`
	`132`	`+ public function getUnitCount_compat(): int`
`133`	`133`	`{`
`134`	`134`	`return $this->getUnitCount();`
`135`	`135`	`}`