Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
51 changes: 1 addition & 50 deletions app/Http/Controllers/AdminController.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,6 @@ public function unBan(User $user)
return redirect()->back()->with('success', 'User Status Changed');
}

public function delete(User $user)
{
$user->delete();
return redirect()->back()->with('success', 'User Deleted');
}

public function create()
{
Expand All @@ -66,52 +61,8 @@ public function create()

public function store(ProfileRequest $request)
{
$this->userService->storeUser($request);
$this->userService->storeUser($request->all());
return redirect()->back()->with('success', 'Librarian Added');
}

/**
* Display the specified resource.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function show($id)
{
//
}

/**
* Show the form for editing the specified resource.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function edit($id)
{
//
}

/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param int $id
* @return \Illuminate\Http\Response
*/
public function update(Request $request, $id)
{
//
}

/**
* Remove the specified resource from storage.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function destroy($id)
{
//
}
}
4 changes: 2 additions & 2 deletions app/Http/Controllers/AuthorController.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public function create()
*/
public function store(AuthorRequest $request)
{
$this->authorService->storeAuthor($request);
$this->authorService->storeAuthor($request->all());
return redirect()->back()->with('success', 'Author Added');
}

Expand Down Expand Up @@ -80,7 +80,7 @@ public function edit(Author $author)
*/
public function update(AuthorRequest $request, Author $author)
{
$this->authorService->updateAuthor($request, $author);
$this->authorService->updateAuthor($request->all(), $author);
return redirect()->back()->with('success', 'Author updated');
}

Expand Down
10 changes: 8 additions & 2 deletions app/Http/Controllers/UserController.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,14 @@ public function dashboard()

public function profileUpdate(ProfileRequest $request)
{
$profile = $this->userService->getUser($request->id);
$this->userService->updateUser($request, $profile);

$this->userService->updateUser($request->all(), $request->id);
return redirect()->back()->with('success', 'Profile updated');
}

public function destroy(User $user)
{
$this->userService->destroy($user);
return redirect()->back()->with('success', 'User Deleted');
}
}
6 changes: 5 additions & 1 deletion app/Http/Requests/ProfileRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace App\Http\Requests;

use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;

class ProfileRequest extends FormRequest
{
Expand All @@ -25,7 +26,10 @@ public function rules()
{
return [
'name' => 'required',
'email' => 'required|email|unique:users',
'email' => [
'required',
Rule::unique('users')->ignore($this->id),
],
'password' => 'sometimes|confirmed'
];
}
Expand Down
9 changes: 5 additions & 4 deletions app/Services/AuthorService.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace App\Services;

use App\Models\Author;
use Illuminate\Support\Arr;

class AuthorService
{
Expand All @@ -16,8 +17,8 @@ public function __construct(FileService $file)
public function storeAuthor($request)
{
$author = new Author();
$author->name = $request->name;
$author->description = $request->name;
$author->name = $request["name"];
$author->description = $request["description"];
if ($request->hasFile('image')) {
if ($request->file('image')->isValid()) {
$author->image = $this->file->storeFile($request->file('image'));
Expand All @@ -28,8 +29,8 @@ public function storeAuthor($request)

public function updateAuthor($request, $author)
{
$author->name = $request->name;
$author->description = $request->name;
$author->name = $request["name"];
$author->description = $request["description"];
if ($request->hasFile('image')) {
if ($request->file('image')->isValid()) {
$this->file->removeFile($author->image);
Expand Down
27 changes: 17 additions & 10 deletions app/Services/UserService.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,28 @@ class UserService
{
public function getUser($user)
{
return User::where('id', $user)->first();
return User::find($user);
}

public function updateUser($request, $profile)
public function updateUser($request, $id)
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rename the parameter to $data, instead of $request. Update in all the methods in Service classes.

{
$profile->name = $request->name;
$profile->email = $request->email;
if ($request->filled('password')) {
$profile->password = Hash::make($request->password);
$profile=$this->getUser($id);
$profile->name = $request['name'];
$profile->email = $request['email'];
if (isset($request['password'])) {
$profile->password = Hash::make($request['password']);
}
$profile->update();
}

public function storeUser($request)
{
$user = new User();
$user->name = $request->name;
$user->phone = $request->phone;
$user->email = $request->email;
$user->name = $request["name"];
$user->phone = $request["phone"];
$user->email = $request["email"];
$user->role = User::ROLE_LIBRARIAN;
$user->password = Hash::make($request->password);
$user->password = Hash::make($request["password"]);
$user->save();
}

Expand All @@ -44,4 +45,10 @@ public function unBan($user)
$user->is_banned = 0;
$user->update();
}

public function destroy($user)
{
dd($user);
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove it.

$user->delete();
}
}
2 changes: 1 addition & 1 deletion resources/views/admin/user/list.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ class="inline-flex items-center border border-gray-300 rounded-md shadow-sm text

</button>
</span>
<form action="{{route('user-delete',$user->id)}}" style="display: none;" id="delete-form{{$user->id}}" method="post">
<form action="{{route('user.destroy',$user)}}" style="display: none;" id="delete-form{{$user->id}}" method="post">
@csrf
@method("DELETE")
</form>
Expand Down
2 changes: 1 addition & 1 deletion routes/web.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
Route::put('users/{user}/ban',[AdminController::class,'ban'])->name('ban');
Route::put('users/{user}/un-ban',[AdminController::class,'unBan'])->name('unBan');
Route::get('users',[AdminController::class,'index'])->name('user-list');
Route::delete('users/{user}/delete',[AdminController::class,'delete'])->name('user-delete');
Route::delete('users/{user}',[UserController::class,'destroy'])->name('user.destroy');
});

require __DIR__.'/auth.php';