move v-pub to composer

Author: ctf0

README.md

@@ -5,68 +5,43 @@
 
 Create menus & pages that support (multiLocale "title, url, body, ...", nesting, template, static & dynamic data, roles & permissions).
 
+- package requires Laravel v5.5+
+- package rely heavily on caching through **Redis**, so make sure to check the [docs](https://laravel.com/docs/5.5/redis) for installation & configuration.
+
 <br>
 
 ## Installation
 
 - `composer require ctf0/simple-menu`
 
-- (Laravel < 5.5) add the service provider & facade to `config/app.php`
-
-```php
-'providers' => [
-    ctf0\SimpleMenu\SimpleMenuServiceProvider::class,
-]
-
-'aliases' => [
-    'SimpleMenu' => ctf0\SimpleMenu\Facade\SimpleMenu::class,
-]
-```
-
 - after installation, package will auto-add
     + package routes to `routes/web.php`
     + package assets compiling to `webpack.mix.js`
 
-- the package rely heavily on caching through **Redis**, so make sure to check the [docs](https://laravel.com/docs/5.4/redis) for installation & configuration.
-
 - publish the packages assets with `php artisan vendor:publish`
-    - for simpleMenu [Wiki](https://github.com/ctf0/simple-menu/wiki/Publish)
-    - also check the below **Dependencies** for extra "configuration/options/migrations".
-        > - [laravel-permission](https://github.com/spatie/laravel-permission#laravel)
-        > - [laravel-translatable](https://github.com/spatie/laravel-translatable#installation)
-        > - [laravel-localization](https://github.com/mcamara/laravel-localization#config)
-
-- add `SMUsers` trait to your **User Model**
-
-```php
-use ctf0\SimpleMenu\Models\Traits\SMUsers;
-
-// ...
-
-class User extends Authenticatable
-{
-    use Notifiable, SMUsers;
-}
-```
+    - [simpleMenu](https://github.com/ctf0/simple-menu/wiki/Publish)
+    - [laravel-permission](https://github.com/spatie/laravel-permission#laravel)
+    - [laravel-translatable](https://github.com/spatie/laravel-translatable#installation)
+    - [laravel-localization](https://github.com/mcamara/laravel-localization#config)
 
 - install JS dependencies
 
-```bash
-yarn add vue axios vue-tippy@v1 vuedraggable vue-notif vue-multi-ref vue-awesome list.js
-# or
-npm install vue axios vue-tippy@v1 vuedraggable vue-notif vue-multi-ref vue-awesome list.js --save
-```
+    ```bash
+    yarn add vue axios vue-tippy@v1 vuedraggable vue-notif vue-multi-ref vue-awesome@v2 list.js
+    # or
+    npm install vue axios vue-tippy@v1 vuedraggable vue-notif vue-multi-ref vue-awesome@v2 list.js --save
+    ```
 
 - add this one liner to your main js file and run `npm run watch` to compile your `js/css` files.
     + if you are having issues [Check](https://ctf0.wordpress.com/2017/09/12/laravel-mix-es6/).
 
-```js
-require('../vendor/SimpleMenu/js/manager')
+    ```js
+    require('../vendor/SimpleMenu/js/manager')
 
-new Vue({
-    el: '#app'
-})
-```
+    new Vue({
+        el: '#app'
+    })
+    ```
 
 <br>
 
@@ -177,10 +152,23 @@ return [
 <br>
 
 ## Usage
+- add `SMUsers` trait to your **User Model**
+
+    ```php
+    use ctf0\SimpleMenu\Models\Traits\SMUsers;
+
+    // ...
+
+    class User extends Authenticatable
+    {
+        use Notifiable, SMUsers;
+    }
+    ```
+
 - visit `localhost:8000/admin`
 - [Wiki](https://github.com/ctf0/simple-menu/wiki/Usage)
 
 <br>
 
 ## Crud Views
-[Wiki](https://github.com/ctf0/SimpleMenu/wiki/Crud-Views)
+[Wiki](https://github.com/ctf0/SimpleMenu/wiki/Crud-Views)

composer.json

@@ -49,5 +49,10 @@
     },
     "config": {
         "sort-packages": true
+    },
+    "scripts": {
+        "post-package-install": [
+            "@php artisan vendor:publish"
+        ]
     }
-}
+}

src/Models/Page.php

@@ -12,18 +12,14 @@ class Page extends Node
 {
     use HasRoles, HasTranslations, SoftDeletes;
 
+    protected $dates      = ['deleted_at'];
     protected $with       = ['roles', 'permissions', 'menus'];
     protected $appends    = ['nests'];
     protected $guard_name = 'web';
     protected $hidden     = [
         'children', 'roles', 'permissions', 'menus',
         'pivot', 'parent_id', 'lft', 'rgt', 'depth',
     ];
-    protected $dates = [
-        'created_at',
-        'updated_at',
-        'deleted_at',
-    ];
     public $translatable = [
         'title', 'body', 'desc', 'prefix',
         'url', 'meta',

src/SimpleMenuServiceProvider.php

@@ -15,10 +15,6 @@
 class SimpleMenuServiceProvider extends ServiceProvider
 {
     protected $file;
-    protected $packagesSP = [
-        \Baum\Providers\BaumServiceProvider::class,
-        \ctf0\PackageChangeLog\PackageChangeLogServiceProvider::class,
-    ];
 
     /**
      * Perform post-registration booting of services.
@@ -72,8 +68,52 @@ protected function packagePublish()
         $this->observers();
         $this->macros();
         $this->viewComp();
+    }
+
+    /**
+     * [autoReg description].
+     *
+     * @return [type] [description]
+     */
+    protected function autoReg()
+    {
+        // routes
+        $route_file = base_path('routes/web.php');
+        $search     = 'SimpleMenu';
+
+        if ($this->checkExist($route_file, $search)) {
+            $data = "\n// SimpleMenu\nSimpleMenu::menuRoutes();";
+
+            $this->file->append($route_file, $data);
+        }
+
+        // mix
+        $mix_file = base_path('webpack.mix.js');
+        $search   = 'SimpleMenu';
+
+        if ($this->checkExist($mix_file, $search)) {
+            $data = "\n// SimpleMenu\nmix.sass('resources/assets/vendor/SimpleMenu/sass/style.scss', 'public/assets/vendor/SimpleMenu/style.css').version();";
 
-        $this->app['simplemenu'];
+            $this->file->append($mix_file, $data);
+        }
+
+        // run check once
+        app('cache')->store('file')->rememberForever('ct-sm', function () {
+            return 'added';
+        });
+    }
+
+    /**
+     * [checkExist description].
+     *
+     * @param [type] $file   [description]
+     * @param [type] $search [description]
+     *
+     * @return [type] [description]
+     */
+    protected function checkExist($file, $search)
+    {
+        return $this->file->exists($file) && !str_contains($this->file->get($file), $search);
     }
 
     /**
@@ -83,10 +123,12 @@ protected function packagePublish()
      */
     protected function observers()
     {
-        if (!app()->runningInConsole()) {
-            app(config('simpleMenu.models.page'))->observe(PageObserver::class);
-            app(config('simpleMenu.models.menu'))->observe(MenuObserver::class);
-            app(config('simpleMenu.models.user'))->observe(UserObserver::class);
+        $config = config('simpleMenu.models');
+
+        if (!app()->runningInConsole() && $config) {
+            app(array_get($config, 'page'))->observe(PageObserver::class);
+            app(array_get($config, 'menu'))->observe(MenuObserver::class);
+            app(array_get($config, 'user'))->observe(UserObserver::class);
         }
     }
 
@@ -135,7 +177,6 @@ public function register()
         });
 
         $this->regPSP();
-        $this->regPA();
         $this->regPMW();
     }
 
@@ -146,21 +187,16 @@ public function register()
      */
     protected function regPSP()
     {
-        foreach ($this->packagesSP as $one) {
+        $packagesSP = [
+            \Baum\Providers\BaumServiceProvider::class,
+            \ctf0\PackageChangeLog\PackageChangeLogServiceProvider::class,
+        ];
+
+        foreach ($packagesSP as $one) {
             $this->app->register($one);
         }
     }
 
-    /**
-     * packages aliases.
-     *
-     * @return [type] [description]
-     */
-    protected function regPA()
-    {
-        $this->app->alias('simplemenu', SimpleMenu::class);
-    }
-
     /**
      * packages middlewares.
      *
@@ -173,50 +209,4 @@ protected function regPMW()
         $this->app['router']->aliasMiddleware('localizationRedirect', LaravelLocalizationRedirectFilter::class);
         $this->app['router']->aliasMiddleware('localeSessionRedirect', LocaleSessionRedirect::class);
     }
-
-    /**
-     * [autoReg description].
-     *
-     * @return [type] [description]
-     */
-    protected function autoReg()
-    {
-        // routes
-        $route_file = base_path('routes/web.php');
-        $search     = 'SimpleMenu';
-
-        if ($this->checkExist($route_file, $search)) {
-            $data = "\n// SimpleMenu\nSimpleMenu::menuRoutes();";
-
-            $this->file->append($route_file, $data);
-        }
-
-        // mix
-        $mix_file = base_path('webpack.mix.js');
-        $search   = 'SimpleMenu';
-
-        if ($this->checkExist($mix_file, $search)) {
-            $data = "\n// SimpleMenu\nmix.sass('resources/assets/vendor/SimpleMenu/sass/style.scss', 'public/assets/vendor/SimpleMenu/style.css').version();";
-
-            $this->file->append($mix_file, $data);
-        }
-
-        // run check once
-        app('cache')->store('file')->rememberForever('ct-sm', function () {
-            return 'added';
-        });
-    }
-
-    /**
-     * [checkExist description].
-     *
-     * @param [type] $file   [description]
-     * @param [type] $search [description]
-     *
-     * @return [type] [description]
-     */
-    protected function checkExist($file, $search)
-    {
-        return $this->file->exists($file) && !str_contains($this->file->get($file), $search);
-    }
 }

src/Traits/RoutesTrait.php

@@ -90,7 +90,7 @@ protected function routeGen($page)
         $route = $this->getRouteUrl($url, $prefix);
 
         $uses = $action
-            ? $action
+            ? starts_with($action, '\\') ? $action : "\\$action"
             : '\ctf0\SimpleMenu\Controllers\DummyController@handle';
 
         $mds = array_filter(array_flatten([$middlewares, $roles, $permissions]));

src/resources/assets/js/manager.js

@@ -36,8 +36,8 @@ axios.defaults.headers.common = {
     'X-Requested-With': 'XMLHttpRequest'
 }
 axios.interceptors.response.use(
-    (response) => {return response},
-    (error) => {return Promise.reject(error.response)}
+    (response) => response,
+    (error) => Promise.reject(error.response)
 )
 
 /*                Component                */

src/resources/views/admin/editors.blade.php

@@ -1,19 +1,19 @@
 {{-- choices --}}
-<script src="//cdnjs.cloudflare.com/ajax/libs/choices.js/3.0.3/choices.min.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/choices.js/3.0.4/choices.min.js"></script>
 {{-- tinymce --}}
-<script src="//cdnjs.cloudflare.com/ajax/libs/tinymce/4.7.9/tinymce.min.js"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/tinymce/4.7.9/plugins/autoresize/plugin.min.js"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/tinymce/4.7.9/plugins/preview/plugin.min.js"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/tinymce/4.7.9/plugins/fullscreen/plugin.min.js"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/tinymce/4.7.9/plugins/image/plugin.min.js"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/tinymce/4.7.9/plugins/link/plugin.min.js"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/tinymce/4.7.9/plugins/lists/plugin.min.js"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/tinymce/4.7.9/plugins/media/plugin.min.js"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/tinymce/4.7.9/plugins/table/plugin.min.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/tinymce/4.7.11/tinymce.min.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/tinymce/4.7.11/plugins/autoresize/plugin.min.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/tinymce/4.7.11/plugins/preview/plugin.min.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/tinymce/4.7.11/plugins/fullscreen/plugin.min.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/tinymce/4.7.11/plugins/image/plugin.min.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/tinymce/4.7.11/plugins/link/plugin.min.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/tinymce/4.7.11/plugins/lists/plugin.min.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/tinymce/4.7.11/plugins/media/plugin.min.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/tinymce/4.7.11/plugins/table/plugin.min.js"></script>
 {{-- ace --}}
-<script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.3.1/ace.js"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.3.1/ext-language_tools.js"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.3.1/ext-spellcheck.js"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.3.1/ext-elastic_tabstops_lite.js"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.3.1/theme-monokai.js"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.3.1/mode-php.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.3.3/ace.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.3.3/ext-language_tools.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.3.3/ext-spellcheck.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.3.3/ext-elastic_tabstops_lite.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.3.3/theme-monokai.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.3.3/mode-php.js"></script>

src/resources/views/admin/shared.blade.php

@@ -9,8 +9,8 @@
     <title>@yield('title', '')</title>
 
     {{-- styles --}}
-    <link href="//cdnjs.cloudflare.com/ajax/libs/choices.js/3.0.3/styles/css/choices.min.css" rel="stylesheet" />
-    <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/bulma/0.6.2/css/bulma.min.css">
+    <link href="//cdnjs.cloudflare.com/ajax/libs/choices.js/3.0.4/styles/css/choices.min.css" rel="stylesheet" />
+    <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/bulma/0.7.1/css/bulma.min.css">
     <link rel="stylesheet" href="{{ asset('assets/vendor/SimpleMenu/style.css') }}"/>
 </head>
 
@@ -88,4 +88,4 @@
     {{-- app --}}
     <script src="{{ asset("path/to/app.js") }}"></script>
 </body>
-</html>
+</html>