minor

…

Author: ctf0

README.md

@@ -35,11 +35,11 @@ Create menus & pages that support (multiLocale "title, url, body, ...", nesting,
     - also check the below **Dependencies** for extra "configuration/options/migrations".
         > - Permissions
         >   - https://github.com/spatie/laravel-permission
-
+        >
         > - MultiLocale
         >   - https://github.com/spatie/laravel-translatable
         >   - https://github.com/mcamara/laravel-localization
-
+        >
         > - Menu Nested Set
         >   - https://github.com/gazsp/baum
 

src/Controllers/Admin/PagesController.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Http\Request;
 use Spatie\Permission\Models\Role;
+use ctf0\SimpleMenu\Facade\SimpleMenu;
 use Spatie\Permission\Models\Permission;
 use ctf0\SimpleMenu\Controllers\BaseController;
 use ctf0\SimpleMenu\Controllers\Admin\Traits\PageOps;
@@ -32,12 +33,13 @@ public function index()
      */
     public function create()
     {
+        $locales     = SimpleMenu::AppLocales();
         $roles       = Role::pluck('name', 'name');
         $permissions = $this->cache->get('spatie.permission.cache')->pluck('name', 'name');
         $menus       = $this->cache->tags('sm')->get('menus')->pluck('name', 'id');
         $templates   = array_unique($this->cache->tags('sm')->get('pages')->pluck('template')->filter()->all());
 
-        return view("{$this->adminPath}.pages.create", compact('roles', 'permissions', 'menus', 'templates'));
+        return view("{$this->adminPath}.pages.create", compact('locales', 'roles', 'permissions', 'menus', 'templates'));
     }
 
     /**
@@ -75,6 +77,7 @@ public function store(Request $request)
      */
     public function edit($id)
     {
+        $locales     = SimpleMenu::AppLocales();
         $roles       = Role::pluck('name', 'name');
         $permissions = $this->cache->get('spatie.permission.cache')->pluck('name', 'name');
         $page        = $this->cache->tags('sm')->get('pages')->find($id) ?: abort(404);
@@ -83,7 +86,7 @@ public function edit($id)
 
         $controllerFile = $page->action ? $this->actionFileContent($page->action, 'get') : null;
 
-        return view("{$this->adminPath}.pages.edit", compact('roles', 'permissions', 'page', 'menus', 'templates', 'controllerFile'));
+        return view("{$this->adminPath}.pages.edit", compact('locales', 'roles', 'permissions', 'page', 'menus', 'templates', 'controllerFile'));
     }
 
     /**

src/Controllers/Admin/Traits/PageOps.php

@@ -72,17 +72,22 @@ protected function cleanEmptyTranslations($request)
 
         foreach ($result as $k => $v) {
             if (is_array($v)) {
-                if (!array_filter($v)) {
-                    $result[$k] = null;
-                } else {
-                    $result[$k] = array_filter($v);
-                }
+                $result[$k] = !array_filter($v) ? null : array_filter($v);
             }
         }
 
         return $result;
     }
 
+    /**
+     * save or get controller content.
+     *
+     * @param [type] $action [description]
+     * @param [type] $type   [description]
+     * @param [type] $data   [description]
+     *
+     * @return [type] [description]
+     */
     protected function actionFileContent($action, $type, $data = null)
     {
         $class = substr($action, 0, strpos($action, '@'));

src/Models/Traits/SMUsers.php

@@ -15,6 +15,8 @@ public function setPasswordAttribute($value)
             $value = $this->password;
         }
 
-        $this->attributes['password'] = app('hash')->needsRehash($value) ? bcrypt($value) : $value;
+        $this->attributes['password'] = app('hash')->needsRehash($value) 
+        	? app('hash')->make($value) 
+        	: $value;
     }
 }

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

@@ -80,7 +80,6 @@ export default {
                 console.error(err)
             })
         }
-    },
-    render () {}
+    }
 }
 </script>

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

@@ -153,7 +153,6 @@ export default {
                 this.updatePages(val)
             })
         }
-    },
-    render () {}
+    }
 }
 </script>

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

@@ -37,7 +37,7 @@ export default {
                 branding: false,
                 browser_spellcheck: true,
                 contextmenu: false,
-                height : '120',
+                height: '120',
                 plugins: 'lists link image fullscreen media table preview autoresize',
                 toolbar: 'undo redo | link unlink | media image | styleselect removeformat | outdent indent | numlist bullist table | preview fullscreen'
             })
@@ -50,14 +50,14 @@ export default {
                 let editor = ace.edit('ace-editor')
                 item.style.lineHeight = '2'
                 editor.setOptions({
-                    enableBasicAutocompletion:true,
-                    enableLiveAutocompletion:true,
-                    enableSnippets:true
+                    enableBasicAutocompletion: true,
+                    enableLiveAutocompletion: true,
+                    enableSnippets: true
                 })
                 editor.renderer.setOptions({
-                    animatedScroll:true,
-                    showInvisibles:true,
-                    showPrintMargin:false,
+                    animatedScroll: true,
+                    showInvisibles: true,
+                    showPrintMargin: false,
                     fontSize: 14,
                     theme: 'ace/theme/monokai'
                 })
@@ -123,7 +123,6 @@ export default {
         desc(newVal, oldVal) {
             this.toggleTinyMce('desc', newVal, oldVal)
         }
-    },
-    render () {}
+    }
 }
 </script>

