diff --git a/app/Http/Controllers/Admin/UserManagement.php b/app/Http/Controllers/Admin/UserManagement.php index 07cb8d8e..c6af35e6 100644 --- a/app/Http/Controllers/Admin/UserManagement.php +++ b/app/Http/Controllers/Admin/UserManagement.php @@ -4,8 +4,8 @@ namespace App\Http\Controllers\Admin; use App\Http\Controllers\Controller; use App\Http\Requests; +use App\Http\Requests\CreateNewUserRequest; use App\Models\User; -use Illuminate\Contracts\Hashing\Hasher; use Illuminate\Http\Request; use Illuminate\Support\Facades\Hash; @@ -43,18 +43,12 @@ class UserManagement extends Controller * * This method saves new user into database * - * @param Request $request + * @param CreateNewUserRequest $request + * + * @return \Illuminate\Http\RedirectResponse */ - protected function postRegistration(Request $request) + protected function postRegistration(CreateNewUserRequest $request) { - - // validate input data - $this->validate($request, [ - 'role' => 'required', - 'email' => 'required|email|max:128|unique:users', - 'password' => 'required|min:6' - ]); - // when user did not provide any username, use his email $username = isset($request->username) && !empty($request->username) ? $request->username : $request->email; @@ -68,6 +62,10 @@ class UserManagement extends Controller // store user into database $user->save(); - // @todo add some redirect, inform user etc. + + // refresh page with information about successfull registration + return redirect() + ->route('users.new') + ->with('message', trans('admin/userManagement.registrationSuccessfull')); } } diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index fb6411f6..074f8f9d 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -17,12 +17,12 @@ class Authenticate */ public function handle($request, Closure $next, $guard = null) { - if (Auth::check()) { + if (!Auth::check($guard)) { if ($request->ajax()) { return response('Unauthorized.', 401); - } else { - return redirect()->guest('login'); } + + return redirect()->guest('login'); } return $next($request); diff --git a/app/Http/Requests/CreateNewUserRequest.php b/app/Http/Requests/CreateNewUserRequest.php new file mode 100644 index 00000000..f2693b29 --- /dev/null +++ b/app/Http/Requests/CreateNewUserRequest.php @@ -0,0 +1,34 @@ +role == User::ROLE_ADMIN; + } + + /** + * Get the validation rules that apply to the request. + * + * @return array + */ + public function rules() + { + return [ + 'role' => 'required', + 'email' => 'required|email|max:128|unique:users', + 'password' => 'required|min:6' + ]; + } +} diff --git a/app/Http/routes.php b/app/Http/routes.php index a8c1c477..0980a1d3 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -20,13 +20,13 @@ Route::group(['middleware' => ['web']], function () { * This route group serves to handle request in admin */ Route::group([ -// 'middleware' => ['auth'], - 'namespace' => 'Admin', - 'prefix' => 'admin' + // 'middleware' => ['auth'], + 'namespace' => 'Admin', + 'prefix' => 'admin' ], function () { - // display dashboard with some usefull information - Route::get('/', 'Dashboard@getIndex'); + Route::get('/', 'Dashboard@getIndex') + ->name('admin.dashboard'); // display form for creating new user Route::get('admin/users/new', 'UserManagement@getNewUser') @@ -43,8 +43,4 @@ Route::group([ // display list of all users registered into our system Route::get('admin/users/overview/{state?}', 'UserManagement@getOverview') ->name('users.overview'); - - // POST methods - Route::post('login', 'Admin\Login@postLogin') - ->name('login'); }); diff --git a/resources/lang/en/admin/userManagement.php b/resources/lang/en/admin/userManagement.php index 093c6910..2e187734 100644 --- a/resources/lang/en/admin/userManagement.php +++ b/resources/lang/en/admin/userManagement.php @@ -8,6 +8,7 @@ return [ 'role_admin' => 'Admin', 'role_editor' => 'Editor', 'role_visitor' => 'Visitor', - 'register' => 'Create user' + 'register' => 'Create user', + 'registrationSuccessfull' => 'New user successfully added.' ]; \ No newline at end of file diff --git a/resources/views/admin/loginForm/form.blade.php b/resources/views/admin/loginForm/form.blade.php index daee0f08..543e69fd 100644 --- a/resources/views/admin/loginForm/form.blade.php +++ b/resources/views/admin/loginForm/form.blade.php @@ -1,9 +1,16 @@ -@extends('admin.layout') - -{{--Set page name--}} -@section('pageName', @trans('admin/loginForm.pageName')) - -@section('content') + + +
+ + + + @yield('head_meta') +