remove the css fw option

Author: ctf0

README.md

@@ -26,7 +26,6 @@ Create menus & pages that support (multiLocale "title, url, body, ...", nesting,
 - after installation, package will auto-add
     + package routes to `routes/web.php`
     + package assets compiling to `webpack.mix.js`
-    + `MIX_SM_FRAMEWORK=bulma` to `.env`
 
 - 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.
 
@@ -172,11 +171,6 @@ return [
         'permissions' => '\ctf0\SimpleMenu\Controllers\Admin\PermissionsController',
         'menus'       => '\ctf0\SimpleMenu\Controllers\Admin\MenusController',
     ],
-
-    /*
-     * css farmework for admin pages
-     */
-    'framework' => env('MIX_SM_FRAMEWORK'),
 ];
 ```
 

src/Controllers/BaseController.php

@@ -20,7 +20,7 @@ public function __construct()
         }
 
         $this->cache       = app('cache');
-        $this->adminPath   = 'SimpleMenu::admin.' . config('simpleMenu.framework');
+        $this->adminPath   = 'SimpleMenu::admin';
         $this->crud_prefix = config('simpleMenu.crud_prefix');
         $this->userModel   = app(config('simpleMenu.models.user'));
         $this->pageModel   = app(config('simpleMenu.models.page'));

src/Middleware/PermissionMiddleware.php

@@ -26,7 +26,7 @@ public function handle($request, Closure $next, ...$permissions)
             throw UnauthorizedException::notLoggedIn();
         }
 
-        if (!$request->user()->hasAnyPermission($permissions)) {
+        if (!$request->user()->load('permissions')->hasAnyPermission($permissions)) {
             throw UnauthorizedException::forPermissions($permissions);
         }
 

src/Middleware/RoleMiddleware.php

@@ -26,7 +26,7 @@ public function handle($request, Closure $next, ...$roles)
             throw UnauthorizedException::notLoggedIn();
         }
 
-        if (!$request->user()->hasAnyRole($roles)) {
+        if (!$request->user()->load('roles')->hasAnyRole($roles)) {
             throw UnauthorizedException::forRoles($roles);
         }
 

src/SimpleMenuServiceProvider.php

@@ -121,7 +121,6 @@ protected function viewComp()
         view()->composer('SimpleMenu::admin.*', function ($view) {
             $view->with([
                 'crud_prefix' => config('simpleMenu.crud_prefix'),
-                'css_fw'      => config('simpleMenu.framework'),
             ]);
         });
     }
@@ -202,16 +201,6 @@ protected function autoReg()
             $this->file->append($mix_file, $data);
         }
 
-        // fw
-        $env_file = base_path('.env');
-        $search   = 'MIX_SM_FRAMEWORK';
-
-        if ($this->checkExist($env_file, $search)) {
-            $data = "\nMIX_SM_FRAMEWORK=bulma";
-
-            $this->file->append($env_file, $data);
-        }
-
         // run check once
         app('cache')->store('file')->rememberForever('ct-sm', function () {
             return 'added';

src/config/simpleMenu.php

@@ -116,11 +116,4 @@
         'permissions' => '\ctf0\SimpleMenu\Controllers\Admin\PermissionsController',
         'menus'       => '\ctf0\SimpleMenu\Controllers\Admin\MenusController',
     ],
-
-    /*
-     * css farmework for admin pages
-     * ex.
-     * MIX_SM_FRAMEWORK=bulma
-     */
-    'framework'=> env('MIX_SM_FRAMEWORK'),
 ];

src/database/seeds/MenuPagesTableSeeder.php

@@ -17,10 +17,10 @@ public function run()
             $menu->pages()->attach($val->id);
         }
 
-        $pageModel->find(4)->makeChildOf($pageModel->find(3));
-        $pageModel->find(5)->makeChildOf($pageModel->find(4));
-        $pageModel->find(6)->makeChildOf($pageModel->find(5));
-        $pageModel->find(7)->makeChildOf($pageModel->find(6));
-        $pageModel->find(8)->makeChildOf($pageModel->find(7));
+        $pageModel->findOrFail(4)->makeChildOf($pageModel->findOrFail(3));
+        $pageModel->findOrFail(5)->makeChildOf($pageModel->findOrFail(4));
+        $pageModel->findOrFail(6)->makeChildOf($pageModel->findOrFail(5));
+        $pageModel->findOrFail(7)->makeChildOf($pageModel->findOrFail(6));
+        $pageModel->findOrFail(8)->makeChildOf($pageModel->findOrFail(7));
     }
 }

src/resources/assets/js/bulma/index.vue src/resources/assets/js/index.vue

@@ -41,7 +41,7 @@ axios.interceptors.response.use(
 )
 
 /*                Component                */
-Vue.component('SmPage', require('./' + process.env.MIX_SM_FRAMEWORK + '/page.vue'))
-Vue.component('SmMenu', require('./' + process.env.MIX_SM_FRAMEWORK + '/menu.vue'))
-Vue.component('SmIndex', require('./' + process.env.MIX_SM_FRAMEWORK + '/index.vue'))
+Vue.component('SmPage', require('./page.vue'))
+Vue.component('SmMenu', require('./menu.vue'))
+Vue.component('SmIndex', require('./index.vue'))
 Vue.component('MyNotification', require('vue-notif'))

src/resources/assets/js/manager.js

@@ -1 +1 @@
-@include("SimpleMenu::admin.$css_fw.shared")
+@include("SimpleMenu::admin.shared")

src/resources/assets/js/bulma/menu.vue src/resources/assets/js/menu.vue

@@ -1,4 +1,4 @@
-@extends("SimpleMenu::admin.$css_fw.shared")
+@extends("SimpleMenu::admin.shared")
 @section('title'){{ trans('SimpleMenu::messages.create_new') }} {{ trans('SimpleMenu::messages.menus') }}@endsection
 
 @section('sub')

src/resources/assets/js/bulma/menu_child.vue src/resources/assets/js/menu_child.vue

@@ -1,4 +1,4 @@
-@extends("SimpleMenu::admin.$css_fw.shared")
+@extends("SimpleMenu::admin.shared")
 @section('title'){{ trans('SimpleMenu::messages.edit') }} "{{ $menu->name }}"@endsection
 
 @section('sub')

src/resources/assets/js/bulma/mixins/menu.js src/resources/assets/js/mixins/menu.js

@@ -1,4 +1,4 @@
-@extends("SimpleMenu::admin.$css_fw.shared")
+@extends("SimpleMenu::admin.shared")
 @section('title', trans('SimpleMenu::messages.menus'))
 
 @section('sub')

src/resources/assets/js/bulma/mixins/search.js src/resources/assets/js/mixins/search.js

@@ -1,4 +1,4 @@
-@extends("SimpleMenu::admin.$css_fw.shared")
+@extends("SimpleMenu::admin.shared")
 @section('title'){{ trans('SimpleMenu::messages.create_new') }} {{ trans('SimpleMenu::messages.pages') }}@endsection
 
 @section('sub')

src/resources/assets/js/bulma/page.vue src/resources/assets/js/page.vue

@@ -1,4 +1,4 @@
-@extends("SimpleMenu::admin.$css_fw.shared")
+@extends("SimpleMenu::admin.shared")
 @section('title'){{ trans('SimpleMenu::messages.edit') }} "{{ empty($page->title) ? collect($page->getTranslations('title'))->first() : $page->title }}"@endsection
 
 @section('sub')

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

@@ -1,4 +1,4 @@
-@extends("SimpleMenu::admin.$css_fw.shared")
+@extends("SimpleMenu::admin.shared")
 @section('title', trans('SimpleMenu::messages.pages'))
 
 @section('sub')

src/resources/views/admin/bulma/menus/create.blade.php

@@ -1,4 +1,4 @@
-@extends("SimpleMenu::admin.$css_fw.shared")
+@extends("SimpleMenu::admin.shared")
 @section('title'){{ trans('SimpleMenu::messages.create_new') }} {{ trans('SimpleMenu::messages.permissions') }}@endsection
 
 @section('sub')

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

@@ -1,4 +1,4 @@
-@extends("SimpleMenu::admin.$css_fw.shared")
+@extends("SimpleMenu::admin.shared")
 @section('title'){{ trans('SimpleMenu::messages.edit') }} "{{ $permission->name }}"@endsection
 
 @section('sub')

src/resources/views/admin/bulma/menus/index.blade.php

@@ -1,4 +1,4 @@
-@extends("SimpleMenu::admin.$css_fw.shared")
+@extends("SimpleMenu::admin.shared")
 @section('title', trans('SimpleMenu::messages.permissions'))
 
 @section('sub')

src/resources/views/admin/bulma/pages/create.blade.php

@@ -1,4 +1,4 @@
-@extends("SimpleMenu::admin.$css_fw.shared")
+@extends("SimpleMenu::admin.shared")
 @section('title'){{ trans('SimpleMenu::messages.create_new') }} {{ trans('SimpleMenu::messages.roles') }}@endsection
 
 @section('sub')

src/resources/views/admin/bulma/pages/edit.blade.php

@@ -1,4 +1,4 @@
-@extends("SimpleMenu::admin.$css_fw.shared")
+@extends("SimpleMenu::admin.shared")
 @section('title'){{ trans('SimpleMenu::messages.edit') }} "{{ $role->name }}"@endsection
 
 @section('sub')

src/resources/views/admin/bulma/pages/index.blade.php

@@ -1,4 +1,4 @@
-@extends("SimpleMenu::admin.$css_fw.shared")
+@extends("SimpleMenu::admin.shared")
 @section('title', trans('SimpleMenu::messages.roles'))
 
 @section('sub')

src/resources/views/admin/bulma/permissions/create.blade.php

@@ -84,7 +84,7 @@
     </section>
 
     {{-- Footer --}}
-    @include("SimpleMenu::admin.$css_fw.editors")
+    @include("SimpleMenu::admin.editors")
     {{-- app --}}
     <script src="{{ asset("path/to/app.js") }}"></script>
 </body>

src/resources/views/admin/bulma/permissions/edit.blade.php

@@ -1,4 +1,4 @@
-@extends("SimpleMenu::admin.$css_fw.shared")
+@extends("SimpleMenu::admin.shared")
 @section('title'){{ trans('SimpleMenu::messages.create_new') }} {{ trans('SimpleMenu::messages.users') }}@endsection
 
 @section('sub')

src/resources/views/admin/bulma/permissions/index.blade.php

@@ -1,4 +1,4 @@
-@extends("SimpleMenu::admin.$css_fw.shared")
+@extends("SimpleMenu::admin.shared")
 @section('title'){{ trans('SimpleMenu::messages.edit') }} "{{ $user->name }}"@endsection
 
 @section('sub')

src/resources/views/admin/bulma/roles/create.blade.php

@@ -1,4 +1,4 @@
-@extends("SimpleMenu::admin.$css_fw.shared")
+@extends("SimpleMenu::admin.shared")
 @section('title', trans('SimpleMenu::messages.users'))
 
 @section('sub')

src/resources/views/admin/bulma/roles/edit.blade.php

@@ -10,7 +10,7 @@
     <title>{{ $title }}</title>
 
     {{-- styles --}}
-    <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/bulma/0.6.1/css/bulma.min.css">
+    <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/bulma/0.6.2/css/bulma.min.css">
 </head>
 <body>
     <div class="columns">