src/resources/assets/sass/style.scss

@@ -15,6 +15,14 @@ thead th {
     background-color: white;
 }
 
+.m-t-5 {
+    margin-top: 5px;
+}
+
+.tags .tag:not(:last-child) {
+    margin-right: 5px;
+}
+
 // select
 .choices {
     font-size: 1rem;

src/resources/lang/en/messages.php

@@ -31,10 +31,11 @@
   'model_updated' => 'Model Updated !',
   'models_deleted' => 'Models Deleted !',
   'name' => 'Name',
-  'no_entries' => 'No entries in table',
+  'no_entries' => 'No Data To Display',
   'ops' => 'Operations',
   'pages' => 'Pages',
   'password' => 'Password',
+  'perm_delete' => 'Permanently Delete',
   'permissions' => 'Permissions',
   'regex' => 'The :attribute must have an "@"',
   'remove_child' => 'Remove Child',
@@ -54,5 +55,4 @@
   'url' => 'Url',
   'url_prefix' => 'Url Prefix',
   'users' => 'Users',
-  'perm_delete' => 'Permanently Delete',
 );

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

@@ -1,10 +1,6 @@
 @extends("SimpleMenu::admin.$css_fw.shared")
 @section('title'){{ trans('SimpleMenu::messages.create_new') }} {{ trans('SimpleMenu::messages.pages') }}@endsection
 
-@php
-    $locales = SimpleMenu::AppLocales();
-@endphp
-
 @section('sub')
     <h3 class="title">
         <a href="{{ route($crud_prefix.'.pages.index') }}">{{ trans('SimpleMenu::messages.go_back') }}</a>
@@ -57,15 +53,17 @@ class="input toggle-pad"
                             {{ Form::label('action', trans('SimpleMenu::messages.action'), ['class' => 'label']) }}
                             <div class="control">
                                 {{ Form::text(
-                                    'action',
-                                    null,
-                                    ['class' => 'input',
-                                    'placeholder' => "Any\Name\Space\SomeController@methodName",
+                                    'action', 
+                                    null, 
+                                    ['class' => 'input', 
+                                    'placeholder' => "Any\Name\Space\SomeController@methodName", 
                                     'ref' => 'action'])
                                 }}
-                                <span class="help">
-                                    <code class="link" data-value="App\Http\Controllers\" @click="updateValue($event, 'action')">App\Http\Controllers\</code>
-                                </span>
+                            </div>
+                            <div class="tag link is-primary m-t-5"
+                                data-value="App\Http\Controllers\"
+                                @click="updateValue($event, 'action')">
+                                App\Http\Controllers\
                             </div>
                             @if($errors->has('action'))
                                 <p class="help is-danger">
@@ -79,19 +77,23 @@ class="input toggle-pad"
                             {{ Form::label('template', trans('SimpleMenu::messages.template'), ['class' => 'label']) }}
                             <div class="control">
                                 {{ Form::text(
-                                    'template',
-                                    null,
-                                    ['class' => 'input',
-                                    'placeholder' => "ex.'folder.abc' or 'Vendor::xyz'",
+                                    'template', 
+                                    null, 
+                                    ['class' => 'input', 
+                                    'placeholder' => "ex.'folder.abc' or 'Vendor::xyz'", 
                                     'ref' => 'template'])
                                 }}
                             </div>
                             @if (count($templates))
-                                <span class="help">
+                                <div class="tags m-t-5">
                                     @foreach ($templates as $one)
-                                        <code class="link" data-value="{{ $one }}" @click="updateValue($event, 'template')">{{ $one }}</code>
+                                        <div class="tag link is-primary"
+                                            data-value="{{ $one }}"
+                                            @click="updateValue($event, 'template')">
+                                            {{ $one }}
+                                        </div>
                                     @endforeach
-                                </span>
+                                </div>
                             @endif
                             @if($errors->has('template'))
                                 <p class="help is-danger">
@@ -104,7 +106,7 @@ class="input toggle-pad"
                         <div class="field">
                             {{ Form::label('route_name', trans('SimpleMenu::messages.route_name'), ['class' => 'label']) }}
                             <div class="control">
-                                {{ Form::text('route_name', null, ['class' => 'input','placeholder' => "route-name"]) }}
+                                {{ Form::text('route_name', null, ['class' => 'input', 'placeholder' => "route-name"]) }}
                             </div>
                             @if($errors->has('route_name'))
                                 <p class="help is-danger">
@@ -118,9 +120,9 @@ class="input toggle-pad"
                             {{ Form::label('middlewares', trans('SimpleMenu::messages.middlewares'), ['class' => 'label']) }}
                             <div class="control">
                                 {{ Form::text(
-                                    'middlewares',
-                                    null,
-                                    ['class' => 'input','placeholder' => "some, other, middleware"])
+                                    'middlewares', 
+                                    null, 
+                                    ['class' => 'input', 'placeholder' => "some, other, middleware"])
                                 }}
                             </div>
                         </div>