From f5d82da4b6366ca8d2e708f145657f63df48a8d9 Mon Sep 17 00:00:00 2001
From: Purvesh <ind.purvesh@gmail.com>
Date: Sun, 13 Mar 2022 14:25:36 +1300
Subject: [PATCH 1/5] wip

---
 .../views/catalog/category/index.blade.php    | 71 +------------------
 .../system/components/layouts/app.blade.php   |  3 +
 .../components/livewire/table/table.blade.php |  3 +
 resources/views/system/datatable.blade.php    | 69 ++++++++++++++++++
 src/Catalog/Tables/CategoryTable.php          | 20 ++++++
 src/Support/Providers/ComponentsProvider.php  | 13 +++-
 6 files changed, 109 insertions(+), 70 deletions(-)
 create mode 100644 resources/views/system/components/livewire/table/table.blade.php
 create mode 100644 resources/views/system/datatable.blade.php
 create mode 100644 src/Catalog/Tables/CategoryTable.php

diff --git a/resources/views/catalog/category/index.blade.php b/resources/views/catalog/category/index.blade.php
index fd6ea3f9..82009f4d 100644
--- a/resources/views/catalog/category/index.blade.php
+++ b/resources/views/catalog/category/index.blade.php
@@ -15,75 +15,8 @@
         <div class="w-full mt-5">
             <!-- component -->
             <div class="overflow-x-auto">
-                <x-avored::table>
-                    <x-slot name="header">
-                        <x-avored::table.row class="bg-gray-300">
-                            <x-avored::table.header class="rounded-tl">
-                                {{ __('avored::system.parent') }}
-                            </x-avored::table.header>
-
-                            <x-avored::table.header>
-                                {{ __('avored::system.name') }}
-                            </x-avored::table.header>
-                            <x-avored::table.header>
-                                {{ __('avored::system.slug') }}
-                            </x-avored::table.header>
-                            <x-avored::table.header>
-                                {{ __('avored::system.meta_title') }}
-                            </x-avored::table.header>
-                            <x-avored::table.header>
-                                {{ __('avored::system.meta_description') }}
-                            </x-avored::table.header>
-                            <x-avored::table.header class="rounded-tr">
-                                {{ __('avored::system.actions') }}
-                            </x-avored::table.header>
-                        </x-avored::table.row>
-                    </x-slot>
-                    <x-slot name="body">
-                        @foreach ($categories as $category)
-                            <x-avored::table.row class="{{ ($loop->index % 2 == 0) ? '' : 'bg-gray-200'  }}">
-                                <x-avored::table.cell>
-                                    {{ $category->parent->name ?? '' }}
-                                </x-avored::table.cell>
-                                <x-avored::table.cell>
-                                    {{ $category->name ?? '' }}
-                                </x-avored::table.cell>
-                                <x-avored::table.cell>
-                                    {{ $category->slug ?? '' }}
-                                </x-avored::table.cell>
-                                <x-avored::table.cell>
-                                    {{ $category->meta_title ?? '' }}
-                                </x-avored::table.cell>
-                                <x-avored::table.cell>
-                                    {{ $category->meta_description ?? '' }}
-                                </x-avored::table.cell>
-                                <x-avored::table.cell>
-                                    <div class="flex">
-                                        <x-avored::link url="{{ route('admin.category.edit', $category) }}">
-                                            <i class="w-5 h-5" data-feather="edit"></i>
-                                        </x-avored::link>
-                                        <span class="mx-2">|</span>
-                                        <x-avored::link
-                                            x-on:click.prevent="toggleConfirmationDialog(
-                                                true,
-                                                {{ $category }},
-                                                '{{ __('avored::system.confirmation_delete_message', ['attribute_value' => $category->name, 'attribute' => strtolower(__('avored::system.category'))]) }}',
-                                                '{{ route('admin.category.destroy', $category) }}'
-                                            )"
-                                            url="{{ route('admin.category.destroy', $category) }}">
-                                            <i class="w-5 h-5" data-feather="trash"></i>
-                                            <x-avored::form.form
-                                                id="category-destory-{{ $category->id }}"
-                                                method="delete"
-                                                action="{{ route('admin.category.destroy', $category) }}">
-                                            </x-avored::form.form>
-                                        </x-avored::link>
-                                    </div>
-                                </x-avored::table.cell>
-                            </x-avored::table.row>
-                        @endforeach
-                    </x-slot>
-                </x-avored::table>
+                @livewire('avored-category-table')
+                
                 <div class="w-full">
                     {{ $categories->render() }}
                 </div>
