From ae626e539236be499187aaba0bc596f9faadbceb Mon Sep 17 00:00:00 2001
From: "Christopher C. Wells" <git@chris-wells.net>
Date: Sat, 23 Jan 2021 16:09:17 -0800
Subject: [PATCH] Add search and filtering to food index

---
 app/JsonApi/Adapters/FoodAdapter.php          |   9 +-
 app/JsonApi/Schemas/FoodSchema.php            |   2 +-
 .../components/ingredient-picker.blade.php    |   1 -
 .../views/components/inputs/button.blade.php  |   4 +-
 resources/views/foods/index.blade.php         | 137 +++++++++++++-----
 5 files changed, 111 insertions(+), 42 deletions(-)

diff --git a/app/JsonApi/Adapters/FoodAdapter.php b/app/JsonApi/Adapters/FoodAdapter.php
index b8a7979..dd509d7 100644
--- a/app/JsonApi/Adapters/FoodAdapter.php
+++ b/app/JsonApi/Adapters/FoodAdapter.php
@@ -38,7 +38,14 @@ class FoodAdapter extends AbstractAdapter
      */
     protected function filter($query, Collection $filters)
     {
-        $this->filterWithScopes($query, $filters);
+        if ($term = $filters->get('search')) {
+            $query->where('foods.name', 'like', "%{$term}%")
+                ->orWhere('foods.detail', 'like', "%{$term}%")
+                ->orWhere('foods.brand', 'like', "%{$term}%");
+        }
+        else {
+            $this->filterWithScopes($query, $filters);
+        }
     }
 
 }
