Skip to content

Commit b300512

Browse files
balajidharmabalajidharma
authored
Merge pull request #34 from balajidharma/1.x-Changes
Fixed code formatting using Laravel pint
2 parents 96e4984 + 15b3484 commit b300512

23 files changed

+77
-207
lines changed

‎README.md‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@
2929
- `./vendor/bin/sail up`
3030
- `./vendor/bin/sail npm install`
3131
- `./vendor/bin/sail npm run dev`
32-
- `./vendor/bin/sail artisan vendor:publish --provider="BalajiDharma\LaravelAdminCore\AdminCoreServiceProvider"`
33-
- `./vendor/bin/sail artisan vendor:publish --provider="BalajiDharma\LaravelMenu\MenuServiceProvider"`
32+
- `./vendor/bin/sail artisan vendor:publish --tag=admin-core`
3433
- `./vendor/bin/sail artisan migrate --seed --seeder=AdminCoreSeeder`
3534
- Now open http://localhost/
3635

@@ -39,8 +38,7 @@
3938
- `composer create-project balajidharma/laravel-vue-admin-panel admin-app`
4039
- `cd admin-app`
4140
- Create a new MYSQL database and update database details in `.env` file
42-
- `php artisan vendor:publish --provider="BalajiDharma\LaravelAdminCore\AdminCoreServiceProvider"`
43-
- `php artisan vendor:publish --provider="BalajiDharma\LaravelMenu\MenuServiceProvider"`
41+
- `artisan vendor:publish --tag=admin-core`
4442
- `php artisan migrate --seed --seeder=AdminCoreSeeder`
4543
- `npm install`
4644
- `npm run dev`

‎app/Console/Kernel.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ class Kernel extends ConsoleKernel
1010
/**
1111
* Define the application's command schedule.
1212
*
13-
* @param \Illuminate\Console\Scheduling\Schedule $schedule
1413
* @return void
1514
*/
1615
protected function schedule(Schedule $schedule)

‎app/Http/Controllers/Admin/CategoryController.php‎

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
use App\Http\Controllers\Controller;
66
use BalajiDharma\LaravelAdminCore\Requests\StoreCategoryRequest;
77
use BalajiDharma\LaravelAdminCore\Requests\UpdateCategoryRequest;
8-
use BalajiDharma\LaravelCategory\Models\CategoryType;
98
use BalajiDharma\LaravelCategory\Models\Category;
9+
use BalajiDharma\LaravelCategory\Models\CategoryType;
1010
use Illuminate\Support\Facades\Auth;
1111
use Inertia\Inertia;
1212

@@ -36,91 +36,86 @@ public function index(CategoryType $type)
3636
'create' => Auth::user()->can('category create'),
3737
'edit' => Auth::user()->can('category edit'),
3838
'delete' => Auth::user()->can('category delete'),
39-
]
39+
],
4040
]);
4141
}
4242

43-
/**
43+
/**
4444
* Show the form for creating a new resource.
4545
*
4646
* @return \Inertia\Response
4747
*/
4848
public function create(CategoryType $type)
4949
{
5050
$itemOptions = Category::selectOptions($type->id, null, true);
51+
5152
return Inertia::render('Admin/Category/Item/Create', [
5253
'categoryType' => $type,
53-
'itemOptions' => $itemOptions
54+
'itemOptions' => $itemOptions,
5455
]);
5556
}
5657

5758
/**
5859
* Store a newly created resource in storage.
5960
*
60-
* @param StoreCategoryRequest $request
61-
* @param \BalajiDharma\LaravelCategory\Models\CategoryType $type
6261
* @return \Illuminate\Http\RedirectResponse
6362
*/
6463
public function store(StoreCategoryRequest $request, CategoryType $type)
6564
{
66-
if(!$request->has('enabled')) {
65+
if (! $request->has('enabled')) {
6766
$request['enabled'] = false;
6867
}
6968

7069
$type->categories()->create($request->all());
7170

7271
return redirect()->route('category.type.item.index', $type->id)
73-
->with('message', 'Category created successfully.');
72+
->with('message', 'Category created successfully.');
7473
}
7574

7675
/**
7776
* Show the form for editing the specified resource.
7877
*
79-
* @param \BalajiDharma\LaravelCategory\Models\CategoryType $type
8078
* @return \Inertia\Response
8179
*/
8280
public function edit(CategoryType $type, Category $item)
8381
{
8482
$itemOptions = Category::selectOptions($type->id, $item->parent_id ?? $item->id);
83+
8584
return Inertia::render('Admin/Category/Item/Edit', [
8685
'categoryType' => $type,
8786
'item' => $item,
88-
'itemOptions' => $itemOptions
87+
'itemOptions' => $itemOptions,
8988
]);
9089
}
9190

9291
/**
9392
* Update the specified resource in storage.
9493
*
95-
* @param UpdateCategoryRequest $request
96-
* @param \BalajiDharma\LaravelCategory\Models\CategoryType $type
97-
* @param \BalajiDharma\LaravelCategory\Models\Category $item
9894
* @return \Illuminate\Http\RedirectResponse
9995
*/
10096
public function update(UpdateCategoryRequest $request, CategoryType $type, Category $item)
10197
{
102-
if(!$request->has('enabled')) {
98+
if (! $request->has('enabled')) {
10399
$request['enabled'] = false;
104100
}
105101

106102
$item->update($request->all());
107103

108104
return redirect()->route('category.type.item.index', $type->id)
109-
->with('message', 'Category updated successfully.');
105+
->with('message', 'Category updated successfully.');
110106
}
111107

112108
/**
113109
* Remove the specified resource from storage.
114110
*
115-
* @param \BalajiDharma\LaravelCategory\Models\CategoryType $type
116-
* @param \BalajiDharma\LaravelCategory\Models\Category $typeItem
111+
* @param \BalajiDharma\LaravelCategory\Models\Category $typeItem
117112
* @return \Illuminate\Http\RedirectResponse
118113
*/
119114
public function destroy(CategoryType $type, Category $item)
120115
{
121116
$item->delete();
122117

123118
return redirect()->route('category.type.item.index', $type->id)
124-
->with('message', __('Category deleted successfully'));
119+
->with('message', __('Category deleted successfully'));
125120
}
126-
}
121+
}

