From cacad9a8f9146557655ac9f6cd3ead68d032c451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Wed, 20 Jan 2016 23:29:00 +0100 Subject: [PATCH] FEATURE: add somehow final login form. Currently, this form does not point to any existing (resp. working) methods for authentication. For this purpose I need to develop some functionality to add user and have some data for testing. --- app/Http/Controllers/Admin/Login.php | 36 ++++++++++++++ app/Http/Controllers/Admin/LoginForm.php | 15 ------ app/Http/routes.php | 12 +++-- resources/assets/css/admin.css | 9 ++++ resources/lang/en/admin/loginForm.php | 10 ++++ resources/views/admin/layout.blade.php | 9 ++-- .../views/admin/loginForm/form.blade.php | 47 +++++++++++++++++-- 7 files changed, 113 insertions(+), 25 deletions(-) create mode 100644 app/Http/Controllers/Admin/Login.php delete mode 100644 app/Http/Controllers/Admin/LoginForm.php create mode 100644 resources/lang/en/admin/loginForm.php diff --git a/app/Http/Controllers/Admin/Login.php b/app/Http/Controllers/Admin/Login.php new file mode 100644 index 00000000..29186fdb --- /dev/null +++ b/app/Http/Controllers/Admin/Login.php @@ -0,0 +1,36 @@ + 'required|max:255', + 'email' => 'required|email|max:255|unique:users', + 'password' => 'required|confirmed|min:6', + ]); + } + + /** + * @param Request $request + */ + public function postLogin(Request $request) + { + } +} diff --git a/app/Http/Controllers/Admin/LoginForm.php b/app/Http/Controllers/Admin/LoginForm.php deleted file mode 100644 index 762f9054..00000000 --- a/app/Http/Controllers/Admin/LoginForm.php +++ /dev/null @@ -1,15 +0,0 @@ - ['web']], function () { - Route::get('login', 'Admin\LoginForm@showLoginForm'); + Route::get('login', function () { + return view('admin.loginForm.form'); + }); + + // POST methods + Route::post('admin/login', 'Admin\Login@postLogin') + ->name('login'); }); +// list of admin routes Route::group([ 'middleware' => ['auth'], 'namespace' => 'Admin', 'prefix' => 'admin' ], function () { - Route::get('/', 'Dashboard@showIndex'); + Route::get('/', 'Dashboard@getIndex'); }); - diff --git a/resources/assets/css/admin.css b/resources/assets/css/admin.css index e69de29b..72a44e85 100644 --- a/resources/assets/css/admin.css +++ b/resources/assets/css/admin.css @@ -0,0 +1,9 @@ + + + + + + +.login-form { + margin-top: 4em; +} \ No newline at end of file diff --git a/resources/lang/en/admin/loginForm.php b/resources/lang/en/admin/loginForm.php new file mode 100644 index 00000000..39480e22 --- /dev/null +++ b/resources/lang/en/admin/loginForm.php @@ -0,0 +1,10 @@ + 'Login form', + 'formHeading' => 'Login with your e-mail', + 'email' => 'E-mail used for login', + 'password' => 'Password', + 'rememberMe' => 'Remember me', + 'forgottenPassword' => 'Did you forgot your password?', + 'login' => 'Login' +]; \ No newline at end of file diff --git a/resources/views/admin/layout.blade.php b/resources/views/admin/layout.blade.php index 46c89b91..b95026d2 100644 --- a/resources/views/admin/layout.blade.php +++ b/resources/views/admin/layout.blade.php @@ -6,16 +6,17 @@ @yield('head_meta') @yield('pageName') {{$vendorName}} - + + @yield('head_stylesheets') @yield('content') - - - + + + @yield('javascripts') diff --git a/resources/views/admin/loginForm/form.blade.php b/resources/views/admin/loginForm/form.blade.php index 8668828b..f20ab3d8 100644 --- a/resources/views/admin/loginForm/form.blade.php +++ b/resources/views/admin/loginForm/form.blade.php @@ -1,9 +1,50 @@ @extends('admin.layout') {{--Set page name--}} -@section('pageName', 'Login form') +@section('pageName', @trans('admin/loginForm.pageName')) @section('content') - @parent - {{$something}} + +
+ +
@stop \ No newline at end of file