Merge pull request #1272 from suraj-webkul/menu-enhancement

Menu enhancement.

Author: devansh-webkul

packages/Webkul/Admin/src/Config/menu.php

@@ -23,7 +23,7 @@
         'key'        => 'mail',
         'name'       => 'admin::app.layouts.mail.title',
         'route'      => 'admin.mail.index',
-        'params'     => ['route' => 'inbox'],
+        'params'     => ['route' => 'compose'],
         'sort'       => 4,
         'icon-class' => 'emails-icon',
     ], [
@@ -32,45 +32,43 @@
         'route'      => 'admin.mail.index',
         'params'     => ['route' => 'compose'],
         'sort'       => 1,
+        'icon-class' => '',
     ], [
         'key'        => 'mail.inbox',
         'name'       => 'admin::app.layouts.mail.inbox',
         'route'      => 'admin.mail.index',
         'params'     => ['route' => 'inbox'],
         'sort'       => 2,
+        'icon-class' => '',
     ], [
         'key'        => 'mail.draft',
         'name'       => 'admin::app.layouts.mail.draft',
         'route'      => 'admin.mail.index',
         'params'     => ['route' => 'draft'],
         'sort'       => 3,
+        'icon-class' => '',
     ], [
         'key'        => 'mail.outbox',
         'name'       => 'admin::app.layouts.mail.outbox',
         'route'      => 'admin.mail.index',
         'params'     => ['route' => 'outbox'],
         'sort'       => 4,
+        'icon-class' => '',
     ], [
         'key'        => 'mail.sent',
         'name'       => 'admin::app.layouts.mail.sent',
         'route'      => 'admin.mail.index',
         'params'     => ['route' => 'sent'],
         'sort'       => 4,
+        'icon-class' => '',
     ], [
         'key'        => 'mail.trash',
         'name'       => 'admin::app.layouts.mail.trash',
         'route'      => 'admin.mail.index',
         'params'     => ['route' => 'trash'],
         'sort'       => 5,
-    ]
-    // , [
-    //     'key'        => 'mail.setting',
-    //     'name'       => 'admin::app.layouts.mail.setting',
-    //     'route'      => 'admin.mail.index',
-    //     'params'     => ['route' => 'setting'],
-    //     'sort'       => 5,
-    // ]
-    , [
+        'icon-class' => '',
+    ], [
         'key'        => 'activities',
         'name'       => 'admin::app.layouts.activities',
         'route'      => 'admin.activities.index',
@@ -87,11 +85,13 @@
         'name'       => 'admin::app.layouts.persons',
         'route'      => 'admin.contacts.persons.index',
         'sort'       => 1,
+        'icon-class' => '',
     ], [
         'key'        => 'contacts.organizations',
         'name'       => 'admin::app.layouts.organizations',
         'route'      => 'admin.contacts.organizations.index',
         'sort'       => 2,
+        'icon-class' => '',
     ], [
         'key'        => 'products',
         'name'       => 'admin::app.layouts.products',
@@ -110,6 +110,7 @@
         'route'      => 'admin.settings.groups.index',
         'info'       => 'admin::app.layouts.user-info',
         'sort'       => 1,
+        'icon-class' => 'group-icon',
     ], [
         'key'        => 'settings.user.groups',
         'name'       => 'admin::app.layouts.groups',
@@ -137,6 +138,7 @@
         'info'       => 'admin::app.layouts.lead-info',
         'route'      => 'admin.settings.pipelines.index',
         'sort'       => 2,
+        'icon-class' => '',
     ], [
         'key'        => 'settings.lead.pipelines',
         'name'       => 'admin::app.layouts.pipelines',
@@ -164,6 +166,7 @@
         'info'       => 'admin::app.layouts.automation-info',
         'route'      => 'admin.settings.attributes.index',
         'sort'       => 3,
+        'icon-class' => '',
     ], [
         'key'        => 'settings.automation.attributes',
         'name'       => 'admin::app.layouts.attributes',

packages/Webkul/Admin/src/Http/Controllers/Setting/RoleController.php

@@ -38,9 +38,7 @@ public function index()
      */
     public function create()
     {
-        $acl = app('acl');
-
-        return view('admin::settings.roles.create', compact('acl'));
+        return view('admin::settings.roles.create');
     }
 
     /**
@@ -84,9 +82,7 @@ public function edit($id)
     {
         $role = $this->roleRepository->findOrFail($id);
 
-        $acl = app('acl');
-
-        return view('admin::settings.roles.edit', compact('role', 'acl'));
+        return view('admin::settings.roles.edit', compact('role'));
     }
 
     /**

packages/Webkul/Admin/src/Http/Middleware/Bouncer.php

@@ -78,10 +78,10 @@ public function isPermissionsEmpty()
      */
     public function checkIfAuthorized()
     {
-        $acl = app('acl');
+        $roles = acl()->getRoles();
 
-        if ($acl && isset($acl->roles[Route::currentRouteName()])) {
-            bouncer()->allow($acl->roles[Route::currentRouteName()]);
+        if (isset($roles[Route::currentRouteName()])) {
+            bouncer()->allow($roles[Route::currentRouteName()]);
         }
     }
 }

packages/Webkul/Admin/src/Menu.php

@@ -31,6 +31,7 @@ public function boot(Router $router)
         $this->app->bind(\Illuminate\Contracts\Debug\ExceptionHandler::class, \Webkul\Admin\Exceptions\Handler::class);
 
         $router->aliasMiddleware('user', \Webkul\Admin\Http\Middleware\Bouncer::class);
+
         $router->aliasMiddleware('admin_locale', Locale::class);
 
         $this->publishes([
@@ -60,8 +61,6 @@ public function register()
         $this->registerConfig();
 
         $this->registerCoreConfig();
-
-        $this->registerACL();
     }
 
     /**
@@ -74,15 +73,10 @@ protected function registerFacades()
         $loader = AliasLoader::getInstance();
 
         $loader->alias('Bouncer', \Webkul\Admin\Facades\Bouncer::class);
-        $loader->alias('Menu', \Webkul\Admin\Facades\Menu::class);
 
         $this->app->singleton('bouncer', function () {
             return new \Webkul\Admin\Bouncer();
         });
-
-        $this->app->singleton('menu', function () {
-            return new \Webkul\Admin\Menu();
-        });
     }
 
     /**
@@ -124,40 +118,4 @@ protected function registerCoreConfig()
             return $tree;
         });
     }
-
-    /**
-     * Registers acl to entire application.
-     *
-     * @return void
-     */
-    protected function registerACL()
-    {
-        $this->app->singleton('acl', function () {
-            return $this->createACL();
-        });
-    }
-
-    /**
-     * Create ACL tree.
-     *
-     * @return mixed
-     */
-    protected function createACL()
-    {
-        static $tree;
-
-        if ($tree) {
-            return $tree;
-        }
-
-        $tree = Tree::create();
-
-        foreach (config('acl') as $item) {
-            $tree->add($item, 'acl');
-        }
-
-        $tree->items = core()->sortItems($tree->items);
-
-        return $tree;
-    }
 }