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

Commit 8c05169

Browse files
ctf0ctf0
committed
views/pages > admin
forgot again
1 parent 3534d68 commit 8c05169

27 files changed

+104
-94
lines changed

‎src/Controllers/Admin/AdminController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class AdminController extends Controller
1313
*/
1414
public function index()
1515
{
16-
return view('SimpleMenu::pages.'.config('simpleMenu.framework').'.admin')->with([
16+
return view('SimpleMenu::admin.'.config('simpleMenu.framework').'.admin')->with([
1717
'title' => 'DashBoard',
1818
'desc' => 'Admin Description',
1919
]);

‎src/Controllers/Admin/MenusController.php

+5-14
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public function index()
1919
{
2020
$menus = Menu::all();
2121

22-
return view('SimpleMenu::pages.'.config('simpleMenu.framework').'.menus.index', compact('menus'));
22+
return view('SimpleMenu::admin.'.config('simpleMenu.framework').'.menus.index', compact('menus'));
2323
}
2424

2525
/**
@@ -29,7 +29,7 @@ public function index()
2929
*/
3030
public function create()
3131
{
32-
return view('SimpleMenu::pages.'.config('simpleMenu.framework').'.menus.create');
32+
return view('SimpleMenu::admin.'.config('simpleMenu.framework').'.menus.create');
3333
}
3434

3535
/**
@@ -61,7 +61,7 @@ public function edit($id)
6161
{
6262
$menu = Menu::findOrFail($id);
6363

64-
return view('SimpleMenu::pages.'.config('simpleMenu.framework').'.menus.edit', compact('menu'));
64+
return view('SimpleMenu::admin.'.config('simpleMenu.framework').'.menus.edit', compact('menu'));
6565
}
6666

6767
/**
@@ -78,7 +78,6 @@ public function update(Request $request, $id)
7878
'name' => 'required|unique:menus,name,'.$id,
7979
]);
8080

81-
// update menu pages order
8281
foreach (json_decode($request->saveList) as $item) {
8382
DB::table('menu_page')->where('page_id', $item->id)->update(['order'=>$item->order]);
8483
}
@@ -105,30 +104,22 @@ public function destroy($id)
105104
return redirect()->route('admin.menus.index');
106105
}
107106

108-
/* helpers */
109-
110107
/**
111108
* remove page from menu with ajax.
112109
*
113-
* @param [type] $id [description]
114-
* @param Request $request [description]
115-
*
116-
* @return [type] [description]
110+
* @param mixed $id
117111
*/
118112
public function removePage($id, Request $request)
119113
{
120114
if (Menu::find($id)->pages()->detach($request->page_id)) {
121115
Menu::find($id)->touch();
116+
122117
return response()->json(['done'=>true]);
123118
}
124119
}
125120

126121
/**
127122
* get all menu pages for sorting with vuejs.
128-
*
129-
* @param Menu $id [description]
130-
*
131-
* @return [type] [description]
132123
*/
133124
public function getPages(Menu $id)
134125
{

‎src/Controllers/Admin/PagesController.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function index()
2323
{
2424
$pages = Page::get();
2525

26-
return view('SimpleMenu::pages.'.config('simpleMenu.framework').'.pages.index', compact('pages'));
26+
return view('SimpleMenu::admin.'.config('simpleMenu.framework').'.pages.index', compact('pages'));
2727
}
2828

2929
/**
@@ -37,7 +37,7 @@ public function create()
3737
$permissions = Permission::get()->pluck('name', 'name');
3838
$menus = Menu::get()->pluck('name', 'id');
3939

40-
return view('SimpleMenu::pages.'.config('simpleMenu.framework').'.pages.create', compact('roles', 'permissions', 'menus'));
40+
return view('SimpleMenu::admin.'.config('simpleMenu.framework').'.pages.create', compact('roles', 'permissions', 'menus'));
4141
}
4242

4343
/**
@@ -77,7 +77,7 @@ public function edit($id)
7777
$permissions = Permission::get()->pluck('name', 'name');
7878
$menus = Menu::get()->pluck('name', 'id');
7979

80-
return view('SimpleMenu::pages.'.config('simpleMenu.framework').'.pages.edit', compact('page', 'roles', 'permissions', 'menus'));
80+
return view('SimpleMenu::admin.'.config('simpleMenu.framework').'.pages.edit', compact('page', 'roles', 'permissions', 'menus'));
8181
}
8282

8383
/**

‎src/Controllers/Admin/PermissionsController.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public function index()
1717
{
1818
$permissions = Permission::all();
1919

20-
return view('SimpleMenu::pages.'.config('simpleMenu.framework').'.permissions.index', compact('permissions'));
20+
return view('SimpleMenu::admin.'.config('simpleMenu.framework').'.permissions.index', compact('permissions'));
2121
}
2222

2323
/**
@@ -27,7 +27,7 @@ public function index()
2727
*/
2828
public function create()
2929
{
30-
return view('SimpleMenu::pages.'.config('simpleMenu.framework').'.permissions.create');
30+
return view('SimpleMenu::admin.'.config('simpleMenu.framework').'.permissions.create');
3131
}
3232

3333
/**
@@ -59,7 +59,7 @@ public function edit($id)
5959
{
6060
$permission = Permission::findOrFail($id);
6161

62-
return view('SimpleMenu::pages.'.config('simpleMenu.framework').'.permissions.edit', compact('permission'));
62+
return view('SimpleMenu::admin.'.config('simpleMenu.framework').'.permissions.edit', compact('permission'));
6363
}
6464

6565
/**

‎src/Controllers/Admin/RolesController.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public function index()
1818
{
1919
$roles = Role::all();
2020

21-
return view('SimpleMenu::pages.'.config('simpleMenu.framework').'.roles.index', compact('roles'));
21+
return view('SimpleMenu::admin.'.config('simpleMenu.framework').'.roles.index', compact('roles'));
2222
}
2323

2424
/**
@@ -30,7 +30,7 @@ public function create()
3030
{
3131
$permissions = Permission::get()->pluck('name', 'name');
3232

33-
return view('SimpleMenu::pages.'.config('simpleMenu.framework').'.roles.create', compact('permissions'));
33+
return view('SimpleMenu::admin.'.config('simpleMenu.framework').'.roles.create', compact('permissions'));
3434
}
3535

3636
/**
@@ -66,7 +66,7 @@ public function edit($id)
6666
$role = Role::findOrFail($id);
6767
$permissions = Permission::get()->pluck('name', 'name');
6868

69-
return view('SimpleMenu::pages.'.config('simpleMenu.framework').'.roles.edit', compact('role', 'permissions'));
69+
return view('SimpleMenu::admin.'.config('simpleMenu.framework').'.roles.edit', compact('role', 'permissions'));
7070
}
7171

7272
/**

‎src/Controllers/Admin/UsersController.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public function index()
1919
{
2020
$users = User::all();
2121

22-
return view('SimpleMenu::pages.'.config('simpleMenu.framework').'.users.index', compact('users'));
22+
return view('SimpleMenu::admin.'.config('simpleMenu.framework').'.users.index', compact('users'));
2323
}
2424

2525
/**
@@ -32,7 +32,7 @@ public function create()
3232
$roles = Role::get()->pluck('name', 'name');
3333
$permissions = Permission::get()->pluck('name', 'name');
3434

35-
return view('SimpleMenu::pages.'.config('simpleMenu.framework').'.users.create', compact('roles', 'permissions'));
35+
return view('SimpleMenu::admin.'.config('simpleMenu.framework').'.users.create', compact('roles', 'permissions'));
3636
}
3737

3838
/**
@@ -75,7 +75,7 @@ public function edit($id)
7575
$roles = Role::get()->pluck('name', 'name');
7676
$permissions = Permission::get()->pluck('name', 'name');
7777

78-
return view('SimpleMenu::pages.'.config('simpleMenu.framework').'.users.edit', compact('user', 'roles', 'permissions'));
78+
return view('SimpleMenu::admin.'.config('simpleMenu.framework').'.users.edit', compact('user', 'roles', 'permissions'));
7979
}
8080

8181
/**

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

+7
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,11 @@
3838
.menu-item {
3939
padding: 0.5em;
4040
margin-bottom: 0.5em !important;
41+
cursor: ns-resize;
42+
table {
43+
table-layout: fixed;
44+
.handler {
45+
width: 15px;
46+
}
47+
}
4148
}

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

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@include('SimpleMenu::admin.'.config('simpleMenu.framework').'.shared')

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
@extends('SimpleMenu::pages.'.config('simpleMenu.framework').'.shared')
1+
@extends('SimpleMenu::admin.'.config('simpleMenu.framework').'.shared')
22
@section('title'){{ 'Create new Menu' }}@endsection
33

44
@section('sub')
55
<h3 class="title">
66
<a href="{{ route('admin.menus.index') }}">Go Back</a>
77
</h3>
8-
8+
99
{{ Form::open(['method' => 'POST', 'route' => 'admin.menus.store']) }}
10-
10+
1111
{{-- name --}}
1212
<div class="field">
1313
{{ Form::label('name', 'Name', ['class' => 'label']) }}
@@ -25,6 +25,6 @@
2525
{{ Form::submit(trans('SimpleMenu::messages.app_save'), ['class' => 'button is-success']) }}
2626
</div>
2727
</div>
28-
28+
2929
{{ Form::close() }}
3030
@stop

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

+16-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
1-
@extends('SimpleMenu::pages.'.config('simpleMenu.framework').'.shared')
1+
@extends('SimpleMenu::admin.'.config('simpleMenu.framework').'.shared')
22
@section('title'){{ "Edit '$menu->name'" }}@endsection
33

44
@section('sub')
55
<h3 class="title">
66
<a href="{{ route('admin.menus.index') }}">Go Back</a>
77
</h3>
88

9-
<menu-comp inline-template del-route="{{ route('admin.menus.removePage',['id'=>$menu->id]) }}" pages-route="{{ route('admin.menus.getPages',['id'=>$menu->id]) }}">
9+
<menu-comp
10+
inline-template
11+
del-route="{{ route('admin.menus.removePage',['id'=>$menu->id]) }}"
12+
pages-route="{{ route('admin.menus.getPages',['id'=>$menu->id]) }}">
1013
<div>
1114
{{ Form::model($menu, ['method' => 'PUT', 'route' => ['admin.menus.update', $menu->id]]) }}
1215

@@ -33,7 +36,16 @@
3336
<ul v-sortable="{ onUpdate: onUpdate }">
3437
<li v-for="item in list" :key="item.id">
3538
<div class="notification is-info menu-item">
36-
<p v-html="item.title.{{ LaravelLocalization::getCurrentLocale() }}"></p>
39+
<table>
40+
<tr>
41+
<td class="handler">
42+
<span class="icon is-small">
43+
<i class="fa fa-caret-right"></i>
44+
</span>
45+
</td>
46+
<td v-html="item.title.{{ LaravelLocalization::getCurrentLocale() }}"></td>
47+
</tr>
48+
</table>
3749
<button class="delete" @click.prevent="deleteItem(item)"></button>
3850
</div>
3951
</li>
@@ -44,4 +56,4 @@
4456
{{ Form::close() }}
4557
</div>
4658
</menu-comp>
47-
@stop
59+
@stop

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@extends('SimpleMenu::pages.'.config('simpleMenu.framework').'.shared')
1+
@extends('SimpleMenu::admin.'.config('simpleMenu.framework').'.shared')
22
@section('title'){{ 'Menus' }}@endsection
33

44
@section('sub')
@@ -39,4 +39,4 @@
3939
@endif
4040
</tbody>
4141
</table>
42-
@stop
42+
@stop

‎src/resources/views/pages/bulma/pages/_multi-edit.blade.php ‎src/resources/views/admin/bulma/pages/_multi-edit.blade.php

File renamed without changes.

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

File renamed without changes.

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@extends('SimpleMenu::pages.'.config('simpleMenu.framework').'.shared')
1+
@extends('SimpleMenu::admin.'.config('simpleMenu.framework').'.shared')
22
@section('title'){{ 'Create new Page' }}@endsection
33

44
@section('sub')
@@ -50,7 +50,7 @@
5050
</div>
5151

5252
{{-- multi --}}
53-
@include('SimpleMenu::pages.'.config('simpleMenu.framework').'.pages._multi')
53+
@include('SimpleMenu::admin.'.config('simpleMenu.framework').'.pages._multi')
5454
{{-- end multi --}}
5555

5656
{{-- roles --}}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@extends('SimpleMenu::pages.'.config('simpleMenu.framework').'.shared')
1+
@extends('SimpleMenu::admin.'.config('simpleMenu.framework').'.shared')
22
@section('title'){{ "Edit '$page->title'" }}@endsection
33

44
@section('sub')
@@ -50,7 +50,7 @@
5050
</div>
5151

5252
{{-- multi --}}
53-
@include('SimpleMenu::pages.'.config('simpleMenu.framework').'.pages._multi-edit')
53+
@include('SimpleMenu::admin.'.config('simpleMenu.framework').'.pages._multi-edit')
5454
{{-- end multi --}}
5555

5656
{{-- roles --}}

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@extends('SimpleMenu::pages.'.config('simpleMenu.framework').'.shared')
1+
@extends('SimpleMenu::admin.'.config('simpleMenu.framework').'.shared')
22
@section('title'){{ 'Pages' }}@endsection
33

44
@section('sub')
@@ -14,7 +14,7 @@
1414
<th>@lang('SimpleMenu::messages.pages.fields.roles')</th>
1515
<th>@lang('SimpleMenu::messages.pages.fields.permissions')</th>
1616
<th>@lang('SimpleMenu::messages.pages.fields.menus')</th>
17-
<th>@lang('SimpleMenu::messages.pages.fields.locales')</th>
17+
<th>@lang('SimpleMenu::messages.pages.fields.locals')</th>
1818
<th>@lang('SimpleMenu::messages.ops')</th>
1919
</tr>
2020
</thead>
@@ -35,13 +35,13 @@
3535
@endforeach
3636
</td>
3737
<td>
38-
@foreach ($page->menuNames()->pluck('name') as $menu)
39-
<span class="tag is-medium is-info">{{ $menu }}</span>
38+
@foreach ($page->menuNames()->pluck('name') as $name)
39+
<span class="tag is-medium is-info">{{ $name }}</span>
4040
@endforeach
4141
</td>
4242
<td>
43-
@foreach ($page->getTranslatedLocales('title') as $locale)
44-
<span class="tag is-medium is-warning">{{ $locale }}</span>
43+
@foreach ($page->getTranslatedLocales('title') as $name)
44+
<span class="tag is-medium is-warning">{{ $name }}</span>
4545
@endforeach
4646
</td>
4747
<td>
@@ -61,4 +61,4 @@
6161
@endif
6262
</tbody>
6363
</table>
64-
@stop
64+
@stop

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
@extends('SimpleMenu::pages.'.config('simpleMenu.framework').'.shared')
1+
@extends('SimpleMenu::admin.'.config('simpleMenu.framework').'.shared')
22
@section('title'){{ 'Create new Permission' }}@endsection
33

44
@section('sub')
55
<h3 class="title">
66
<a href="{{ route('admin.permissions.index') }}">Go Back</a>
77
</h3>
8-
8+
99
{{ Form::open(['method' => 'POST', 'route' => 'admin.permissions.store']) }}
10-
10+
1111
{{-- name --}}
1212
<div class="field">
1313
{{ Form::label('name', 'Name', ['class' => 'label']) }}
@@ -25,6 +25,6 @@
2525
{{ Form::submit(trans('SimpleMenu::messages.app_save'), ['class' => 'button is-success']) }}
2626
</div>
2727
</div>
28-
28+
2929
{{ Form::close() }}
3030
@stop

0 commit comments

Comments
 (0)