updates & cleanup

## todo
- add new nesting levels

Author: ctf0

README.md

@@ -12,7 +12,10 @@
 - Javascript
     + [Vue](https://vuejs.org/)
     + [jQuery](https://jquery.com/)
+    + [select2]()
+    + [tinymce]()
     + [vuedraggable](https://github.com/SortableJS/Vue.Draggable)
+    + [notification-component](https://github.com/ctf0/Notification-Component)
 
 ## Installation
 
@@ -34,7 +37,7 @@
 
 - publish the packages assets with `php artisan vendor:publish`
     - for simpleMenu [Wiki](https://github.com/ctf0/simple-menu/wiki/Publish)
-    - also check the **Dependencies** packages pages for "config/options/migrations".
+    - also check the **Dependencies** packages for "config/options/migrations".
 
 ## Config
 **config/simpleMenu.php**
@@ -50,31 +53,40 @@ return [
     ],
 
     /*
-     * where to search for the template views relative to "resources\views" folder
+     * where to search for the template views ? (relative to "resources\views" folder)
      */
     'templatePath' => 'pages',
 
     /*
-     * the path where we will save the route list for multiLocal route resolving
+     * the path where we will save the routes list
      */
     'routeListPath' => storage_path('logs/simpleMenu.php'),
 
     /*
-     * what happens when a route is available in one locale "en" but not in another "fr", add either
-     * 'home' = '/' or
-     * 'error' = '404'
+     * where to redirect when a route is available in one locale "en" but not in another "fr" ?
      */
     'unFoundLocalizedRoute' => 'home',
 
     /*
-     * pages controller namespace
+     * pages action controller namespace
      */
-    'pagesControllerNS'=> 'App\Http\Controllers',
+    'pagesControllerNS' => 'App\Http\Controllers',
 
     /*
-     * css farmework
+     * the user model we are going to use for the admin page
      */
-    'framework'=> 'bulma',
+    'userModel' => App\User::class,
+
+    /*
+     * by default when removing a nested page, all of its 'Descendants' gets cleared.
+     * but what about when removing the root, do you also want the same behavior ?
+     */
+    'clearRootDescendants' => false,
+
+    /*
+     * css farmework for admin pages
+     */
+    'framework' => 'bulma',
 ];
 ```
 
@@ -90,7 +102,3 @@ return [
 
 ### Crud Views
 [Wiki](https://github.com/ctf0/SimpleMenu/wiki/Crud-Views)
-
-# ToDo
-
-* [ ] Menu Pages Hierarchy "nesting" Creation.

src/Controllers/Admin/AdminController.php

@@ -2,9 +2,9 @@
 
 namespace ctf0\SimpleMenu\Controllers\Admin;
 
-use App\Http\Controllers\Controller;
+use ctf0\SimpleMenu\Controllers\BaseController;
 
-class AdminController extends Controller
+class AdminController extends BaseController
 {
     /**
      * home.
@@ -13,7 +13,7 @@ class AdminController extends Controller
      */
     public function index()
     {
-        return view('SimpleMenu::admin.'.config('simpleMenu.framework').'.admin')->with([
+        return view("{$this->adminPath}.admin")->with([
             'title' => 'DashBoard',
             'desc'  => 'Admin Description',
         ]);

src/Controllers/Admin/MenusController.php

@@ -2,24 +2,27 @@
 
 namespace ctf0\SimpleMenu\Controllers\Admin;
 
-use App\Http\Controllers\Controller;
+use ctf0\SimpleMenu\Controllers\Admin\Traits\MenuOps;
+use ctf0\SimpleMenu\Controllers\BaseController;
 use ctf0\SimpleMenu\Models\Menu;
 use ctf0\SimpleMenu\Models\Page;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
-class MenusController extends Controller
+class MenusController extends BaseController
 {
+    use MenuOps;
+
     /**
      * Display a listing of Menu.
      *
      * @return \Illuminate\Http\Response
      */
     public function index()
     {
-        $menus = Menu::all();
+        $menus = cache('sm-menus');
 
-        return view('SimpleMenu::admin.'.config('simpleMenu.framework').'.menus.index', compact('menus'));
+        return view("{$this->adminPath}.menus.index", compact('menus'));
     }
 
     /**
@@ -29,7 +32,7 @@ public function index()
      */
     public function create()
     {
-        return view('SimpleMenu::admin.'.config('simpleMenu.framework').'.menus.create');
+        return view("{$this->adminPath}.menus.create");
     }
 
     /**
@@ -47,6 +50,8 @@ public function store(Request $request)
 
         Menu::create($request->all());
 
+        $this->clearCache();
+
         return redirect()->route('admin.menus.index');
     }
 
@@ -59,9 +64,9 @@ public function store(Request $request)
      */
     public function edit($id)
     {
-        $menu = Menu::findOrFail($id);
+        $menu = cache('sm-menus')->find($id);
 
-        return view('SimpleMenu::admin.'.config('simpleMenu.framework').'.menus.edit', compact('menu'));
+        return view("{$this->adminPath}.menus.edit", compact('menu'));
     }
 
     /**
@@ -78,18 +83,28 @@ public function update($id, Request $request)
             'name' => 'required|unique:menus,name,'.$id,
         ]);
 
-        $menu = Menu::findOrFail($id);
+        $menu = Menu::find($id);
+
+        // clear prev records
+        DB::table('menu_page')->where('menu_id', $menu->id)->delete();
 
         foreach (json_decode($request->saveList) as $item) {
-            $menu->pages()->sync($item->id, false);
-            DB::table('menu_page')->where('page_id', $item->id)->update(['order'=>$item->order]);
+            // make sure page is not included under any other pages
+            $this->clearSelfAndNests($item->id);
+
+            // save page hierarchy
+            if ($item->children) {
+                $this->saveListToDb($item->children);
+            }
+
+            // update the menu root list
+            $menu->pages()->attach($item->id, ['order'=>$item->order]);
         }
 
+        // update and trigger events
         $menu->update($request->except('saveList'));
 
-        /*
-         * todo "page nest list"
-         */
+        $this->clearCache();
 
         return back();
     }
@@ -103,53 +118,10 @@ public function update($id, Request $request)
      */
     public function destroy($id)
     {
-        Menu::findOrFail($id)->delete();
+        Menu::find($id)->delete();
 
-        return redirect()->route('admin.menus.index');
-    }
+        $this->clearCache();
 
-    /**
-     * get all menu pages for vuejs.
-     *
-     * @param Menu $id [description]
-     *
-     * @return [type] [description]
-     */
-    public function getMenuPages($id)
-    {
-        $pages = Menu::findOrFail($id)->pages()->orderBy('pivot_order', 'asc')->get();
-
-        $pages->map(function ($item) {
-            if (count($childs = $item->getDescendants()->toHierarchy())) {
-                $item['children'] = $childs;
-            }
-        });
-
-        $allPages = Page::all()->diff($pages);
-
-        $allPages->map(function ($item) {
-            if (count($childs = $item->getDescendants()->toHierarchy())) {
-                $item['children'] = $childs;
-            }
-        });
-
-        return response()->json(compact('pages', 'allPages'));
-    }
-
-    /**
-     * 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::findOrFail($id)->pages()->detach($request->page_id)) {
-            Menu::find($id)->touch();
-
-            return response()->json(['done'=>true]);
-        }
+        return redirect()->route('admin.menus.index');
     }
 }