diff --git a/app/Http/Livewire/Picker.php b/app/Http/Livewire/FoodPicker.php similarity index 61% rename from app/Http/Livewire/Picker.php rename to app/Http/Livewire/FoodPicker.php index 4f42e34..3999f88 100644 --- a/app/Http/Livewire/Picker.php +++ b/app/Http/Livewire/FoodPicker.php @@ -2,11 +2,11 @@ namespace App\Http\Livewire; +use App\Models\Food; use Livewire\Component; -class Picker extends Component +class FoodPicker extends Component { - public string $model; public string $term = ''; /** @@ -17,10 +17,10 @@ class Picker extends Component public function render() { if (!empty($this->term)) { - $results = $this->model::search($this->term); + $foods = Food::search($this->term); } else { - $results = []; + $foods = []; } - return view('livewire.picker')->with('results', $results); + return view('livewire.food-picker')->with('foods', $foods); } } diff --git a/resources/views/livewire/food-picker.blade.php b/resources/views/livewire/food-picker.blade.php new file mode 100644 index 0000000..00d5303 --- /dev/null +++ b/resources/views/livewire/food-picker.blade.php @@ -0,0 +1,39 @@ +
+
+
+ +
+
+
+ @forelse($foods as $food) +
+
+ {{ $food->name }}@if($food->detail), {{ $food->detail }}@endif +
+ @if($food->brand) +
+ {{ $food->brand }} +
+ @endif +
+ Serving size {{ \App\Support\Number::fractionStringFromFloat($food->serving_size) }} + {{ $food->serving_unit }} + ({{ $food->serving_weight }}g) +
+
+ @empty +
+ No results found. +
+ @endforelse +
+
+
+
diff --git a/resources/views/livewire/picker.blade.php b/resources/views/livewire/picker.blade.php deleted file mode 100644 index 2c89c55..0000000 --- a/resources/views/livewire/picker.blade.php +++ /dev/null @@ -1,31 +0,0 @@ -
-
-
- -
- -
-
- @forelse($results as $result) -
-
    -
  • - {{ Str::limit($result->name, 40) }} -
  • -
-
- @empty -
- No results found. -
- @endforelse -
-
-
-
diff --git a/resources/views/recipes/edit.blade.php b/resources/views/recipes/edit.blade.php index 43194c2..553bce6 100644 --- a/resources/views/recipes/edit.blade.php +++ b/resources/views/recipes/edit.blade.php @@ -91,7 +91,7 @@ {{-- :selectedValue="old('foods.' . $i, $food_id)">--}} {{-- --}} {{-- --}} - +