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

Commit 1379587

Browse files
ctf0ctf0
committed
more cleanup, fix migration error when changing column names
add macro for url use `request()->url()` internally for render update sidebar links update page observer
1 parent 4a09aad commit 1379587

File tree

6 files changed

+66
-27
lines changed

6 files changed

+66
-27
lines changed

‎src/Observers/PageObserver.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,12 @@ protected function cleanData($page)
3737
{
3838
$route_name = $page->route_name;
3939

40+
// clear page session
41+
session()->forget($route_name);
42+
43+
// remove the route file
44+
File::delete(config('simpleMenu.routeListPath'));
45+
4046
foreach (array_keys(LaravelLocalization::getSupportedLocales()) as $code) {
4147
// clear menu cache
4248
Menu::get()->pluck('name')->each(function ($item) use ($code) {
@@ -46,11 +52,5 @@ protected function cleanData($page)
4652
// clear page cache
4753
return Cache::forget("$code-$route_name");
4854
}
49-
50-
// clear page session
51-
session()->forget($route_name);
52-
53-
// remove the route file
54-
File::delete(config('simpleMenu.routeListPath'));
5555
}
5656
}

‎src/SimpleMenu.php

+6-4
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@ public function __construct()
1616
{
1717
$this->listFileDir = config('simpleMenu.routeListPath');
1818

19-
// create routes
20-
$this->createRoutes();
19+
if (!app()->runningInConsole()) {
20+
// create routes
21+
$this->createRoutes();
2122

22-
// create menu
23-
$this->createMenus();
23+
// create menu
24+
$this->createMenus();
25+
}
2426
}
2527
}

‎src/Traits/NavigationTrait.php

