minor

Author: ctf0

README.md

@@ -1,6 +1,6 @@
 # SimpleMenu
 
-[![Latest Stable Version](https://img.shields.io/packagist/v/ctf0/simple-menu.svg)](https://packagist.org/packages/ctf0/simple-menu) [![Total Downloads](https://img.shields.io/packagist/dt/ctf0/simple-menu.svg)](https://packagist.org/packages/ctf0/simple-menu) [![Donate with Bitcoin](https://en.cryptobadges.io/badge/micro/16ri7Hh848bw7vxbEevKHFuHXLmsV8Vc9L)](https://en.cryptobadges.io/donate/16ri7Hh848bw7vxbEevKHFuHXLmsV8Vc9L)
+[![Latest Stable Version](https://img.shields.io/packagist/v/ctf0/simple-menu.svg)](https://packagist.org/packages/ctf0/simple-menu) [![Total Downloads](https://img.shields.io/packagist/dt/ctf0/simple-menu.svg)](https://packagist.org/packages/ctf0/simple-menu)
 
 Create menus & pages that support (multiLocale "title, url, body, ...", nesting, template, static & dynamic data, roles & permissions).
 
@@ -151,6 +151,10 @@ return [
 <br>
 
 ## Usage
+> [Demo](https://github.com/ctf0/demos/tree/simple-menu)<br>
+> [Usage](https://github.com/ctf0/simple-menu/wiki/Usage)<br>
+> [Views](https://github.com/ctf0/SimpleMenu/wiki/Crud-Views)
+
 - add `SMUsers` trait to your **User Model**
 
     ```php
@@ -165,9 +169,3 @@ return [
     ```
 
 - 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)

composer.json

@@ -26,10 +26,8 @@
         "spatie/laravel-permission": "^2.0",
         "spatie/laravel-translatable": "^2.0",
         "codezero/laravel-unique-translation": "^1.1",
-        "ctf0/package-changelog": "^1.0"
-    },
-    "suggest": {
-        "laravelcollective/html": "HTML and Form Builders for the Laravel Framework"
+        "ctf0/package-changelog": "^1.0",
+        "laravelcollective/html": "*"
     },
     "autoload": {
         "psr-4": {
@@ -55,4 +53,4 @@
             "@php artisan vendor:publish"
         ]
     }
-}
+}

src/Controllers/Admin/Traits/Paginate.php

@@ -7,23 +7,24 @@
 use Illuminate\Pagination\LengthAwarePaginator;
 
 /**
- * https://gist.github.com/PaulaAguirre/5473cde2a4b066d262bf96cdb231e91a.
+ * https://gist.github.com/vluzrmos/3ce756322702331fdf2bf414fea27bcb.
  */
 trait Paginate
 {
-    public function paginate($items, $perPage = 15, $page = null, $options = [])
+    public function paginate($items, $perPage = 15, $page = null)
     {
-        $page  = $page ?: (Paginator::resolveCurrentPage() ?: 1);
-        $items = $items instanceof Collection ? $items : Collection::make($items);
+        $pageName = 'page';
+        $page     = $page ?: (Paginator::resolveCurrentPage($pageName) ?: 1);
+        $items    = $items instanceof Collection ? $items : Collection::make($items);
 
         return new LengthAwarePaginator(
-            $items->forPage($page, $perPage),
+            $items->forPage($page, $perPage)->values(),
             $items->count(),
             $perPage,
             $page,
-            $options ?? [
+            [
                 'path'     => Paginator::resolveCurrentPath(),
-                'pageName' => 'page',
+                'pageName' => $pageName,
             ]
         );
     }

src/SimpleMenu.php

@@ -22,17 +22,19 @@ public function __construct()
         $this->listFileDir  = config('simpleMenu.routeListPath');
         $this->localeCodes  = array_keys(LaravelLocalization::getSupportedLocales());
 
-        if ($this->listFileDir !== '') {
+        if ($this->listFileDir) {
             static::create_LFD($this->listFileDir);
 
-            // create caches
-            $this->createCaches();
+            if (!app()->runningInConsole()) {
+                // create caches
+                $this->createCaches();
 
-            // create routes
-            $this->createRoutes();
+                // create routes
+                $this->createRoutes();
 
-            // create menu
-            $this->createMenus();
+                // create menu
+                $this->createMenus();
+            }
         }
     }
 }

src/SimpleMenuServiceProvider.php

@@ -65,7 +65,8 @@ protected function packagePublish()
         // views
         $this->loadViewsFrom(__DIR__ . '/resources/views', 'SimpleMenu');
         $this->publishes([
-            __DIR__ . '/resources/views' => resource_path('views/vendor/SimpleMenu'),
+            __DIR__ . '/resources/views'      => resource_path('views/vendor/SimpleMenu'),
+            __DIR__ . '/resources/pagination' => resource_path('views/vendor/pagination'),
         ], 'views');
     }
 
@@ -140,7 +141,7 @@ protected function autoReg()
         $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();";
+            $data = "\n// SimpleMenu\nmix.sass('resources/assets/vendor/SimpleMenu/sass/style.scss', 'public/assets/vendor/SimpleMenu/style.css')";
 
             $this->file->append($mix_file, $data);
         }

src/Traits/MenusTrait.php

@@ -26,8 +26,8 @@ public function createMenus()
     public function viewComp($name)
     {
         $viewFile = view()->exists("SimpleMenu::menu.{$name}")
-        ? "SimpleMenu::menu.{$name}"
-        : 'SimpleMenu::menu.example';
+            ? "SimpleMenu::menu.{$name}"
+            : 'SimpleMenu::menu.example';
 
         return view()->composer($viewFile, function ($view) use ($name) {
             $view->with([

src/resources/assets/js/manager.js

@@ -18,9 +18,9 @@ Vue.use(require('vue-tippy'), {
         }
     }
 })
+require('vue-multi-ref')
 
 // icons
-require('vue-multi-ref')
 import 'vue-awesome/icons/search'
 import 'vue-awesome/icons/times'
 import 'vue-awesome/icons/pencil'
@@ -44,4 +44,4 @@ axios.interceptors.response.use(
 Vue.component('SmPage', require('./page.vue'))
 Vue.component('SmMenu', require('./menu.vue'))
 Vue.component('SmIndex', require('./index.vue'))
-Vue.component('MyNotification', require('vue-notif'))
+Vue.component('MyNotification', require('vue-notif'))

src/resources/assets/js/menu.vue

@@ -1,5 +1,7 @@
 <style scoped lang="scss">
     .menu-list {
+        height: 100%;
+
         a:hover {
             color: unset !important;
             background-color: unset !important;
@@ -31,6 +33,11 @@ export default {
     created() {
         this.getPages()
     },
+    mounted() {
+        EventHub.listen('updatePagesHierarchy', () => {
+            this.updatePages(this.pages)
+        })
+    },
     computed: {
         finalList() {
             return JSON.stringify(this.saveList)
@@ -161,10 +168,6 @@ export default {
     watch: {
         pages(val) {
             this.updatePages(val)
-
-            EventHub.listen('updatePagesHierarchy', () => {
-                this.updatePages(val)
-            })
         }
     },
     render() {}

src/resources/pagination/bulma.blade.php

@@ -0,0 +1,39 @@
+@if ($paginator->hasPages())
+    <nav class="pagination is-centered">
+        <ul class="pagination-list">
+            <li>
+                @if ($paginator->onFirstPage())
+                    <a class="pagination-previous" disabled>Previous</a>
+                @else
+                    <a href="{{ $paginator->previousPageUrl() }}" rel="prev" class="pagination-previous">Previous</a>
+                @endif
+            </li>
+
+            {{-- Pagination Elements --}}
+            @foreach ($elements as $element)
+                {{-- "Three Dots" Separator --}}
+                @if (is_string($element))
+                    <li><span class="pagination-ellipsis"><span>{{ $element }}</span></span></li>
+                @endif
+
+                {{-- Array Of Links --}}
+                @if (is_array($element))
+                    @foreach ($element as $page => $url)
+                        @if ($page == $paginator->currentPage())
+                            <li><a class="pagination-link is-current">{{ $page }}</a></li>
+                        @else
+                            <li><a href="{{ $url }}" class="pagination-link">{{ $page }}</a></li>
+                        @endif
+                    @endforeach
+                @endif
+            @endforeach
+            <li>
+                @if ($paginator->hasMorePages())
+                    <a class="pagination-next" href="{{ $paginator->nextPageUrl() }}" rel="next">Next</a>
+                @else
+                    <a class="pagination-next" disabled>Next page</a>
+                @endif
+            </li>
+        </ul>
+    </nav>
+@endif

src/resources/views/admin/menus/edit.blade.php

@@ -28,7 +28,7 @@ class="button is-success">
         </div>
     </h3>
 
-    <sm-menu inline-template
+    <sm-menu inline-template v-cloak
         get-menu-pages="{{ route($crud_prefix.'.menus.getMenuPages', ['id' => $menu->id]) }}"
         del-page="{{ route($crud_prefix.'.menus.removePage', ['id' => $menu->id]) }}"
         del-child="{{ route($crud_prefix.'.menus.removeChild') }}"