Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Apply fixes from StyleCI #425

Merged
merged 1 commit into from
Oct 25, 2021
Merged

Apply fixes from StyleCI #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Commands/BadasoSetup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ protected function updatePackageJson()

protected function checkExist($file, $search)
{
return $this->file->exists($file) && !Str::contains($this->file->get($file), $search);
return $this->file->exists($file) && ! Str::contains($this->file->get($file), $search);
}

protected function updateWebpackMix()
Expand Down Expand Up @@ -324,7 +324,7 @@ protected function addingBadasoEnv()

$this->info('Adding badaso env');
} catch (\Exception $e) {
$this->error('Failed adding badaso env ' . $e->getMessage());
$this->error('Failed adding badaso env '.$e->getMessage());
}
}

Expand Down
40 changes: 20 additions & 20 deletions src/Controllers/BadasoMenuController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,24 +37,24 @@ public function menuOptions(Request $request)

foreach ($request->order as $index => $menu_id) {
Menu::find($menu_id)->update([
'order' => $index + 1
'order' => $index + 1,
]);
}
} else if (isset($request->is_expand)) {
} elseif (isset($request->is_expand)) {
$request->validate([
'menu_id' => ['required', 'integer'],
]);

$menu = Menu::find($request->menu_id);
$menu->is_expand = !$menu->is_expand;
$menu->is_expand = ! $menu->is_expand;
$menu->save();
} else if (isset($request->is_show_header)) {
} elseif (isset($request->is_show_header)) {
$request->validate([
'menu_id' => ['required', 'integer'],
]);

$menu = Menu::find($request->menu_id);
$menu->is_show_header = !$menu->is_show_header;
$menu->is_show_header = ! $menu->is_show_header;
$menu->save();
}

Expand All @@ -74,7 +74,7 @@ public function browseMenuItem(Request $request)

$menu_items = MenuItem::where('menu_id', $request->menu_id)
->orderBy('order', 'asc')
->whereNull($prefix . 'menu_items.parent_id')
->whereNull($prefix.'menu_items.parent_id')
->get();

$menu_items = $this->getChildMenuItems($menu_items);
Expand Down Expand Up @@ -130,11 +130,11 @@ public function browseMenuItemByKey(Request $request)
$prefix = config('badaso.database.prefix');
$menu = Menu::where('key', $request->menu_key)->first();

$all_menu_items = MenuItem::join($prefix . 'menus', $prefix . 'menus.id', $prefix . 'menu_items.menu_id')
->where($prefix . 'menus.key', $request->menu_key)
->whereNull($prefix . 'menu_items.parent_id')
->select($prefix . 'menu_items.*')
->orderBy($prefix . 'menu_items.order', 'asc')
$all_menu_items = MenuItem::join($prefix.'menus', $prefix.'menus.id', $prefix.'menu_items.menu_id')
->where($prefix.'menus.key', $request->menu_key)
->whereNull($prefix.'menu_items.parent_id')
->select($prefix.'menu_items.*')
->orderBy($prefix.'menu_items.order', 'asc')
->get();
$menu_items = [];
foreach ($all_menu_items as $menu_item) {
Expand Down Expand Up @@ -166,11 +166,11 @@ public function browseMenuItemByKeys(Request $request)
foreach ($menu_keys as $key => $menu_key) {
$menu = Menu::where('key', $menu_key)->first();

$all_menu_items = MenuItem::join($prefix . 'menus', $prefix . 'menus.id', $prefix . 'menu_items.menu_id')
->where($prefix . 'menus.key', $menu_key)
->whereNull($prefix . 'menu_items.parent_id')
->select($prefix . 'menu_items.*')
->orderBy($prefix . 'menu_items.order', 'asc')
$all_menu_items = MenuItem::join($prefix.'menus', $prefix.'menus.id', $prefix.'menu_items.menu_id')
->where($prefix.'menus.key', $menu_key)
->whereNull($prefix.'menu_items.parent_id')
->select($prefix.'menu_items.*')
->orderBy($prefix.'menu_items.order', 'asc')
->get();
$menu_items = [];
foreach ($all_menu_items as $menu_item) {
Expand All @@ -186,13 +186,13 @@ public function browseMenuItemByKeys(Request $request)

$data = collect($data)->toArray();
} else {
$all_menu_items = MenuItem::orderBy($prefix . 'menu_items.order', 'asc')
$all_menu_items = MenuItem::orderBy($prefix.'menu_items.order', 'asc')
->get();
$menus = Menu::orderBy('order')->get();

$data = [];
foreach ($menus as $index => $menu) {
$menu_items = $all_menu_items->whereNull($prefix . 'menu_items.parent_id')
$menu_items = $all_menu_items->whereNull($prefix.'menu_items.parent_id')
->where('menu_id', $menu->id)->map(function ($item) use ($all_menu_items) {
$children = array_values($all_menu_items->where('parent_id', $item->id)->toArray());

Expand Down Expand Up @@ -278,7 +278,7 @@ public function addMenuItem(Request $request)

$url = $request->get('url');
if (filter_var($url, FILTER_VALIDATE_URL) === false) {
$url = substr($request->get('url'), 0, 1) != '/' ? '/' . $request->get('url') : $request->get('url');
$url = substr($request->get('url'), 0, 1) != '/' ? '/'.$request->get('url') : $request->get('url');
}

$new_menu_item = new MenuItem();
Expand Down Expand Up @@ -344,7 +344,7 @@ public function editMenuItem(Request $request)

$url = $request->get('url');
if (filter_var($url, FILTER_VALIDATE_URL) === false) {
$url = substr($request->get('url'), 0, 1) != '/' ? '/' . $request->get('url') : $request->get('url');
$url = substr($request->get('url'), 0, 1) != '/' ? '/'.$request->get('url') : $request->get('url');
}

$menu_item = MenuItem::find($request->menu_item_id);
Expand Down
6 changes: 3 additions & 3 deletions src/Migrations/2021_10_21_054710_add_is_show_header_and_expand_in_menus_table.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ class AddIsShowHeaderAndExpandInMenusTable extends Migration
public function up()
{
Schema::table('badaso_menus', function (Blueprint $table) {
if (!Schema::hasColumn('badaso_menus', 'is_show_header')) {
if (! Schema::hasColumn('badaso_menus', 'is_show_header')) {
$table->boolean('is_show_header')->default(true)->after('icon');
}
if (!Schema::hasColumn('badaso_menus', 'is_expand')) {
if (! Schema::hasColumn('badaso_menus', 'is_expand')) {
$table->boolean('is_expand')->default(true)->after('icon');
}
if (!Schema::hasColumn('badaso_menus', 'order')) {
if (! Schema::hasColumn('badaso_menus', 'order')) {
$table->boolean('order')->nullable()->after('icon');
}
});
Expand Down
2 changes: 1 addition & 1 deletion src/Models/Menu.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class Menu extends Model
public function __construct(array $attributes = [])
{
$prefix = config('badaso.database.prefix');
$this->table = $prefix . 'menus';
$this->table = $prefix.'menus';
parent::__construct($attributes);
}

Expand Down
Loading