+7-1
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,11 @@ protected function routeLink($name, $code)
116116
switch (config('simpleMenu.unFoundLocalizedRoute')) {
117117
case 'home':
118118
return '/';
119+
119120
break;
120121
case 'error':
121122
return '404';
123+
122124
break;
123125
}
124126
}
@@ -136,18 +138,22 @@ protected function routeLink($name, $code)
136138
*
137139
* @return [type] [description]
138140
*/
139-
public function render($pages, $classes = null, $params = null, $url)
141+
public function render($pages, $classes = null, $params = null)
140142
{
143+
$url = request()->url();
144+
141145
switch ($classes) {
142146
case 'config':
143147
$ul = config('simpleMenu.listClasses.ul');
144148
$li = config('simpleMenu.listClasses.li');
145149
$a = config('simpleMenu.listClasses.a');
150+
146151
break;
147152
default:
148153
$ul = array_get($classes, 'ul');
149154
$li = array_get($classes, 'li');
150155
$a = array_get($classes, 'a');
156+
151157
break;
152158
}
153159

‎src/database/seeds/PagesTableSeeder.php

+25-3
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,33 @@ public function run()
1313
{
1414
$faker = Factory::create();
1515

16-
$heros = ['Home', 'About', 'Contact Us'];
16+
Page::create([
17+
'template' => 'hero',
18+
'route_name'=> str_slug('Home'),
19+
'action' => 'PageController@'.camel_case('Home'),
20+
'title' => [
21+
'en' => title_case('Home'),
22+
'fr' => title_case('Home'),
23+
],
24+
'body' => [
25+
'en' => $faker->text(),
26+
'fr' => $faker->text(),
27+
],
28+
'desc' => [
29+
'en' => $faker->text(),
30+
'fr' => $faker->text(),
31+
],
32+
'url' => [
33+
'en' => '/',
34+
'fr' => '/',
35+
],
36+
]);
37+
38+
$heros = ['About', 'Contact Us'];
1739
foreach ($heros as $one) {
1840
Page::create([
19-
'route_name'=> str_slug($one),
2041
'template' => 'hero',
42+
'route_name'=> str_slug($one),
2143
'action' => 'PageController@'.camel_case($one),
2244
'title' => [
2345
'en' => title_case($one),
@@ -44,8 +66,8 @@ public function run()
4466
$fr = $faker->unique()->city;
4567

4668
Page::create([
47-
'route_name'=> str_slug($en),
4869
'template' => 'hero',
70+
'route_name'=> str_slug($en),
4971
'title' => [
5072
'en' => title_case($en),
5173
'fr' => title_case($fr),

‎src/resources/views/pages/bulma/menus/index.blade.php

+8-8
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,26 @@
66
@lang('SimpleMenu::messages.menus.title') "{{ count($menus) }}"
77
<a href="{{ route('admin.menus.create') }}" class="button is-success">@lang('SimpleMenu::messages.app_add_new')</a>
88
</h3>
9-
9+
1010
<table class="table is-bordered">
1111
<thead>
1212
<tr>
1313
<th>@lang('SimpleMenu::messages.menus.fields.name')</th>
1414
<th>@lang('SimpleMenu::messages.ops')</th>
1515
</tr>
1616
</thead>
17-
17+
1818
<tbody>
1919
@if (count($menus) > 0)
20-
@foreach ($menus as $permission)
21-
<tr data-entry-id="{{ $permission->id }}">
22-
<td>{{ $permission->name }}</td>
20+
@foreach ($menus as $menu)
21+
<tr>
22+
<td>{{ $menu->name }}</td>
2323
<td>
24-
<a href="{{ route('admin.menus.edit',[$permission->id]) }}" class="button is-info is-inline-block">
24+
<a href="{{ route('admin.menus.edit',[$menu->id]) }}" class="button is-info is-inline-block">
2525
@lang('SimpleMenu::messages.app_edit')
2626
</a>
2727
<a class="is-inline-block">
28-
{{ Form::open(['method' => 'DELETE', 'route' => ['admin.menus.destroy', $permission->id]]) }}
28+
{{ Form::open(['method' => 'DELETE', 'route' => ['admin.menus.destroy', $menu->id]]) }}
2929
{{ Form::submit(trans('SimpleMenu::messages.app_delete'), ['class' => 'button is-danger']) }}
3030
{{ Form::close() }}
3131
</a>
@@ -39,4 +39,4 @@
3939
@endif
4040
</tbody>
4141
</table>
42-
@stop
42+
@stop

‎src/resources/views/pages/bulma/shared.blade.php

+14-5
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,20 @@
3434
<div class="column">
3535
<aside class="menu">
3636
<ul class="menu-list">
37-
<li><a class="{{ URL::has('users') ? 'is-active' : '' }}" href="{{ route('admin.users.index') }}">Users</a></li>
38-
<li><a class="{{ URL::has('roles') ? 'is-active' : '' }}" href="{{ route('admin.roles.index') }}">Roles</a></li>
39-
<li><a class="{{ URL::has('permissions') ? 'is-active' : '' }}" href="{{ route('admin.permissions.index') }}">Permissions</a></li>
40-
<li><a class="{{ URL::has('menus') ? 'is-active' : '' }}" href="{{ route('admin.menus.index') }}">Menus</a></li>
41-
<li><a class="{{ URL::has('pages') ? 'is-active' : '' }}" href="{{ route('admin.pages.index') }}">Pages</a></li>
37+
<li><a class="{{ request()->url() == route('admin.users.index') ? 'is-active' : '' }}" href="{{ route('admin.users.index') }}">Users</a></li>
38+
<li><a class="{{ request()->url() == route('admin.roles.index') ? 'is-active' : '' }}" href="{{ route('admin.roles.index') }}">Roles</a></li>
39+
<li><a class="{{ request()->url() == route('admin.permissions.index') ? 'is-active' : '' }}" href="{{ route('admin.permissions.index') }}">Permissions</a></li>
40+
<li>
41+
<a class="{{ request()->url() == route('admin.menus.index') ? 'is-active' : '' }}" href="{{ route('admin.menus.index') }}">Menus</a>
42+
<ul>
43+
@foreach (\ctf0\SimpleMenu\Models\Menu::all() as $menu)
44+
<li>
45+
<a class="{{ request()->url() == route('admin.menus.edit',['id'=>$menu->id]) ? 'is-active is-info' : '' }}" href="{{ route('admin.menus.edit',[$menu->id]) }}">{{ $menu->name }}</a>
46+
</li>
47+
@endforeach
48+
</ul>
49+
</li>
50+
<li><a class="{{ request()->url() == route('admin.pages.index') ? 'is-active' : '' }}" href="{{ route('admin.pages.index') }}">Pages</a></li>
4251
</ul>
4352
</aside>
4453
</div>

0 commit comments

Comments
 (0)