‎app/Http/Controllers/Admin/CategoryTypeController.php‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
namespace App\Http\Controllers\Admin;
44

55
use App\Http\Controllers\Controller;
6-
use BalajiDharma\LaravelCategory\Models\CategoryType;
76
use BalajiDharma\LaravelAdminCore\Requests\StoreCategoryTypeRequest;
87
use BalajiDharma\LaravelAdminCore\Requests\UpdateCategoryTypeRequest;
8+
use BalajiDharma\LaravelCategory\Models\CategoryType;
99
use Illuminate\Support\Facades\Auth;
1010
use Inertia\Inertia;
1111

@@ -54,7 +54,7 @@ public function index()
5454
'edit' => Auth::user()->can('category.type edit'),
5555
'delete' => Auth::user()->can('category.type delete'),
5656
'manage' => Auth::user()->can('category index'),
57-
]
57+
],
5858
]);
5959
}
6060

@@ -71,12 +71,11 @@ public function create()
7171
/**
7272
* Store a newly created resource in storage.
7373
*
74-
* @param StoreCategoryTypeRequest $request
7574
* @return \Illuminate\Http\RedirectResponse
7675
*/
7776
public function store(StoreCategoryTypeRequest $request)
7877
{
79-
if(!$request->has('is_flat')) {
78+
if (! $request->has('is_flat')) {
8079
$request['is_flat'] = false;
8180
}
8281

@@ -88,7 +87,7 @@ public function store(StoreCategoryTypeRequest $request)
8887
]);
8988

9089
return redirect()->route('category.type.index')
91-
->with('message', 'Category type created successfully.');
90+
->with('message', 'Category type created successfully.');
9291
}
9392

9493
/**
@@ -107,20 +106,19 @@ public function edit(CategoryType $type)
107106
/**
108107
* Update the specified resource in storage.
109108
*
110-
* @param UpdateCategoryTypeRequest $request
111109
* @param \BalajiDharma\LaravelCategory\Models\CategoryType $categoryType
112110
* @return \Illuminate\Http\RedirectResponse
113111
*/
114112
public function update(UpdateCategoryTypeRequest $request, CategoryType $type)
115113
{
116-
if(!$request->has('is_flat')) {
114+
if (! $request->has('is_flat')) {
117115
$request['is_flat'] = false;
118116
}
119117

120118
$type->update($request->all());
121119

122120
return redirect()->route('category.type.index')
123-
->with('message', 'Category type updated successfully.');
121+
->with('message', 'Category type updated successfully.');
124122
}
125123

126124
/**
@@ -134,6 +132,6 @@ public function destroy(CategoryType $type)
134132
$type->delete();
135133

136134
return redirect()->route('category.type.index')
137-
->with('message', __('Category type deleted successfully'));
135+
->with('message', __('Category type deleted successfully'));
138136
}
139137
}

‎app/Http/Controllers/Admin/MenuController.php‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
namespace App\Http\Controllers\Admin;
44

55
use App\Http\Controllers\Controller;
6-
use BalajiDharma\LaravelMenu\Models\Menu;
76
use BalajiDharma\LaravelAdminCore\Requests\StoreMenuRequest;
87
use BalajiDharma\LaravelAdminCore\Requests\UpdateMenuRequest;
8+
use BalajiDharma\LaravelMenu\Models\Menu;
99
use Illuminate\Support\Facades\Auth;
1010
use Inertia\Inertia;
1111

@@ -54,7 +54,7 @@ public function index()
5454
'edit' => Auth::user()->can('menu edit'),
5555
'delete' => Auth::user()->can('menu delete'),
5656
'manage' => Auth::user()->can('menu.item index'),
57-
]
57+
],
5858
]);
5959
}
6060

@@ -71,7 +71,6 @@ public function create()
7171
/**
7272
* Store a newly created resource in storage.
7373
*
74-
* @param StoreMenuRequest $request
7574
* @return \Illuminate\Http\RedirectResponse
7675
*/
7776
public function store(StoreMenuRequest $request)
@@ -83,13 +82,12 @@ public function store(StoreMenuRequest $request)
8382
]);
8483

