v3.3.7

ctf0 · Sep 4, 2018 · a2ae73d · a2ae73d
1 parent 0c7e2bf
commit a2ae73d
Show file tree

Hide file tree

Showing 28 changed files with 239 additions and 158 deletions.
diff --git a/README.md b/README.md
@@ -35,6 +35,10 @@ Create menus & pages that support (multiLocale "title, url, body, ...", nesting,
     + if you are having issues [Check](https://ctf0.wordpress.com/2017/09/12/laravel-mix-es6/).
 
     ```js
+    // app.js
+
+    window.Vue = require('vue')
+
     require('../vendor/SimpleMenu/js/manager')
 
     new Vue({

diff --git a/src/Controllers/Admin/MenusController.php b/src/Controllers/Admin/MenusController.php
@@ -103,6 +103,7 @@ public function update($id, Request $request)
 
         // update and trigger events
         $menu->update($request->except('saveList'));
+        $menu->touch();
 
         return back()->with('status', trans('SimpleMenu::messages.model_updated'));
     }

diff --git a/src/Controllers/Admin/PagesController.php b/src/Controllers/Admin/PagesController.php
@@ -53,9 +53,9 @@ public function store(Request $request)
 
         $img         = $this->getImage($request->cover);
         $page        = $this->pageModel->create(array_merge(['cover'=>$img], $this->cleanEmptyTranslations($request)));
-        $roles       = $request->input('roles') ?: [];
-        $permissions = $request->input('permissions') ?: [];
-        $menus       = $request->input('menus') ?: [];
+        $roles       = $request->roles ?: [];
+        $permissions = $request->permissions ?: [];
+        $menus       = $request->menus ?: [];
 
         $page->assignRole($roles);
         $page->givePermissionTo($permissions);
@@ -101,19 +101,28 @@ public function update($id, Request $request)
 
         $img         = $this->getImage($request->cover);
         $page        = $this->getItem($id);
-        $roles       = $request->input('roles') ?: [];
-        $permissions = $request->input('permissions') ?: [];
-        $menus       = $request->input('menus') ?: [];
+        $roles       = $request->roles;
+        $permissions = $request->permissions;
+        $menus       = $request->menus ?: [];
 
         $page->update(array_merge(['cover'=>$img], $this->cleanEmptyTranslations($request)));
-        $page->syncRoles($roles);
-        $page->syncPermissions($permissions);
+
+        if (!$this->checkBeforeAssign($page->roles, $roles)) {
+            $page->syncRoles($roles ?: []);
+        }
+
+        if (!$this->checkBeforeAssign($page->permissions, $permissions)) {
+            $page->syncPermissions($permissions ?: []);
+        }
+
         $page->syncMenus($menus);
 
         if (!is_null($request->controllerFile)) {
             $this->actionFileContent($request->action, 'update', $request->controllerFile);
         }
 
+        $page->touch();
+
         return back()->with('status', trans('SimpleMenu::messages.model_updated'));
     }
 

diff --git a/src/Controllers/Admin/PermissionsController.php b/src/Controllers/Admin/PermissionsController.php
@@ -81,6 +81,7 @@ public function update($id, Request $request)
         ]);
 
         $this->permissionModel->findOrFail($id)->update($request->all());
+        $this->permissionModel->touch();
 
         $this->clearCache();
 

diff --git a/src/Controllers/Admin/RolesController.php b/src/Controllers/Admin/RolesController.php
@@ -48,7 +48,7 @@ public function store(Request $request)
         ]);
 
         $role        = $this->roleModel->create($request->except('permissions'));
-        $permissions = $request->input('permissions') ?: [];
+        $permissions = $request->permissions ?: [];
 
         $role->givePermissionTo($permissions);
 
@@ -87,10 +87,11 @@ public function update($id, Request $request)
         ]);
 
         $role        = $this->roleModel->findOrFail($id);
-        $permissions = $request->input('permissions') ?: [];
+        $permissions = $request->permissions ?: [];
 
         $role->update($request->except('permissions'));
         $role->syncPermissions($permissions);
+        $role->touch();
 
         $this->clearCache();
 

diff --git a/src/Controllers/Admin/Traits/MenuOps.php b/src/Controllers/Admin/Traits/MenuOps.php
@@ -20,7 +20,7 @@ public function getMenuPages($id)
                 ->sortBy('pivot_order')
                 ->each(function ($item) {
                     $item['from'] = 'pages';
-                });
+                })->values()->all();
 
         $allPages = $this->cache->tags('sm')->get('pages')->diff($pages)->each(function ($item) {
             $item['from'] = 'allPages';

diff --git a/src/Controllers/Admin/Traits/UserPageOps.php b/src/Controllers/Admin/Traits/UserPageOps.php
@@ -8,4 +8,21 @@ protected function getImage($img)
     {
         return $img;
     }
+
+    /**
+     * check if model items are the same as the request items.
+     * fix spatie role & perm detach then attach model relation.
+     *
+     * @param [type] $item  [description]
+     * @param [type] $input [description]
+     *
+     * @return [type] [description]
+     */
+    protected function checkBeforeAssign($item, $input)
+    {
+        $self = $item->pluck('name')->sort()->values()->all();
+        $new  = collect($input)->sort()->values()->all();
+
+        return $self === $new;
+    }
 }
diff --git a/src/Controllers/Admin/UsersController.php b/src/Controllers/Admin/UsersController.php
@@ -52,8 +52,8 @@ public function store(Request $request)
 
         $img         = $this->getImage($request->avatar);
         $user        = $this->userModel->create(array_merge(['avatar'=>$img], $request->except(['roles', 'permissions'])));
-        $roles       = $request->input('roles') ?: [];
-        $permissions = $request->input('permissions') ?: [];
+        $roles       = $request->roles ?: [];
+        $permissions = $request->permissions ?: [];
 
         $user->assignRole($roles);
         $user->givePermissionTo($permissions);
@@ -95,13 +95,21 @@ public function update($id, Request $request)
         ]);
 
         $user        = $this->userModel->findOrFail($id);
-        $roles       = $request->input('roles') ?: [];
-        $permissions = $request->input('permissions') ?: [];
         $img         = $this->getImage($request->avatar);
+        $roles       = $request->roles;
+        $permissions = $request->permissions;
 
         $user->update(array_merge(['avatar'=>$img], $request->except(['roles', 'permissions'])));
-        $user->syncRoles($roles);
-        $user->syncPermissions($permissions);
+
+        if (!$this->checkBeforeAssign($user->roles, $roles)) {
+            $user->syncRoles($roles ?: []);
+        }
+
+        if (!$this->checkBeforeAssign($user->permissions, $permissions)) {
+            $user->syncPermissions($permissions ?: []);
+        }
+
+        $user->touch();
 
         return back()->with('status', trans('SimpleMenu::messages.model_updated'));
     }

diff --git a/src/Controllers/BaseController.php b/src/Controllers/BaseController.php
@@ -25,15 +25,17 @@ public function __construct()
             parent::__construct();
         }
 
-        $config                = config('simpleMenu');
-        $this->cache           = app('cache');
-        $this->adminPath       = 'SimpleMenu::admin';
-        $this->crud_prefix     = array_get($config, 'crud_prefix');
-        $this->userModel       = app(array_get($config, 'models.user'));
-        $this->pageModel       = app(array_get($config, 'models.page'));
-        $this->menuModel       = app(array_get($config, 'models.menu'));
-
-        $this->roleModel       = app(config('permission.models.role'));
-        $this->permissionModel = app(config('permission.models.permission'));
+        $sm_config = config('simpleMenu');
+        $sp_config = config('permission');
+
+        $this->cache       = app('cache');
+        $this->adminPath   = 'SimpleMenu::admin';
+        $this->crud_prefix = array_get($sm_config, 'crud_prefix');
+        $this->userModel   = app(array_get($sm_config, 'models.user'));
+        $this->pageModel   = app(array_get($sm_config, 'models.page'));
+        $this->menuModel   = app(array_get($sm_config, 'models.menu'));
+
+        $this->roleModel       = app(array_get($sp_config, 'models.role'));
+        $this->permissionModel = app(array_get($sp_config, 'models.permission'));
     }
 }
diff --git a/src/SimpleMenu.php b/src/SimpleMenu.php
@@ -3,14 +3,19 @@
 namespace ctf0\SimpleMenu;
 
 use ctf0\SimpleMenu\Traits\Ops;
-use ctf0\SimpleMenu\Traits\MenusTrait;
-use ctf0\SimpleMenu\Traits\RoutesTrait;
-use ctf0\SimpleMenu\Traits\NavigationTrait;
+use ctf0\SimpleMenu\Traits\Menus;
+use ctf0\SimpleMenu\Traits\Routes;
+use ctf0\SimpleMenu\Traits\Navigation;
+use ctf0\SimpleMenu\Traits\PackageRoutes;
 use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
 
 class SimpleMenu
 {
-    use RoutesTrait, MenusTrait, NavigationTrait, Ops;
+    use Routes,
+        Menus,
+        Navigation,
+        Ops,
+        PackageRoutes;
 
     protected $listFileDir;
     protected $localeCodes;

diff --git a/src/Traits/MenusTrait.php → src/Traits/Menus.php b/src/Traits/MenusTrait.php → src/Traits/Menus.php
@@ -2,7 +2,7 @@
 
 namespace ctf0\SimpleMenu\Traits;
 
-trait MenusTrait
+trait Menus
 {
     /**
      * register routes for menu pages.

diff --git a/src/Traits/NavigationTrait.php → src/Traits/Navigation.php b/src/Traits/NavigationTrait.php → src/Traits/Navigation.php
@@ -4,7 +4,7 @@
 
 use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
 
-trait NavigationTrait
+trait Navigation
 {
     protected $urlRoute;
 

diff --git a/src/Traits/Ops.php b/src/Traits/Ops.php
@@ -58,54 +58,4 @@ protected static function create_LFD($dir)
             }
         }
     }
-
-    /**
-     * package routes.
-     *
-     * @return [type] [description]
-     */
-    public function menuRoutes()
-    {
-        $prefix      = config('simpleMenu.crud_prefix');
-        $controllers = config('simpleMenu.controllers');
-
-        app('router')->group([
-            'prefix'=> $prefix,
-        ], function () use ($prefix, $controllers) {
-            /*                Home                */
-            if (isset($controllers['admin'])) {
-                app('router')->get('/', $controllers['admin'])->name($prefix);
-            }
-
-            /*                Everything Else                */
-            app('router')->group([
-                'as'=> "$prefix.",
-            ], function () use ($controllers) {
-                /*               Roles               */
-                app('router')->resource('roles', $controllers['roles'], ['except'=>'show']);
-                app('router')->post('roles/remove-multi', $controllers['roles'] . '@destroyMulti')->name('roles.destroy_multi');
-
-                /*               Perms               */
-                app('router')->resource('permissions', $controllers['permissions'], ['except'=>'show']);
-                app('router')->post('permissions/remove-multi', $controllers['permissions'] . '@destroyMulti')->name('permissions.destroy_multi');
-
-                /*               Menus               */
-                app('router')->post('menus/removechild', $controllers['menus'] . '@removeChild')->name('menus.removeChild');
-                app('router')->post('menus/removepage/{id}', $controllers['menus'] . '@removePage')->name('menus.removePage');
-                app('router')->get('menus/getmenupages/{id}', $controllers['menus'] . '@getMenuPages')->name('menus.getMenuPages');
-                app('router')->resource('menus', $controllers['menus'], ['except'=>'show']);
-                app('router')->post('menus/remove-multi', $controllers['menus'] . '@destroyMulti')->name('menus.destroy_multi');
-
-                /*               Users               */
-                app('router')->resource('users', $controllers['users'], ['except'=>'show']);
-                app('router')->post('users/remove-multi', $controllers['users'] . '@destroyMulti')->name('users.destroy_multi');
-
-                /*               Pages               */
-                app('router')->resource('pages', $controllers['pages'], ['except'=>'show']);
-                app('router')->post('pages/remove-multi', $controllers['pages'] . '@destroyMulti')->name('pages.destroy_multi');
-                app('router')->put('pages/{id}/restore', $controllers['pages'] . '@restore')->name('pages.restore');
-                app('router')->delete('pages/{id}/remove-force', $controllers['pages'] . '@forceDelete')->name('pages.destroy_force');
-            });
-        });
-    }
 }
diff --git a/src/Traits/PackageRoutes.php b/src/Traits/PackageRoutes.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace ctf0\SimpleMenu\Traits;
+
+trait PackageRoutes
+{
+    /**
+     * package routes.
+     *
+     * @return [type] [description]
+     */
+    public function menuRoutes()
+    {
+        $prefix      = config('simpleMenu.crud_prefix');
+        $controllers = config('simpleMenu.controllers');
+
+        app('router')->group([
+            'prefix'=> $prefix,
+        ], function () use ($prefix, $controllers) {
+            /*                Home                */
+            if (isset($controllers['admin'])) {
+                app('router')->get('/', $controllers['admin'])->name($prefix);
+            }
+
+            /*                Everything Else                */
+            app('router')->group([
+                'as'=> "$prefix.",
+            ], function () use ($controllers) {
+                /*               Roles               */
+                app('router')->resource('roles', $controllers['roles'], ['except'=>'show']);
+                app('router')->post('roles/remove-multi', $controllers['roles'] . '@destroyMulti')->name('roles.destroy_multi');
+
+                /*               Perms               */
+                app('router')->resource('permissions', $controllers['permissions'], ['except'=>'show']);
+                app('router')->post('permissions/remove-multi', $controllers['permissions'] . '@destroyMulti')->name('permissions.destroy_multi');
+
+                /*               Menus               */
+                app('router')->post('menus/removechild', $controllers['menus'] . '@removeChild')->name('menus.removeChild');
+                app('router')->post('menus/removepage/{id}', $controllers['menus'] . '@removePage')->name('menus.removePage');
+                app('router')->get('menus/getmenupages/{id}', $controllers['menus'] . '@getMenuPages')->name('menus.getMenuPages');
+                app('router')->resource('menus', $controllers['menus'], ['except'=>'show']);
+                app('router')->post('menus/remove-multi', $controllers['menus'] . '@destroyMulti')->name('menus.destroy_multi');
+
+                /*               Users               */
+                app('router')->resource('users', $controllers['users'], ['except'=>'show']);
+                app('router')->post('users/remove-multi', $controllers['users'] . '@destroyMulti')->name('users.destroy_multi');
+
+                /*               Pages               */
+                app('router')->resource('pages', $controllers['pages'], ['except'=>'show']);
+                app('router')->post('pages/remove-multi', $controllers['pages'] . '@destroyMulti')->name('pages.destroy_multi');
+                app('router')->put('pages/{id}/restore', $controllers['pages'] . '@restore')->name('pages.restore');
+                app('router')->delete('pages/{id}/remove-force', $controllers['pages'] . '@forceDelete')->name('pages.destroy_force');
+            });
+        });
+    }
+}
diff --git a/src/Traits/RoutesTrait.php → src/Traits/Routes.php b/src/Traits/RoutesTrait.php → src/Traits/Routes.php
@@ -4,7 +4,7 @@
 
 use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
 
-trait RoutesTrait
+trait Routes
 {
     protected $allRoutes     = [];
     protected $listFileFound = true;

diff --git a/src/resources/assets/js/index.vue b/src/resources/assets/js/index.vue
@@ -14,13 +14,14 @@ export default {
             sortableList: [
                 'data-sort-name',
                 'data-sort-email',
-                'data-sort-roles',
-                'data-sort-permissions',
+                'data-sort-middlewares',
                 'data-sort-route',
                 'data-sort-url',
-                'data-sort-menus',
-                'data-sort-locals',
                 'data-sort-template',
+                {name: 'data-sort-permissions', attr: 'data-permissions'},
+                {name: 'data-sort-roles', attr: 'data-roles'},
+                {name: 'data-sort-menus', attr: 'data-menus'},
+                {name: 'data-sort-locals', attr: 'data-locals'},
                 {name: 'data-sort-ops', attr: 'data-ops'}
             ]
         }
@@ -42,6 +43,9 @@ export default {
                 document.getElementById(e.id) ? this.ids.push(e.value) : false
             })
         },
+        clickOnCkBox(id) {
+            document.querySelector(`#${id}`).click()
+        },
         updateCounter(val) {
             return this.itemsCount = val
         },

diff --git a/src/resources/assets/js/manager.js b/src/resources/assets/js/manager.js
@@ -1,5 +1,4 @@
 /*                Packages                */
-window.Vue = require('vue')
 window.EventHub = require('vuemit')
 Vue.use(require('vue-tippy'), {
     arrow: true,