add menu page order & remove

Update README.md

menu comp cleanup

small update for nav trait

add urlRouteCheck()

Author: ctf0

README.md

@@ -9,6 +9,11 @@
     > - Menu Nested Set
     >   - https://github.com/gazsp/baum
 
+- Javascript
+    + [Vue](https://vuejs.org/)
+    + [jQuery](https://jquery.com/)
+    + [vue-sortable](https://github.com/sagalbot/vue-sortable/pull/17#issuecomment-260562645)
+
 ## Installation
 
 - `composer require ctf0/simple-menu`
@@ -31,8 +36,6 @@
     - for simpleMenu [Wiki](https://github.com/ctf0/simple-menu/wiki/Publish)
     - also check the **Dependencies** packages pages for "config/options/migrations".
 
-- check `resources/assets/vendor/SimpleMenu` and add the **component & styles** to your build system.
-
 ## Config
 **config/simpleMenu.php**
 ```php
@@ -91,4 +94,3 @@ return [
 # ToDo
 
 * [ ] Menu Pages Hierarchy "nesting" Creation.
-* [ ] Clear cache through pivot table events.

src/Controllers/Admin/MenusController.php

@@ -4,12 +4,14 @@
 
 use App\Http\Controllers\Controller;
 use ctf0\SimpleMenu\Models\Menu;
+use ctf0\SimpleMenu\Models\Page;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
 
 class MenusController extends Controller
 {
     /**
-     * Display a listing of Permission.
+     * Display a listing of Menu.
      *
      * @return \Illuminate\Http\Response
      */
@@ -21,7 +23,7 @@ public function index()
     }
 
     /**
-     * Show the form for creating new Permission.
+     * Show the form for creating new Menu.
      *
      * @return \Illuminate\Http\Response
      */
@@ -31,7 +33,7 @@ public function create()
     }
 
     /**
-     * Store a newly created Permission in storage.
+     * Store a newly created Menu in storage.
      *
      * @param \App\Http\Requests\StoreMenusRequest $request
      *
@@ -49,21 +51,21 @@ public function store(Request $request)
     }
 
     /**
-     * Show the form for editing Permission.
+     * Show the form for editing Menu.
      *
      * @param int $id
      *
      * @return \Illuminate\Http\Response
      */
     public function edit($id)
     {
-        $menu = Menu::findOrFail($id);
+        $menu  = Menu::findOrFail($id);
 
         return view('SimpleMenu::pages.'.config('simpleMenu.framework').'.menus.edit', compact('menu'));
     }
 
     /**
-     * Update Permission in storage.
+     * Update Menu in storage.
      *
      * @param \App\Http\Requests\UpdateMenusRequest $request
      * @param int                                   $id
@@ -76,13 +78,21 @@ public function update(Request $request, $id)
             'name' => 'required|unique:menus,name,'.$id,
         ]);
 
-        Menu::findOrFail($id)->update($request->all());
+        // update menu pages order
+        foreach (json_decode($request->saveList) as $item) {
+            DB::table('menu_page')->where('page_id', $item->id)->update(['order'=>$item->order]);
+        }
 
-        return redirect()->route('admin.menus.index');
+        Menu::findOrFail($id)->update($request->except('saveList'));
+
+        // todo
+        // page nest list
+
+        return back();
     }
 
     /**
-     * Remove Permission from storage.
+     * Remove Menu from storage.
      *
      * @param int $id
      *
@@ -94,4 +104,36 @@ public function destroy($id)
 
         return redirect()->route('admin.menus.index');
     }
+
+    /*                helpers                */
+
+    /**
+     * remove page from menu with ajax.
+     *
+     * @param [type]  $id      [description]
+     * @param Request $request [description]
+     *
+     * @return [type] [description]
+     */
+    public function removePage($id, Request $request)
+    {
+        if (Menu::find($id)->pages()->detach($request->page_id)) {
+            Menu::find($id)->touch();
+            return response()->json(['done'=>true]);
+        }
+    }
+
+    /**
+     * get all menu pages for sorting with vuejs.
+     *
+     * @param Menu $id [description]
+     *
+     * @return [type] [description]
+     */
+    public function getPages(Menu $id)
+    {
+        $pages = $id->pages()->orderBy('pivot_order', 'asc')->where('url->'.app()->getLocale(), '!=', '')->get();
+
+        return response()->json(['data' => $pages]);
+    }
 }

src/Controllers/Admin/PagesController.php

@@ -131,8 +131,8 @@ public function destroy($id)
     protected function storeValidation($request)
     {
         $validator = Validator::make($request->all(), [
-            'route_name'  => 'required|unique:pages,route_name',
             'template'    => 'required_without:action',
+            'route_name'  => 'required|unique:pages,route_name',
             'roles'       => 'required',
             'permissions' => 'required',
         ]);
@@ -167,8 +167,8 @@ protected function storeValidation($request)
     protected function updateValidation($request, $id)
     {
         $validator = Validator::make($request->all(), [
-            'route_name'   => 'required|unique:pages,route_name,'.$id,
             'template'     => 'required_without:action',
+            'route_name'   => 'required|unique:pages,route_name,'.$id,
             'roles'        => 'required',
             'permissions'  => 'required',
         ]);

src/Models/Menu.php

@@ -14,6 +14,6 @@ class Menu extends Model
 
     public function pages()
     {
-        return $this->belongsToMany(Page::class);
+        return $this->belongsToMany(Page::class)->withPivot('order');
     }
 }

src/Observers/MenuObserver.php

@@ -9,15 +9,15 @@
 class MenuObserver
 {
     /**
-     * Listen to the User saved event.
+     * Listen to the Menu saved event.
      */
     public function saved(Menu $menu)
     {
         return $this->cleanData($menu);
     }
 
     /**
-     * Listen to the User deleting event.
+     * Listen to the Menu deleting event.
      */
     public function deleted(Menu $menu)
     {
@@ -34,7 +34,7 @@ public function deleted(Menu $menu)
     protected function cleanData($menu)
     {
         foreach (array_keys(LaravelLocalization::getSupportedLocales()) as $code) {
-            return Cache::forget("{$menu->name}Menu-{$code}Pages");
+            Cache::forget("{$menu->name}Menu-{$code}Pages");
         }
     }
 }

src/Observers/PageObserver.php

@@ -11,15 +11,15 @@
 class PageObserver
 {
     /**
-     * Listen to the User saved event.
+     * Listen to the Page saved event.
      */
     public function saved(Page $page)
     {
         return $this->cleanData($page);
     }
 
     /**
-     * Listen to the User deleting event.
+     * Listen to the Page deleted event.
      */
     public function deleted(Page $page)
     {
@@ -46,11 +46,11 @@ protected function cleanData($page)
         foreach (array_keys(LaravelLocalization::getSupportedLocales()) as $code) {
             // clear menu cache
             Menu::get()->pluck('name')->each(function ($item) use ($code) {
-                return Cache::forget("{$item}Menu-{$code}Pages");
+                Cache::forget("{$item}Menu-{$code}Pages");
             });
 
             // clear page cache
-            return Cache::forget("$code-$route_name");
+            Cache::forget("$code-$route_name");
         }
     }
 }

src/Traits/MenusTrait.php

@@ -51,7 +51,7 @@ public function viewComp($name)
     public function query($name)
     {
         Cache::rememberForever("{$name}Menu-".app()->getLocale().'Pages', function () use ($name) {
-            return app(Menu::class)->where('name', $name)->first()->pages()->where('url->'.app()->getLocale(), '!=', '')->get();
+            return app(Menu::class)->where('name', $name)->first()->pages()->orderBy('pivot_order', 'asc')->where('url->'.app()->getLocale(), '!=', '')->get();
         });
 
         return cache("{$name}Menu-".app()->getLocale().'Pages');

src/Traits/NavigationTrait.php

@@ -59,7 +59,7 @@ public function getRoute($crntRouteName, array $params = null)
         if ($params) {
             foreach ($params as $key => $value) {
                 if ($crntRouteName == $key) {
-                    session([$crntRouteName => $value]);
+                    session([$key => $value]);
 
                     // fix link not being 'is-active' when "hideDefaultLocaleInURL => true"
                     if (LaravelLocalization::hideDefaultLocaleInURL() && $code == LaravelLocalization::getDefaultLocale()) {
@@ -69,16 +69,13 @@ public function getRoute($crntRouteName, array $params = null)
                     }
 
                     $this->urlRoute = $finalUrl;
-
                     return $finalUrl;
                 }
             }
         }
 
-        $finalUrl       = route($crntRouteName);
-        $this->urlRoute = $finalUrl;
-
-        return $finalUrl;
+        $this->urlRoute = route($crntRouteName);
+        return $this->urlRoute;
     }
 
     /**
@@ -91,6 +88,11 @@ public function urlRoute()
         return $this->urlRoute;
     }
 
+    public function urlRouteCheck()
+    {
+        return request()->url() == $this->urlRoute;
+    }
+
     public function getRouteData($name)
     {
         return cache(LaravelLocalization::getCurrentLocale().'-'.$name);
@@ -116,11 +118,9 @@ protected function routeLink($name, $code)
             switch (config('simpleMenu.unFoundLocalizedRoute')) {
                 case 'home':
                     return '/';
-
                     break;
                 case 'error':
                     return '404';
-
                     break;
             }
         }
@@ -147,13 +147,11 @@ public function render($pages, $classes = null, $params = null)
                 $ul = config('simpleMenu.listClasses.ul');
                 $li = config('simpleMenu.listClasses.li');
                 $a  = config('simpleMenu.listClasses.a');
-
                 break;
             default:
                 $ul = array_get($classes, 'ul');
                 $li = array_get($classes, 'li');
                 $a  = array_get($classes, 'a');
-
                 break;
         }
 

src/database/migrations/2017_03_01_232836_create_menu_page_table.php

@@ -16,6 +16,8 @@ public function up()
             $table->foreign('menu_id')->references('id')->on('menus')->onDelete('cascade');
             $table->integer('page_id')->unsigned()->index();
             $table->foreign('page_id')->references('id')->on('pages')->onDelete('cascade');
+
+            $table->integer('order')->nullable();
         });
     }
 

src/resources/assets/js/components/menus.vue

@@ -0,0 +1,57 @@
+<template></template>
+
+<script>
+import Sortable from 'vue-sortable'
+Vue.use(Sortable)
+
+export default {
+    props: ['DelRoute', 'PagesRoute'],
+    data() {
+        return {
+            list: [],
+            saveList: []
+        };
+    },
+    created() {
+        $.ajaxSetup({
+            cache: false,
+            headers: {
+                'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
+            }
+        });
+
+        this.getPages();
+    },
+    methods: {
+        onUpdate(event) {
+            this.list.splice(event.newIndex, 0, (this.list.splice(event.oldIndex, 1)[0]))
+        },
+        getPages(){
+            $.get(this.PagesRoute, (res) => {
+                this.list = res.data;
+            });
+        },
+        deleteItem(item){
+            $.post(this.DelRoute,{
+                page_id: item.id,
+            }, (res) => {
+                if (res.done) {
+                    this.list.splice(this.list.indexOf(item), 1)
+                }
+            });
+        }
+    },
+    watch: {
+        list(val) {
+            this.saveList = []
+
+            val.map((item) => {
+                return this.saveList.push({
+                    id: item.id,
+                    order: this.list.indexOf(item) + 1
+                })
+            })
+        }
+    },
+}
+</script>