structure

akaunting · Apr 11, 2019 · 54dc4ea · 54dc4ea
1 parent 9abc740
commit 54dc4ea
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 33 deletions.
diff --git a/src/Config/menu.php b/src/Config/menu.php
@@ -13,7 +13,7 @@
         'bs3-navmenu' => \Akaunting\Menu\Presenters\Bootstrap3\Nav::class,
 
         // Zurb
-        'zurbmenu' => \Akaunting\Menu\Presenters\Foundation\Zurb::class,
+        'zurb' => \Akaunting\Menu\Presenters\Foundation\Zurb::class,
 
         // Admin
         'adminlte' => \Akaunting\Menu\Presenters\Admin\Adminlte::class,

diff --git a/src/Provider.php b/src/Provider.php
@@ -8,46 +8,41 @@
 class Provider extends ServiceProvider
 {
     /**
-     * Indicates if loading of the provider is deferred.
+     * Bootstrap the application services.
      *
-     * @var bool
-     */
-    protected $defer = true;
-
-    /**
-     * Bootstrap the application events.
+     * @return void
      */
     public function boot()
     {
-        $configPath = __DIR__ . '/Config/menu.php';
-        $viewsPath = __DIR__ . '/Resources/views';
-
-        $this->mergeConfigFrom($configPath, 'menu');
-        $this->loadViewsFrom($viewsPath, 'menu');
-
         $this->publishes([
-            $configPath => config_path('menu.php'),
+            __DIR__ . '/Config/menu.php' => config_path('menu.php'),
         ], 'menu');
 
         $this->publishes([
-            $viewsPath => base_path('resources/views/vendor/akaunting/menu'),
+            __DIR__ . '/Resources/views' => base_path('resources/views/vendor/akaunting/menu'),
         ], 'views');
-
-        if (file_exists($file = app_path('Support/menu.php'))) {
-            require $file;
+
+        $this->app->singleton('menu', function ($app) {
+            return new Menu($app['view'], $app['config']);
+        });
+
+        if (file_exists($file = app_path('Support/menus.php'))) {
+            require_once($file);
         }
     }
 
     /**
-     * Register the service provider.
+     * Register the application services.
+     *
+     * @return void
      */
     public function register()
     {
         $this->registerHtmlPackage();
 
-        $this->app->singleton('menu', function ($app) {
-            return new Menu($app['view'], $app['config']);
-        });
+        $this->mergeConfigFrom(__DIR__ . '/Config/menu.php', 'menu');
+
+        $this->loadViewsFrom(__DIR__ . '/Resources/views', 'menu');
     }
 
     /**
@@ -64,14 +59,4 @@ private function registerHtmlPackage()
 
         AliasLoader::getInstance($aliases)->register();
     }
-
-    /**
-     * Get the services provided by the provider.
-     *
-     * @return array
-     */
-    public function provides()
-    {
-        return ['menu'];
-    }
 }