diff --git a/app/JsonApi/Schemas/FoodSchema.php b/app/JsonApi/Schemas/FoodSchema.php
index d56c790..10a8305 100644
--- a/app/JsonApi/Schemas/FoodSchema.php
+++ b/app/JsonApi/Schemas/FoodSchema.php
@@ -30,7 +30,7 @@ class FoodSchema extends SchemaProvider
     public function getAttributes($resource)
     {
         return [
-            'name' => $resource->created_at,
+            'name' => $resource->name,
             'detail' => $resource->detail,
             'brand' => $resource->brand,
             'calories' => $resource->calories,
diff --git a/resources/views/components/ingredient-picker.blade.php b/resources/views/components/ingredient-picker.blade.php
index ea5533b..a8c703d 100644
--- a/resources/views/components/ingredient-picker.blade.php
+++ b/resources/views/components/ingredient-picker.blade.php
@@ -49,7 +49,6 @@
     </div>
 </div>
 
-
 @once
     @push('scripts')
         <script type="text/javascript">
diff --git a/resources/views/components/inputs/button.blade.php b/resources/views/components/inputs/button.blade.php
index 8f18773..5284ba2 100644
--- a/resources/views/components/inputs/button.blade.php
+++ b/resources/views/components/inputs/button.blade.php
@@ -1,3 +1,5 @@
-<button {{ $attributes->merge(['type' => 'submit', 'class' => 'inline-flex items-center px-4 py-2 bg-gray-800 border border-transparent rounded-md font-semibold text-xs text-white uppercase tracking-widest hover:bg-gray-700 active:bg-gray-900 focus:outline-none focus:border-gray-900 focus:ring ring-gray-300 disabled:opacity-25 transition ease-in-out duration-150']) }}>
+@props(['color' => 'gray', 'textColor' => 'white'])
+
+<button {{ $attributes->merge(['type' => 'submit', 'class' => "inline-flex items-center px-4 py-2 bg-{$color}-800 border border-transparent rounded-md font-semibold text-xs text-{$textColor} uppercase tracking-widest hover:bg-{$color}-700 active:bg-{$color}-900 focus:outline-none focus:border-{$color}-900 focus:ring ring-{$color}-300 disabled:opacity-25 transition ease-in-out duration-150"]) }}>
     {{ $slot }}
 </button>
diff --git a/resources/views/foods/index.blade.php b/resources/views/foods/index.blade.php
index 9efca4d..49bd729 100644
--- a/resources/views/foods/index.blade.php
+++ b/resources/views/foods/index.blade.php
@@ -9,49 +9,110 @@
         <div class="max-w-7xl mx-auto sm:px-6 lg:px-8">
             <div class="bg-white overflow-hidden shadow-sm sm:rounded-lg">
                 <div class="p-6 bg-white border-b border-gray-200">
-                    <div class="grid grid-cols-3 gap-4">
-                        @foreach ($foods as $food)
-                            <div class="p-2 font-light rounded-t border-2 border-gray-400">
-                                <a class="h-6 w-6 text-gray-500 hover:text-gray-700 hover:border-gray-300 float-right text-sm"
-                                   href="{{ route('foods.edit', $food) }}">
-                                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
-                                        <path d="M17.414 2.586a2 2 0 00-2.828 0L7 10.172V13h2.828l7.586-7.586a2 2 0 000-2.828z" />
-                                        <path fill-rule="evenodd" d="M2 6a2 2 0 012-2h4a1 1 0 010 2H4v10h10v-4a1 1 0 112 0v4a2 2 0 01-2 2H4a2 2 0 01-2-2V6z" clip-rule="evenodd" />
-                                    </svg>
-                                </a>
-                                <div class="text-2xl">
-                                    {{ $food->name }}@if($food->detail), <span class="text-gray-500">{{ $food->detail }}</span>@endif
-                                </div>
-                                @if($food->brand)
-                                    <div class="text-xl text-gray-600">
-                                        {{ $food->brand }}
+                    <div x-data="foods()" x-init="loadMore()">
+                        <x-inputs.input type="text"
+                                        name="search"
+                                        placeholder="Search..."
+                                        autocomplete="off"
+                                        class="w-full mb-4"
+                                        @input.debounce.400ms="search($event)" />
+                        <div class="grid grid-cols-3 gap-4">
+                            <template x-for="food in foods" :key="food">
+                                <div class="p-2 font-light rounded-t border-2 border-gray-400">
+                                    <a class="h-6 w-6 text-gray-500 hover:text-gray-700 hover:border-gray-300 float-right text-sm"
+                                       href="/TODO">
+                                        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
+                                            <path d="M17.414 2.586a2 2 0 00-2.828 0L7 10.172V13h2.828l7.586-7.586a2 2 0 000-2.828z" />
+                                            <path fill-rule="evenodd" d="M2 6a2 2 0 012-2h4a1 1 0 010 2H4v10h10v-4a1 1 0 112 0v4a2 2 0 01-2 2H4a2 2 0 01-2-2V6z" clip-rule="evenodd" />
+                                        </svg>
+                                    </a>
+                                    <div class="text-2xl">
+                                        <span x-text="food.name"></span><span class="text-gray-500" x-text="`, ${food.detail}`" x-show="food.detail"></span>
+                                    </div>
+                                    <div class="text-xl text-gray-600" x-text="food.brand" x-show="food.brand"></div>
+                                    <div class="font-bold">
+                                        Serving size <span x-text="food.servingSizeFormatted"></span>
+                                        <span x-text="food.servingUnit"></span>
+                                        <span x-text="`(${food.servingWeight}g)`"></span>
+                                    </div>
+                                    <div class="grid grid-cols-2 text-sm border-t-8 border-black pt-2">
+                                        <div class="col-span-2 text-xs font-bold text-right">Amount per serving</div>
+                                        <div class="font-extrabold text-lg border-b-4 border-black">Calories</div>
+                                        <div class="font-extrabold text-right text-lg border-b-4 border-black" x-text="`${food.calories}g`"></div>
+                                        <div class="font-bold border-b border-gray-300">Fat</div>
+                                        <div class="text-right border-b border-gray-300" x-text="`${food.fat}g`"></div>
+                                        <div class="font-bold border-b border-gray-300">Cholesterol</div>
+                                        <div class="text-right border-b border-gray-300" x-text="`${Math.round(food.cholesterol*1000)}mg`"></div>
+                                        <div class="font-bold border-b border-gray-300">Sodium</div>
+                                        <div class="text-right border-b border-gray-300" x-text="`${Math.round(food.sodium*1000)}mg`">{</div>
+                                        <div class="font-bold border-b border-gray-300">Carbohydrates</div>
+                                        <div class="text-right border-b border-gray-300" x-text="`${food.carbohydrates}g`"></div>
+                                        <div class="font-bold">Protein</div>
+                                        <div class="text-right" x-text="`${food.protein}g`"></div>
                                     </div>
-                                @endif
-                                <div class="font-bold">
-                                    Serving size {{ \App\Support\Number::fractionStringFromFloat($food->serving_size) }}
-                                    {{ $food->serving_unit }}
-                                    ({{ $food->serving_weight }}g)
                                 </div>
-                                <div class="grid grid-cols-2 text-sm border-t-8 border-black pt-2">
-                                    <div class="col-span-2 text-xs font-bold text-right">Amount per serving</div>
-                                    <div class="font-extrabold text-lg border-b-4 border-black">Calories</div>
-                                    <div class="font-extrabold text-right text-lg border-b-4 border-black">{{$food->calories}}</div>
-                                    <div class="font-bold border-b border-gray-300">Fat</div>
-                                    <div class="text-right border-b border-gray-300">{{ $food->fat < 1 ? $food->fat * 1000 . "m" : $food->fat }}g</div>
-                                    <div class="font-bold border-b border-gray-300">Cholesterol</div>
-                                    <div class="text-right border-b border-gray-300">{{ $food->cholesterol < 1 ? $food->cholesterol * 1000 . "m" : $food->cholesterol }}g</div>
-                                    <div class="font-bold border-b border-gray-300">Sodium</div>
-                                    <div class="text-right border-b border-gray-300">{{ $food->sodium < 1 ? $food->sodium * 1000 . "m" : $food->sodium }}g</div>
-                                    <div class="font-bold border-b border-gray-300">Carbohydrates</div>
-                                    <div class="text-right border-b border-gray-300">{{ $food->carbohydrates < 1 ? $food->carbohydrates * 1000 . "m" : $food->carbohydrates }}g</div>
-                                    <div class="font-bold">Protein</div>
-                                    <div class="text-right">{{ $food->protein < 1 ? $food->protein * 1000 . "m" : $food->protein }}g</div>
-                                </div>
-                            </div>
-                        @endforeach
+                            </template>
+                        </div>
+                        <x-inputs.button
+                            class="text-xl mt-4"
+                            color="blue"
+                            type="button"
+                            x-show="morePages"
+                            @click.prevent="loadMore()">
+                            Load more
+                        </x-inputs.button>
                     </div>
                 </div>
             </div>
         </div>
     </div>
+
+    @once
+        @push('scripts')
+            <script type="text/javascript">
+                let foods = () => {
+                    return {
+                        foods: [],
+                        number: 1,
+                        size: 12,
+                        morePages: true,
+                        searchTerm: null,
+                        reset() {
+                            this.foods = [];
+                            this.number = 1;
+                            this.searchTerm = null;
+                            this.morePages = true;
+                        },
+                        loadMore() {
+                            let url = `{{ route('api:v1:foods.index') }}?page[number]=${this.number}&page[size]=${this.size}`;
+                            if (this.searchTerm) {
+                                url += `&filter[search]=${this.searchTerm}`;
+                            }
+                            console.log(url);
+                            fetch(url)
+                                .then(response => response.json())
+                                .then(data => {
+                                    this.foods = [...this.foods, ...data.data.map(food => food.attributes)];
+                                    if (this.number >= data.meta.page['last-page']) {
+                                        this.morePages = false;
+                                    } else {
+                                        this.number++;
+                                    }
+                                });
+                        },
+                        search(e) {
+                            this.reset();
+                            if (e.target.value !== '') {
+                                this.searchTerm = e.target.value;
+                                this.loadMore();
+                            }
+                            else {
+                                this.loadMore();
+                            }
+                        }
+                    }
+                }
+            </script>
+        @endpush
+    @endonce
 </x-app-layout>