diff --git a/resources/views/system/components/layouts/app.blade.php b/resources/views/system/components/layouts/app.blade.php
index 51c62420..2ca94b22 100644
--- a/resources/views/system/components/layouts/app.blade.php
+++ b/resources/views/system/components/layouts/app.blade.php
@@ -11,6 +11,8 @@
 
     <link rel="stylesheet" href="{{ asset('vendor/avored/css/app.css') }}"></link>
 
+    <livewire:styles />
+    <livewire:scripts />
 </head>
 <body x-data="app">
 
@@ -24,6 +26,7 @@
             {{ $slot }}
         </div>
     </div>
+    
     <script src="{{ asset('vendor/avored/js/app.js')  }}"></script>
     @stack('scripts')
     <script>
diff --git a/resources/views/system/components/livewire/table/table.blade.php b/resources/views/system/components/livewire/table/table.blade.php
new file mode 100644
index 00000000..9fdfcdb7
--- /dev/null
+++ b/resources/views/system/components/livewire/table/table.blade.php
@@ -0,0 +1,3 @@
+<div>
+    Display Table Here
+</div>
\ No newline at end of file
diff --git a/resources/views/system/datatable.blade.php b/resources/views/system/datatable.blade.php
new file mode 100644
index 00000000..e3a993a0
--- /dev/null
+++ b/resources/views/system/datatable.blade.php
@@ -0,0 +1,69 @@
+<x-avored::table>
+    <x-slot name="header">
+        <x-avored::table.row class="bg-gray-300">
+            <x-avored::table.header class="rounded-tl">
+                {{ __('avored::system.parent') }}
+            </x-avored::table.header>
+
+            <x-avored::table.header>
+                {{ __('avored::system.name') }}
+            </x-avored::table.header>
+            <x-avored::table.header>
+                {{ __('avored::system.slug') }}
+            </x-avored::table.header>
+            <x-avored::table.header>
+                {{ __('avored::system.meta_title') }}
+            </x-avored::table.header>
+            <x-avored::table.header>
+                {{ __('avored::system.meta_description') }}
+            </x-avored::table.header>
+            <x-avored::table.header class="rounded-tr">
+                {{ __('avored::system.actions') }}
+            </x-avored::table.header>
+        </x-avored::table.row>
+    </x-slot>
+    <x-slot name="body">
+        @foreach ($categories as $category)
+            <x-avored::table.row class="{{ ($loop->index % 2 == 0) ? '' : 'bg-gray-200'  }}">
+                <x-avored::table.cell>
+                    {{ $category->parent->name ?? '' }}
+                </x-avored::table.cell>
+                <x-avored::table.cell>
+                    {{ $category->name ?? '' }}
+                </x-avored::table.cell>
+                <x-avored::table.cell>
+                    {{ $category->slug ?? '' }}
+                </x-avored::table.cell>
+                <x-avored::table.cell>
+                    {{ $category->meta_title ?? '' }}
+                </x-avored::table.cell>
+                <x-avored::table.cell>
+                    {{ $category->meta_description ?? '' }}
+                </x-avored::table.cell>
+                <x-avored::table.cell>
+                    <div class="flex">
+                        <x-avored::link url="{{ route('admin.category.edit', $category) }}">
+                            <i class="w-5 h-5" data-feather="edit"></i>
+                        </x-avored::link>
+                        <span class="mx-2">|</span>
+                        <x-avored::link
+                            x-on:click.prevent="toggleConfirmationDialog(
+                                true,
+                                {{ $category }},
+                                '{{ __('avored::system.confirmation_delete_message', ['attribute_value' => $category->name, 'attribute' => strtolower(__('avored::system.category'))]) }}',
+                                '{{ route('admin.category.destroy', $category) }}'
+                            )"
+                            url="{{ route('admin.category.destroy', $category) }}">
+                            <i class="w-5 h-5" data-feather="trash"></i>
+                            <x-avored::form.form
+                                id="category-destory-{{ $category->id }}"
+                                method="delete"
+                                action="{{ route('admin.category.destroy', $category) }}">
+                            </x-avored::form.form>
+                        </x-avored::link>
+                    </div>
+                </x-avored::table.cell>
+            </x-avored::table.row>
+        @endforeach
+    </x-slot>
+</x-avored::table>
\ No newline at end of file
diff --git a/src/Catalog/Tables/CategoryTable.php b/src/Catalog/Tables/CategoryTable.php
new file mode 100644
index 00000000..219f3183
--- /dev/null
+++ b/src/Catalog/Tables/CategoryTable.php
@@ -0,0 +1,20 @@
+<?php
+namespace AvoRed\Framework\Catalog\Tables;
+
+use AvoRed\Framework\Database\Models\Category;
+use Livewire\Component;
+
+class CategoryTable extends Component
+{
+
+    /**
+     * @return mixed
+     */
+    public function render()
+    {
+        return view('avored::system.datatable')
+            ->with('categories', Category::all())
+            ;
+    }
+
+}
\ No newline at end of file
diff --git a/src/Support/Providers/ComponentsProvider.php b/src/Support/Providers/ComponentsProvider.php
index 1a78b6ab..84bfe141 100644
--- a/src/Support/Providers/ComponentsProvider.php
+++ b/src/Support/Providers/ComponentsProvider.php
@@ -1,6 +1,7 @@
 <?php
 namespace AvoRed\Framework\Support\Providers;
 
