From a4ceb2a2375eac87a54df929360a6fb34bd51928 Mon Sep 17 00:00:00 2001 From: Nasir Khan Saikat Date: Sun, 21 Apr 2024 20:24:19 +0600 Subject: [PATCH 1/5] Log viewwe update --- .../views/vendor/log-viewer/laravel-starter/logs.blade.php | 2 +- .../views/vendor/log-viewer/laravel-starter/show.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/vendor/log-viewer/laravel-starter/logs.blade.php b/resources/views/vendor/log-viewer/laravel-starter/logs.blade.php index e3d8506f1..25920a695 100644 --- a/resources/views/vendor/log-viewer/laravel-starter/logs.blade.php +++ b/resources/views/vendor/log-viewer/laravel-starter/logs.blade.php @@ -90,7 +90,7 @@ class="badge badge-level-{{ $key }}">{{ $value }} - {{ $rows->render() }} + {{ $rows->links('pagination::bootstrap-5') }} diff --git a/resources/views/vendor/log-viewer/laravel-starter/show.blade.php b/resources/views/vendor/log-viewer/laravel-starter/show.blade.php index 7c3f44939..9a1f6e036 100644 --- a/resources/views/vendor/log-viewer/laravel-starter/show.blade.php +++ b/resources/views/vendor/log-viewer/laravel-starter/show.blade.php @@ -214,7 +214,7 @@ class="list-group-item list-group-item-action d-flex justify-content-between ali - {!! $entries->appends(compact('query'))->render() !!} + {!! $entries->appends(compact('query'))->render('pagination::bootstrap-5') !!} From 091df6fdef487da691f7322d1eede92a6618e74f Mon Sep 17 00:00:00 2001 From: Nasir Khan Saikat Date: Sun, 21 Apr 2024 20:44:07 +0600 Subject: [PATCH 2/5] ++ --- .../Backend/BackendBaseController.php | 30 +++---- .../Controllers/Backend/BackupController.php | 8 +- .../Backend/NotificationsController.php | 10 +-- .../Controllers/Backend/RolesController.php | 28 +++--- .../Controllers/Backend/SettingController.php | 2 +- .../Controllers/Backend/UserController.php | 86 +++++++++---------- resources/views/backend/roles/index.blade.php | 6 +- 7 files changed, 85 insertions(+), 85 deletions(-) diff --git a/app/Http/Controllers/Backend/BackendBaseController.php b/app/Http/Controllers/Backend/BackendBaseController.php index 92e3b2a11..ae13366af 100644 --- a/app/Http/Controllers/Backend/BackendBaseController.php +++ b/app/Http/Controllers/Backend/BackendBaseController.php @@ -60,7 +60,7 @@ public function index() $$module_name = $module_model::paginate(); - logUserAccess($module_title.' '.$module_action); + logUserAccess($module_title . ' ' . $module_action); return view( "{$module_path}.{$module_name}.index_datatable", @@ -98,7 +98,7 @@ public function index_list(Request $request) foreach ($query_data as $row) { $$module_name[] = [ 'id' => $row->id, - 'text' => $row->name.' (Slug: '.$row->slug.')', + 'text' => $row->name . ' (Slug: ' . $row->slug . ')', ]; } @@ -122,7 +122,7 @@ public function index_data() $module_action = 'List'; $page_heading = label_case($module_title); - $title = $page_heading.' '.label_case($module_action); + $title = $page_heading . ' ' . label_case($module_action); $$module_name = $module_model::select('id', 'name', 'updated_at'); @@ -167,7 +167,7 @@ public function create() $module_action = 'Create'; - logUserAccess($module_title.' '.$module_action); + logUserAccess($module_title . ' ' . $module_action); return view( "{$module_path}.{$module_name}.create", @@ -196,9 +196,9 @@ public function store(Request $request) $$module_name_singular = $module_model::create($request->all()); - flash("New '".Str::singular($module_title)."' Added")->success()->important(); + flash("New '" . Str::singular($module_title) . "' Added")->success()->important(); - logUserAccess($module_title.' '.$module_action.' | Id: '.$$module_name_singular->id); + logUserAccess($module_title . ' ' . $module_action . ' | Id: ' . $$module_name_singular->id); return redirect("admin/{$module_name}"); } @@ -222,7 +222,7 @@ public function show($id) $$module_name_singular = $module_model::findOrFail($id); - logUserAccess($module_title.' '.$module_action.' | Id: '.$$module_name_singular->id); + logUserAccess($module_title . ' ' . $module_action . ' | Id: ' . $$module_name_singular->id); return view( "{$module_path}.{$module_name}.show", @@ -250,7 +250,7 @@ public function edit($id) $$module_name_singular = $module_model::findOrFail($id); - logUserAccess($module_title.' '.$module_action.' | Id: '.$$module_name_singular->id); + logUserAccess($module_title . ' ' . $module_action . ' | Id: ' . $$module_name_singular->id); return view( "{$module_path}.{$module_name}.edit", @@ -284,9 +284,9 @@ public function update(Request $request, $id) $$module_name_singular->update($request->all()); - flash(Str::singular($module_title)."' Updated Successfully")->success()->important(); + flash(Str::singular($module_title) . "' Updated Successfully")->success()->important(); - logUserAccess($module_title.' '.$module_action.' | Id: '.$$module_name_singular->id); + logUserAccess($module_title . ' ' . $module_action . ' | Id: ' . $$module_name_singular->id); return redirect()->route("backend.{$module_name}.show", $$module_name_singular->id); } @@ -316,9 +316,9 @@ public function destroy($id) $$module_name_singular->delete(); - flash(label_case($module_name_singular).' Deleted Successfully!')->success()->important(); + flash(label_case($module_name_singular) . ' Deleted Successfully!')->success()->important(); - logUserAccess($module_title.' '.$module_action.' | Id: '.$$module_name_singular->id); + logUserAccess($module_title . ' ' . $module_action . ' | Id: ' . $$module_name_singular->id); return redirect("admin/{$module_name}"); } @@ -342,7 +342,7 @@ public function trashed() $$module_name = $module_model::onlyTrashed()->orderBy('deleted_at', 'desc')->paginate(); - logUserAccess($module_title.' '.$module_action); + logUserAccess($module_title . ' ' . $module_action); return view( "{$module_path}.{$module_name}.trash", @@ -375,9 +375,9 @@ public function restore($id) $$module_name_singular = $module_model::withTrashed()->find($id); $$module_name_singular->restore(); - flash(label_case($module_name_singular).' Data Restoreded Successfully!')->success()->important(); + flash(label_case($module_name_singular) . ' Data Restoreded Successfully!')->success()->important(); - logUserAccess($module_title.' '.$module_action.' | Id: '.$$module_name_singular->id); + logUserAccess($module_title . ' ' . $module_action . ' | Id: ' . $$module_name_singular->id); return redirect("admin/{$module_name}"); } diff --git a/app/Http/Controllers/Backend/BackupController.php b/app/Http/Controllers/Backend/BackupController.php index cffc983d4..7fdbb0038 100644 --- a/app/Http/Controllers/Backend/BackupController.php +++ b/app/Http/Controllers/Backend/BackupController.php @@ -68,7 +68,7 @@ public function index() if (substr($f, -4) === '.zip' && $disk->exists($f)) { $$module_name[] = [ 'file_path' => $f, - 'file_name' => str_replace(config('backup.backup.name').'/', '', $f), + 'file_name' => str_replace(config('backup.backup.name') . '/', '', $f), 'file_size_byte' => $disk->size($f), 'file_size' => humanFilesize($disk->size($f)), 'last_modified_timestamp' => $disk->lastModified($f), @@ -114,7 +114,7 @@ public function create() $output = Artisan::output(); // Log the results - Log::info("Backpack\BackupManager -- new backup started from admin interface \r\n".$output); + Log::info("Backpack\BackupManager -- new backup started from admin interface \r\n" . $output); // return the results as a response to the ajax call flash('New backup created')->success()->important(); @@ -135,7 +135,7 @@ public function create() public function download($file_name) { $disk = Storage::disk('local'); - $file = config('backup.backup.name').'/'.$file_name; + $file = config('backup.backup.name') . '/' . $file_name; if ($disk->exists($file)) { return Storage::download($file); @@ -149,7 +149,7 @@ public function download($file_name) public function delete($file_name) { $disk = Storage::disk('local'); - $file = config('backup.backup.name').'/'.$file_name; + $file = config('backup.backup.name') . '/' . $file_name; if ($disk->exists($file)) { $disk->delete($file); diff --git a/app/Http/Controllers/Backend/NotificationsController.php b/app/Http/Controllers/Backend/NotificationsController.php index b5fb965e0..5de64d2a9 100644 --- a/app/Http/Controllers/Backend/NotificationsController.php +++ b/app/Http/Controllers/Backend/NotificationsController.php @@ -58,7 +58,7 @@ public function index() $$module_name = auth()->user()->notifications()->paginate(); $unread_notifications_count = auth()->user()->unreadNotifications()->count(); - Log::info(label_case($module_title.' '.$module_action).' | User:'.Auth::user()->name.'(ID:'.Auth::user()->id.')'); + Log::info(label_case($module_title . ' ' . $module_action) . ' | User:' . Auth::user()->name . '(ID:' . Auth::user()->id . ')'); return view( "backend.{$module_path}.index", @@ -91,11 +91,11 @@ public function show($id) $$module_name_singular->save(); } } else { - Log::info(label_case($module_title.' '.$module_action).' | User:'.Auth::user()->name.'(ID:'.Auth::user()->id.')'); + Log::info(label_case($module_title . ' ' . $module_action) . ' | User:' . Auth::user()->name . '(ID:' . Auth::user()->id . ')'); abort(404); } - Log::info(label_case($module_title.' '.$module_action).' | User:'.Auth::user()->name.'(ID:'.Auth::user()->id.')'); + Log::info(label_case($module_title . ' ' . $module_action) . ' | User:' . Auth::user()->name . '(ID:' . Auth::user()->id . ')'); return view( "backend.{$module_name}.show", @@ -126,7 +126,7 @@ public function deleteAll() flash('All Notifications Deleted')->success()->important(); - Log::info(label_case($module_title.' '.$module_action).' | User:'.Auth::user()->name.'(ID:'.Auth::user()->id.')'); + Log::info(label_case($module_title . ' ' . $module_action) . ' | User:' . Auth::user()->name . '(ID:' . Auth::user()->id . ')'); return back(); } @@ -153,7 +153,7 @@ public function markAllAsRead() flash('All Notifications Marked As Read')->success()->important(); - Log::info(label_case($module_title.' '.$module_action).' | User:'.Auth::user()->name.'(ID:'.Auth::user()->id.')'); + Log::info(label_case($module_title . ' ' . $module_action) . ' | User:' . Auth::user()->name . '(ID:' . Auth::user()->id . ')'); return back(); } diff --git a/app/Http/Controllers/Backend/RolesController.php b/app/Http/Controllers/Backend/RolesController.php index e11cef477..e9d48f470 100644 --- a/app/Http/Controllers/Backend/RolesController.php +++ b/app/Http/Controllers/Backend/RolesController.php @@ -63,7 +63,7 @@ public function index() $$module_name = $module_model::with('permissions')->paginate(); - Log::info(label_case($module_title.' '.$module_action).' | User:'.auth()->user()->name.'(ID:'.auth()->user()->id.')'); + Log::info(label_case($module_title . ' ' . $module_action) . ' | User:' . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); return view( "backend.{$module_path}.index", @@ -90,7 +90,7 @@ public function create() $roles = Role::get(); $permissions = Permission::select('name', 'id')->orderBy('id')->get(); - Log::info(label_case($module_title.' '.$module_action).' | User:'.auth()->user()->name.'(ID:'.auth()->user()->id.')'); + Log::info(label_case($module_title . ' ' . $module_action) . ' | User:' . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); return view("backend.{$module_name}.create", compact('module_title', 'module_name', 'module_icon', 'module_action', 'roles', 'permissions')); } @@ -126,7 +126,7 @@ public function store(Request $request) flash("{$$module_name_singular->name} {$module_name_singular} created successfully!")->success()->important(); - Log::info(label_case($module_title.' '.$module_action).' | User:'.auth()->user()->name.'(ID:'.auth()->user()->id.')'); + Log::info(label_case($module_title . ' ' . $module_action) . ' | User:' . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); return redirect("admin/{$module_name}")->with('flash_success', "{$module_name} added!"); } @@ -153,7 +153,7 @@ public function show($id) $users = User::role($$module_name_singular->name)->get(); - Log::info(label_case($module_title.' '.$module_action).' | User:'.auth()->user()->name.'(ID:'.auth()->user()->id.')'); + Log::info(label_case($module_title . ' ' . $module_action) . ' | User:' . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); return view( "backend.{$module_name}.show", @@ -183,7 +183,7 @@ public function edit($id) $$module_name_singular = $module_model::findOrFail($id); - Log::info(label_case($module_title.' '.$module_action).' | User:'.auth()->user()->name.'(ID:'.auth()->user()->id.')'); + Log::info(label_case($module_title . ' ' . $module_action) . ' | User:' . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); return view("backend.{$module_name}.edit", compact('module_title', 'module_name', "{$module_name_singular}", 'module_name_singular', 'module_icon', 'module_action', 'permissions')); } @@ -209,7 +209,7 @@ public function update(Request $request, $id) $$module_name_singular = $module_model::findOrFail($id); $validated_data = $request->validate([ - 'name' => 'required|max:100|unique:roles,name,'.$id, + 'name' => 'required|max:100|unique:roles,name,' . $id, 'permissions' => 'nullable|array', ]); @@ -221,9 +221,9 @@ public function update(Request $request, $id) $permissions = isset($validated_data['permissions']) ? $validated_data['permissions'] : []; $$module_name_singular->syncPermissions($permissions); - flash(label_case($$module_name_singular->name.' '.$module_name_singular).' updated successfully!')->success()->important(); + flash(label_case($$module_name_singular->name . ' ' . $module_name_singular) . ' updated successfully!')->success()->important(); - Log::info(label_case($module_title.' '.$module_action).' | User:'.auth()->user()->name.'(ID:'.auth()->user()->id.')'); + Log::info(label_case($module_title . ' ' . $module_action) . ' | User:' . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); return redirect("admin/{$module_name}"); } @@ -258,19 +258,19 @@ public function destroy($id) if ($id == 1) { Flash::warning("You can not delete {$$module_name_singular->name} role!")->important(); - Log::notice(label_case($module_title.' '.$module_action).' Failed | User:'.auth()->user()->name.'(ID:'.auth()->user()->id.')'); + Log::notice(label_case($module_title . ' ' . $module_action) . ' Failed | User:' . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); return redirect()->route("backend.{$module_name}.index"); } elseif (in_array($role_name, $user_roles->toArray())) { Flash::warning('You can not delete your Role!')->important(); - Log::notice(label_case($module_title.' '.$module_action).' Failed | User:'.auth()->user()->name.'(ID:'.auth()->user()->id.')'); + Log::notice(label_case($module_title . ' ' . $module_action) . ' Failed | User:' . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); return redirect()->route("backend.{$module_name}.index"); } elseif ($role_users) { - Flash::warning('Can not be deleted! '.$role_users.' user(s) found!')->important(); + Flash::warning('Can not be deleted! ' . $role_users . ' user(s) found!')->important(); - Log::notice(label_case($module_title.' '.$module_action).' Failed | User:'.auth()->user()->name.'(ID:'.auth()->user()->id.')'); + Log::notice(label_case($module_title . ' ' . $module_action) . ' Failed | User:' . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); return redirect()->route("backend.{$module_name}.index"); } @@ -279,14 +279,14 @@ public function destroy($id) if ($$module_name_singular->delete()) { Flash::success('Role successfully deleted!')->important(); - Log::info(label_case($module_title.' '.$module_action).' | User:'.auth()->user()->name.'(ID:'.auth()->user()->id.')'); + Log::info(label_case($module_title . ' ' . $module_action) . ' | User:' . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); return redirect()->route("backend.{$module_name}.index"); } } catch (\Exception $e) { Log::error($e); - Log::error('Can not delete role with id '.$id); + Log::error('Can not delete role with id ' . $id); } } } diff --git a/app/Http/Controllers/Backend/SettingController.php b/app/Http/Controllers/Backend/SettingController.php index 344ee6768..1e54727db 100644 --- a/app/Http/Controllers/Backend/SettingController.php +++ b/app/Http/Controllers/Backend/SettingController.php @@ -57,7 +57,7 @@ public function index() $$module_name = $module_model::paginate(); - Log::info(label_case($module_title.' '.$module_action).' | User:'.Auth::user()->name.'(ID:'.Auth::user()->id.')'); + Log::info(label_case($module_title . ' ' . $module_action) . ' | User:' . Auth::user()->name . '(ID:' . Auth::user()->id . ')'); return view( "backend.{$module_path}.index", diff --git a/app/Http/Controllers/Backend/UserController.php b/app/Http/Controllers/Backend/UserController.php index b6282ed26..40e85704b 100644 --- a/app/Http/Controllers/Backend/UserController.php +++ b/app/Http/Controllers/Backend/UserController.php @@ -70,11 +70,11 @@ public function index() $module_action = 'List'; $page_heading = ucfirst($module_title); - $title = $page_heading.' '.ucfirst($module_action); + $title = $page_heading . ' ' . ucfirst($module_action); $$module_name = $module_model::paginate(); - Log::info("'{$title}' viewed by User:".auth()->user()->name.'(ID:'.auth()->user()->id.')'); + Log::info("'{$title}' viewed by User:" . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); return view( "{$module_path}.{$module_name}.index", @@ -111,7 +111,7 @@ public function index_data() ->editColumn('name', '{{$name}}') ->editColumn('status', function ($data) { $return_data = $data->status_label; - $return_data .= '
'.$data->confirmed_label; + $return_data .= '
' . $data->confirmed_label; return $return_data; }) @@ -151,7 +151,7 @@ public function index_list(Request $request) $module_action = 'List'; $page_heading = label_case($module_title); - $title = $page_heading.' '.label_case($module_action); + $title = $page_heading . ' ' . label_case($module_action); $term = trim($request->q); @@ -166,7 +166,7 @@ public function index_list(Request $request) foreach ($query_data as $row) { $$module_name[] = [ 'id' => $row->id, - 'text' => $row->name.' (Email: '.$row->email.')', + 'text' => $row->name . ' (Email: ' . $row->email . ')', ]; } @@ -224,7 +224,7 @@ public function store(Request $request) ]); $data_array = $request->except('_token', 'roles', 'permissions', 'password_confirmation'); - $data_array['name'] = $request->first_name.' '.$request->last_name; + $data_array['name'] = $request->first_name . ' ' . $request->last_name; $data_array['password'] = Hash::make($request->password); if ($request->confirmed === 1) { @@ -250,7 +250,7 @@ public function store(Request $request) event(new UserCreated($$module_name_singular)); - flash("New '".Str::singular($module_title)."' Created")->success()->important(); + flash("New '" . Str::singular($module_title) . "' Created")->success()->important(); if ($request->email_credentials === 1) { $data = [ @@ -263,7 +263,7 @@ public function store(Request $request) Artisan::call('cache:clear'); - Log::info(label_case($module_title.' '.$module_action)." | '".$$module_name_singular->name.'(ID:'.$$module_name_singular->id.") ' by User:".auth()->user()->name.'(ID:'.auth()->user()->id.')'); + Log::info(label_case($module_title . ' ' . $module_action) . " | '" . $$module_name_singular->name . '(ID:' . $$module_name_singular->id . ") ' by User:" . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); return redirect("admin/{$module_name}"); } @@ -287,7 +287,7 @@ public function show($id) $$module_name_singular = $module_model::findOrFail($id); - Log::info(label_case($module_title.' '.$module_action).' | User:'.auth()->user()->name.'(ID:'.auth()->user()->id.')'); + Log::info(label_case($module_title . ' ' . $module_action) . ' | User:' . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); return view( "{$module_path}.{$module_name}.show", @@ -315,9 +315,9 @@ public function changePassword($id) $module_action = 'Change Password'; $page_heading = label_case($module_title); - $title = $page_heading.' '.label_case($module_action); + $title = $page_heading . ' ' . label_case($module_action); - if (! auth()->user()->can('edit_users')) { + if (!auth()->user()->can('edit_users')) { $id = auth()->user()->id; } @@ -352,7 +352,7 @@ public function changePasswordUpdate(Request $request, $id) $module_model = $this->module_model; $module_name_singular = Str::singular($module_name); - if (! auth()->user()->can('edit_users')) { + if (!auth()->user()->can('edit_users')) { $id = auth()->user()->id; } @@ -363,7 +363,7 @@ public function changePasswordUpdate(Request $request, $id) $$module_name_singular->update($request_data); - flash(Str::singular($module_title)."' Updated Successfully")->success()->important(); + flash(Str::singular($module_title) . "' Updated Successfully")->success()->important(); return redirect("admin/{$module_name}"); } @@ -378,7 +378,7 @@ public function changePasswordUpdate(Request $request, $id) */ public function edit($id) { - if (! auth()->user()->can('edit_users')) { + if (!auth()->user()->can('edit_users')) { $id = auth()->user()->id; } @@ -399,7 +399,7 @@ public function edit($id) $roles = Role::get(); $permissions = Permission::select('name', 'id')->orderBy('id')->get(); - Log::info(label_case($module_title.' '.$module_action)." | '".$$module_name_singular->name.'(ID:'.$$module_name_singular->id.") ' by User:".auth()->user()->name.'(ID:'.auth()->user()->id.')'); + Log::info(label_case($module_title . ' ' . $module_action) . " | '" . $$module_name_singular->name . '(ID:' . $$module_name_singular->id . ") ' by User:" . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); return view( "{$module_path}.{$module_name}.edit", @@ -418,7 +418,7 @@ public function edit($id) */ public function update(Request $request, $id) { - if (! auth()->user()->can('edit_users')) { + if (!auth()->user()->can('edit_users')) { $id = auth()->user()->id; } @@ -434,7 +434,7 @@ public function update(Request $request, $id) $validated_data = $request->validate([ 'first_name' => 'required|min:3|max:191', 'last_name' => 'required|min:3|max:191', - 'email' => 'required|email|regex:/(.+)@(.+)\.(.+)/i|max:191|unique:users,email,'.$id, + 'email' => 'required|email|regex:/(.+)@(.+)\.(.+)/i|max:191|unique:users,email,' . $id, 'roles' => 'nullable|array', 'permissions' => 'nullable|array', ]); @@ -446,7 +446,7 @@ public function update(Request $request, $id) if ($id === 1) { $user->syncRoles(['super admin']); - flash(Str::singular($module_title)."' Updated Successfully")->success()->important(); + flash(Str::singular($module_title) . "' Updated Successfully")->success()->important(); Artisan::call('cache:clear'); @@ -463,9 +463,9 @@ public function update(Request $request, $id) event(new UserUpdated($$module_name_singular)); - flash(Str::singular($module_title)."' Updated Successfully")->success()->important(); + flash(Str::singular($module_title) . "' Updated Successfully")->success()->important(); - Log::info(label_case($module_title.' '.$module_action)." | '".$$module_name_singular->name.'(ID:'.$$module_name_singular->id.") ' by User:".auth()->user()->name.'(ID:'.auth()->user()->id.')'); + Log::info(label_case($module_title . ' ' . $module_action) . " | '" . $$module_name_singular->name . '(ID:' . $$module_name_singular->id . ") ' by User:" . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); return redirect("admin/{$module_name}"); } @@ -492,12 +492,12 @@ public function destroy($id) if (auth()->user()->id === $id || $id === 1) { flash('You can not delete this user!')->warning()->important(); - Log::notice(label_case($module_title.' '.$module_action).' Failed | User:'.auth()->user()->name.'(ID:'.auth()->user()->id.')'); + Log::notice(label_case($module_title . ' ' . $module_action) . ' Failed | User:' . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); return redirect()->back(); } - if (! auth()->user()->can('edit_users')) { + if (!auth()->user()->can('edit_users')) { $id = auth()->user()->id; } @@ -507,9 +507,9 @@ public function destroy($id) event(new UserUpdated($$module_name_singular)); - flash($$module_name_singular->name.' User Successfully Deleted!')->success()->important(); + flash($$module_name_singular->name . ' User Successfully Deleted!')->success()->important(); - Log::info(label_case($module_action)." '{$module_name}': '".$$module_name_singular->name.', ID:'.$$module_name_singular->id." ' by User:".auth()->user()->name); + Log::info(label_case($module_action) . " '{$module_name}': '" . $$module_name_singular->name . ', ID:' . $$module_name_singular->id . " ' by User:" . auth()->user()->name); return redirect("admin/{$module_name}"); } @@ -532,7 +532,7 @@ public function trashed() $$module_name = $module_model::onlyTrashed()->orderBy('deleted_at', 'desc')->paginate(); - logUserAccess($module_title.' '.$module_action); + logUserAccess($module_title . ' ' . $module_action); return view( "{$module_path}.{$module_name}.trash", @@ -548,7 +548,7 @@ public function trashed() */ public function restore($id) { - if (! auth()->user()->can('restore_users')) { + if (!auth()->user()->can('restore_users')) { abort(403); } @@ -567,9 +567,9 @@ public function restore($id) event(new UserUpdated($$module_name_singular)); - flash($$module_name_singular->name.' Successfully Restoreded!')->success()->important(); + flash($$module_name_singular->name . ' Successfully Restoreded!')->success()->important(); - Log::info(label_case($module_action)." '{$module_name}': '".$$module_name_singular->name.', ID:'.$$module_name_singular->id." ' by User:".auth()->user()->name); + Log::info(label_case($module_action) . " '{$module_name}': '" . $$module_name_singular->name . ', ID:' . $$module_name_singular->id . " ' by User:" . auth()->user()->name); return redirect("admin/{$module_name}"); } @@ -584,7 +584,7 @@ public function restore($id) */ public function block($id) { - if (! auth()->user()->can('delete_users')) { + if (!auth()->user()->can('delete_users')) { abort(403); } @@ -600,7 +600,7 @@ public function block($id) if (auth()->user()->id == $id || $id == 1) { flash("You can not 'Block' this user!")->success()->important(); - Log::notice(label_case($module_title.' '.$module_action).' Failed | User:'.auth()->user()->name.'(ID:'.auth()->user()->id.')'); + Log::notice(label_case($module_title . ' ' . $module_action) . ' Failed | User:' . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); return redirect()->back(); } @@ -613,7 +613,7 @@ public function block($id) event(new UserUpdated($$module_name_singular)); - flash($$module_name_singular->name.' User Successfully Blocked!')->success()->important(); + flash($$module_name_singular->name . ' User Successfully Blocked!')->success()->important(); return redirect()->back(); } catch (Exception $e) { @@ -631,7 +631,7 @@ public function block($id) */ public function unblock($id) { - if (! auth()->user()->can('delete_users')) { + if (!auth()->user()->can('delete_users')) { abort(403); } @@ -647,7 +647,7 @@ public function unblock($id) if (auth()->user()->id == $id || $id == 1) { flash("You can not 'Unblock' this user!")->warning()->important(); - Log::notice(label_case($module_title.' '.$module_action).' Failed | User:'.auth()->user()->name.'(ID:'.auth()->user()->id.')'); + Log::notice(label_case($module_title . ' ' . $module_action) . ' Failed | User:' . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); return redirect()->back(); } @@ -660,15 +660,15 @@ public function unblock($id) event(new UserUpdated($$module_name_singular)); - flash($$module_name_singular->name.' - User Successfully Unblocked!')->success()->important(); + flash($$module_name_singular->name . ' - User Successfully Unblocked!')->success()->important(); - Log::notice(label_case($module_title.' '.$module_action).' Success | User:'.auth()->user()->name.'(ID:'.auth()->user()->id.')'); + Log::notice(label_case($module_title . ' ' . $module_action) . ' Success | User:' . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); return redirect()->back(); } catch (Exception $e) { flash('There was a problem updating this user. Please try again.!')->error()->important(); - Log::error(label_case($module_title.' '.$module_action).' | User:'.auth()->user()->name.'(ID:'.auth()->user()->id.')'); + Log::error(label_case($module_title . ' ' . $module_action) . ' | User:' . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); Log::error($e); } } @@ -693,7 +693,7 @@ public function userProviderDestroy(Request $request) $user_provider_id = $request->user_provider_id; $user_id = $request->user_id; - if (! $user_provider_id > 0 || ! $user_id > 0) { + if (!$user_provider_id > 0 || !$user_id > 0) { flash('Invalid Request. Please try again.')->error()->important(); return redirect()->back(); @@ -703,7 +703,7 @@ public function userProviderDestroy(Request $request) if ($user_id == $user_provider->user->id) { $user_provider->delete(); - flash('Unlinked from User, "'.$user_provider->user->name.'"!')->success()->important(); + flash('Unlinked from User, "' . $user_provider->user->name . '"!')->success()->important(); return redirect()->back(); } @@ -726,9 +726,9 @@ public function emailConfirmationResend($id) { if ($id !== auth()->user()->id) { if (auth()->user()->hasAnyRole(['administrator', 'super admin'])) { - Log::info(auth()->user()->name.' ('.auth()->user()->id.') - User Requested for Email Verification.'); + Log::info(auth()->user()->name . ' (' . auth()->user()->id . ') - User Requested for Email Verification.'); } else { - Log::warning(auth()->user()->name.' ('.auth()->user()->id.') - User trying to confirm another users email.'); + Log::warning(auth()->user()->name . ' (' . auth()->user()->id . ') - User trying to confirm another users email.'); abort('404'); } @@ -738,7 +738,7 @@ public function emailConfirmationResend($id) if ($user) { if ($user->email_verified_at === null) { - Log::info($user->name.' ('.$user->id.') - User Requested for Email Verification.'); + Log::info($user->name . ' (' . $user->id . ') - User Requested for Email Verification.'); // Send Email To Registered User $user->sendEmailVerificationNotification(); @@ -747,9 +747,9 @@ public function emailConfirmationResend($id) return redirect()->back(); } - Log::info($user->name.' ('.$user->id.') - User Requested but Email already verified at.'.$user->email_verified_at); + Log::info($user->name . ' (' . $user->id . ') - User Requested but Email already verified at.' . $user->email_verified_at); - flash($user->name.', You already confirmed your email address at '.$user->email_verified_at->isoFormat('LL'))->success()->important(); + flash($user->name . ', You already confirmed your email address at ' . $user->email_verified_at->isoFormat('LL'))->success()->important(); return redirect()->back(); } diff --git a/resources/views/backend/roles/index.blade.php b/resources/views/backend/roles/index.blade.php index 7d6108dbc..385a5a287 100644 --- a/resources/views/backend/roles/index.blade.php +++ b/resources/views/backend/roles/index.blade.php @@ -70,14 +70,14 @@ class="text-muted">{{ __($module_action) }}
-
+
{!! $$module_name->total() !!} {{ __('labels.backend.total') }}
-
+
- {!! $$module_name->render() !!} + {{ $$module_name->links('pagination::bootstrap-5') }}
From 874cd4830870e1a4c0957e130b60214dfaa9dabe Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Sun, 21 Apr 2024 14:44:23 +0000 Subject: [PATCH 3/5] Apply fixes from StyleCI --- .../Backend/BackendBaseController.php | 30 +++---- .../Controllers/Backend/BackupController.php | 8 +- .../Backend/NotificationsController.php | 10 +-- .../Controllers/Backend/RolesController.php | 28 +++--- .../Controllers/Backend/SettingController.php | 2 +- .../Controllers/Backend/UserController.php | 86 +++++++++---------- 6 files changed, 82 insertions(+), 82 deletions(-) diff --git a/app/Http/Controllers/Backend/BackendBaseController.php b/app/Http/Controllers/Backend/BackendBaseController.php index ae13366af..92e3b2a11 100644 --- a/app/Http/Controllers/Backend/BackendBaseController.php +++ b/app/Http/Controllers/Backend/BackendBaseController.php @@ -60,7 +60,7 @@ public function index() $$module_name = $module_model::paginate(); - logUserAccess($module_title . ' ' . $module_action); + logUserAccess($module_title.' '.$module_action); return view( "{$module_path}.{$module_name}.index_datatable", @@ -98,7 +98,7 @@ public function index_list(Request $request) foreach ($query_data as $row) { $$module_name[] = [ 'id' => $row->id, - 'text' => $row->name . ' (Slug: ' . $row->slug . ')', + 'text' => $row->name.' (Slug: '.$row->slug.')', ]; } @@ -122,7 +122,7 @@ public function index_data() $module_action = 'List'; $page_heading = label_case($module_title); - $title = $page_heading . ' ' . label_case($module_action); + $title = $page_heading.' '.label_case($module_action); $$module_name = $module_model::select('id', 'name', 'updated_at'); @@ -167,7 +167,7 @@ public function create() $module_action = 'Create'; - logUserAccess($module_title . ' ' . $module_action); + logUserAccess($module_title.' '.$module_action); return view( "{$module_path}.{$module_name}.create", @@ -196,9 +196,9 @@ public function store(Request $request) $$module_name_singular = $module_model::create($request->all()); - flash("New '" . Str::singular($module_title) . "' Added")->success()->important(); + flash("New '".Str::singular($module_title)."' Added")->success()->important(); - logUserAccess($module_title . ' ' . $module_action . ' | Id: ' . $$module_name_singular->id); + logUserAccess($module_title.' '.$module_action.' | Id: '.$$module_name_singular->id); return redirect("admin/{$module_name}"); } @@ -222,7 +222,7 @@ public function show($id) $$module_name_singular = $module_model::findOrFail($id); - logUserAccess($module_title . ' ' . $module_action . ' | Id: ' . $$module_name_singular->id); + logUserAccess($module_title.' '.$module_action.' | Id: '.$$module_name_singular->id); return view( "{$module_path}.{$module_name}.show", @@ -250,7 +250,7 @@ public function edit($id) $$module_name_singular = $module_model::findOrFail($id); - logUserAccess($module_title . ' ' . $module_action . ' | Id: ' . $$module_name_singular->id); + logUserAccess($module_title.' '.$module_action.' | Id: '.$$module_name_singular->id); return view( "{$module_path}.{$module_name}.edit", @@ -284,9 +284,9 @@ public function update(Request $request, $id) $$module_name_singular->update($request->all()); - flash(Str::singular($module_title) . "' Updated Successfully")->success()->important(); + flash(Str::singular($module_title)."' Updated Successfully")->success()->important(); - logUserAccess($module_title . ' ' . $module_action . ' | Id: ' . $$module_name_singular->id); + logUserAccess($module_title.' '.$module_action.' | Id: '.$$module_name_singular->id); return redirect()->route("backend.{$module_name}.show", $$module_name_singular->id); } @@ -316,9 +316,9 @@ public function destroy($id) $$module_name_singular->delete(); - flash(label_case($module_name_singular) . ' Deleted Successfully!')->success()->important(); + flash(label_case($module_name_singular).' Deleted Successfully!')->success()->important(); - logUserAccess($module_title . ' ' . $module_action . ' | Id: ' . $$module_name_singular->id); + logUserAccess($module_title.' '.$module_action.' | Id: '.$$module_name_singular->id); return redirect("admin/{$module_name}"); } @@ -342,7 +342,7 @@ public function trashed() $$module_name = $module_model::onlyTrashed()->orderBy('deleted_at', 'desc')->paginate(); - logUserAccess($module_title . ' ' . $module_action); + logUserAccess($module_title.' '.$module_action); return view( "{$module_path}.{$module_name}.trash", @@ -375,9 +375,9 @@ public function restore($id) $$module_name_singular = $module_model::withTrashed()->find($id); $$module_name_singular->restore(); - flash(label_case($module_name_singular) . ' Data Restoreded Successfully!')->success()->important(); + flash(label_case($module_name_singular).' Data Restoreded Successfully!')->success()->important(); - logUserAccess($module_title . ' ' . $module_action . ' | Id: ' . $$module_name_singular->id); + logUserAccess($module_title.' '.$module_action.' | Id: '.$$module_name_singular->id); return redirect("admin/{$module_name}"); } diff --git a/app/Http/Controllers/Backend/BackupController.php b/app/Http/Controllers/Backend/BackupController.php index 7fdbb0038..cffc983d4 100644 --- a/app/Http/Controllers/Backend/BackupController.php +++ b/app/Http/Controllers/Backend/BackupController.php @@ -68,7 +68,7 @@ public function index() if (substr($f, -4) === '.zip' && $disk->exists($f)) { $$module_name[] = [ 'file_path' => $f, - 'file_name' => str_replace(config('backup.backup.name') . '/', '', $f), + 'file_name' => str_replace(config('backup.backup.name').'/', '', $f), 'file_size_byte' => $disk->size($f), 'file_size' => humanFilesize($disk->size($f)), 'last_modified_timestamp' => $disk->lastModified($f), @@ -114,7 +114,7 @@ public function create() $output = Artisan::output(); // Log the results - Log::info("Backpack\BackupManager -- new backup started from admin interface \r\n" . $output); + Log::info("Backpack\BackupManager -- new backup started from admin interface \r\n".$output); // return the results as a response to the ajax call flash('New backup created')->success()->important(); @@ -135,7 +135,7 @@ public function create() public function download($file_name) { $disk = Storage::disk('local'); - $file = config('backup.backup.name') . '/' . $file_name; + $file = config('backup.backup.name').'/'.$file_name; if ($disk->exists($file)) { return Storage::download($file); @@ -149,7 +149,7 @@ public function download($file_name) public function delete($file_name) { $disk = Storage::disk('local'); - $file = config('backup.backup.name') . '/' . $file_name; + $file = config('backup.backup.name').'/'.$file_name; if ($disk->exists($file)) { $disk->delete($file); diff --git a/app/Http/Controllers/Backend/NotificationsController.php b/app/Http/Controllers/Backend/NotificationsController.php index 5de64d2a9..b5fb965e0 100644 --- a/app/Http/Controllers/Backend/NotificationsController.php +++ b/app/Http/Controllers/Backend/NotificationsController.php @@ -58,7 +58,7 @@ public function index() $$module_name = auth()->user()->notifications()->paginate(); $unread_notifications_count = auth()->user()->unreadNotifications()->count(); - Log::info(label_case($module_title . ' ' . $module_action) . ' | User:' . Auth::user()->name . '(ID:' . Auth::user()->id . ')'); + Log::info(label_case($module_title.' '.$module_action).' | User:'.Auth::user()->name.'(ID:'.Auth::user()->id.')'); return view( "backend.{$module_path}.index", @@ -91,11 +91,11 @@ public function show($id) $$module_name_singular->save(); } } else { - Log::info(label_case($module_title . ' ' . $module_action) . ' | User:' . Auth::user()->name . '(ID:' . Auth::user()->id . ')'); + Log::info(label_case($module_title.' '.$module_action).' | User:'.Auth::user()->name.'(ID:'.Auth::user()->id.')'); abort(404); } - Log::info(label_case($module_title . ' ' . $module_action) . ' | User:' . Auth::user()->name . '(ID:' . Auth::user()->id . ')'); + Log::info(label_case($module_title.' '.$module_action).' | User:'.Auth::user()->name.'(ID:'.Auth::user()->id.')'); return view( "backend.{$module_name}.show", @@ -126,7 +126,7 @@ public function deleteAll() flash('All Notifications Deleted')->success()->important(); - Log::info(label_case($module_title . ' ' . $module_action) . ' | User:' . Auth::user()->name . '(ID:' . Auth::user()->id . ')'); + Log::info(label_case($module_title.' '.$module_action).' | User:'.Auth::user()->name.'(ID:'.Auth::user()->id.')'); return back(); } @@ -153,7 +153,7 @@ public function markAllAsRead() flash('All Notifications Marked As Read')->success()->important(); - Log::info(label_case($module_title . ' ' . $module_action) . ' | User:' . Auth::user()->name . '(ID:' . Auth::user()->id . ')'); + Log::info(label_case($module_title.' '.$module_action).' | User:'.Auth::user()->name.'(ID:'.Auth::user()->id.')'); return back(); } diff --git a/app/Http/Controllers/Backend/RolesController.php b/app/Http/Controllers/Backend/RolesController.php index e9d48f470..e11cef477 100644 --- a/app/Http/Controllers/Backend/RolesController.php +++ b/app/Http/Controllers/Backend/RolesController.php @@ -63,7 +63,7 @@ public function index() $$module_name = $module_model::with('permissions')->paginate(); - Log::info(label_case($module_title . ' ' . $module_action) . ' | User:' . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); + Log::info(label_case($module_title.' '.$module_action).' | User:'.auth()->user()->name.'(ID:'.auth()->user()->id.')'); return view( "backend.{$module_path}.index", @@ -90,7 +90,7 @@ public function create() $roles = Role::get(); $permissions = Permission::select('name', 'id')->orderBy('id')->get(); - Log::info(label_case($module_title . ' ' . $module_action) . ' | User:' . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); + Log::info(label_case($module_title.' '.$module_action).' | User:'.auth()->user()->name.'(ID:'.auth()->user()->id.')'); return view("backend.{$module_name}.create", compact('module_title', 'module_name', 'module_icon', 'module_action', 'roles', 'permissions')); } @@ -126,7 +126,7 @@ public function store(Request $request) flash("{$$module_name_singular->name} {$module_name_singular} created successfully!")->success()->important(); - Log::info(label_case($module_title . ' ' . $module_action) . ' | User:' . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); + Log::info(label_case($module_title.' '.$module_action).' | User:'.auth()->user()->name.'(ID:'.auth()->user()->id.')'); return redirect("admin/{$module_name}")->with('flash_success', "{$module_name} added!"); } @@ -153,7 +153,7 @@ public function show($id) $users = User::role($$module_name_singular->name)->get(); - Log::info(label_case($module_title . ' ' . $module_action) . ' | User:' . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); + Log::info(label_case($module_title.' '.$module_action).' | User:'.auth()->user()->name.'(ID:'.auth()->user()->id.')'); return view( "backend.{$module_name}.show", @@ -183,7 +183,7 @@ public function edit($id) $$module_name_singular = $module_model::findOrFail($id); - Log::info(label_case($module_title . ' ' . $module_action) . ' | User:' . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); + Log::info(label_case($module_title.' '.$module_action).' | User:'.auth()->user()->name.'(ID:'.auth()->user()->id.')'); return view("backend.{$module_name}.edit", compact('module_title', 'module_name', "{$module_name_singular}", 'module_name_singular', 'module_icon', 'module_action', 'permissions')); } @@ -209,7 +209,7 @@ public function update(Request $request, $id) $$module_name_singular = $module_model::findOrFail($id); $validated_data = $request->validate([ - 'name' => 'required|max:100|unique:roles,name,' . $id, + 'name' => 'required|max:100|unique:roles,name,'.$id, 'permissions' => 'nullable|array', ]); @@ -221,9 +221,9 @@ public function update(Request $request, $id) $permissions = isset($validated_data['permissions']) ? $validated_data['permissions'] : []; $$module_name_singular->syncPermissions($permissions); - flash(label_case($$module_name_singular->name . ' ' . $module_name_singular) . ' updated successfully!')->success()->important(); + flash(label_case($$module_name_singular->name.' '.$module_name_singular).' updated successfully!')->success()->important(); - Log::info(label_case($module_title . ' ' . $module_action) . ' | User:' . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); + Log::info(label_case($module_title.' '.$module_action).' | User:'.auth()->user()->name.'(ID:'.auth()->user()->id.')'); return redirect("admin/{$module_name}"); } @@ -258,19 +258,19 @@ public function destroy($id) if ($id == 1) { Flash::warning("You can not delete {$$module_name_singular->name} role!")->important(); - Log::notice(label_case($module_title . ' ' . $module_action) . ' Failed | User:' . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); + Log::notice(label_case($module_title.' '.$module_action).' Failed | User:'.auth()->user()->name.'(ID:'.auth()->user()->id.')'); return redirect()->route("backend.{$module_name}.index"); } elseif (in_array($role_name, $user_roles->toArray())) { Flash::warning('You can not delete your Role!')->important(); - Log::notice(label_case($module_title . ' ' . $module_action) . ' Failed | User:' . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); + Log::notice(label_case($module_title.' '.$module_action).' Failed | User:'.auth()->user()->name.'(ID:'.auth()->user()->id.')'); return redirect()->route("backend.{$module_name}.index"); } elseif ($role_users) { - Flash::warning('Can not be deleted! ' . $role_users . ' user(s) found!')->important(); + Flash::warning('Can not be deleted! '.$role_users.' user(s) found!')->important(); - Log::notice(label_case($module_title . ' ' . $module_action) . ' Failed | User:' . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); + Log::notice(label_case($module_title.' '.$module_action).' Failed | User:'.auth()->user()->name.'(ID:'.auth()->user()->id.')'); return redirect()->route("backend.{$module_name}.index"); } @@ -279,14 +279,14 @@ public function destroy($id) if ($$module_name_singular->delete()) { Flash::success('Role successfully deleted!')->important(); - Log::info(label_case($module_title . ' ' . $module_action) . ' | User:' . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); + Log::info(label_case($module_title.' '.$module_action).' | User:'.auth()->user()->name.'(ID:'.auth()->user()->id.')'); return redirect()->route("backend.{$module_name}.index"); } } catch (\Exception $e) { Log::error($e); - Log::error('Can not delete role with id ' . $id); + Log::error('Can not delete role with id '.$id); } } } diff --git a/app/Http/Controllers/Backend/SettingController.php b/app/Http/Controllers/Backend/SettingController.php index 1e54727db..344ee6768 100644 --- a/app/Http/Controllers/Backend/SettingController.php +++ b/app/Http/Controllers/Backend/SettingController.php @@ -57,7 +57,7 @@ public function index() $$module_name = $module_model::paginate(); - Log::info(label_case($module_title . ' ' . $module_action) . ' | User:' . Auth::user()->name . '(ID:' . Auth::user()->id . ')'); + Log::info(label_case($module_title.' '.$module_action).' | User:'.Auth::user()->name.'(ID:'.Auth::user()->id.')'); return view( "backend.{$module_path}.index", diff --git a/app/Http/Controllers/Backend/UserController.php b/app/Http/Controllers/Backend/UserController.php index 40e85704b..b6282ed26 100644 --- a/app/Http/Controllers/Backend/UserController.php +++ b/app/Http/Controllers/Backend/UserController.php @@ -70,11 +70,11 @@ public function index() $module_action = 'List'; $page_heading = ucfirst($module_title); - $title = $page_heading . ' ' . ucfirst($module_action); + $title = $page_heading.' '.ucfirst($module_action); $$module_name = $module_model::paginate(); - Log::info("'{$title}' viewed by User:" . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); + Log::info("'{$title}' viewed by User:".auth()->user()->name.'(ID:'.auth()->user()->id.')'); return view( "{$module_path}.{$module_name}.index", @@ -111,7 +111,7 @@ public function index_data() ->editColumn('name', '{{$name}}') ->editColumn('status', function ($data) { $return_data = $data->status_label; - $return_data .= '
' . $data->confirmed_label; + $return_data .= '
'.$data->confirmed_label; return $return_data; }) @@ -151,7 +151,7 @@ public function index_list(Request $request) $module_action = 'List'; $page_heading = label_case($module_title); - $title = $page_heading . ' ' . label_case($module_action); + $title = $page_heading.' '.label_case($module_action); $term = trim($request->q); @@ -166,7 +166,7 @@ public function index_list(Request $request) foreach ($query_data as $row) { $$module_name[] = [ 'id' => $row->id, - 'text' => $row->name . ' (Email: ' . $row->email . ')', + 'text' => $row->name.' (Email: '.$row->email.')', ]; } @@ -224,7 +224,7 @@ public function store(Request $request) ]); $data_array = $request->except('_token', 'roles', 'permissions', 'password_confirmation'); - $data_array['name'] = $request->first_name . ' ' . $request->last_name; + $data_array['name'] = $request->first_name.' '.$request->last_name; $data_array['password'] = Hash::make($request->password); if ($request->confirmed === 1) { @@ -250,7 +250,7 @@ public function store(Request $request) event(new UserCreated($$module_name_singular)); - flash("New '" . Str::singular($module_title) . "' Created")->success()->important(); + flash("New '".Str::singular($module_title)."' Created")->success()->important(); if ($request->email_credentials === 1) { $data = [ @@ -263,7 +263,7 @@ public function store(Request $request) Artisan::call('cache:clear'); - Log::info(label_case($module_title . ' ' . $module_action) . " | '" . $$module_name_singular->name . '(ID:' . $$module_name_singular->id . ") ' by User:" . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); + Log::info(label_case($module_title.' '.$module_action)." | '".$$module_name_singular->name.'(ID:'.$$module_name_singular->id.") ' by User:".auth()->user()->name.'(ID:'.auth()->user()->id.')'); return redirect("admin/{$module_name}"); } @@ -287,7 +287,7 @@ public function show($id) $$module_name_singular = $module_model::findOrFail($id); - Log::info(label_case($module_title . ' ' . $module_action) . ' | User:' . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); + Log::info(label_case($module_title.' '.$module_action).' | User:'.auth()->user()->name.'(ID:'.auth()->user()->id.')'); return view( "{$module_path}.{$module_name}.show", @@ -315,9 +315,9 @@ public function changePassword($id) $module_action = 'Change Password'; $page_heading = label_case($module_title); - $title = $page_heading . ' ' . label_case($module_action); + $title = $page_heading.' '.label_case($module_action); - if (!auth()->user()->can('edit_users')) { + if (! auth()->user()->can('edit_users')) { $id = auth()->user()->id; } @@ -352,7 +352,7 @@ public function changePasswordUpdate(Request $request, $id) $module_model = $this->module_model; $module_name_singular = Str::singular($module_name); - if (!auth()->user()->can('edit_users')) { + if (! auth()->user()->can('edit_users')) { $id = auth()->user()->id; } @@ -363,7 +363,7 @@ public function changePasswordUpdate(Request $request, $id) $$module_name_singular->update($request_data); - flash(Str::singular($module_title) . "' Updated Successfully")->success()->important(); + flash(Str::singular($module_title)."' Updated Successfully")->success()->important(); return redirect("admin/{$module_name}"); } @@ -378,7 +378,7 @@ public function changePasswordUpdate(Request $request, $id) */ public function edit($id) { - if (!auth()->user()->can('edit_users')) { + if (! auth()->user()->can('edit_users')) { $id = auth()->user()->id; } @@ -399,7 +399,7 @@ public function edit($id) $roles = Role::get(); $permissions = Permission::select('name', 'id')->orderBy('id')->get(); - Log::info(label_case($module_title . ' ' . $module_action) . " | '" . $$module_name_singular->name . '(ID:' . $$module_name_singular->id . ") ' by User:" . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); + Log::info(label_case($module_title.' '.$module_action)." | '".$$module_name_singular->name.'(ID:'.$$module_name_singular->id.") ' by User:".auth()->user()->name.'(ID:'.auth()->user()->id.')'); return view( "{$module_path}.{$module_name}.edit", @@ -418,7 +418,7 @@ public function edit($id) */ public function update(Request $request, $id) { - if (!auth()->user()->can('edit_users')) { + if (! auth()->user()->can('edit_users')) { $id = auth()->user()->id; } @@ -434,7 +434,7 @@ public function update(Request $request, $id) $validated_data = $request->validate([ 'first_name' => 'required|min:3|max:191', 'last_name' => 'required|min:3|max:191', - 'email' => 'required|email|regex:/(.+)@(.+)\.(.+)/i|max:191|unique:users,email,' . $id, + 'email' => 'required|email|regex:/(.+)@(.+)\.(.+)/i|max:191|unique:users,email,'.$id, 'roles' => 'nullable|array', 'permissions' => 'nullable|array', ]); @@ -446,7 +446,7 @@ public function update(Request $request, $id) if ($id === 1) { $user->syncRoles(['super admin']); - flash(Str::singular($module_title) . "' Updated Successfully")->success()->important(); + flash(Str::singular($module_title)."' Updated Successfully")->success()->important(); Artisan::call('cache:clear'); @@ -463,9 +463,9 @@ public function update(Request $request, $id) event(new UserUpdated($$module_name_singular)); - flash(Str::singular($module_title) . "' Updated Successfully")->success()->important(); + flash(Str::singular($module_title)."' Updated Successfully")->success()->important(); - Log::info(label_case($module_title . ' ' . $module_action) . " | '" . $$module_name_singular->name . '(ID:' . $$module_name_singular->id . ") ' by User:" . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); + Log::info(label_case($module_title.' '.$module_action)." | '".$$module_name_singular->name.'(ID:'.$$module_name_singular->id.") ' by User:".auth()->user()->name.'(ID:'.auth()->user()->id.')'); return redirect("admin/{$module_name}"); } @@ -492,12 +492,12 @@ public function destroy($id) if (auth()->user()->id === $id || $id === 1) { flash('You can not delete this user!')->warning()->important(); - Log::notice(label_case($module_title . ' ' . $module_action) . ' Failed | User:' . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); + Log::notice(label_case($module_title.' '.$module_action).' Failed | User:'.auth()->user()->name.'(ID:'.auth()->user()->id.')'); return redirect()->back(); } - if (!auth()->user()->can('edit_users')) { + if (! auth()->user()->can('edit_users')) { $id = auth()->user()->id; } @@ -507,9 +507,9 @@ public function destroy($id) event(new UserUpdated($$module_name_singular)); - flash($$module_name_singular->name . ' User Successfully Deleted!')->success()->important(); + flash($$module_name_singular->name.' User Successfully Deleted!')->success()->important(); - Log::info(label_case($module_action) . " '{$module_name}': '" . $$module_name_singular->name . ', ID:' . $$module_name_singular->id . " ' by User:" . auth()->user()->name); + Log::info(label_case($module_action)." '{$module_name}': '".$$module_name_singular->name.', ID:'.$$module_name_singular->id." ' by User:".auth()->user()->name); return redirect("admin/{$module_name}"); } @@ -532,7 +532,7 @@ public function trashed() $$module_name = $module_model::onlyTrashed()->orderBy('deleted_at', 'desc')->paginate(); - logUserAccess($module_title . ' ' . $module_action); + logUserAccess($module_title.' '.$module_action); return view( "{$module_path}.{$module_name}.trash", @@ -548,7 +548,7 @@ public function trashed() */ public function restore($id) { - if (!auth()->user()->can('restore_users')) { + if (! auth()->user()->can('restore_users')) { abort(403); } @@ -567,9 +567,9 @@ public function restore($id) event(new UserUpdated($$module_name_singular)); - flash($$module_name_singular->name . ' Successfully Restoreded!')->success()->important(); + flash($$module_name_singular->name.' Successfully Restoreded!')->success()->important(); - Log::info(label_case($module_action) . " '{$module_name}': '" . $$module_name_singular->name . ', ID:' . $$module_name_singular->id . " ' by User:" . auth()->user()->name); + Log::info(label_case($module_action)." '{$module_name}': '".$$module_name_singular->name.', ID:'.$$module_name_singular->id." ' by User:".auth()->user()->name); return redirect("admin/{$module_name}"); } @@ -584,7 +584,7 @@ public function restore($id) */ public function block($id) { - if (!auth()->user()->can('delete_users')) { + if (! auth()->user()->can('delete_users')) { abort(403); } @@ -600,7 +600,7 @@ public function block($id) if (auth()->user()->id == $id || $id == 1) { flash("You can not 'Block' this user!")->success()->important(); - Log::notice(label_case($module_title . ' ' . $module_action) . ' Failed | User:' . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); + Log::notice(label_case($module_title.' '.$module_action).' Failed | User:'.auth()->user()->name.'(ID:'.auth()->user()->id.')'); return redirect()->back(); } @@ -613,7 +613,7 @@ public function block($id) event(new UserUpdated($$module_name_singular)); - flash($$module_name_singular->name . ' User Successfully Blocked!')->success()->important(); + flash($$module_name_singular->name.' User Successfully Blocked!')->success()->important(); return redirect()->back(); } catch (Exception $e) { @@ -631,7 +631,7 @@ public function block($id) */ public function unblock($id) { - if (!auth()->user()->can('delete_users')) { + if (! auth()->user()->can('delete_users')) { abort(403); } @@ -647,7 +647,7 @@ public function unblock($id) if (auth()->user()->id == $id || $id == 1) { flash("You can not 'Unblock' this user!")->warning()->important(); - Log::notice(label_case($module_title . ' ' . $module_action) . ' Failed | User:' . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); + Log::notice(label_case($module_title.' '.$module_action).' Failed | User:'.auth()->user()->name.'(ID:'.auth()->user()->id.')'); return redirect()->back(); } @@ -660,15 +660,15 @@ public function unblock($id) event(new UserUpdated($$module_name_singular)); - flash($$module_name_singular->name . ' - User Successfully Unblocked!')->success()->important(); + flash($$module_name_singular->name.' - User Successfully Unblocked!')->success()->important(); - Log::notice(label_case($module_title . ' ' . $module_action) . ' Success | User:' . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); + Log::notice(label_case($module_title.' '.$module_action).' Success | User:'.auth()->user()->name.'(ID:'.auth()->user()->id.')'); return redirect()->back(); } catch (Exception $e) { flash('There was a problem updating this user. Please try again.!')->error()->important(); - Log::error(label_case($module_title . ' ' . $module_action) . ' | User:' . auth()->user()->name . '(ID:' . auth()->user()->id . ')'); + Log::error(label_case($module_title.' '.$module_action).' | User:'.auth()->user()->name.'(ID:'.auth()->user()->id.')'); Log::error($e); } } @@ -693,7 +693,7 @@ public function userProviderDestroy(Request $request) $user_provider_id = $request->user_provider_id; $user_id = $request->user_id; - if (!$user_provider_id > 0 || !$user_id > 0) { + if (! $user_provider_id > 0 || ! $user_id > 0) { flash('Invalid Request. Please try again.')->error()->important(); return redirect()->back(); @@ -703,7 +703,7 @@ public function userProviderDestroy(Request $request) if ($user_id == $user_provider->user->id) { $user_provider->delete(); - flash('Unlinked from User, "' . $user_provider->user->name . '"!')->success()->important(); + flash('Unlinked from User, "'.$user_provider->user->name.'"!')->success()->important(); return redirect()->back(); } @@ -726,9 +726,9 @@ public function emailConfirmationResend($id) { if ($id !== auth()->user()->id) { if (auth()->user()->hasAnyRole(['administrator', 'super admin'])) { - Log::info(auth()->user()->name . ' (' . auth()->user()->id . ') - User Requested for Email Verification.'); + Log::info(auth()->user()->name.' ('.auth()->user()->id.') - User Requested for Email Verification.'); } else { - Log::warning(auth()->user()->name . ' (' . auth()->user()->id . ') - User trying to confirm another users email.'); + Log::warning(auth()->user()->name.' ('.auth()->user()->id.') - User trying to confirm another users email.'); abort('404'); } @@ -738,7 +738,7 @@ public function emailConfirmationResend($id) if ($user) { if ($user->email_verified_at === null) { - Log::info($user->name . ' (' . $user->id . ') - User Requested for Email Verification.'); + Log::info($user->name.' ('.$user->id.') - User Requested for Email Verification.'); // Send Email To Registered User $user->sendEmailVerificationNotification(); @@ -747,9 +747,9 @@ public function emailConfirmationResend($id) return redirect()->back(); } - Log::info($user->name . ' (' . $user->id . ') - User Requested but Email already verified at.' . $user->email_verified_at); + Log::info($user->name.' ('.$user->id.') - User Requested but Email already verified at.'.$user->email_verified_at); - flash($user->name . ', You already confirmed your email address at ' . $user->email_verified_at->isoFormat('LL'))->success()->important(); + flash($user->name.', You already confirmed your email address at '.$user->email_verified_at->isoFormat('LL'))->success()->important(); return redirect()->back(); } From 219ea42e972ed63aaa211a8297b7432b24cd68eb Mon Sep 17 00:00:00 2001 From: Nasir Khan Saikat Date: Sun, 21 Apr 2024 20:52:06 +0600 Subject: [PATCH 4/5] ++ --- resources/views/backend/roles/create.blade.php | 2 +- resources/views/backend/roles/edit.blade.php | 4 ++-- resources/views/backend/roles/index.blade.php | 2 +- resources/views/backend/roles/show.blade.php | 4 ++-- .../views/backend/users/changePassword.blade.php | 5 +---- resources/views/backend/users/create.blade.php | 2 +- resources/views/backend/users/edit.blade.php | 2 +- .../views/backend/users/index_datatable.blade.php | 7 ++----- resources/views/backend/users/show.blade.php | 11 +++++------ 9 files changed, 16 insertions(+), 23 deletions(-) diff --git a/resources/views/backend/roles/create.blade.php b/resources/views/backend/roles/create.blade.php index ab327c8c8..8e0e99baf 100644 --- a/resources/views/backend/roles/create.blade.php +++ b/resources/views/backend/roles/create.blade.php @@ -22,7 +22,7 @@ class="text-muted">{{ __($module_action) }} - + diff --git a/resources/views/backend/roles/edit.blade.php b/resources/views/backend/roles/edit.blade.php index 1d7f8986c..84237cb9f 100644 --- a/resources/views/backend/roles/edit.blade.php +++ b/resources/views/backend/roles/edit.blade.php @@ -22,9 +22,9 @@ class="text-muted">{{ __($module_action) }} - + + route='{!! route("backend.$module_name.show", $$module_name_singular) !!}' :small=true /> diff --git a/resources/views/backend/roles/index.blade.php b/resources/views/backend/roles/index.blade.php index 385a5a287..b8077c353 100644 --- a/resources/views/backend/roles/index.blade.php +++ b/resources/views/backend/roles/index.blade.php @@ -20,7 +20,7 @@ class="text-muted">{{ __($module_action) }} + route='{{ route("backend.$module_name.create") }}' :small=true /> diff --git a/resources/views/backend/roles/show.blade.php b/resources/views/backend/roles/show.blade.php index 2ae0b3d53..cafc5faf3 100644 --- a/resources/views/backend/roles/show.blade.php +++ b/resources/views/backend/roles/show.blade.php @@ -20,10 +20,10 @@ class="text-muted">{{ __($module_title) }} - + + route='{!! route("backend.$module_name.edit", $$module_name_singular) !!}' :small=true /> diff --git a/resources/views/backend/users/changePassword.blade.php b/resources/views/backend/users/changePassword.blade.php index d19c08dce..de8549335 100644 --- a/resources/views/backend/users/changePassword.blade.php +++ b/resources/views/backend/users/changePassword.blade.php @@ -21,11 +21,8 @@ {{ __($module_title) }} {{ __($module_action) }} - - @lang(':module_name Management Dashboard', ['module_name' => Str::title($module_name)]) - - + diff --git a/resources/views/backend/users/create.blade.php b/resources/views/backend/users/create.blade.php index ae4518868..e42078f6f 100644 --- a/resources/views/backend/users/create.blade.php +++ b/resources/views/backend/users/create.blade.php @@ -22,7 +22,7 @@ class="text-muted">{{ __($module_action) }} - + diff --git a/resources/views/backend/users/edit.blade.php b/resources/views/backend/users/edit.blade.php index 2011f6312..3d6c42adc 100644 --- a/resources/views/backend/users/edit.blade.php +++ b/resources/views/backend/users/edit.blade.php @@ -8,7 +8,7 @@ @section('breadcrumbs') - {{ $$module_name_singular->name }} - {{ $$module_name_singular->username }} + {{ $$module_name_singular->name }} {{ __($module_title) }} diff --git a/resources/views/backend/users/index_datatable.blade.php b/resources/views/backend/users/index_datatable.blade.php index f51c0b3af..cf5969180 100644 --- a/resources/views/backend/users/index_datatable.blade.php +++ b/resources/views/backend/users/index_datatable.blade.php @@ -15,14 +15,11 @@ {{ __($module_title) }} {{ __($module_action) }} - - @lang(":module_name Management Dashboard", ['module_name'=>Str::title($module_name)]) - - +
-
    diff --git a/resources/views/backend/users/show.blade.php b/resources/views/backend/users/show.blade.php index a395d6558..169812872 100644 --- a/resources/views/backend/users/show.blade.php +++ b/resources/views/backend/users/show.blade.php @@ -8,7 +8,7 @@ @section('breadcrumbs') - {{ $$module_name_singular->name }} - {{ $$module_name_singular->username }} + {{ $$module_name_singular->name }} {{ __($module_title) }} @@ -20,16 +20,15 @@ - {{ $$module_name_singular->name }} - - {{ $$module_name_singular->username }} {{ __($module_title) }} + {{ $$module_name_singular->name }} {{ __($module_title) }} {{ __($module_action) }} - - + List + route='{!! route("backend.$module_name.edit", $$module_name_singular) !!}' :small=true /> From 4c9d6e1718c389cd33818b0886db1929a8d92f07 Mon Sep 17 00:00:00 2001 From: Nasir Khan Saikat Date: Sun, 21 Apr 2024 21:00:31 +0600 Subject: [PATCH 5/5] ++ --- resources/views/backend/users/edit.blade.php | 16 ++++++++-------- .../components/backend/buttons/save.blade.php | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/resources/views/backend/users/edit.blade.php b/resources/views/backend/users/edit.blade.php index 3d6c42adc..33eff39f1 100644 --- a/resources/views/backend/users/edit.blade.php +++ b/resources/views/backend/users/edit.blade.php @@ -51,7 +51,7 @@
    @@ -63,7 +63,7 @@
    @@ -75,7 +75,7 @@
    @@ -87,7 +87,7 @@
    @@ -102,7 +102,7 @@
    @@ -135,7 +135,7 @@
    @@ -147,7 +147,7 @@
    diff --git a/resources/views/components/backend/buttons/save.blade.php b/resources/views/components/backend/buttons/save.blade.php index 109bef200..2c472d668 100644 --- a/resources/views/components/backend/buttons/save.blade.php +++ b/resources/views/components/backend/buttons/save.blade.php @@ -1,2 +1,2 @@ @props(["small"=>""]) -{{ html()->submit($text = icon('fas fa-save fa-fw')." Save")->class('btn btn-success m-1'.(($small=='true')? ' btn-sm' : '')) }} \ No newline at end of file +{{ html()->submit($text = icon('fa-solid fa-floppy-disk fa-fw')." ".__('Save'))->class('btn btn-success m-1'.(($small=='true')? ' btn-sm' : '')) }}