add edit btn for menu items

…

…

replace tinymce jquery with js

…

…

…

…

better table search

optimization

Author: ctf0

src/Controllers/Admin/MenusController.php

@@ -80,7 +80,7 @@ public function update($id, Request $request)
             'name' => 'required|unique:menus,name,' . $id,
         ]);
 
-        $menu = $this->menuModel->find($id) ?: abort(404);
+        $menu = $this->menuModel->findOrFail($id);
 
         // clear prev records
         $menu->pages()->detach();
@@ -116,7 +116,7 @@ public function update($id, Request $request)
      */
     public function destroy($id, Request $request)
     {
-        $menu = $this->menuModel->find($id) ?: abort(404);
+        $menu = $this->menuModel->findOrFail($id);
         $menu->pages()->detach();
         $menu->delete();
 
@@ -134,7 +134,7 @@ public function destroyMulti(Request $request)
         $ids = explode(',', $request->ids);
 
         foreach ($ids as $one) {
-            $menu = $this->menuModel->find($one);
+            $menu = $this->menuModel->findOrFail($one);
             $menu->pages()->detach();
             $menu->delete();
         }

src/Controllers/Admin/PagesController.php

@@ -191,6 +191,6 @@ public function forceDelete($id)
      */
     protected function getItem($id)
     {
-        return $this->pageModel->withTrashed()->find($id) ?: abort(404);
+        return $this->pageModel->withTrashed()->findOrFail($id);
     }
 }

src/Controllers/Admin/PermissionsController.php

@@ -62,7 +62,7 @@ public function store(Request $request)
      */
     public function edit($id)
     {
-        $permission = Permission::find($id);
+        $permission = Permission::findOrFail($id);
 
         return view("{$this->adminPath}.permissions.edit", compact('permission'));
     }
@@ -81,7 +81,7 @@ public function update($id, Request $request)
             'name' => 'required|unique:permissions,name,' . $id,
         ]);
 
-        Permission::find($id)->update($request->all());
+        Permission::findOrFail($id)->update($request->all());
 
         $this->clearCache();
 

src/Controllers/Admin/RolesController.php

@@ -19,7 +19,7 @@ class RolesController extends BaseController
      */
     public function index()
     {
-        $roles = Role::all();
+        $roles = Role::with('permissions')->get();
 
         return view("{$this->adminPath}.roles.index", compact('roles'));
     }
@@ -68,7 +68,7 @@ public function store(Request $request)
      */
     public function edit($id)
     {
-        $role        = Role::find($id);
+        $role        = Role::findOrFail($id);
         $permissions = Permission::pluck('name', 'name');
 
         return view("{$this->adminPath}.roles.edit", compact('role', 'permissions'));
@@ -88,7 +88,7 @@ public function update($id, Request $request)
             'name' => 'required|unique:roles,name,' . $id,
         ]);
 
-        $role        = Role::find($id);
+        $role        = Role::findOrFail($id);
         $permissions = $request->input('permissions') ?: [];
 
         $role->update($request->except('permissions'));

src/Controllers/Admin/Traits/MenuOps.php

@@ -40,7 +40,7 @@ public function getMenuPages($id)
     public function removePage($id, Request $request)
     {
         // remove page from menu
-        $menu = $this->menuModel->find($id) ?: abort(404);
+        $menu = $this->menuModel->findOrFail($id);
         $menu->pages()->detach($request->page_id);
         $menu->touch();
 
@@ -121,6 +121,6 @@ protected function clearSelfAndNests($id)
 
     protected function findPage($id)
     {
-        return $this->pageModel->find($id) ?: abort(404);
+        return $this->pageModel->findOrFail($id);
     }
 }

src/Controllers/Admin/Traits/PageOps.php

@@ -72,7 +72,7 @@ protected function cleanEmptyTranslations($request)
 
         foreach ($result as $k => $v) {
             if (is_array($v)) {
-                $result[$k] = !array_filter($v) ? null : array_filter($v);
+                $result[$k] = array_filter($v) ?: null;
             }
         }
 

src/Controllers/Admin/UsersController.php

@@ -96,7 +96,7 @@ public function update($id, Request $request)
             'email' => 'required|email|unique:users,email,' . $id,
         ]);
 
-        $user        = $this->userModel->find($id) ?: abort(404);
+        $user        = $this->userModel->findOrFail($id);
         $roles       = $request->input('roles') ?: [];
         $permissions = $request->input('permissions') ?: [];
         $img         = $this->getImage($request->avatar);

src/Traits/NavigationTrait.php

@@ -146,7 +146,7 @@ protected function searchForRoute($name, $code)
         $routesListFile = include $this->listFileDir;
 
         // check if we have a link according to that "routeName & code"
-        return $routesListFile[$name][$code] ?? false;
+        return $routesListFile[$name][$code] ?: false;
     }
 
     /**

src/resources/assets/js/bulma/index.vue

@@ -80,6 +80,7 @@ export default {
                 console.error(err)
             })
         }
-    }
+    },
+    render() {}
 }
 </script>

src/resources/assets/js/bulma/menu.vue

@@ -1,11 +1,11 @@
 <script>
 import draggable from 'vuedraggable'
-import MenuChild from './menu_childs.vue'
+import MenuChild from './menu_child.vue'
 import menu from './mixins/menu'
 
 export default {
     components: {draggable, MenuChild},
-    name: 'menu-comp',
+    name: 'sm-menu',
     mixins: [menu],
     props: ['getMenuPages', 'delPage'],
     data() {
@@ -153,6 +153,7 @@ export default {
                 this.updatePages(val)
             })
         }
-    }
+    },
+    render() {}
 }
 </script>