+use AvoRed\Framework\Catalog\Tables\CategoryTable;
 use AvoRed\Framework\System\Components\Alert;
 use AvoRed\Framework\System\Components\Form\Checkbox;
 use AvoRed\Framework\System\Components\Form\Form;
@@ -9,6 +10,7 @@
 use AvoRed\Framework\System\Components\Form\Link;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\ServiceProvider;
+use Livewire\Livewire;
 
 class ComponentsProvider extends ServiceProvider
 {
@@ -16,7 +18,7 @@ class ComponentsProvider extends ServiceProvider
      * Indicates if loading of the provider is deferred.
      * @var bool
      */
-    protected $defer = true;
+    protected $defer = false;
 
     public function boot()
     {
@@ -26,6 +28,15 @@ public function boot()
     public function registerBlades()
     {
         Blade::componentNamespace('AvoRed\\Framework\\System\\Components', 'avored');
+        
+        
+        // Blade::component('avored::system.components.livewire.table.table', 'avored-table::tailwind.table');
+
+
+        Livewire::component('avored-category-table', CategoryTable::class);
+
+
+
         // Blade::component('avored-input', Input::class);
         // Blade::component('avored-checkbox', Checkbox::class);
         // Blade::component('avored-form', Form::class);

From 20cb2e9498210122f15739dbf25eb67da6b398c3 Mon Sep 17 00:00:00 2001
From: indpurvesh <ind.purvesh@gmail.com>
Date: Sun, 13 Mar 2022 16:33:18 +1300
Subject: [PATCH 2/5] wip

---
 resources/views/system/datatable.blade.php | 27 ++++++----------------
 src/Catalog/Tables/CategoryTable.php       | 27 +++++++++++++++++++++-
 2 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/resources/views/system/datatable.blade.php b/resources/views/system/datatable.blade.php
index e3a993a0..a1873697 100644
--- a/resources/views/system/datatable.blade.php
+++ b/resources/views/system/datatable.blade.php
@@ -1,25 +1,12 @@
+
 <x-avored::table>
     <x-slot name="header">
         <x-avored::table.row class="bg-gray-300">
-            <x-avored::table.header class="rounded-tl">
-                {{ __('avored::system.parent') }}
-            </x-avored::table.header>
-
-            <x-avored::table.header>
-                {{ __('avored::system.name') }}
-            </x-avored::table.header>
-            <x-avored::table.header>
-                {{ __('avored::system.slug') }}
-            </x-avored::table.header>
-            <x-avored::table.header>
-                {{ __('avored::system.meta_title') }}
-            </x-avored::table.header>
-            <x-avored::table.header>
-                {{ __('avored::system.meta_description') }}
-            </x-avored::table.header>
-            <x-avored::table.header class="rounded-tr">
-                {{ __('avored::system.actions') }}
-            </x-avored::table.header>
+            @foreach ($columns as $column)
+                <x-avored::table.header class="rounded-tl">
+                    {{ __('avored::system.' . $column['identifier']) }}
+                </x-avored::table.header>
+            @endforeach
         </x-avored::table.row>
     </x-slot>
     <x-slot name="body">
@@ -66,4 +53,4 @@
             </x-avored::table.row>
         @endforeach
     </x-slot>
-</x-avored::table>
\ No newline at end of file
+</x-avored::table>
diff --git a/src/Catalog/Tables/CategoryTable.php b/src/Catalog/Tables/CategoryTable.php
index 219f3183..a6c116d5 100644
--- a/src/Catalog/Tables/CategoryTable.php
+++ b/src/Catalog/Tables/CategoryTable.php
@@ -2,11 +2,35 @@
 namespace AvoRed\Framework\Catalog\Tables;
 
 use AvoRed\Framework\Database\Models\Category;
+use Illuminate\Support\Collection;
 use Livewire\Component;
 
 class CategoryTable extends Component
 {
 
+    public function columns()
+    {
+        $columns = Collection::make([]);
+        $columns->push([
+            'identifier' => 'parent'
+        ]);
+        $columns->push([
+            'identifier' => 'name'
+        ]);
+        $columns->push([
+            'identifier' => 'slug'
+        ]);
+        $columns->push([
+            'identifier' => 'meta_title'
+        ]);
+        $columns->push([
+            'identifier' => 'meta_description'
+        ]);
+        $columns->push([
+            'identifier' => 'actions'
+        ]);
+        return $columns;
+    }
     /**
      * @return mixed
      */
@@ -14,7 +38,8 @@ public function render()
     {
         return view('avored::system.datatable')
             ->with('categories', Category::all())
+            ->with('columns', $this->columns())
             ;
     }
 
-}
\ No newline at end of file
+}

From 450991ad47ee852410639ce3df9bb037e57f9808 Mon Sep 17 00:00:00 2001
From: indpurvesh <ind.purvesh@gmail.com>
Date: Sun, 26 Jun 2022 11:08:27 +1200
Subject: [PATCH 3/5] basic category table implemented

---
 composer.json                                 |  3 ++-
 .../views/catalog/category/_actions.blade.php | 21 +++++++++++++++++++
 resources/views/system/datatable.blade.php    | 18 +++++++++++++---
 src/Catalog/Tables/CategoryTable.php          | 13 +++++++++---
 4 files changed, 48 insertions(+), 7 deletions(-)
 create mode 100644 resources/views/catalog/category/_actions.blade.php

diff --git a/composer.json b/composer.json
index b50733a5..d3f577ce 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,8 @@
         "rebing/graphql-laravel": "^8.2",
         "nyholm/psr7": "^1.4",
         "laravel/passport": "^10.1|^10.2|^10.3",
-        "symfony/yaml": "^5.3|^6.0"
+        "symfony/yaml": "^5.3|^6.0",
+        "livewire/livewire": "^2.10"
     },
     "require-dev": {
         "brianium/paratest": "^6.0",
diff --git a/resources/views/catalog/category/_actions.blade.php b/resources/views/catalog/category/_actions.blade.php
new file mode 100644
index 00000000..4e82b70c
--- /dev/null
+++ b/resources/views/catalog/category/_actions.blade.php
@@ -0,0 +1,21 @@
+<div class="flex">
+    <x-avored::link url="{{ route('admin.category.edit', $category) }}">
+        <i class="w-5 h-5" data-feather="edit"></i>
+    </x-avored::link>
+    <span class="mx-2">|</span>
+    <x-avored::link
+        x-on:click.prevent="toggleConfirmationDialog(
+            true,
+            {{ $category }},
+            '{{ __('avored::system.confirmation_delete_message', ['attribute_value' => $category->name, 'attribute' => strtolower(__('avored::system.category'))]) }}',
+            '{{ route('admin.category.destroy', $category) }}'
+        )"
+        url="{{ route('admin.category.destroy', $category) }}">
+        <i class="w-5 h-5" data-feather="trash"></i>
+        <x-avored::form.form
+            id="category-destory-{{ $category->id }}"
+            method="delete"
+            action="{{ route('admin.category.destroy', $category) }}">
+        </x-avored::form.form>
+    </x-avored::link>
+</div>
diff --git a/resources/views/system/datatable.blade.php b/resources/views/system/datatable.blade.php
index a1873697..25cbf8f5 100644
--- a/resources/views/system/datatable.blade.php
+++ b/resources/views/system/datatable.blade.php
@@ -10,9 +10,21 @@
         </x-avored::table.row>
     </x-slot>
     <x-slot name="body">
-        @foreach ($categories as $category)
+        @foreach ($rows as $row)
+
             <x-avored::table.row class="{{ ($loop->index % 2 == 0) ? '' : 'bg-gray-200'  }}">
-                <x-avored::table.cell>
+                @foreach ($columns as $column)
+                    <x-avored::table.cell>
+                        @if (isset ($column['render']) && is_callable($column['render']))
+                            @php $renderFunc = $column['render']; @endphp
+                            {!! $renderFunc($row) !!}
+                        @else
+                            @php $identifier = $column['identifier']; @endphp
+                            {{ $row->$identifier ?? '' }}
+                        @endif
+                    </x-avored::table.cell>
+                @endforeach
+                {{--  <x-avored::table.cell>
                     {{ $category->parent->name ?? '' }}
                 </x-avored::table.cell>
                 <x-avored::table.cell>
@@ -49,7 +61,7 @@
                             </x-avored::form.form>
                         </x-avored::link>
                     </div>
-                </x-avored::table.cell>
+                </x-avored::table.cell>  --}}
             </x-avored::table.row>
         @endforeach
     </x-slot>
diff --git a/src/Catalog/Tables/CategoryTable.php b/src/Catalog/Tables/CategoryTable.php
index a6c116d5..447a29c1 100644
--- a/src/Catalog/Tables/CategoryTable.php
+++ b/src/Catalog/Tables/CategoryTable.php
@@ -12,7 +12,10 @@ public function columns()
     {
         $columns = Collection::make([]);
         $columns->push([
-            'identifier' => 'parent'
+            'identifier' => 'parent',
+            'render' => function ($row) {
+                return ($row->parent) ? $row->parent->name : '';
+            }
         ]);
         $columns->push([
             'identifier' => 'name'
@@ -27,7 +30,11 @@ public function columns()
             'identifier' => 'meta_description'
         ]);
         $columns->push([
-            'identifier' => 'actions'
+            'identifier' => 'actions',
+            'render' => function ($row) {
+                return view('avored::catalog.category._actions')
+                    ->with('category', $row);
+            }
         ]);
         return $columns;
     }
@@ -37,7 +44,7 @@ public function columns()
     public function render()
     {
         return view('avored::system.datatable')
-            ->with('categories', Category::all())
+            ->with('rows', Category::all())
             ->with('columns', $this->columns())
             ;
     }

From 4e1da5e0fded3ee1f1c14b219cb76d6994e5eaaf Mon Sep 17 00:00:00 2001
From: indpurvesh <ind.purvesh@gmail.com>
Date: Sun, 26 Jun 2022 11:17:42 +1200
Subject: [PATCH 4/5] not required

---
 .../views/system/components/livewire/table/table.blade.php     | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 resources/views/system/components/livewire/table/table.blade.php

diff --git a/resources/views/system/components/livewire/table/table.blade.php b/resources/views/system/components/livewire/table/table.blade.php
deleted file mode 100644
index 9fdfcdb7..00000000
--- a/resources/views/system/components/livewire/table/table.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<div>
-    Display Table Here
-</div>
\ No newline at end of file

From febbbfb2314ea5fe282288499e31f5690c227485 Mon Sep 17 00:00:00 2001
From: indpurvesh <ind.purvesh@gmail.com>
Date: Sun, 26 Jun 2022 11:21:15 +1200
Subject: [PATCH 5/5] minor changes

---
 resources/views/system/components/table.blade.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/resources/views/system/components/table.blade.php b/resources/views/system/components/table.blade.php
index 122c5c79..9258510c 100644
--- a/resources/views/system/components/table.blade.php
+++ b/resources/views/system/components/table.blade.php
@@ -16,5 +16,4 @@
             </table>
         </div>
     </div>
-</div
->
+</div>