NW/FleetCart
1
0
Fork 0
Code Issues 4 Pull Requests Packages Projects 1 Releases Wiki Activity

¨4.0.1¨

Browse Source
This commit is contained in:
¨NW¨
2023-12-03 14:07:47 +00:00
parent c08b36d1b6
commit f35052522d
1112 changed files with 43019 additions and 24987 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
Modules/User/Http/Controllers/Admin/AuthController.php
View File

@@ -2,12 +2,36 @@
namespace Modules\User\Http\Controllers\Admin;
use Illuminate\Http\Response;
use Modules\User\Entities\User;
use Modules\User\Http\Controllers\BaseAuthController;
class AuthController extends BaseAuthController
{
/**
* Where to redirect users after login..
* Show login form.
*
* @return Response
*/
public function getLogin()
{
return view('user::admin.auth.login');
}
/**
* Show reset password form.
*
* @return Response
*/
public function getReset()
{
return view('user::admin.auth.reset.begin');
}
/**
* Where to redirect users after login.
*
* @return string
*/
@@ -16,6 +40,7 @@ class AuthController extends BaseAuthController
return route('admin.dashboard.index');
}
/**
* The login URL.
*
@@ -26,31 +51,13 @@ class AuthController extends BaseAuthController
return route('admin.login');
}
/**
* Show login form.
*
* @return \Illuminate\Http\Response
*/
public function getLogin()
{
return view('user::admin.auth.login');
}
/**
* Show reset password form.
*
* @return \Illuminate\Http\Response
*/
public function getReset()
{
return view('user::admin.auth.reset.begin');
}
/**
* Reset complete form route.
*
* @param \Modules\User\Entities\User $user
* @param User $user
* @param string $code
*
* @return string
*/
protected function resetCompleteRoute($user, $code)
@@ -58,6 +65,7 @@ class AuthController extends BaseAuthController
return route('admin.reset.complete', [$user->email, $code]);
}
/**
* Password reset complete view.
*

19
Modules/User/Http/Controllers/Admin/ProfileController.php
View File

@@ -2,6 +2,8 @@
namespace Modules\User\Http\Controllers\Admin;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Modules\Admin\Ui\Facades\TabManager;
use Modules\User\Http\Requests\UpdateProfileRequest;
@@ -10,8 +12,9 @@ class ProfileController
/**
* Show the form for editing the specified resource.
*
* @param int $id
* @return \Illuminate\Http\Response
* @param int $id
*
* @return Response
*/
public function edit()
{
@@ -20,11 +23,13 @@ class ProfileController
return view('user::admin.profile.edit', compact('tabs'));
}
/**
* Update the specified resource in storage.
*
* @param \Modules\User\Http\Requests\UpdateProfileRequest $request
* @return \Illuminate\Http\Response
* @param UpdateProfileRequest $request
*
* @return Response
*/
public function update(UpdateProfileRequest $request)
{
@@ -32,15 +37,17 @@ class ProfileController
auth()->user()->update($request->all());
return back()->withSuccess(trans('admin::messages.resource_saved', [
return back()->withSuccess(trans('admin::messages.resource_updated', [
'resource' => trans('user::users.profile'),
]));
}
/**
* Bcrypt user password.
*
* @param \Illuminate\Http\Request $request
* @param Request $request
*
* @return void
*/
private function bcryptPassword($request)

19
Modules/User/Http/Controllers/Admin/UserController.php
View File

@@ -2,6 +2,7 @@
namespace Modules\User\Http\Controllers\Admin;
use Illuminate\Http\Response;
use Modules\User\Entities\User;
use Modules\Admin\Traits\HasCrudActions;
use Modules\User\Http\Requests\SaveUserRequest;
@@ -39,11 +40,13 @@ class UserController
*/
protected $validation = SaveUserRequest::class;
/**
* Store a newly created resource in storage.
*
* @param \Modules\User\Http\Requests\SaveUserRequest $request
* @return \Illuminate\Http\Response
* @param SaveUserRequest $request
*
* @return Response
*/
public function store(SaveUserRequest $request)
{
@@ -56,15 +59,17 @@ class UserController
Activation::complete($user, Activation::create($user)->code);
return redirect()->route('admin.users.index')
->withSuccess(trans('admin::messages.resource_saved', ['resource' => trans('user::users.user')]));
->withSuccess(trans('admin::messages.resource_created', ['resource' => trans('user::users.user')]));
}
/**
* Update the specified resource in storage.
*
* @param int $id
* @param \Modules\User\Http\Requests\SaveUserRequest $request
* @return \Illuminate\Http\Response
* @param SaveUserRequest $request
*
* @return Response
*/
public function update($id, SaveUserRequest $request)
{
@@ -80,7 +85,7 @@ class UserController
$user->roles()->sync($request->roles);
if (! Activation::completed($user) && $request->activated === '1') {
if (!Activation::completed($user) && $request->activated === '1') {
Activation::complete($user, Activation::create($user)->code);
}
@@ -89,6 +94,6 @@ class UserController
}
return redirect()->route('admin.users.index')
->withSuccess(trans('admin::messages.resource_saved', ['resource' => trans('user::users.user')]));
->withSuccess(trans('admin::messages.resource_updated', ['resource' => trans('user::users.user')]));
}
}

8
Modules/User/Http/Controllers/Admin/UserResetPasswordController.php
View File

@@ -2,6 +2,8 @@
namespace Modules\User\Http\Controllers\Admin;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Modules\User\Entities\User;
use Illuminate\Support\Facades\Mail;
use Modules\User\Mail\ResetPasswordEmail;
@@ -12,8 +14,9 @@ class UserResetPasswordController
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
* @param Request $request
*
* @return Response
*/
public function store($id, Authentication $auth)
{
@@ -28,6 +31,7 @@ class UserResetPasswordController
->withSuccess(trans('user::messages.users.reset_password_email_sent'));
}
private function getResetCompleteURL($user, $code)
{
return route('admin.reset.complete', [$user->email, $code]);