From 58746d9eecbf16f1433112777985b68bedc4323d Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Mon, 30 Mar 2015 18:20:53 +0300 Subject: [PATCH] Working on users in L5 --- .../Controllers/Auth/PasswordController.php | 2 + app/Http/routes.php | 6 +- ...30_100000_create_password_resets_table.php | 33 +++++ resources/views/auth/login.blade.php | 4 +- .../password.blade.php} | 18 ++- .../reset.blade.php} | 26 ++-- ...eset_html.blade.php => password.blade.php} | 2 +- resources/views/users/login.blade.php | 119 ------------------ 8 files changed, 76 insertions(+), 134 deletions(-) create mode 100644 database/migrations/2015_03_30_100000_create_password_resets_table.php rename resources/views/{users/forgot_password.blade.php => auth/password.blade.php} (77%) rename resources/views/{users/reset_password.blade.php => auth/reset.blade.php} (69%) rename resources/views/emails/{passwordreset_html.blade.php => password.blade.php} (67%) delete mode 100644 resources/views/users/login.blade.php diff --git a/app/Http/Controllers/Auth/PasswordController.php b/app/Http/Controllers/Auth/PasswordController.php index 3106193591ce..3741a8157983 100644 --- a/app/Http/Controllers/Auth/PasswordController.php +++ b/app/Http/Controllers/Auth/PasswordController.php @@ -20,6 +20,8 @@ class PasswordController extends Controller { use ResetsPasswords; + protected $redirectTo = '/dashboard'; + /** * Create a new password controller instance. * diff --git a/app/Http/routes.php b/app/Http/routes.php index 0675fbe21180..52d83cf57e59 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -66,8 +66,10 @@ post('/signup', array('as' => 'signup', 'uses' => 'Auth\AuthController@postRegis get('/login', array('as' => 'login', 'uses' => 'Auth\AuthController@getLogin')); post('/login', array('as' => 'login', 'uses' => 'Auth\AuthController@postLogin')); get('/logout', array('as' => 'logout', 'uses' => 'Auth\AuthController@getLogout')); -get('/forgot', array('as' => 'forgot', 'uses' => 'Auth\AuthController@getLogin')); -post('/forgot', array('as' => 'forgot', 'uses' => 'Auth\AuthController@postLogin')); +get('/forgot', array('as' => 'forgot', 'uses' => 'Auth\PasswordController@getEmail')); +post('/forgot', array('as' => 'forgot', 'uses' => 'Auth\PasswordController@postEmail')); +get('/password/reset', array('as' => 'forgot', 'uses' => 'Auth\PasswordController@getReset')); +post('/password/reset', array('as' => 'forgot', 'uses' => 'Auth\PasswordController@postReset')); /* // Confide routes diff --git a/database/migrations/2015_03_30_100000_create_password_resets_table.php b/database/migrations/2015_03_30_100000_create_password_resets_table.php new file mode 100644 index 000000000000..679df38f8838 --- /dev/null +++ b/database/migrations/2015_03_30_100000_create_password_resets_table.php @@ -0,0 +1,33 @@ +string('email')->index(); + $table->string('token')->index(); + $table->timestamp('created_at'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::drop('password_resets'); + } + +} diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index cd5993158e7d..3e68c0ea9499 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -65,10 +65,10 @@ {!! Former::password('password')->placeholder(trans('texts.password'))->raw() !!}

-

{!! Button::primary(trans('texts.lets_go'))->withAttributes(array('class' => 'btn-lg'))->submit()->block() !!}

+

{!! Button::success(trans('texts.lets_go'))->withAttributes(array('class' => 'btn-lg'))->submit()->block() !!}

- {!! link_to('forgot_password', trans('texts.forgot_password')) !!} + {!! link_to('/forgot', trans('texts.forgot_password')) !!}

diff --git a/resources/views/users/forgot_password.blade.php b/resources/views/auth/password.blade.php similarity index 77% rename from resources/views/users/forgot_password.blade.php rename to resources/views/auth/password.blade.php index 4393ecec83f3..c2f563b030b1 100644 --- a/resources/views/users/forgot_password.blade.php +++ b/resources/views/auth/password.blade.php @@ -53,7 +53,7 @@ @section('body')
-{!! Former::open('forgot_password')->rules(['email' => 'required|email'])->addClass('form-signin') !!} +{!! Former::open('forgot')->rules(['email' => 'required|email'])->addClass('form-signin') !!}

Invoice Ninja | {{ trans('texts.password_recovery') }}

@@ -63,7 +63,21 @@ {!! Former::text('email')->placeholder(trans('texts.email_address'))->raw() !!}

-

{!! Button::normal(trans('texts.send_email'))->withAttributes(array('class' => 'btn-lg'))->submit()->block() !!}

+

{!! Button::success(trans('texts.send_email'))->withAttributes(array('class' => 'btn-lg'))->submit()->block() !!}

+ + @if (count($errors->all())) +
+ @foreach ($errors->all() as $error) +
  • {{ $error }}
    • + @endforeach +
    + @endif + + @if (session('status')) +
    + {{ session('status') }} +
    + @endif @if (Session::has('warning')) diff --git a/resources/views/users/reset_password.blade.php b/resources/views/auth/reset.blade.php similarity index 69% rename from resources/views/users/reset_password.blade.php rename to resources/views/auth/reset.blade.php index 1c4e7750b503..7bdf2a66a550 100644 --- a/resources/views/users/reset_password.blade.php +++ b/resources/views/auth/reset.blade.php @@ -53,10 +53,10 @@ @section('body')
    - {{ Former::open('user/reset')->addClass('form-signin')->rules(array( - 'password' => 'required', - 'password_confirmation' => 'required', - )); }} + {!! Former::open('/password/reset')->addClass('form-signin')->rules(array( + 'password' => 'required', + 'password_confirmation' => 'required', + )) !!}
    @@ -66,12 +66,22 @@

    - {{ Former::password('password')->placeholder(trans('texts.password'))->raw() }} - {{ Former::password('password_confirmation')->placeholder(trans('texts.confirm_password'))->raw() }} + {!! Former::text('email')->placeholder(trans('texts.email'))->raw() !!} + {!! Former::password('password')->placeholder(trans('texts.password'))->raw() !!} + {!! Former::password('password_confirmation')->placeholder(trans('texts.confirm_password'))->raw() !!}

    -

    {{ Button::success_submit(trans('texts.save'), array('class' => 'btn-lg'))->block() }}

    +

    {!! Button::success(trans('texts.save'), array('class' => 'btn-lg'))->submit()->block() !!}

    + + + @if (count($errors->all())) +
    + @foreach ($errors->all() as $error) +
  • {{ $error }}
    • + @endforeach +
    + @endif @if (Session::has('warning')) @@ -87,7 +97,7 @@ @endif - {{ Former::close() }} + {!! Former::close() !!}
    diff --git a/resources/views/emails/passwordreset_html.blade.php b/resources/views/emails/password.blade.php similarity index 67% rename from resources/views/emails/passwordreset_html.blade.php rename to resources/views/emails/password.blade.php index 52ad2763ed5f..b42fc337f5e8 100644 --- a/resources/views/emails/passwordreset_html.blade.php +++ b/resources/views/emails/password.blade.php @@ -1,7 +1,7 @@ {{ trans('texts.email_salutation', ['name' => $user->username]) }}

    {{ trans('texts.reset_password') }}
    -{{{ (Confide::checkAction('UserController@reset_password', array($token))) ? : URL::to('user/reset/'.$token) }}}

    +{!! url('password/reset/'.$token) !!}

    {{ trans('texts.email_signature') }}
    {{ trans('texts.email_from') }}

    diff --git a/resources/views/users/login.blade.php b/resources/views/users/login.blade.php deleted file mode 100644 index d0dc37fd0cde..000000000000 --- a/resources/views/users/login.blade.php +++ /dev/null @@ -1,119 +0,0 @@ -@extends('master') - -@section('head') - - - - - - -@endsection - -@section('body') -

    - - - {!! Former::open('login')->rules(['login_email' => 'required|email', 'login_password' => 'required'])->addClass('form-signin') !!} -
    - -

    Invoice Ninja | {{ trans('texts.account_login') }}

    -
    -

    - {{ $errors->first('login_email') }} - {{ $errors->first('login_password') }} -

    - -

    - {!! Former::text('login_email')->placeholder(trans('texts.email_address'))->raw() !!} - {!! Former::password('login_password')->placeholder(trans('texts.password'))->raw() !!} -

    - -

    {!! Button::primary(trans('texts.lets_go'))->withAttributes(array('class' => 'btn-lg'))->submit()->block() !!}

    - -

    - {!! link_to('forgot_password', trans('texts.forgot_password')) !!} -

    - - - @if (Session::has('warning')) -
    {{ Session::get('warning') }}
    - @endif - - @if (Session::has('message')) -
    {{ Session::get('message') }}
    - @endif - - @if (Session::has('error')) -
    {{ Session::get('error') }}
    - @endif - -
    - - {!! Former::close() !!} - - @if (!Utils::isNinja()) -

    -

    -
    - - -
       - - - - - -
    - @endif - -
    - - @endsection \ No newline at end of file