fix #33

Remove "laravolt.menu" binding Use only "laravolt.menu.sidebar"
laravolt · Feb 15, 2020 · e858cb3 · e858cb3
1 parent 6f3860b
commit e858cb3
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 27 deletions.
diff --git a/src/Platform/Providers/UiServiceProvider.php b/src/Platform/Providers/UiServiceProvider.php
@@ -7,6 +7,7 @@
 use Illuminate\Foundation\Application;
 use Illuminate\Pagination\Paginator;
 use Illuminate\Support\ServiceProvider as BaseServiceProvider;
+use Laravolt\Platform\Enums\Permission;
 use Laravolt\Platform\Http\Middleware\FlashMiddleware;
 use Laravolt\Platform\Services\Flash;
 use Laravolt\Platform\Services\Menu;
@@ -35,25 +36,13 @@ public function register()
             return new Menu();
         });
 
-        $this->app->singleton(
-            'laravolt.menu',
-            function (Application $app) {
-                return app('laravolt.menu.sidebar')->make(
-                    'sidebar',
-                    function (Builder $menu) {
-                        return $menu;
-                    }
-                );
-            }
-        );
-
         $this->bootConfig();
 
         // We add default menu in register() method,
         // to make sure it is always accessible by other providers.
-        $this->app['laravolt.menu']
-            ->add('System')
-            ->data('order', config('laravolt.ui.system_menu.order'));
+        app('laravolt.menu.sidebar')->register(function ($menu) {
+            $menu->add('System')->data('order', config('laravolt.ui.system_menu.order'));
+        });
 
         $this->registerAssets();
 

diff --git a/src/Platform/Services/Menu.php b/src/Platform/Services/Menu.php
@@ -4,6 +4,7 @@
 
 namespace Laravolt\Platform\Services;
 
+use Lavary\Menu\Builder;
 use Lavary\Menu\Item;
 use Lavary\Menu\Menu as BaseMenu;
 
@@ -44,7 +45,12 @@ public static function setActiveParent($children, $isActive, $active = 'active c
 
     public function all()
     {
-        $sidebar = $this->get('sidebar');
+        $sidebar = app('laravolt.menu.sidebar')->make(
+            'sidebar',
+            function (Builder $menu) {
+                return $menu;
+            }
+        );
 
         foreach ($this->callbacks as $callback) {
             call_user_func($callback, $sidebar);

diff --git a/src/Platform/Services/MenuBuilder.php b/src/Platform/Services/MenuBuilder.php
@@ -31,22 +31,27 @@ public function make()
 
     public function loadSection($name, $menu, $options = [])
     {
-        $section = app('laravolt.menu')->add($name);
-        $this->setData($section, $options);
-
-        $this->addMenu($section, $menu);
+        app('laravolt.menu.sidebar')->register(function ($menu) use ($name, $options) {
+            $section = $menu->add($name);
+            $this->setData($section, $options);
+            $this->addMenu($section, $menu);
+        });
     }
 
     public function loadArray(array $menu)
     {
         foreach ($menu as $title => $option) {
-            $section = app('laravolt.menu')->add($title);
-            if (isset($option['menu'])) {
-                $this->addMenu($section, $option['menu']);
-            }
-            if (isset($option['data'])) {
-                $this->setData($section, $option['data']);
-            }
+
+            app('laravolt.menu.sidebar')->register(function ($menu) use ($title, $option) {
+                $section = $menu->add($title);
+                if (isset($option['menu'])) {
+                    $this->addMenu($section, $option['menu']);
+                }
+                if (isset($option['data'])) {
+                    $this->setData($section, $option['data']);
+                }
+            });
+
         }
     }
 

diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
@@ -10,6 +10,7 @@
 use Laravolt\Platform\Providers\EpicentrumServiceProvider;
 use Laravolt\Platform\Providers\PlatformServiceProvider;
 use Laravolt\Platform\Providers\UiServiceProvider;
+use Lavary\Menu\ServiceProvider;
 
 trait Bootstrap
 {
@@ -46,6 +47,7 @@ protected function getEnvironmentSetUp($app)
     protected function getPackageProviders($app)
     {
         return [
+            ServiceProvider::class,
             AuthServiceProvider::class,
             EpicentrumServiceProvider::class,
             NoCaptchaServiceProvider::class,