8584
return redirect()->route('menu.index')
86-
->with('message', 'Menu created successfully.');
85+
->with('message', 'Menu created successfully.');
8786
}
8887

8988
/**
9089
* Show the form for editing the specified resource.
9190
*
92-
* @param \BalajiDharma\LaravelMenu\Models\Menu $menu
9391
* @return \Inertia\Response
9492
*/
9593
public function edit(Menu $menu)
@@ -102,29 +100,26 @@ public function edit(Menu $menu)
102100
/**
103101
* Update the specified resource in storage.
104102
*
105-
* @param UpdateMenuRequest $request
106-
* @param \BalajiDharma\LaravelMenu\Models\Menu $menu
107103
* @return \Illuminate\Http\RedirectResponse
108104
*/
109105
public function update(UpdateMenuRequest $request, Menu $menu)
110106
{
111107
$menu->update($request->all());
112108

113109
return redirect()->route('menu.index')
114-
->with('message', 'Menu updated successfully.');
110+
->with('message', 'Menu updated successfully.');
115111
}
116112

117113
/**
118114
* Remove the specified resource from storage.
119115
*
120-
* @param \BalajiDharma\LaravelMenu\Models\Menu $menu
121116
* @return \Illuminate\Http\RedirectResponse
122117
*/
123118
public function destroy(Menu $menu)
124119
{
125120
$menu->delete();
126121

127122
return redirect()->route('menu.index')
128-
->with('message', __('Menu deleted successfully'));
123+
->with('message', __('Menu deleted successfully'));
129124
}
130125
}

‎app/Http/Controllers/Admin/MenuItemController.php‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function index(Menu $menu)
3636
'create' => Auth::user()->can('menu.item create'),
3737
'edit' => Auth::user()->can('menu.item edit'),
3838
'delete' => Auth::user()->can('menu.item delete'),
39-
]
39+
],
4040
]);
4141
}
4242

@@ -48,71 +48,66 @@ public function index(Menu $menu)
4848
public function create(Menu $menu)
4949
{
5050
$item_options = MenuItem::selectOptions($menu->id, null, true);
51+
5152
return Inertia::render('Admin/Menu/Item/Create', [
5253
'menu' => $menu,
53-
'item_options' => $item_options
54+
'item_options' => $item_options,
5455
]);
5556
}
5657

5758
/**
5859
* Store a newly created resource in storage.
5960
*
60-
* @param StoreMenuItemRequest $request
61-
* @param \BalajiDharma\LaravelMenu\Models\Menu $menu
6261
* @return \Illuminate\Http\RedirectResponse
6362
*/
6463
public function store(StoreMenuItemRequest $request, Menu $menu)
6564
{
6665
$menu->menuItems()->create($request->all());
6766

6867
return redirect()->route('menu.item.index', $menu->id)
69-
->with('message', 'Menu created successfully.');
68+
->with('message', 'Menu created successfully.');
7069
}
7170

7271
/**
7372
* Show the form for editing the specified resource.
7473
*
75-
* @param \BalajiDharma\LaravelMenu\Models\Menu $menu
7674
* @return \Inertia\Response
7775
*/
7876
public function edit(Menu $menu, MenuItem $item)
7977
{
8078
$item_options = MenuItem::selectOptions($menu->id, $item->parent_id ?? $item->id);
79+
8180
return Inertia::render('Admin/Menu/Item/Edit', [
8281
'menu' => $menu,
8382
'item' => $item,
84-
'item_options' => $item_options
83+
'item_options' => $item_options,
8584
]);
8685
}
8786

8887
/**
8988
* Update the specified resource in storage.
9089
*
91-
* @param UpdateMenuItemRequest $request
92-
* @param \BalajiDharma\LaravelMenu\Models\Menu $menu
93-
* @param \BalajiDharma\LaravelMenu\Models\MenuItem $item
9490
* @return \Illuminate\Http\RedirectResponse
9591
*/
9692
public function update(UpdateMenuItemRequest $request, Menu $menu, MenuItem $item)
9793
{
9894
$item->update($request->all());
9995

10096
return redirect()->route('menu.item.index', $menu->id)
101-
->with('message', 'Menu Item updated successfully.');
97+
->with('message', 'Menu Item updated successfully.');
10298
}
10399

104100
/**
105101
* Remove the specified resource from storage.
106102
*
107-
* @param \BalajiDharma\LaravelMenu\Models\Menu $menu
108-
* @param \BalajiDharma\LaravelMenu\Models\MenuItem $menuItem
103+
* @param \BalajiDharma\LaravelMenu\Models\MenuItem $menuItem
109104
* @return \Illuminate\Http\RedirectResponse
110105
*/
111106
public function destroy(Menu $menu, MenuItem $item)
112107
{
113108
$item->delete();
114109

115110
return redirect()->route('menu.item.index', $menu->id)
116-
->with('message', __('Menu deleted successfully'));
111+
->with('message', __('Menu deleted successfully'));
117112
}
118-
}
113+
}

0 commit comments

Comments
 (0)