Merge pull request #9 from JeremyParker/add-word-to-category

Add word to a category

Author: JeremyParker

README.md

@@ -57,3 +57,6 @@ php artisan cache:clear
 php artisan view:clear
 php artisan route:clear
 ```
+
+To check the phpinfo for debugging, go to http://localhost/phpinfo-secret.php
+TODO: this is a security issue.

app/Http/Controllers/CategoryController.php

@@ -42,11 +42,6 @@ public function createCategory(Request $request)
         return back()->withInput()->withErrors('Error. See logs');
     }
 
-    public function showCategories()
-    {
-        return view('categories');
-    }
-
     public function showEditCategory(Category $category)
     {
         return view('category', ['category' => $category]);

app/Http/Controllers/CategoryWordController.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\{Word, Category, CategoryWord};
+use Illuminate\Http\Request;
+
+class CategoryWordController extends Controller
+{
+    protected $word;
+    protected $category;
+
+    // Show the form for creating a new CategoryWord instance
+    public function showCreate(Request $request)
+    {
+        $wordId = $request->query('word');
+        $categoryId = $request->query('category');
+        $returnTo = $request->query('returnTo');
+
+        $word = Word::findOrFail($wordId);
+        $category = Category::findOrFail($categoryId);
+        return view('categoryword.create', [
+            'word' => $word,
+            'category' => $category,
+            'returnTo' => $returnTo,
+        ]);
+    }
+
+    // Store the new CategoryWord instance
+    public function store(Request $request)
+    {
+        $validated = $request->validate([
+            'word_id' => 'required|exists:words,id',
+            'category_id' => 'required|exists:categories,id',
+            'difficulty_override' => 'nullable|numeric',
+            'example_sentence' => 'nullable|string',
+        ]);
+
+        // Create a new CategoryWord instance
+        CategoryWord::create($validated);
+
+        // return to either the edit word page, or edit category page depending on where we came from
+        $returnTo = $request->input('return_to');
+        if ($returnTo === 'word') {
+            return redirect()->route('showEditWord', $validated['word_id'])->with('success', 'successfully added to that category!');
+        } else {
+            return redirect()->route('showEditCategory', $validated['category_id'])->with('success', 'word added successfully!');
+        }
+    }
+}

app/Http/Controllers/WordController.php

@@ -7,14 +7,14 @@
 use Illuminate\Http\Request;
 use Illuminate\Validation\Rule;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Database\QueryException;
 
 class WordController extends Controller
 {
     public function showWords()
     {
-        $words = Word::orderBy('updated_at', 'desc')->get();
-        return view('words', ['words' => $words]);
+        return view('words');
     }
 
     public function showEditWord(Word $word)
@@ -43,9 +43,9 @@ public function createWord(Request $request)
                 return back()->with('success', 'Word saved. Thanks!');
             }
         } catch (Exception $e) {
-            \Log::error($e->getMessage());
+            Log::error($e->getMessage());
         } catch (QueryException $qe) {
-            \Log::error($qe->getMessage());
+            Log::error($qe->getMessage());
         }
         return back()->withInput()->withErrors('Error: ' . $e->getMessage());
     }
@@ -71,9 +71,9 @@ public function updateWord(Word $word, Request $request)
                 return redirect('/words')->with('success', 'Word saved. Thanks!');
             }
         } catch (Exception $e) {
-            \Log::error($e->getMessage());
+            Log::error($e->getMessage());
         } catch (QueryException $qe) {
-            \Log::error($qe->getMessage());
+            Log::error($qe->getMessage());
         }
         return back()->withInput()->withErrors('Error: ' . $e->getMessage());
     }

app/Http/Livewire/AddWordToCategory.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Http\Livewire;
+
+use App\Models\Word;
+use Livewire\Component;
+use Livewire\Attributes\On;
+
+/**
+ * Component that shows the list of categories so the user can choose which category to add the word to
+ */
+class AddWordToCategory extends Component
+{
+    public $layout = 'components.layouts.app';
+    public Word $word;
+
+    public function mount(Word $word)
+    {
+        $this->word = $word;
+    }
+
+    public function render(Word $word)
+    {
+        return view('livewire.add-word-to-category', ['word' => $word]);
+    }
+
+    #[On('categorySelected')]
+    public function categorySelected($categoryId)
+    {
+        return redirect()->to(route('category_word.create', [
+            'category' => $categoryId,
+            'word' => $this->word->id,
+            'returnTo' => 'word',
+        ]));
+    }
+}

app/Http/Livewire/Categories.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Livewire;
+
+use Livewire\Component;
+use Livewire\Attributes\On;
+
+class Categories extends Component
+{
+    public $layout = 'components.layouts.app';
+
+    public function render()
+    {
+        return view('livewire.categories');
+    }
+
+    #[On('categorySelected')]
+    public function categorySelected($categoryId)
+    {
+        return redirect()->to(route('showEditCategory', ['category' => $categoryId]));
+    }
+}

app/Http/Livewire/CategoryList.php

@@ -7,14 +7,20 @@
 
 class CategoryList extends Component
 {
-    public $categories;
+    public $layout = 'components.layouts.app';
+
     public $search = '';
 
     public function render()
     {
-        $this->categories = Category::whereRaw('LOWER(name) LIKE ?', ['%' . strtolower($this->search) . '%'])
+        $categories = Category::whereRaw('LOWER(name) LIKE ?', ['%' . strtolower($this->search) . '%'])
             ->orderBy('updated_at', 'desc')
             ->get();
-        return view('livewire.category-list', ['categories' => $this->categories]);
+        return view('livewire.category-list', ['categories' => $categories]);
+    }
+
+    public function onSelected($categoryId)
+    {
+        $this->dispatch('categorySelected', categoryId: $categoryId);
     }
 }

app/Http/Livewire/WordForm.php

@@ -8,10 +8,9 @@
 
 class WordForm extends Component
 {
+    public $layout = 'components.layouts.app';
     public Word $word;
-
     public String $text;
-
     public bool $isTopical;
 
     public function mount(Word $word)

app/Http/Livewire/WordList.php

@@ -7,6 +7,7 @@
 
 class WordList extends Component
 {
+    public $layout = 'components.layouts.app';
     public $words;
     public $search = '';
     public bool $isTopical;

composer.json

@@ -2,7 +2,10 @@
     "name": "laravel/laravel",
     "type": "project",
     "description": "The skeleton application for the Laravel framework.",
-    "keywords": ["laravel", "framework"],
+    "keywords": [
+        "laravel",
+        "framework"
+    ],
     "license": "MIT",
     "require": {
         "php": "^8.1",