update

update

src/Controllers/MenuController.php

@@ -9,11 +9,18 @@ use Dcat\Admin\Layout\Row;
 use Dcat\Admin\Models\Repositories\Menu;
 use Dcat\Admin\Tree;
 use Dcat\Admin\Widgets\Card;
-use Illuminate\Routing\Controller;
 
-class MenuController extends Controller
+class MenuController extends AdminController
 {
-    use HasResourceActions;
+    /**
+     * Get content title.
+     *
+     * @return string
+     */
+    public function title()
+    {
+        return trans('admin.menu');
+    }
 
     /**
      * Index interface.
@@ -25,7 +32,7 @@ class MenuController extends Controller
     public function index(Content $content)
     {
         return $content
-            ->title(trans('admin.menu'))
+            ->title($this->title())
             ->description(trans('admin.list'))
             ->row(function (Row $row) {
                 $row->column(7, $this->treeView()->render());
@@ -87,22 +94,6 @@ class MenuController extends Controller
         return $tree;
     }
 
-    /**
-     * Edit interface.
-     *
-     * @param string  $id
-     * @param Content $content
-     *
-     * @return Content
-     */
-    public function edit($id, Content $content)
-    {
-        return $content
-            ->title(trans('admin.menu'))
-            ->description(trans('admin.edit'))
-            ->row($this->form()->edit($id));
-    }
-
     /**
      * Make a form builder.
      *

src/Controllers/PermissionController.php

@@ -10,12 +10,19 @@ use Dcat\Admin\Models\Repositories\Permission;
 use Dcat\Admin\Show;
 use Dcat\Admin\SimpleGrid;
 use Dcat\Admin\Tree;
-use Illuminate\Routing\Controller;
 use Illuminate\Support\Str;
 
-class PermissionController extends Controller
+class PermissionController extends AdminController
 {
-    use HasResourceActions;
+    /**
+     * Get content title.
+     *
+     * @return string
+     */
+    protected function title()
+    {
+        return trans('admin.permissions');
+    }
 
     /**
      * Index interface.
@@ -31,7 +38,7 @@ class PermissionController extends Controller
         }
 
         return $content
-            ->title(trans('admin.permissions'))
+            ->title($this->title())
             ->description(trans('admin.list'))
             ->body(function (Row $row) {
                 if (request('_layout')) {
@@ -42,53 +49,6 @@ class PermissionController extends Controller
             });
     }
 
-    /**
-     * Show interface.
-     *
-     * @param mixed   $id
-     * @param Content $content
-     *
-     * @return Content
-     */
-    public function show($id, Content $content)
-    {
-        return $content
-            ->title(trans('admin.permissions'))
-            ->description(trans('admin.detail'))
-            ->body($this->detail($id));
-    }
-
-    /**
-     * Edit interface.
-     *
-     * @param $id
-     * @param Content $content
-     *
-     * @return Content
-     */
-    public function edit($id, Content $content)
-    {
-        return $content
-            ->title(trans('admin.permissions'))
-            ->description(trans('admin.edit'))
-            ->body($this->form()->edit($id));
-    }
-
-    /**
-     * Create interface.
-     *
-     * @param Content $content
-     *
-     * @return Content
-     */
-    public function create(Content $content)
-    {
-        return $content
-            ->title(trans('admin.permissions'))
-            ->description(trans('admin.create'))
-            ->body($this->form());
-    }
-
     protected function simpleGrid()
     {
         $grid = new SimpleGrid(new Permission());

src/Controllers/RoleController.php

@@ -5,80 +5,22 @@ namespace Dcat\Admin\Controllers;
 use Dcat\Admin\Auth\Permission;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
-use Dcat\Admin\Layout\Content;
 use Dcat\Admin\Models\Repositories\Role;
 use Dcat\Admin\Models\Role as RoleModel;
 use Dcat\Admin\Show;
 use Dcat\Admin\SimpleGrid;
 use Dcat\Admin\Support\Helper;
-use Illuminate\Routing\Controller;
 
-class RoleController extends Controller
+class RoleController extends AdminController
 {
-    use HasResourceActions {
-        destroy as delete;
-    }
-
-    /**
-     * Index interface.
-     *
-     * @param Content $content
-     *
-     * @return Content
-     */
-    public function index(Content $content)
-    {
-        return $content
-            ->title(trans('admin.roles'))
-            ->description(trans('admin.list'))
-            ->body($this->grid());
-    }
-
-    /**
-     * Show interface.
-     *
-     * @param mixed   $id
-     * @param Content $content
-     *
-     * @return Content
-     */
-    public function show($id, Content $content)
-    {
-        return $content
-            ->title(trans('admin.roles'))
-            ->description(trans('admin.detail'))
-            ->body($this->detail($id));
-    }
-
-    /**
-     * Edit interface.
-     *
-     * @param mixed   $id
-     * @param Content $content
-     *
-     * @return Content
-     */
-    public function edit($id, Content $content)
-    {
-        return $content
-            ->title(trans('admin.roles'))
-            ->description(trans('admin.edit'))
-            ->body($this->form()->edit($id));
-    }
-
     /**
-     * Create interface.
-     *
-     * @param Content $content
+     * Get content title.
      *
-     * @return Content
+     * @return string
      */
-    public function create(Content $content)
+    public function title()
     {
-        return $content
-            ->title(trans('admin.roles'))
-            ->description(trans('admin.create'))
-            ->body($this->form());
+        return trans('admin.roles');
     }
 
     /**
@@ -208,6 +150,6 @@ class RoleController extends Controller
             Permission::error();
         }
 
-        return $this->delete($id);
+        return parent::destroy($id);
     }
 }

src/Controllers/UserController.php

@@ -12,73 +12,17 @@ use Dcat\Admin\Show;
 use Dcat\Admin\SimpleGrid;
 use Dcat\Admin\Support\Helper;
 use Dcat\Admin\Widgets\Tree;
-use Illuminate\Routing\Controller;
 
-class UserController extends Controller
+class UserController extends AdminController
 {
-    use HasResourceActions {
-        destroy as delete;
-    }
-
-    /**
-     * Index interface.
-     *
-     * @return Content
-     */
-    public function index(Content $content)
-    {
-        if (request(SimpleGrid::QUERY_NAME)) {
-            return $content->body($this->simpleGrid());
-        }
-
-        return $content
-            ->title(trans('admin.administrator'))
-            ->description(trans('admin.list'))
-            ->body($this->grid());
-    }
-
-    /**
-     * Show interface.
-     *
-     * @param mixed   $id
-     * @param Content $content
-     *
-     * @return Content
-     */
-    public function show($id, Content $content)
-    {
-        return $content
-            ->title(trans('admin.administrator'))
-            ->description(trans('admin.detail'))
-            ->body($this->detail($id));
-    }
-
-    /**
-     * Edit interface.
-     *
-     * @param $id
-     *
-     * @return Content
-     */
-    public function edit($id, Content $content)
-    {
-        return $content
-            ->title(trans('admin.administrator'))
-            ->description(trans('admin.edit'))
-            ->body($this->form()->edit($id));
-    }
-
     /**
-     * Create interface.
+     * Get content title.
      *
-     * @return Content
+     * @return string
      */
-    public function create(Content $content)
+    public function title()
     {
-        return $content
-            ->title(trans('admin.administrator'))
-            ->description(trans('admin.create'))
-            ->body($this->form());
+        return trans('admin.administrator');
     }
 
     /**
@@ -297,6 +241,6 @@ class UserController extends Controller
             Permission::error();
         }
 
-        return $this->delete($id);
+        return parent::destroy($id);
     }
 }