Skip to content

Commit eadec56

Browse files
CodexshaperCodexshaper
authored
Merge pull request #3 from Codexshaper/analysis-peE0Rk
Apply fixes from StyleCI for Nested Menu
2 parents 8b711df + 7d63d15 commit eadec56

File tree

8 files changed

+46
-43
lines changed

8 files changed

+46
-43
lines changed

‎database/seeds/DatabaseMenuSeeder.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,31 @@ class DatabaseMenuSeeder extends Seeder
1212
*/
1313
public function run()
1414
{
15-
$menu = DBM::Menu()->where('slug','admin')->first();
15+
$menu = DBM::Menu()->where('slug', 'admin')->first();
1616

17-
if(! $menu) {
17+
if (! $menu) {
1818
$order = DBM::Menu()->max('order');
1919
$menu = DBM::Menu();
20-
$menu->name = "Admin";
20+
$menu->name = 'Admin';
2121
$menu->slug = Str::slug('Admin');
2222
$menu->url = '/admin';
23-
$menu->order = $order+1;
23+
$menu->order = $order + 1;
2424
$menu->save();
2525
}
2626

27-
foreach($this->getItems() as $item) {
28-
if(! DBM::MenuItem()->where('slug', Str::slug($item['slug']))->first()) {
27+
foreach ($this->getItems() as $item) {
28+
if (! DBM::MenuItem()->where('slug', Str::slug($item['slug']))->first()) {
2929
$itemOrder = DBM::MenuItem()->max('order');
3030
$menuItem = DBM::MenuItem();
3131
$menuItem->menu_id = $menu->id;
3232
$menuItem->title = $item['title'];
3333
$menuItem->slug = Str::slug($item['slug']);
3434
$menuItem->url = $item['url'];
35-
if($item['parent']) {
35+
if ($item['parent']) {
3636
$parentItem = DBM::MenuItem()->where('slug', $item['parent'])->first();
3737
$menuItem->parent_id = $parentItem->id;
3838
}
39-
$menuItem->order = $itemOrder+1;
39+
$menuItem->order = $itemOrder + 1;
4040
$menuItem->route = $item['route'];
4141
$menuItem->params = $item['params'];
4242
$menuItem->middleware = $item['middleware'];

‎src/Commands/DatabaseAdmin.php‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace CodexShaper\DBM\Commands;
34

45
use CodexShaper\DBM\Facades\Manager;
@@ -20,8 +21,9 @@ class DatabaseAdmin extends Command
2021
* @var string
2122
*/
2223
protected $description = 'Make Database Admin';
24+
2325
/**
24-
* Get Option
26+
* Get Option.
2527
*
2628
* @return array
2729
*/
@@ -39,9 +41,10 @@ protected function getOptions()
3941
*/
4042
protected function findComposer()
4143
{
42-
if (file_exists(getcwd() . '/composer.phar')) {
43-
return '"' . PHP_BINARY . '" ' . getcwd() . '/composer.phar';
44+
if (file_exists(getcwd().'/composer.phar')) {
45+
return '"'.PHP_BINARY.'" '.getcwd().'/composer.phar';
4446
}
47+
4548
return 'composer';
4649
}
4750

@@ -54,18 +57,18 @@ protected function findComposer()
5457
*/
5558
public function handle()
5659
{
57-
$email = $this->argument('email');
58-
$column = $this->option('column');
59-
$permissions = Manager::Permission()->all();
60-
$successMessage = "Admin Created successfully";
60+
$email = $this->argument('email');
61+
$column = $this->option('column');
62+
$permissions = Manager::Permission()->all();
63+
$successMessage = 'Admin Created successfully';
6164

6265
if ($this->argument('action') == 'drop') {
63-
$permissions = [];
64-
$successMessage = "Admin Deleted successfully";
66+
$permissions = [];
67+
$successMessage = 'Admin Deleted successfully';
6568
}
6669

67-
$userModel = config('dbm.auth.user.model');
68-
$userTable = config('dbm.auth.user.table');
70+
$userModel = config('dbm.auth.user.model');
71+
$userTable = config('dbm.auth.user.table');
6972
$localObject = Manager::model($userModel, $userTable)
7073
->where($column, $email)
7174
->first();

‎src/Http/Controllers/CrudController.php‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -135,19 +135,19 @@ public function addOrUpdateObject($table)
135135
*/
136136
public function addMenu($object)
137137
{
138-
$menu = DBM::Menu()::where('slug','admin')->first();
138+
$menu = DBM::Menu()::where('slug', 'admin')->first();
139139

140-
if(! $menu) {
140+
if (! $menu) {
141141
$order = DBM::Menu()::max('order');
142142
$menu = DBM::Menu();
143-
$menu->name = "Admin";
143+
$menu->name = 'Admin';
144144
$menu->slug = Str::slug('Admin');
145145
$menu->url = '/admin';
146-
$menu->order = $order+1;
146+
$menu->order = $order + 1;
147147
$menu->save();
148148
}
149149

150-
if(! DBM::MenuItem()::where('slug', Str::slug($object->name))->first()) {
150+
if (! DBM::MenuItem()::where('slug', Str::slug($object->name))->first()) {
151151
$itemOrder = DBM::MenuItem()::max('order');
152152

153153
$menuItem = DBM::MenuItem();
@@ -156,7 +156,7 @@ public function addMenu($object)
156156
$menuItem->slug = Str::slug($object->name);
157157
$menuItem->url = '/database/record/'.$object->name;
158158
$menuItem->parent_id = null;
159-
$menuItem->order = $itemOrder+1;
159+
$menuItem->order = $itemOrder + 1;
160160
$menuItem->route = 'record';
161161
$menuItem->params = '{"tableName":"'.$object->name.'"}';
162162
$menuItem->middleware = null;
@@ -165,7 +165,7 @@ public function addMenu($object)
165165
$menuItem->icon = null;
166166
$menuItem->custom_class = null;
167167

168-
if($menuItem->save()) {
168+
if ($menuItem->save()) {
169169
return true;
170170
}
171171
}
@@ -184,8 +184,9 @@ public function removeMenu($slug)
184184
{
185185
$menu = Menu::where('slug', 'admin')->first();
186186

187-
if($menuItem = MenuItem::where(['slug' => $slug, 'menu_id' => $menu->id])->first()) {
187+
if ($menuItem = MenuItem::where(['slug' => $slug, 'menu_id' => $menu->id])->first()) {
188188
$menuItem->delete();
189+
189190
return true;
190191
}
191192

‎src/Http/Controllers/MenuController.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function get()
2727
{
2828
// if ($request->ajax()) {
2929
try {
30-
if($menu = DBM::Menu()->where('slug', 'admin')->first()) {
30+
if ($menu = DBM::Menu()->where('slug', 'admin')->first()) {
3131
$menus = DBM::MenuItem()::with('childrens')
3232
->where('menu_id', $menu->id)
3333
->whereNull('parent_id')
@@ -39,7 +39,6 @@ public function get()
3939
'menus' => $menus,
4040
]);
4141
}
42-
4342
} catch (\Exception $e) {
4443
$this->generateError([$e->getMessage()]);
4544
}

‎src/Manager.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44

55
use CodexShaper\DBM\Facades\Driver;
66
use CodexShaper\DBM\Models\DBM_Field;
7+
use CodexShaper\DBM\Models\DBM_Menu;
8+
use CodexShaper\DBM\Models\DBM_MenuItem;
79
use CodexShaper\DBM\Models\DBM_MongoField;
10+
use CodexShaper\DBM\Models\DBM_MongoMenu;
11+
use CodexShaper\DBM\Models\DBM_MongoMenuItem;
812
use CodexShaper\DBM\Models\DBM_MongoObject;
913
use CodexShaper\DBM\Models\DBM_MongoPermission;
1014
use CodexShaper\DBM\Models\DBM_MongoTemplate;
11-
use CodexShaper\DBM\Models\DBM_MongoMenu;
12-
use CodexShaper\DBM\Models\DBM_MongoMenuItem;
1315
use CodexShaper\DBM\Models\DBM_Object;
1416
use CodexShaper\DBM\Models\DBM_Permission;
1517
use CodexShaper\DBM\Models\DBM_Template;
16-
use CodexShaper\DBM\Models\DBM_Menu;
17-
use CodexShaper\DBM\Models\DBM_MenuItem;
1818
use Illuminate\Filesystem\Filesystem;
1919
use Illuminate\Support\Facades\App;
2020
use Illuminate\Support\Facades\Artisan;

‎src/Models/DBM_MenuItem.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ class DBM_MenuItem extends Model
99
protected $table = 'menu_items';
1010
//
1111
protected $fillable = [
12-
'title',
13-
'slug',
14-
'order',
12+
'title',
13+
'slug',
14+
'order',
1515
'parent_id',
1616
];
1717

1818
protected $cast = [
19-
'params' => 'array',
19+
'params' => 'array',
2020
];
2121

2222
public function children()

‎src/Models/DBM_MongoMenu.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
class DBM_MongoMenu extends Model
99
{
10-
use Relationships;
10+
use Relationships;
1111
//
1212
protected $collection = 'menus';
1313

‎src/Models/DBM_MongoMenuItem.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@
88
class DBM_MongoMenuItem extends Model
99
{
1010
use Relationships;
11-
11+
1212
protected $collection = 'menu_items';
1313
//
1414
protected $fillable = [
15-
'title',
16-
'slug',
17-
'order',
15+
'title',
16+
'slug',
17+
'order',
1818
'parent_id',
1919
];
2020

2121
protected $cast = [
22-
'params' => 'array',
22+
'params' => 'array',
2323
];
2424

2525
public function children()

0 commit comments

Comments
 (0)