Skip to content
This repository was archived by the owner on Jan 3, 2023. It is now read-only.

Commit 902bff5

Browse files
ctf0ctf0
committed
minor
…
1 parent 8f0553b commit 902bff5

File tree

15 files changed

+88
-61
lines changed

15 files changed

+88
-61
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ Create menus & pages that support (multiLocale "title, url, body, ...", nesting,
3535
- also check the below **Dependencies** for extra "configuration/options/migrations".
3636
> - Permissions
3737
> - https://github.com/spatie/laravel-permission
38-
38+
>
3939
> - MultiLocale
4040
> - https://github.com/spatie/laravel-translatable
4141
> - https://github.com/mcamara/laravel-localization
42-
42+
>
4343
> - Menu Nested Set
4444
> - https://github.com/gazsp/baum
4545

‎src/Controllers/Admin/PagesController.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use Illuminate\Http\Request;
66
use Spatie\Permission\Models\Role;
7+
use ctf0\SimpleMenu\Facade\SimpleMenu;
78
use Spatie\Permission\Models\Permission;
89
use ctf0\SimpleMenu\Controllers\BaseController;
910
use ctf0\SimpleMenu\Controllers\Admin\Traits\PageOps;
@@ -32,12 +33,13 @@ public function index()
3233
*/
3334
public function create()
3435
{
36+
$locales = SimpleMenu::AppLocales();
3537
$roles = Role::pluck('name', 'name');
3638
$permissions = $this->cache->get('spatie.permission.cache')->pluck('name', 'name');
3739
$menus = $this->cache->tags('sm')->get('menus')->pluck('name', 'id');
3840
$templates = array_unique($this->cache->tags('sm')->get('pages')->pluck('template')->filter()->all());
3941

40-
return view("{$this->adminPath}.pages.create", compact('roles', 'permissions', 'menus', 'templates'));
42+
return view("{$this->adminPath}.pages.create", compact('locales', 'roles', 'permissions', 'menus', 'templates'));
4143
}
4244

4345
/**
@@ -75,6 +77,7 @@ public function store(Request $request)
7577
*/
7678
public function edit($id)
7779
{
80+
$locales = SimpleMenu::AppLocales();
7881
$roles = Role::pluck('name', 'name');
7982
$permissions = $this->cache->get('spatie.permission.cache')->pluck('name', 'name');
8083
$page = $this->cache->tags('sm')->get('pages')->find($id) ?: abort(404);
@@ -83,7 +86,7 @@ public function edit($id)
8386

8487
$controllerFile = $page->action ? $this->actionFileContent($page->action, 'get') : null;
8588

86-
return view("{$this->adminPath}.pages.edit", compact('roles', 'permissions', 'page', 'menus', 'templates', 'controllerFile'));
89+
return view("{$this->adminPath}.pages.edit", compact('locales', 'roles', 'permissions', 'page', 'menus', 'templates', 'controllerFile'));
8790
}
8891

8992
/**

‎src/Controllers/Admin/Traits/PageOps.php

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,22 @@ protected function cleanEmptyTranslations($request)
7272

7373
foreach ($result as $k => $v) {
7474
if (is_array($v)) {
75-
if (!array_filter($v)) {
76-
$result[$k] = null;
77-
} else {
78-
$result[$k] = array_filter($v);
79-
}
75+
$result[$k] = !array_filter($v) ? null : array_filter($v);
8076
}
8177
}
8278

8379
return $result;
8480
}
8581

82+
/**
83+
* save or get controller content.
84+
*
85+
* @param [type] $action [description]
86+
* @param [type] $type [description]
87+
* @param [type] $data [description]
88+
*
89+
* @return [type] [description]
90+
*/
8691
protected function actionFileContent($action, $type, $data = null)
8792
{
8893
$class = substr($action, 0, strpos($action, '@'));

‎src/Models/Traits/SMUsers.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ public function setPasswordAttribute($value)
1515
$value = $this->password;
1616
}
1717

18-
$this->attributes['password'] = app('hash')->needsRehash($value) ? bcrypt($value) : $value;
18+
$this->attributes['password'] = app('hash')->needsRehash($value)
19+
? app('hash')->make($value)
20+
: $value;
1921
}
2022
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ export default {
8080
console.error(err)
8181
})
8282
}
83-
},
84-
render () {}
83+
}
8584
}
8685
</script>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ export default {
153153
this.updatePages(val)
154154
})
155155
}
156-
},
157-
render () {}
156+
}
158157
}
159158
</script>

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export default {
3737
branding: false,
3838
browser_spellcheck: true,
3939
contextmenu: false,
40-
height : '120',
40+
height: '120',
4141
plugins: 'lists link image fullscreen media table preview autoresize',
4242
toolbar: 'undo redo | link unlink | media image | styleselect removeformat | outdent indent | numlist bullist table | preview fullscreen'
4343
})
@@ -50,14 +50,14 @@ export default {
5050
let editor = ace.edit('ace-editor')
5151
item.style.lineHeight = '2'
5252
editor.setOptions({
53-
enableBasicAutocompletion:true,
54-
enableLiveAutocompletion:true,
55-
enableSnippets:true
53+
enableBasicAutocompletion: true,
54+
enableLiveAutocompletion: true,
55+
enableSnippets: true
5656
})
5757
editor.renderer.setOptions({
58-
animatedScroll:true,
59-
showInvisibles:true,
60-
showPrintMargin:false,
58+
animatedScroll: true,
59+
showInvisibles: true,
60+
showPrintMargin: false,
6161
fontSize: 14,
6262
theme: 'ace/theme/monokai'
6363
})
@@ -123,7 +123,6 @@ export default {
123123
desc(newVal, oldVal) {
124124
this.toggleTinyMce('desc', newVal, oldVal)
125125
}
126-
},
127-
render () {}
126+
}
128127
}
129128
</script>

