From da0e34fe8e6e71b0c5edb067d1b92b87d3355dd4 Mon Sep 17 00:00:00 2001
From: IsharaEkanayaka <e20094@eng.pdn.ac.lk>
Date: Sat, 12 Oct 2024 18:36:35 +0530
Subject: [PATCH 1/5] create routes for taxonomy terms

---
 .../Models/TaxonomyTerm.php}                  | 14 ++---
 .../Traits/Scope/TaxonomyTermsScope.php       | 11 ----
 .../Services/TaxonomyTermsService.php         | 22 -------
 ...troller.php => TaxonomyTermController.php} | 37 ++++++------
 ...rmsFactory.php => TaxonomyTermFactory.php} |  9 +--
 .../backend/taxonomy/terms/create.blade.php   |  0
 .../backend/taxonomy/terms/delete.blade.php   |  0
 .../backend/taxonomy/terms/edit.blade.php     |  0
 .../backend/taxonomy/terms/index.blade.php    |  0
 routes/backend/taxonomy.php                   | 58 +++++++++++++++++++
 10 files changed, 85 insertions(+), 66 deletions(-)
 rename app/Domains/{TaxonomyTerms/Models/TaxonomyTerms.php => Taxonomy/Models/TaxonomyTerm.php} (71%)
 delete mode 100644 app/Domains/TaxonomyTerms/Models/Traits/Scope/TaxonomyTermsScope.php
 delete mode 100644 app/Domains/TaxonomyTerms/Services/TaxonomyTermsService.php
 rename app/Http/Controllers/Backend/{TaxonomyTermsController.php => TaxonomyTermController.php} (60%)
 rename database/factories/{TaxonomyTermsFactory.php => TaxonomyTermFactory.php} (89%)
 create mode 100644 resources/views/backend/taxonomy/terms/create.blade.php
 create mode 100644 resources/views/backend/taxonomy/terms/delete.blade.php
 create mode 100644 resources/views/backend/taxonomy/terms/edit.blade.php
 create mode 100644 resources/views/backend/taxonomy/terms/index.blade.php

diff --git a/app/Domains/TaxonomyTerms/Models/TaxonomyTerms.php b/app/Domains/Taxonomy/Models/TaxonomyTerm.php
similarity index 71%
rename from app/Domains/TaxonomyTerms/Models/TaxonomyTerms.php
rename to app/Domains/Taxonomy/Models/TaxonomyTerm.php
index 7daa09da..6a8d8dc3 100644
--- a/app/Domains/TaxonomyTerms/Models/TaxonomyTerms.php
+++ b/app/Domains/Taxonomy/Models/TaxonomyTerm.php
@@ -1,21 +1,19 @@
 <?php
 
-namespace App\Domains\TaxonomyTerms\Models;
+namespace App\Domains\Taxonomy\Models;
 
 use App\Domains\Auth\Models\User;
-use Database\Factories\TaxonomyTermsFactory;
+use Database\Factories\TaxonomyTermFactory;
 use Illuminate\Database\Eloquent\Model;
 use Spatie\Activitylog\Traits\LogsActivity;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
-use App\Domains\TaxonomyTerms\Models\Traits\Scope\TaxonomyTermsScope;
 
 /**
- * Class TaxonomyTerms.
+ * Class TaxonomyTerm.
  */
-class TaxonomyTerms extends Model
+class TaxonomyTerm extends Model
 {
-    use TaxonomyTermsScope,
-        HasFactory,
+    use HasFactory,
         LogsActivity;
 
 
@@ -46,6 +44,6 @@ public function user()
      */
     protected static function newFactory()
     {
-        return TaxonomyTermsFactory::new();
+        return TaxonomyTermFactory::new();
     }
 }
\ No newline at end of file
diff --git a/app/Domains/TaxonomyTerms/Models/Traits/Scope/TaxonomyTermsScope.php b/app/Domains/TaxonomyTerms/Models/Traits/Scope/TaxonomyTermsScope.php
deleted file mode 100644
index a9be8716..00000000
--- a/app/Domains/TaxonomyTerms/Models/Traits/Scope/TaxonomyTermsScope.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace App\Domains\TaxonomyTerms\Models\Traits\Scope;
-
-/**
- * Class TaxonomyTermsScope.
- */
-trait TaxonomyTermsScope
-{
-   
-}
diff --git a/app/Domains/TaxonomyTerms/Services/TaxonomyTermsService.php b/app/Domains/TaxonomyTerms/Services/TaxonomyTermsService.php
deleted file mode 100644
index 6f8f2e1d..00000000
--- a/app/Domains/TaxonomyTerms/Services/TaxonomyTermsService.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Domains\TaxonomyTerms\Services;
-
-use App\Domains\TaxonomyTerms\Models\TaxonomyTerms;
-use App\Services\BaseService;
-
-/**
- * Class TaxonomyTermsService.
- */
-class TaxonomyTermsService extends BaseService
-{
-    /**
-     * TaxonomyTermsService constructor.
-     *
-     * @param  TaxonomyTerms  $taxonomyTerms
-     */
-    public function __construct(TaxonomyTerms $taxonomyTerms)
-    {
-        $this->model = $taxonomyTerms;
-    }
-}
diff --git a/app/Http/Controllers/Backend/TaxonomyTermsController.php b/app/Http/Controllers/Backend/TaxonomyTermController.php
similarity index 60%
rename from app/Http/Controllers/Backend/TaxonomyTermsController.php
rename to app/Http/Controllers/Backend/TaxonomyTermController.php
index 69e8886a..2e74610e 100644
--- a/app/Http/Controllers/Backend/TaxonomyTermsController.php
+++ b/app/Http/Controllers/Backend/TaxonomyTermController.php
@@ -5,9 +5,9 @@
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
 use App\Http\Controllers\Controller;
-use App\Domains\TaxonomyTerms\Models\TaxonomyTerms;
+use App\Domains\Taxonomy\Models\TaxonomyTerm;
 
