From 0c493c29786402a5fc373b4f087c8425f6dadf93 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Mon, 24 Jan 2022 22:30:38 +0100 Subject: [PATCH] app/Http/Controllers/Admin/*Controller.php: refactoring so that all controllers share similar code by inheriting from BaseController and set $_datatable property. --- .../Controllers/Admin/AdminController.php | 24 +++++++++----- app/Http/Controllers/Admin/CardController.php | 31 ++++++++++++++----- .../Controllers/Admin/CharacterController.php | 26 +++++++++++----- app/Http/Controllers/Admin/RaidController.php | 26 +++++++++++----- resources/views/admin/admin/index.blade.php | 20 ------------ resources/views/admin/card/index.blade.php | 25 --------------- .../views/admin/character/index.blade.php | 20 ------------ resources/views/admin/raid/index.blade.php | 20 ------------ 8 files changed, 76 insertions(+), 116 deletions(-) delete mode 100644 resources/views/admin/admin/index.blade.php delete mode 100644 resources/views/admin/card/index.blade.php delete mode 100644 resources/views/admin/character/index.blade.php delete mode 100644 resources/views/admin/raid/index.blade.php diff --git a/app/Http/Controllers/Admin/AdminController.php b/app/Http/Controllers/Admin/AdminController.php index ed69827..487916e 100644 --- a/app/Http/Controllers/Admin/AdminController.php +++ b/app/Http/Controllers/Admin/AdminController.php @@ -2,12 +2,22 @@ namespace App\Http\Controllers\Admin; -use App\Http\Controllers\Controller; - -class AdminController extends Controller +class AdminController extends BaseController { - public function index() - { - return view("admin.admin.index"); - } + protected $_datatable = [ + 'model' => \App\Models\Admin::class, + 'default_sort' => 'id', + 'columns' => [ + 'id' => '#', + 'username' => 'Username', + 'created_at' => 'Created', + 'updated_at' => 'Updated', + ], + 'sort_columns' => [ + 'id' => 'id', + 'username' => 'username', + 'created_at' => 'created_at', + 'updated_at' => 'updated_at', + ] + ]; } diff --git a/app/Http/Controllers/Admin/CardController.php b/app/Http/Controllers/Admin/CardController.php index c1c43fa..05a08c5 100644 --- a/app/Http/Controllers/Admin/CardController.php +++ b/app/Http/Controllers/Admin/CardController.php @@ -5,17 +5,32 @@ namespace App\Http\Controllers\Admin; use App\Models\Card; use App\Http\Livewire\Form\CardForm; -use App\Http\Controllers\Controller; - -class CardController extends Controller +class CardController extends BaseController { + protected $_datatable = [ + 'model' => Card::class, + 'default_sort' => 'id', + 'route_create' => 'admin.card.create', + 'route_edit' => 'admin.card.edit', + 'delete_enabled' => true, + 'restore_enabled' => true, + 'columns' => [ + 'id' => '#', + 'body' => 'Body', + 'subject' => 'Subject', + 'subject_type' => 'Subject Type', + 'raid.name' => 'Raid', + ], + 'sort_columns' => [ + 'id' => 'id', + 'body' => 'body', + 'subject' => ['character.name', 'class', 'role'], + 'raid.name' => 'raid.name', + ] + ]; + static public function getForm() : string { return CardForm::class; } - - public function index() - { - return view('admin.card.index'); - } } diff --git a/app/Http/Controllers/Admin/CharacterController.php b/app/Http/Controllers/Admin/CharacterController.php index 5616f87..146589d 100644 --- a/app/Http/Controllers/Admin/CharacterController.php +++ b/app/Http/Controllers/Admin/CharacterController.php @@ -5,17 +5,27 @@ namespace App\Http\Controllers\Admin; use App\Models\Character; use App\Http\Livewire\Form\CharacterForm; -use App\Http\Controllers\Controller; - -class CharacterController extends Controller +class CharacterController extends BaseController { + protected $_datatable = [ + 'model' => Character::class, + 'default_sort' => 'id', + 'route_create' => 'admin.character.create', + 'route_edit' => 'admin.character.edit', + 'delete_enabled' => true, + 'restore_enabled' => true, + 'columns' => [ + 'id' => '#', + 'name' => 'Name', + ], + 'sort_columns' => [ + 'id' => 'id', + 'name' => 'name', + ] + ]; + static public function getForm() : string { return CharacterForm::class; } - - public function index() - { - return view("admin.character.index"); - } } diff --git a/app/Http/Controllers/Admin/RaidController.php b/app/Http/Controllers/Admin/RaidController.php index f3c5957..b4f7c52 100644 --- a/app/Http/Controllers/Admin/RaidController.php +++ b/app/Http/Controllers/Admin/RaidController.php @@ -5,17 +5,27 @@ namespace App\Http\Controllers\Admin; use App\Models\Raid; use App\Http\Livewire\Form\RaidForm; -use App\Http\Controllers\Controller; - -class RaidController extends Controller +class RaidController extends BaseController { + protected $_datatable = [ + 'model' => Raid::class, + 'default_sort' => 'id', + 'route_create' => 'admin.raid.create', + 'route_edit' => 'admin.raid.edit', + 'delete_enabled' => true, + 'restore_enabled' => true, + 'columns' => [ + 'id' => '#', + 'name' => 'Name', + ], + 'sort_columns' => [ + 'id' => 'id', + 'name' => 'name', + ] + ]; + static public function getForm() : string { return RaidForm::class; } - - public function index() - { - return view("admin.raid.index"); - } } diff --git a/resources/views/admin/admin/index.blade.php b/resources/views/admin/admin/index.blade.php deleted file mode 100644 index 7dc6439..0000000 --- a/resources/views/admin/admin/index.blade.php +++ /dev/null @@ -1,20 +0,0 @@ - - - @livewire('datatable', [ - 'model' => \App\Models\Admin::class, - 'default_sort' => 'id', - 'columns' => [ - 'id' => '#', - 'username' => 'Username', - 'created_at' => 'Created', - 'updated_at' => 'Updated', - ], - 'sort_columns' => [ - 'id' => 'id', - 'username' => 'username', - 'created_at' => 'created_at', - 'updated_at' => 'updated_at' - ] - ]) - - diff --git a/resources/views/admin/card/index.blade.php b/resources/views/admin/card/index.blade.php deleted file mode 100644 index b184ab4..0000000 --- a/resources/views/admin/card/index.blade.php +++ /dev/null @@ -1,25 +0,0 @@ - - - @livewire('datatable', [ - 'model' => \App\Models\Card::class, - 'default_sort' => 'id', - 'route_create' => 'admin.card.create', - 'route_edit' => 'admin.card.edit', - 'delete_enabled' => true, - 'restore_enabled' => true, - 'columns' => [ - 'id' => '#', - 'body' => 'Body', - 'subject' => 'Subject', - 'subject_type' => 'Subject Type', - 'raid.name' => 'Raid', - ], - 'sort_columns' => [ - 'id' => 'id', - 'body' => 'body', - 'subject' => ['character.name', 'class', 'role'], - 'raid.name' => 'raid.name', - ] - ]) - - diff --git a/resources/views/admin/character/index.blade.php b/resources/views/admin/character/index.blade.php deleted file mode 100644 index c587365..0000000 --- a/resources/views/admin/character/index.blade.php +++ /dev/null @@ -1,20 +0,0 @@ - - - @livewire('datatable', [ - 'model' => \App\Models\Character::class, - 'default_sort' => 'id', - 'route_create' => 'admin.character.create', - 'route_edit' => 'admin.character.edit', - 'delete_enabled' => true, - 'restore_enabled' => true, - 'columns' => [ - 'id' => '#', - 'name' => 'Name', - ], - 'sort_columns' => [ - 'id' => 'id', - 'name' => 'name', - ] - ]) - - diff --git a/resources/views/admin/raid/index.blade.php b/resources/views/admin/raid/index.blade.php deleted file mode 100644 index ce95f16..0000000 --- a/resources/views/admin/raid/index.blade.php +++ /dev/null @@ -1,20 +0,0 @@ - - - @livewire('datatable', [ - 'model' => \App\Models\Raid::class, - 'default_sort' => 'id', - 'route_create' => 'admin.raid.create', - 'route_edit' => 'admin.raid.edit', - 'delete_enabled' => true, - 'restore_enabled' => true, - 'columns' => [ - 'id' => '#', - 'name' => 'Name', - ], - 'sort_columns' => [ - 'id' => 'id', - 'name' => 'name', - ] - ]) - -