‎src/resources/assets/sass/style.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,14 @@ thead th {
1515
background-color: white;
1616
}
1717

18+
.m-t-5 {
19+
margin-top: 5px;
20+
}
21+
22+
.tags .tag:not(:last-child) {
23+
margin-right: 5px;
24+
}
25+
1826
// select
1927
.choices {
2028
font-size: 1rem;

‎src/resources/lang/en/messages.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,11 @@
3131
'model_updated' => 'Model Updated !',
3232
'models_deleted' => 'Models Deleted !',
3333
'name' => 'Name',
34-
'no_entries' => 'No entries in table',
34+
'no_entries' => 'No Data To Display',
3535
'ops' => 'Operations',
3636
'pages' => 'Pages',
3737
'password' => 'Password',
38+
'perm_delete' => 'Permanently Delete',
3839
'permissions' => 'Permissions',
3940
'regex' => 'The :attribute must have an "@"',
4041
'remove_child' => 'Remove Child',
@@ -54,5 +55,4 @@
5455
'url' => 'Url',
5556
'url_prefix' => 'Url Prefix',
5657
'users' => 'Users',
57-
'perm_delete' => 'Permanently Delete',
5858
);

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

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
@extends("SimpleMenu::admin.$css_fw.shared")
22
@section('title'){{ trans('SimpleMenu::messages.create_new') }} {{ trans('SimpleMenu::messages.pages') }}@endsection
33

4-
@php
5-
$locales = SimpleMenu::AppLocales();
6-
@endphp
7-
84
@section('sub')
95
<h3 class="title">
106
<a href="{{ route($crud_prefix.'.pages.index') }}">{{ trans('SimpleMenu::messages.go_back') }}</a>
@@ -57,15 +53,17 @@ class="input toggle-pad"
5753
{{ Form::label('action', trans('SimpleMenu::messages.action'), ['class' => 'label']) }}
5854
<div class="control">
5955
{{ Form::text(
60-
'action',
61-
null,
62-
['class' => 'input',
63-
'placeholder' => "Any\Name\Space\SomeController@methodName",
56+
'action',
57+
null,
58+
['class' => 'input',
59+
'placeholder' => "Any\Name\Space\SomeController@methodName",
6460
'ref' => 'action'])
6561
}}
66-
<span class="help">
67-
<code class="link" data-value="App\Http\Controllers\" @click="updateValue($event, 'action')">App\Http\Controllers\</code>
68-
</span>
62+
</div>
63+
<div class="tag link is-primary m-t-5"
64+
data-value="App\Http\Controllers\"
65+
@click="updateValue($event, 'action')">
66+
App\Http\Controllers\
6967
</div>
7068
@if($errors->has('action'))
7169
<p class="help is-danger">
@@ -79,19 +77,23 @@ class="input toggle-pad"
7977
{{ Form::label('template', trans('SimpleMenu::messages.template'), ['class' => 'label']) }}
8078
<div class="control">
8179
{{ Form::text(
82-
'template',
83-
null,
84-
['class' => 'input',
85-
'placeholder' => "ex.'folder.abc' or 'Vendor::xyz'",
80+
'template',
81+
null,
82+
['class' => 'input',
83+
'placeholder' => "ex.'folder.abc' or 'Vendor::xyz'",
8684
'ref' => 'template'])
8785
}}
8886
</div>
8987
@if (count($templates))
90-
<span class="help">
88+
<div class="tags m-t-5">
9189
@foreach ($templates as $one)
92-
<code class="link" data-value="{{ $one }}" @click="updateValue($event, 'template')">{{ $one }}</code>
90+
<div class="tag link is-primary"
91+
data-value="{{ $one }}"
92+
@click="updateValue($event, 'template')">
93+
{{ $one }}
94+
</div>
9395
@endforeach
94-
</span>
96+
</div>
9597
@endif
9698
@if($errors->has('template'))
9799
<p class="help is-danger">
@@ -104,7 +106,7 @@ class="input toggle-pad"
104106
<div class="field">
105107
{{ Form::label('route_name', trans('SimpleMenu::messages.route_name'), ['class' => 'label']) }}
106108
<div class="control">
107-
{{ Form::text('route_name', null, ['class' => 'input','placeholder' => "route-name"]) }}
109+
{{ Form::text('route_name', null, ['class' => 'input', 'placeholder' => "route-name"]) }}
108110
</div>
109111
@if($errors->has('route_name'))
110112
<p class="help is-danger">
@@ -118,9 +120,9 @@ class="input toggle-pad"
118120
{{ Form::label('middlewares', trans('SimpleMenu::messages.middlewares'), ['class' => 'label']) }}
119121
<div class="control">
120122
{{ Form::text(
121-
'middlewares',
122-
null,
123-
['class' => 'input','placeholder' => "some, other, middleware"])
123+
'middlewares',
124+
null,
125+
['class' => 'input', 'placeholder' => "some, other, middleware"])
124126
}}
125127
</div>
126128
</div>

0 commit comments

Comments
 (0)