-class TaxonomyTermsController extends Controller
+class TaxonomyTermController extends Controller
 {
     /**
      * Show the form for creating a new resource.
@@ -17,7 +17,7 @@ class TaxonomyTermsController extends Controller
     public function create()
     {
         try{
-            return view('backend.taxonomyTerms.create');
+            return view('backend.taxonomy.terms.create');
         }catch (\Exception $ex) {
             Log::error('Failed to load taxonomy terms creation page', ['error' => $ex->getMessage()]);    
             return abort(500);
@@ -36,15 +36,15 @@ public function store(Request $request)
     /**
      * Show the form for editing the specified resource.
      *
-     * @param \App\Domains\TaxonomyTerms\Models\TaxonomyTerms $taxonomyTerms
+     * @param \App\Domains\TaxonomyTerm\Models\TaxonomyTerm $taxonomyTerm
      * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View
      */
-    public function edit(TaxonomyTerms $taxonomyTerms)
+    public function edit(TaxonomyTerm $taxonomyTerm)
     {
         try{
-            return view('backend.taxonomyTerms.edit', ['taxonomyTerms' => $taxonomyTerms]);
+            return view('backend.taxonomy.terms.edit', ['taxonomyTerm' => $taxonomyTerm]);
         }catch (\Exception $ex) {
-            Log::error('Failed to load taxonomy terms edit page', ['error' => $ex->getMessage()]);    
+            Log::error('Failed to load taxonomy term edit page', ['error' => $ex->getMessage()]);    
             return abort(500);
         }
     }
@@ -52,40 +52,39 @@ public function edit(TaxonomyTerms $taxonomyTerms)
      * Update the specified resource in storage.
      *
      * @param \Illuminate\Http\Request $request
-     * @param \App\Domains\TaxonomyTerms\Models\TaxonomyTerms $taxonomyTerms
+     * @param \App\Domains\TaxonomyTerm\Models\TaxonomyTerm $taxonomyTerm
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function update(Request $request, TaxonomyTerms $taxonomyTerms)
+    public function update(Request $request, TaxonomyTerm $taxonomyTerm)
     {
 
     }
      /**
      * Confirm to delete the specified resource from storage.
      *
-     * @param \App\Domains\TaxonomyTerms\Models\TaxonomyTerms $taxonomyTerms
+     * @param \App\Domains\TaxonomyTerm\Models\TaxonomyTerm $taxonomyTerm
      * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View
      */
-    public function delete(TaxonomyTerms $taxonomyTerms)
+    public function delete(TaxonomyTerm $taxonomyTerm)
     {
-        return view('backend.taxonomyTerms.delete', compact('taxonomyTerms'));
+        return view('backend.taxonomy.terms.delete', compact('taxonomyTerm'));
     }
 
 
     /**
      * Remove the specified resource from storage.
      *
-     * @param \App\Domains\TaxonomyTerms\Models\TaxonomyTerms $taxonomyTerms
+     * @param \App\Domains\TaxonomyTerm\Models\TaxonomyTerm $taxonomyTerm
      * @return \Illuminate\Http\RedirectResponse|null
      */
-    public function destroy(TaxonomyTerms $taxonomyTerms)
+    public function destroy(TaxonomyTerm $taxonomyTerm)
     {
         try {
-            $taxonomyTerms->delete();
-            return redirect()->route('dashboard.taxonomyTerms.index')->with('Success', 'Taxonomy term was deleted !');
+            $taxonomyTerm->delete();
+            return redirect()->route('dashboard.taxonomy.terms.index')->with('Success', 'Taxonomy term was deleted !');
         } catch (\Exception $ex) {
-            Log::error('Failed to delete taxonomy term', ['taxonomyTerms_id' => $taxonomyTerms->id, 'error' => $ex->getMessage()]);
+            Log::error('Failed to delete taxonomy term', ['taxonomyTerm_id' => $taxonomyTerm->id, 'error' => $ex->getMessage()]);
             return abort(500);
         }
     }
-}
-
+}
\ No newline at end of file
diff --git a/database/factories/TaxonomyTermsFactory.php b/database/factories/TaxonomyTermFactory.php
similarity index 89%
rename from database/factories/TaxonomyTermsFactory.php
rename to database/factories/TaxonomyTermFactory.php
index cb580e2f..117d2123 100644
--- a/database/factories/TaxonomyTermsFactory.php
+++ b/database/factories/TaxonomyTermFactory.php
@@ -1,19 +1,16 @@
 <?php
 
 namespace Database\Factories;
-use App\Domains\TaxonomyTerms\Models\TaxonomyTerms;
+use App\Domains\Taxonomy\Models\TaxonomyTerm;
 use App\Domains\Auth\Models\User;
 
 
 
 use Illuminate\Database\Eloquent\Factories\Factory;
 
-class TaxonomyTermsFactory extends Factory
+class TaxonomyTermFactory extends Factory
 {
-
-
-
-    protected $model = TaxonomyTerms::class;
+    protected $model = TaxonomyTerm::class;
 
     /**
      * Define the model's default state.
diff --git a/resources/views/backend/taxonomy/terms/create.blade.php b/resources/views/backend/taxonomy/terms/create.blade.php
new file mode 100644
index 00000000..e69de29b
diff --git a/resources/views/backend/taxonomy/terms/delete.blade.php b/resources/views/backend/taxonomy/terms/delete.blade.php
new file mode 100644
index 00000000..e69de29b
diff --git a/resources/views/backend/taxonomy/terms/edit.blade.php b/resources/views/backend/taxonomy/terms/edit.blade.php
new file mode 100644
index 00000000..e69de29b
diff --git a/resources/views/backend/taxonomy/terms/index.blade.php b/resources/views/backend/taxonomy/terms/index.blade.php
new file mode 100644
index 00000000..e69de29b
diff --git a/routes/backend/taxonomy.php b/routes/backend/taxonomy.php
index b5a143aa..75cfd489 100644
--- a/routes/backend/taxonomy.php
+++ b/routes/backend/taxonomy.php
@@ -2,6 +2,7 @@
 
 use Tabuna\Breadcrumbs\Trail;
 use App\Http\Controllers\Backend\TaxonomyController;
+use App\Http\Controllers\Backend\TaxonomyTermController;
 use Illuminate\Support\Facades\Route;
 
 Route::group([], function () {
@@ -53,4 +54,61 @@
     // Destroy
     Route::delete('taxonomy/{taxonomy}', [TaxonomyController::class, 'destroy'])
         ->name('taxonomy.destroy');
+
+    //Taxonomy Term Routes
+    Route::group(['prefix' => 'taxonomy/{taxonomy}/terms'], function () {
+
+        // Index (list terms for a taxonomy)
+        Route::get('/', function(){
+            return view('backend.taxonomy.terms.index');
+        })->name('taxonomy.terms.index')
+            ->breadcrumbs(function (Trail $trail, $taxonomy) {
+                $trail->push(__('Home'), route('dashboard.home'))
+                    ->push(__('Taxonomy'), route('dashboard.taxonomy.index'))
+                    ->push($taxonomy->name, route('dashboard.taxonomy.edit', $taxonomy))
+                    ->push(__('Terms'), route('dashboard.taxonomy.terms.index', $taxonomy));
+            });
+
+        // Create (show form for creating a new term)
+        Route::get('/create', [TaxonomyTermController::class, 'create'])
+            ->name('taxonomy.terms.create')
+            ->breadcrumbs(function (Trail $trail, $taxonomy) {
+                $trail->push(__('Home'), route('dashboard.home'))
+                    ->push(__('Taxonomy'), route('dashboard.taxonomy.index'))
+                    ->push($taxonomy->name, route('dashboard.taxonomy.edit', $taxonomy))
+                    ->push(__('Create Term'));
+            });
+
+        // Store (store a new term in the taxonomy)
+        Route::post('/', [TaxonomyTermController::class, 'store'])
+            ->name('taxonomy.terms.store');
+
+        // Edit (show form for editing a term)
+        Route::get('/edit/{term}', [TaxonomyTermController::class, 'edit'])
+            ->name('taxonomy.terms.edit')
+            ->breadcrumbs(function (Trail $trail, $taxonomy, $term) {
+                $trail->push(__('Home'), route('dashboard.home'))
+                    ->push(__('Taxonomy'), route('dashboard.taxonomy.index'))
+                    ->push($taxonomy->name, route('dashboard.taxonomy.edit', $taxonomy))
+                    ->push(__('Edit Term'));
+            });
+
+        // Update (update a term in the taxonomy)
+        Route::put('/{term}', [TaxonomyTermController::class, 'update'])
+            ->name('taxonomy.terms.update');
+
+        // Delete (show confirmation for deleting a term)
+        Route::get('/delete/{term}', [TaxonomyTermController::class, 'delete'])
+            ->name('taxonomy.terms.delete')
+            ->breadcrumbs(function (Trail $trail, $taxonomy, $term) {
+                $trail->push(__('Home'), route('dashboard.home'))
+                    ->push(__('Taxonomy'), route('dashboard.taxonomy.index'))
+                    ->push($taxonomy->name, route('dashboard.taxonomy.edit', $taxonomy))
+                    ->push(__('Delete Term'));
+            });
+
+        // Destroy (delete a term from the taxonomy)
+        Route::delete('/{term}', [TaxonomyTermController::class, 'destroy'])
+            ->name('taxonomy.terms.destroy');
+    });
 });

From e1784c96a4b156697a37df458c9df2804d267e36 Mon Sep 17 00:00:00 2001
From: IsharaEkanayaka <e20094@eng.pdn.ac.lk>
Date: Sun, 13 Oct 2024 12:23:39 +0530
Subject: [PATCH 2/5] feat: implement taxonomy create

---
 .../Backend/TaxonomyController.php            |  21 +-
 app/Http/Livewire/Backend/TaxonomyTable.php   |   4 +-
 resources/views/backend/layouts/app.blade.php |  60 ------
 .../views/backend/taxonomy/create.blade.php   |  95 +++++++++
 .../taxonomy/index-table-row.blade.php        |  20 +-
 .../backend/taxonomy_property_adder.blade.php | 196 ++++++++++++++++++
 6 files changed, 328 insertions(+), 68 deletions(-)
 create mode 100644 resources/views/components/backend/taxonomy_property_adder.blade.php

diff --git a/app/Http/Controllers/Backend/TaxonomyController.php b/app/Http/Controllers/Backend/TaxonomyController.php
index b8e97c5f..bcbed574 100644
--- a/app/Http/Controllers/Backend/TaxonomyController.php
+++ b/app/Http/Controllers/Backend/TaxonomyController.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Auth;
 use App\Http\Controllers\Controller;
 use App\Domains\Taxonomy\Models\Taxonomy;
 
@@ -31,7 +32,25 @@ public function create()
      */
     public function store(Request $request)
     {
-
+        $request->validate([
+            'code' => 'required|unique:taxonomies',
+            'name' => 'required',
+            'description' => 'required',
+        ]);
+    
+        try{
+            $taxonomy = new Taxonomy();
+            $taxonomy->code = $request->code;
+            $taxonomy->name = $request->name;
+            $taxonomy->description = $request->description;
+            $taxonomy->properties = $request->properties;
+            $taxonomy->created_by = Auth::user()->id;
+            $taxonomy->save();
+            return redirect()->route('dashboard.taxonomy.index')->with('success', 'Taxonomy created successfully');
+        }catch (\Exception $ex) {
+            Log::error('Failed to create taxonomy', ['error' => $ex->getMessage()]);
+            return abort(500);
+        }
     }
     /**
      * Show the form for editing the specified resource.
diff --git a/app/Http/Livewire/Backend/TaxonomyTable.php b/app/Http/Livewire/Backend/TaxonomyTable.php
index 9d4f3b43..0e2baae4 100644
--- a/app/Http/Livewire/Backend/TaxonomyTable.php
+++ b/app/Http/Livewire/Backend/TaxonomyTable.php
@@ -28,6 +28,8 @@ public function columns(): array
                 ->sortable(),
             Column::make("Created at", "created_at")
                 ->sortable(),
+            Column::make("Updated at", "updated_at")
+                ->sortable(),
             Column::make("Actions")
         ];
     }
@@ -39,7 +41,7 @@ public function query(): Builder
 
     public function rowView(): string
     {
-        return 'backend.taxonomies.index-table-row';
+        return 'backend.taxonomy.index-table-row';
     }
 }
 
diff --git a/resources/views/backend/layouts/app.blade.php b/resources/views/backend/layouts/app.blade.php
index 20851939..2eadad02 100644
--- a/resources/views/backend/layouts/app.blade.php
+++ b/resources/views/backend/layouts/app.blade.php
@@ -58,66 +58,6 @@
     <script src="{{ mix('js/backend.js') }}"></script>
     @stack('after-scripts')
 
-    <script src="https://cdn.quilljs.com/1.3.6/quill.js"></script>
-    <script>
-        var toolbarOptions = [
-            ['bold', 'italic', 'underline', 'strike'], // toggled buttons
-
-            [{
-                'header': 1
-            }, {
-                'header': 2
-            }], // custom button values
-            [{
-                'list': 'ordered'
-            }, {
-                'list': 'bullet'
-            }],
-            [{
-                'script': 'sub'
-            }, {
-                'script': 'super'
-            }], // superscript/subscript
-            [{
-                'indent': '-1'
-            }, {
-                'indent': '+1'
-            }], // outdent/indent
-
-            [{
-                'size': ['small', false, 'large', 'huge']
-            }], // custom dropdown
-            [{
-                'header': [1, 2, 3, 4, 5, 6, false]
-            }],
-
-            [{
-                'color': []
-            }, {
-                'background': []
-            }], // dropdown with defaults from theme
-            [{
-                'align': []
-            }],
-
-            ['clean'] // remove formatting button
-        ];
-
-        var quill = new Quill('#editor-container', {
-            theme: 'snow',
-            modules: {
-                toolbar: toolbarOptions
-            }
-        });
-
-        document.getElementById('submit-button').addEventListener('click', function(event) {
-            // Get Quill content
-            var quillContent = quill.root.innerHTML;
-            // Populate hidden form field with quill data
-            var description = document.querySelector('textarea[name=description]');
-            description.value = quillContent;
-        });
-    </script>
 </body>
 
 </html>
diff --git a/resources/views/backend/taxonomy/create.blade.php b/resources/views/backend/taxonomy/create.blade.php
index e69de29b..d676dc7d 100644
--- a/resources/views/backend/taxonomy/create.blade.php
+++ b/resources/views/backend/taxonomy/create.blade.php
@@ -0,0 +1,95 @@
+@extends('backend.layouts.app')
+
+@section('title', __('Create Taxonomy'))
+
+@section('content')
+    <div x-data="{
+        properties: [],
+        updateProperties(event) {
+            this.properties = event.detail;
+            $refs.propertiesInput.value = JSON.stringify(this.properties);
+        }
+    }" x-on:update-properties="updateProperties">
+        {!! Form::open([
+            'url' => route('dashboard.taxonomy.store'),
+            'method' => 'post',
+            'class' => 'container',
+            'files' => true,
+            'enctype' => 'multipart/form-data',
+        ]) !!}
+
+        @csrf
+        <x-backend.card>
+            <x-slot name="header">
+                Taxonomy : Create
+            </x-slot>
+
+            <x-slot name="body">
+                <div class="card">
+                    <div class="card-body">
+                        <h5 class="card-title" style="text-align: left; text-decoration: none;">Basic Configurations</h5>
+                        <!-- Taxonomy Code -->
+                        <div class="row">
+                            {!! Form::label('code', 'Taxonomy Code*', ['class' => 'col-form-label']) !!}
+                        </div>
+                        <div class="form-group row">
+                            <div class="col-md-12">
+                                {!! Form::text('code', '', ['class' => 'form-control']) !!}
+                                @error('code')
+                                    <strong class="text-danger">{{ $message }}</strong>
+                                @enderror
+                            </div>
+                        </div>
+
+                        <!-- Taxonomy Name -->
+                        <div class="row">
+                            {!! Form::label('name', 'Taxonomy Name*', ['class' => 'col-form-label']) !!}
+                        </div>
+                        
+                        <div class="form-group row">
+                            <div class="col-md-12">
+                                {!! Form::text('name', '', ['class' => 'form-control']) !!}
+                                @error('name')
+                                    <strong class="text-danger">{{ $message }}</strong>
+                                @enderror
+                            </div>
+
+                        </div>
+
+                        <!-- Taxonomy Description -->
+                        <div class="row">
+                            {!! Form::label('description', 'Taxonomy Description*', ['class' => 'col-form-label']) !!}
+                        </div>
+                        
+                        <div class="form-group row">
+                            <div class="col-md-12">
+                                {!! Form::textarea('description', '', ['class' => 'form-control','style'=>'overflow:hidden;height: 100px;','oninput'=>"this.style.height = '100px';this.style.height = this.scrollHeight + 'px';"]) !!}
+                                @error('description')
+                                    <strong class="text-danger">{{ $message }}</strong>
+                                @enderror
+                            </div>
+
+                        </div>
+                    </div>
+                </div>
+
+                <div class="card">
+                    <div class="card-body">
+                        <h5 class="card-title" style="text-align: left; text-decoration: none;">Properties</h5>
+                        <x-backend.taxonomy_property_adder></x-backend.taxonomy_property_adder>
+                        {!! Form::hidden('properties', '', ['x-ref'=>'propertiesInput']) !!}
+                    </div>
+                </div>
+                
+
+            </x-slot>
+
+            <x-slot name="footer">
+                {!! Form::submit('Create', ['class' => 'btn btn-primary btn-w-150 float-right']) !!}
+            </x-slot>
+
+        </x-backend.card>
+
+        {!! Form::close() !!}
+    </div>
+@endsection
\ No newline at end of file
diff --git a/resources/views/backend/taxonomy/index-table-row.blade.php b/resources/views/backend/taxonomy/index-table-row.blade.php
index 3977af78..b5b65e83 100644
--- a/resources/views/backend/taxonomy/index-table-row.blade.php
+++ b/resources/views/backend/taxonomy/index-table-row.blade.php
@@ -1,6 +1,6 @@
 <?php use App\Domains\Auth\Models\User; ?>
 
-<x-livewire-ttables::table.cell>
+<x-livewire-tables::table.cell>
     {{ $row->code }}
 </x-livewire-tables::table.cell>
 
@@ -16,27 +16,35 @@
     {{ User::find($row->updated_by)->name ?? 'N/A' }}
 </x-livewire-tables::table.cell>
 
+<x-livewire-tables::table.cell>
+    {{ $row->created_at }}
+</x-livewire-tables::table.cell>
+
+<x-livewire-tables::table.cell>
+    {{ $row->updated_at }}
+</x-livewire-tables::table.cell>
+
 <x-livewire-tables::table.cell>
     <div class="d-flex px-0 mt-0 mb-0">
         <div class="btn-group" role="group" aria-label="">
 
             <!-- View Button -->
-            <a href="{{ route('taxonomy.view', $row->id) }}" class="btn btn-sm btn-primary">
+            {{-- <a href="{{ route('taxonomy.view', $row->id) }}" class="btn btn-sm btn-primary">
                 <i class="fa fa-eye" title="View"></i>
-            </a>
+            </a> --}}
 
             <!-- Manage Button -->
-            <a href="{{ route('taxonomy.terms', $row->id) }}" class="btn btn-sm btn-secondary">
+            <a href="{{ route('dashboard.taxonomy.terms.index', $row->id) }}" class="btn btn-sm btn-secondary">
                 <i class="fa fa-list" title="Manage"></i>
             </a>
 
             <!-- Edit Button -->
-            <a href="{{ route('taxonomy.edit', $row->id) }}" class="btn btn-sm btn-warning">
+            <a href="{{ route('dashboard.taxonomy.edit', $row->id) }}" class="btn btn-sm btn-warning">
                 <i class="fa fa-pencil" title="Edit"></i>
             </a>
 
             <!-- Delete Button -->
-            <a href="{{ route('taxonomy.delete', $row->id) }}" class="btn btn-sm btn-danger">
+            <a href="{{ route('dashboard.taxonomy.delete', $row->id) }}" class="btn btn-sm btn-danger">
                 <i class="fa fa-trash" title="Delete"></i>
             </a>
 
diff --git a/resources/views/components/backend/taxonomy_property_adder.blade.php b/resources/views/components/backend/taxonomy_property_adder.blade.php
new file mode 100644
index 00000000..22c73fd1
--- /dev/null
+++ b/resources/views/components/backend/taxonomy_property_adder.blade.php
@@ -0,0 +1,196 @@
+<div x-data="{
+    properties: [],
+    selectedItem: null,
+    editIndex: null,
+    isEditing: false,
+    newProperty: {
+        code: '',
+        name: '',
+        data_type: 'string',
+    },
+    ClearAll() {
+        this.properties = [];
+        this.selectedItem = null;
+        this.$dispatch('update-properties', this.properties);
+    },
+    deleteItem() {
+        if (this.selectedItem !== null) {
+            this.properties.splice(this.selectedItem, 1);
+            this.selectedItem = null;
+            this.$dispatch('update-properties', this.properties);
+        }
+    },
+    moveUp() {
+        if (this.selectedItem > 0) {
+            let temp = this.properties[this.selectedItem - 1];
+            this.properties[this.selectedItem - 1] = this.properties[this.selectedItem];
+            this.properties[this.selectedItem] = temp;
+            this.selectedItem -= 1;
+            this.$dispatch('update-properties', this.properties);
+        }
+    },
+    moveDown() {
+        if (this.selectedItem < this.properties.length - 1) {
+            let temp = this.properties[this.selectedItem + 1];
+            this.properties[this.selectedItem + 1] = this.properties[this.selectedItem];
+            this.properties[this.selectedItem] = temp;
+            this.selectedItem += 1;
+            this.$dispatch('update-properties', this.properties);
+        }
+    },
+    editItem() {
+        if (this.selectedItem !== null) {
+            this.editIndex = this.selectedItem;
+            this.newProperty = { ...this.properties[this.selectedItem] };
+            this.isEditing = true;
+            document.getElementById('addPropertyItemModalLabel').innerHTML = 'Edit Property';
+            new bootstrap.Modal(document.getElementById('addPropertyItemModal')).show();
+        }
+    },
+    handleSave() {
+        if (!Array.isArray(this.properties)) {
+            this.properties = [];
+        }
+
+        const newPropertyData = {
+            code: this.newProperty.code.trim(),
+            name: this.newProperty.name.trim(),
+            data_type: this.newProperty.data_type
+        };
+
+        if (this.isEditing && this.editIndex !== null) {
+            if (this.editIndex >= 0 && this.editIndex < this.properties.length) {
+                this.properties[this.editIndex] = newPropertyData;
+                this.selectedItem = this.editIndex; // Select the edited item
+            } else {
+                console.error('Invalid editIndex:', this.editIndex);
+            }
+            this.editIndex = null;
+            this.isEditing = false;
+        } else {
+            this.properties.push(newPropertyData);
+            this.selectedItem = this.properties.length - 1; // Select the newly added item
+        }
+        console.log(this.properties);
+        this.$dispatch('update-properties', this.properties);
+        bootstrap.Modal.getInstance(document.getElementById('addPropertyItemModal')).hide();
+        {{-- nextTick ensures that the modal is hidden before resetting the form --}}
+        this.$nextTick(() => {
+            this.resetForm();
+        });
+    },
+    resetForm() {
+        this.newProperty = {
+            code: '',
+            name: '',
+            data_type: 'string'
+        };
+    },
+
+}" x-cloak>
+    
+    <style>
+        [x-cloak] {
+            display: none !important;
+        }
+    </style>
+    <div class="d-flex justify-content-between mb-3">
+        <button type="button" class="btn btn-primary btn-w-150" data-bs-toggle="modal" data-bs-target="#addPropertyItemModal"
+            x-on:click="resetForm(); document.getElementById('addPropertyItemModalLabel').innerHTML = 'Add Property'; isEditing=false">
+            <i class="fas fa-plus me-2"></i>Add
+        </button>
+        <button type="button" class="btn btn-dark btn-w-150" x-show="properties.length" x-transition x-on:click="ClearAll()">
+            <i class="fas fa-times me-2"></i>Clear All
+        </button>
+    </div>
+    
+    <!-- Modal -->
+    <div class="modal fade" id="addPropertyItemModal" tabindex="-1" aria-labelledby="addPropertyItemModalLabel"
+        aria-hidden="true" x-init="$el.addEventListener('hidden.bs.modal', () => resetForm())">
+        <div class="modal-dialog modal-dialog-centered">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h1 class="modal-title fs-5" id="addPropertyItemModalLabel">Add Property</h1>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+                <form >
+                    <div class="modal-body">
+                        <div class="container-fluid">
+                            <div class="row">
+                                <div class="mb-3">
+                                    <label for="propertyCode" class="form-label">Code*</label>
+                                    <input type="text" class="form-control" id="propertyCode" 
+                                        x-model="newProperty.code" />
+                                </div>
+                                <div class="mb-3">
+                                    <label for="propertyName" class="form-label">Name*</label>
+                                    <input type="text" class="form-control" id="propertyName" 
+                                        x-model="newProperty.name"/>
+                                </div>
+                                <div class="mb-3">
+                                    <label for="propertyDatatype" class="form-label">Datatype</label>
+                                    <select class="form-select" aria-label="Datatype" x-model="newProperty.data_type">
+                                        <option selected value="string">String</option>
+                                        <option value="integer">Integer Number</option>
+                                        <option value="float">Floating Point Number</option>
+                                        <option value="date">Date</option>
+                                        <option value="datetime">Date Time</option>
+                                        <option value="boolean">Boolean</option>
+                                        <option value="url">URL</option>
+                                        <option value="image">Image</option>
+                                      </select>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary btn-w-150" data-bs-dismiss="modal">Close</button>
+                    <button type="button" class="btn btn-primary btn-w-150"
+                        x-on:click="handleSave()">Save</button>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <ul class="list-group" :style="{ 'padding-left': '0', 'margin-left': '0' }">
+        <template x-for="(item, index) in properties" :key="item + '-' + index">
+            <li class="list-group-item position-relative" style="padding: 8px;"
+                :style="{ backgroundColor: selectedItem === index ? '#cfe2ff' : '' }"
+                x-on:click="selectedItem = selectedItem === index ? null : index">
+                <div
+                    class="d-flex flex-column flex-md-row justify-content-between align-items-start align-items-md-center">
+                    <div class="mb-2 mb-md-0 me-md-3">
+                        <strong x-text="index + 1 + '.'"></strong>
+                        <span x-text="item.name"></span>
+                        <span>(</span>
+                        <span x-text="item.code"></span>
+                        <span>,</span>
+                        <span x-text="item.data_type"></span>
+                        <span>)</span>
+                    </div>
+
+                    <div class="d-flex flex-column flex-md-row align-items-md-end ms-auto">
+                        <div x-show="selectedItem === index" class="btn-group" role="group" aria-label="Item actions">
+                            <button type="button" class="btn btn-sm btn-secondary me-1 me-md-2 rounded"
+                                @click.stop="moveUp()">
+                                <i class="fas fa-chevron-up"></i>
+                            </button>
+                            <button type="button" class="btn btn-sm btn-secondary me-1 me-md-2 rounded"
+                                @click.stop="moveDown()">
+                                <i class="fas fa-chevron-down"></i>
+                            </button>
+                            <button type="button" class="btn btn-sm btn-warning me-1 me-md-2 rounded"
+                                @click.stop="editItem()">
+                                <i class="fas fa-pencil-alt"></i>
+                            </button>
+                            <button type="button" class="btn btn-sm btn-danger rounded" @click.stop="deleteItem()">
+                                <i class="fas fa-trash-alt"></i>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </li>
+        </template>
+    </ul>
+</div>

From ff857437a6ae9f8b4d71abfc22a8751361e543bb Mon Sep 17 00:00:00 2001
From: Supun Dulara <e20087@eng.pdn.ac.lk>
Date: Sun, 13 Oct 2024 22:29:28 +0530
Subject: [PATCH 3/5] implement taxonomy edit

---
 .../Backend/TaxonomyController.php            | 36 +++++--
 .../views/backend/taxonomy/edit.blade.php     | 94 +++++++++++++++++++
 .../backend/taxonomy_property_adder.blade.php |  2 +-
 3 files changed, 125 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/Backend/TaxonomyController.php b/app/Http/Controllers/Backend/TaxonomyController.php
index bcbed574..dc5e80cc 100644
--- a/app/Http/Controllers/Backend/TaxonomyController.php
+++ b/app/Http/Controllers/Backend/TaxonomyController.php
@@ -35,7 +35,7 @@ public function store(Request $request)
         $request->validate([
             'code' => 'required|unique:taxonomies',
             'name' => 'required',
-            'description' => 'required',
+            'description' => 'nullable',
         ]);
     
         try{
@@ -46,7 +46,7 @@ public function store(Request $request)
             $taxonomy->properties = $request->properties;
             $taxonomy->created_by = Auth::user()->id;
             $taxonomy->save();
-            return redirect()->route('dashboard.taxonomy.index')->with('success', 'Taxonomy created successfully');
+            return redirect()->route('dashboard.taxonomy.index')->with('Success', 'Taxonomy created successfully');
         }catch (\Exception $ex) {
             Log::error('Failed to create taxonomy', ['error' => $ex->getMessage()]);
             return abort(500);
@@ -60,13 +60,18 @@ public function store(Request $request)
      */
     public function edit(Taxonomy $taxonomy)
     {
-        try{
-            return view('backend.taxonomy.edit', ['taxonomy' => $taxonomy]);
-        }catch (\Exception $ex) {
-            Log::error('Failed to load taxonomy edit page', ['error' => $ex->getMessage()]);    
+        try {
+
+            return view('backend.taxonomy.edit', [
+                'taxonomy' => $taxonomy,
+            ]);
+        } catch (\Exception $ex) {
+            Log::error('Failed to load taxonomy edit page', ['error' => $ex->getMessage()]);
             return abort(500);
         }
     }
+    
+
     /**
      * Update the specified resource in storage.
      *
@@ -76,6 +81,25 @@ public function edit(Taxonomy $taxonomy)
      */
     public function update(Request $request, Taxonomy $taxonomy)
     {
+        $data = $request->validate([
+            'code' => 'required',
+            'name' => 'required',
+            'description' => 'nullable',
+            
+            
+        ]);
+    
+        try{
+            $taxonomy->update($data);
+            $taxonomy->updated_by = Auth::user()->id;
+            if ($request->properties != null) {
+                $taxonomy->properties = $request->properties;}            
+            $taxonomy->save();
+            return redirect()->route('dashboard.taxonomy.index')->with('Success', 'Taxonomy updated successfully');
+        }catch (\Exception $ex) {
+            Log::error('Failed to update taxonomy', ['error' => $ex->getMessage()]);
+            return abort(500);
+        }
 
     }
      /**
diff --git a/resources/views/backend/taxonomy/edit.blade.php b/resources/views/backend/taxonomy/edit.blade.php
index e69de29b..a75a3fa3 100644
--- a/resources/views/backend/taxonomy/edit.blade.php
+++ b/resources/views/backend/taxonomy/edit.blade.php
@@ -0,0 +1,94 @@
+@extends('backend.layouts.app')
+
+@section('title', __('Edit Taxonomy'))
+
+<script></script>
+@section('content')
+    <div x-data="{
+        
+        properties: {{$taxonomy->properties}},
+        updateProperties(event) {
+            this.properties = event.detail;
+            $refs.propertiesInput.value = JSON.stringify(this.properties);
+        }
+    }" x-on:update-properties="updateProperties">
+        {!! Form::model($taxonomy, [
+            'url' => route('dashboard.taxonomy.update', $taxonomy->id),
+            'method' => 'PUT',
+            'class' => 'container',
+            'files' => true,
+            'enctype' => 'multipart/form-data',
+        ]) !!}
+
+        @csrf
+        <x-backend.card>
+            <x-slot name="header">
+                Taxonomy : Edit
+            </x-slot>
+
+            <x-slot name="body">
+                <div class="card">
+                    <div class="card-body">
+                        <h5 class="card-title" style="text-align: left; text-decoration: none;">Basic Configurations</h5>
+                        <!-- Taxonomy Code -->
+                        <div class="row">
+                            {!! Form::label('code', 'Taxonomy Code*', ['class' => 'col-form-label']) !!}
+                        </div>
+                        <div class="form-group row">
+                            <div class="col-md-12">
+                                {!! Form::text('code', null, ['class' => 'form-control']) !!}
+                                @error('code')
+                                    <strong class="text-danger">{{ $message }}</strong>
+                                @enderror
+                            </div>
+                        </div>
+
+                        <!-- Taxonomy Name -->
+                        <div class="row">
+                            {!! Form::label('name', 'Taxonomy Name*', ['class' => 'col-form-label']) !!}
+                        </div>
+                        
+                        <div class="form-group row">
+                            <div class="col-md-12">
+                                {!! Form::text('name', null, ['class' => 'form-control']) !!}
+                                @error('name')
+                                    <strong class="text-danger">{{ $message }}</strong>
+                                @enderror
+                            </div>
+                        </div>
+
+                        <!-- Taxonomy Description -->
+                        <div class="row">
+                            {!! Form::label('description', 'Taxonomy Description*', ['class' => 'col-form-label']) !!}
+                        </div>
+                        
+                        <div class="form-group row">
+                            <div class="col-md-12">
+                                {!! Form::textarea('description', null, ['class' => 'form-control','style'=>'overflow:hidden;height: 100px;','oninput'=>"this.style.height = '100px';this.style.height = this.scrollHeight + 'px';"]) !!}
+                                @error('description')
+                                    <strong class="text-danger">{{ $message }}</strong>
+                                @enderror
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="card">
+                    <div class="card-body">
+                        <h5 class="card-title" style="text-align: left; text-decoration: none;">Properties</h5>
+                        
+                        <x-backend.taxonomy_property_adder/>
+                            {!! Form::hidden('properties', '', ['x-ref'=>'propertiesInput']) !!}
+                    </div>
+                </div>
+            </x-slot>
+
+            <x-slot name="footer">
+                {!! Form::submit('Update', ['class' => 'btn btn-primary btn-w-150 float-right']) !!}
+            </x-slot>
+
+        </x-backend.card>
+
+        {!! Form::close() !!}
+    </div>
+@endsection
diff --git a/resources/views/components/backend/taxonomy_property_adder.blade.php b/resources/views/components/backend/taxonomy_property_adder.blade.php
index 22c73fd1..94ff77c7 100644
--- a/resources/views/components/backend/taxonomy_property_adder.blade.php
+++ b/resources/views/components/backend/taxonomy_property_adder.blade.php
@@ -1,5 +1,5 @@
 <div x-data="{
-    properties: [],
+    
     selectedItem: null,
     editIndex: null,
     isEditing: false,

From 7190e2cf97120e674ceeee596280940a33d32eb9 Mon Sep 17 00:00:00 2001
From: IsharaEkanayaka <e20094@eng.pdn.ac.lk>
Date: Mon, 14 Oct 2024 05:33:05 +0530
Subject: [PATCH 4/5] chore: refactor the code

---
 .../Controllers/Backend/TaxonomyController.php  | 17 +++++------------
 .../views/backend/taxonomy/create.blade.php     | 14 +++-----------
 resources/views/backend/taxonomy/edit.blade.php | 13 ++-----------
 .../backend/taxonomy_property_adder.blade.php   | 14 ++------------
 4 files changed, 12 insertions(+), 46 deletions(-)

diff --git a/app/Http/Controllers/Backend/TaxonomyController.php b/app/Http/Controllers/Backend/TaxonomyController.php
index dc5e80cc..fbb47efa 100644
--- a/app/Http/Controllers/Backend/TaxonomyController.php
+++ b/app/Http/Controllers/Backend/TaxonomyController.php
@@ -32,17 +32,14 @@ public function create()
      */
     public function store(Request $request)
     {
-        $request->validate([
+        $validatedData =$request->validate([
             'code' => 'required|unique:taxonomies',
             'name' => 'required',
             'description' => 'nullable',
         ]);
     
         try{
-            $taxonomy = new Taxonomy();
-            $taxonomy->code = $request->code;
-            $taxonomy->name = $request->name;
-            $taxonomy->description = $request->description;
+            $taxonomy = new Taxonomy($validatedData);
             $taxonomy->properties = $request->properties;
             $taxonomy->created_by = Auth::user()->id;
             $taxonomy->save();
@@ -61,7 +58,6 @@ public function store(Request $request)
     public function edit(Taxonomy $taxonomy)
     {
         try {
-
             return view('backend.taxonomy.edit', [
                 'taxonomy' => $taxonomy,
             ]);
@@ -84,16 +80,13 @@ public function update(Request $request, Taxonomy $taxonomy)
         $data = $request->validate([
             'code' => 'required',
             'name' => 'required',
-            'description' => 'nullable',
-            
-            
+            'description' => 'nullable',     
         ]);
     
         try{
             $taxonomy->update($data);
-            $taxonomy->updated_by = Auth::user()->id;
-            if ($request->properties != null) {
-                $taxonomy->properties = $request->properties;}            
+            $taxonomy->properties = $request->properties;
+            $taxonomy->updated_by = Auth::user()->id;        
             $taxonomy->save();
             return redirect()->route('dashboard.taxonomy.index')->with('Success', 'Taxonomy updated successfully');
         }catch (\Exception $ex) {
diff --git a/resources/views/backend/taxonomy/create.blade.php b/resources/views/backend/taxonomy/create.blade.php
index d676dc7d..5208d815 100644
--- a/resources/views/backend/taxonomy/create.blade.php
+++ b/resources/views/backend/taxonomy/create.blade.php
@@ -3,13 +3,7 @@
 @section('title', __('Create Taxonomy'))
 
 @section('content')
-    <div x-data="{
-        properties: [],
-        updateProperties(event) {
-            this.properties = event.detail;
-            $refs.propertiesInput.value = JSON.stringify(this.properties);
-        }
-    }" x-on:update-properties="updateProperties">
+    <div x-data="{ properties: [] }" >
         {!! Form::open([
             'url' => route('dashboard.taxonomy.store'),
             'method' => 'post',
@@ -76,12 +70,10 @@
                 <div class="card">
                     <div class="card-body">
                         <h5 class="card-title" style="text-align: left; text-decoration: none;">Properties</h5>
-                        <x-backend.taxonomy_property_adder></x-backend.taxonomy_property_adder>
-                        {!! Form::hidden('properties', '', ['x-ref'=>'propertiesInput']) !!}
+                        <x-backend.taxonomy_property_adder/>
+                        {!! Form::hidden('properties', '', ['x-model' => 'JSON.stringify(properties)']) !!}
                     </div>
                 </div>
-                
-
             </x-slot>
 
             <x-slot name="footer">
diff --git a/resources/views/backend/taxonomy/edit.blade.php b/resources/views/backend/taxonomy/edit.blade.php
index a75a3fa3..b882f4f4 100644
--- a/resources/views/backend/taxonomy/edit.blade.php
+++ b/resources/views/backend/taxonomy/edit.blade.php
@@ -2,16 +2,8 @@
 
 @section('title', __('Edit Taxonomy'))
 
-<script></script>
 @section('content')
-    <div x-data="{
-        
-        properties: {{$taxonomy->properties}},
-        updateProperties(event) {
-            this.properties = event.detail;
-            $refs.propertiesInput.value = JSON.stringify(this.properties);
-        }
-    }" x-on:update-properties="updateProperties">
+    <div x-data="{ properties: {{$taxonomy->properties}} }">
         {!! Form::model($taxonomy, [
             'url' => route('dashboard.taxonomy.update', $taxonomy->id),
             'method' => 'PUT',
@@ -76,9 +68,8 @@
                 <div class="card">
                     <div class="card-body">
                         <h5 class="card-title" style="text-align: left; text-decoration: none;">Properties</h5>
-                        
                         <x-backend.taxonomy_property_adder/>
-                            {!! Form::hidden('properties', '', ['x-ref'=>'propertiesInput']) !!}
+                        {!! Form::hidden('properties', '', ['x-model' => 'JSON.stringify(properties)']) !!}
                     </div>
                 </div>
             </x-slot>
diff --git a/resources/views/components/backend/taxonomy_property_adder.blade.php b/resources/views/components/backend/taxonomy_property_adder.blade.php
index 94ff77c7..223a46d5 100644
--- a/resources/views/components/backend/taxonomy_property_adder.blade.php
+++ b/resources/views/components/backend/taxonomy_property_adder.blade.php
@@ -1,5 +1,5 @@
 <div x-data="{
-    
+    {{-- properties array from parent component can be directly accessed here --}}
     selectedItem: null,
     editIndex: null,
     isEditing: false,
@@ -11,13 +11,11 @@
     ClearAll() {
         this.properties = [];
         this.selectedItem = null;
-        this.$dispatch('update-properties', this.properties);
     },
     deleteItem() {
         if (this.selectedItem !== null) {
             this.properties.splice(this.selectedItem, 1);
             this.selectedItem = null;
-            this.$dispatch('update-properties', this.properties);
         }
     },
     moveUp() {
@@ -26,7 +24,6 @@
             this.properties[this.selectedItem - 1] = this.properties[this.selectedItem];
             this.properties[this.selectedItem] = temp;
             this.selectedItem -= 1;
-            this.$dispatch('update-properties', this.properties);
         }
     },
     moveDown() {
@@ -35,7 +32,6 @@
             this.properties[this.selectedItem + 1] = this.properties[this.selectedItem];
             this.properties[this.selectedItem] = temp;
             this.selectedItem += 1;
-            this.$dispatch('update-properties', this.properties);
         }
     },
     editItem() {
@@ -48,10 +44,6 @@
         }
     },
     handleSave() {
-        if (!Array.isArray(this.properties)) {
-            this.properties = [];
-        }
-
         const newPropertyData = {
             code: this.newProperty.code.trim(),
             name: this.newProperty.name.trim(),
@@ -71,8 +63,6 @@
             this.properties.push(newPropertyData);
             this.selectedItem = this.properties.length - 1; // Select the newly added item
         }
-        console.log(this.properties);
-        this.$dispatch('update-properties', this.properties);
         bootstrap.Modal.getInstance(document.getElementById('addPropertyItemModal')).hide();
         {{-- nextTick ensures that the modal is hidden before resetting the form --}}
         this.$nextTick(() => {
@@ -88,7 +78,7 @@
     },
 
 }" x-cloak>
-    
+
     <style>
         [x-cloak] {
             display: none !important;

From 575e5a3d92e8794c548f2770edad58e4ae68ddb0 Mon Sep 17 00:00:00 2001
From: IsharaEkanayaka <e20094@eng.pdn.ac.lk>
Date: Mon, 14 Oct 2024 11:20:01 +0530
Subject: [PATCH 5/5] feat: create propertyType array in model level

---
 app/Domains/Taxonomy/Models/Taxonomy.php      | 11 ++++++++
 resources/sass/backend/app.scss               |  4 +++
 .../backend/taxonomy_property_adder.blade.php | 26 +++++++------------
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/app/Domains/Taxonomy/Models/Taxonomy.php b/app/Domains/Taxonomy/Models/Taxonomy.php
index dadd4cd1..450cf7c9 100644
--- a/app/Domains/Taxonomy/Models/Taxonomy.php
+++ b/app/Domains/Taxonomy/Models/Taxonomy.php
@@ -32,6 +32,17 @@ class Taxonomy extends Model
         'properties',
     ];
 
+    public static $propertyType = [
+        'string'=>'String',
+        'integer' => 'Integer Number',
+        'float' => 'Floating Point Number',
+        'date' => 'Date',
+        'datetime' => 'Date Time',
+        'boolean' => 'Boolean',
+        'url' => 'URL',
+        'image' => 'Image'
+    ];
+
     public function user()
     {
         return $this->belongsTo(User::class, 'created_by');
diff --git a/resources/sass/backend/app.scss b/resources/sass/backend/app.scss
index 587d91b1..aa7b99db 100644
--- a/resources/sass/backend/app.scss
+++ b/resources/sass/backend/app.scss
@@ -117,3 +117,7 @@
 .btn-w-150 {
     min-width: 150px !important;
 }
+
+[x-cloak] {
+    display: none !important;
+}
diff --git a/resources/views/components/backend/taxonomy_property_adder.blade.php b/resources/views/components/backend/taxonomy_property_adder.blade.php
index 223a46d5..48ee534d 100644
--- a/resources/views/components/backend/taxonomy_property_adder.blade.php
+++ b/resources/views/components/backend/taxonomy_property_adder.blade.php
@@ -1,3 +1,6 @@
+@php
+    $propertyTypes = \App\Domains\Taxonomy\Models\Taxonomy::$propertyType;
+@endphp
 <div x-data="{
     {{-- properties array from parent component can be directly accessed here --}}
     selectedItem: null,
@@ -6,8 +9,9 @@
     newProperty: {
         code: '',
         name: '',
-        data_type: 'string',
+        data_type: null,
     },
+    propertyTypes:{{ json_encode($propertyTypes) }},
     ClearAll() {
         this.properties = [];
         this.selectedItem = null;
@@ -73,17 +77,11 @@
         this.newProperty = {
             code: '',
             name: '',
-            data_type: 'string'
+            data_type: null
         };
     },
 
 }" x-cloak>
-
-    <style>
-        [x-cloak] {
-            display: none !important;
-        }
-    </style>
     <div class="d-flex justify-content-between mb-3">
         <button type="button" class="btn btn-primary btn-w-150" data-bs-toggle="modal" data-bs-target="#addPropertyItemModal"
             x-on:click="resetForm(); document.getElementById('addPropertyItemModalLabel').innerHTML = 'Add Property'; isEditing=false">
@@ -120,14 +118,10 @@
                                 <div class="mb-3">
                                     <label for="propertyDatatype" class="form-label">Datatype</label>
                                     <select class="form-select" aria-label="Datatype" x-model="newProperty.data_type">
-                                        <option selected value="string">String</option>
-                                        <option value="integer">Integer Number</option>
-                                        <option value="float">Floating Point Number</option>
-                                        <option value="date">Date</option>
-                                        <option value="datetime">Date Time</option>
-                                        <option value="boolean">Boolean</option>
-                                        <option value="url">URL</option>
-                                        <option value="image">Image</option>
+                                        <option selected>Open this select menu</option>
+                                        <template x-for="(value,key) in propertyTypes" :key="key">
+                                            <option :value="key" x-text="value"></option>
+                                        </template>
                                       </select>
                                 </div>
                             </div>