From 9d5015aef238b9c12b3e04210f749302d51bc617 Mon Sep 17 00:00:00 2001
From: Kawlll Maxso <muhdazreen12@gmail.com>
Date: Fri, 22 Mar 2019 10:05:07 +0800
Subject: [PATCH 1/3] Forgot Account

---
 .../Accounts/ForgotAccountLogic.php           | 62 +++++++++++++++++++
 .../Account/ForgotAccountController.php       | 50 +++++++++++++++
 .../Auth/ForgotPasswordController.php         |  5 ++
 .../pages/authentication/forgot.blade.php     | 55 ++++++++++++++++
 routes/web.php                                |  3 +
 5 files changed, 175 insertions(+)
 create mode 100644 app/Classes/Modules/ControllersLogic/Accounts/ForgotAccountLogic.php
 create mode 100644 app/Http/Controllers/Account/ForgotAccountController.php
 create mode 100644 resources/views/pages/authentication/forgot.blade.php

diff --git a/app/Classes/Modules/ControllersLogic/Accounts/ForgotAccountLogic.php b/app/Classes/Modules/ControllersLogic/Accounts/ForgotAccountLogic.php
new file mode 100644
index 0000000..b71e334
--- /dev/null
+++ b/app/Classes/Modules/ControllersLogic/Accounts/ForgotAccountLogic.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Classes\Modules\ControllersLogic\Accounts;
+
+
+use App\Classes\Modules\Accounts\DataTransferObjects\UserInvitationObject;
+use App\Classes\Modules\Accounts\Services\CreatesUserInvitation;
+use App\Classes\Modules\Accounts\Validation\CanSendAccountInvitation;
+use App\Classes\Modules\ControllerLogic\Exceptions\InternalServerErrorException;
+use App\Classes\Modules\ControllerLogic\Exceptions\ResourceConflictException;
+use App\Classes\ValueObjects\Constants\HttpStatus;
+use App\Events\Accounts\UserInvited;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ForgotAccountLogic
+{
+
+    /** @var CreatesUserInvitation */
+    private $createUserInvitation;
+
+    /** @var CanSendAccountInvitation */
+    private $canSendAccountInvitation;
+
+    /**
+     * CreateAccountInvitationLogic constructor.
+     * @param CreatesUserInvitation $createUserInvitation
+     * @param CanSendAccountInvitation $canSendAccountInvitation
+     */
+    public function __construct(CreatesUserInvitation $createUserInvitation, CanSendAccountInvitation $canSendAccountInvitation)
+    {
+        $this->createUserInvitation = $createUserInvitation;
+        $this->canSendAccountInvitation = $canSendAccountInvitation;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws InternalServerErrorException
+     */
+    public function execute(Request $request) {
+
+        try {
+
+            $object = new UserInvitationObject($request->get('role_id'), $request->get('email'));
+
+            if($this->canSendAccountInvitation->execute($object)){
+
+
+                $invitation = $this->createUserInvitation->execute($object);
+
+                event(new UserInvited($invitation));
+
+                return new JsonResponse("Invitation have been sent!", HttpStatus::RESOURCE_CREATED);
+            }
+
+        } catch (ResourceConflictException $exception) {
+            throw new InternalServerErrorException("Failed to send user invitation because {$exception->getMessage()}");
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Account/ForgotAccountController.php b/app/Http/Controllers/Account/ForgotAccountController.php
new file mode 100644
index 0000000..7f8cddb
--- /dev/null
+++ b/app/Http/Controllers/Account/ForgotAccountController.php
@@ -0,0 +1,50 @@
+<?php
+//namespace App\Http\Controllers\Account;
+//
+//use App\Classes\Modules\ControllersLogic\Accounts\ForgotAccountLogic;
+//use App\Http\Controllers\Controller;
+//use Illuminate\Http\JsonResponse;
+//use Illuminate\Http\RedirectResponse;
+//use Illuminate\Http\Request;
+//
+//class ForgotAccountController extends Controller
+//{
+//    /**
+//     * @param Request $request
+//     * @param ForgotAccountLogic $logic
+//     * @return JsonResponse
+//     * @throws \App\Classes\Modules\ControllerLogic\Exceptions\InternalServerErrorException
+//     * @throws \App\Classes\Modules\ControllerLogic\Exceptions\MalformedRequestException
+//     */
+//    public function forgot(Request $request, ForgotAccountLogic $logic): JsonResponse
+//    {
+//        return $logic->execute($request);
+//    }
+//}
+
+
+namespace App\Http\Controllers\Account;
+
+use Illuminate\Support\Facades\Mail;
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+
+class ForgotAccountController extends Controller
+{
+    /**
+     * Send an e-mail reminder to the user.
+     *
+     * @param  Request  $request
+     * @param  int  $id
+     * @return Response
+     */
+    public function forgot()
+    {
+
+        Mail::send('emails.reminder', ['user' => "ahmad"], function ($m) {
+            $m->from('2f114cfc66-6c1272@inbox.mailtrap.io', 'Your Application');
+
+            $m->to("2f114cfc66-6c1272@inbox.mailtrap.io", "ahmad")->subject('Your Reminder!');
+        });
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php
index 38e126f..46cbf98 100644
--- a/app/Http/Controllers/Auth/ForgotPasswordController.php
+++ b/app/Http/Controllers/Auth/ForgotPasswordController.php
@@ -28,4 +28,9 @@ class ForgotPasswordController extends Controller
     {
         $this->middleware('guest');
     }
+
+    public function showForgotForm()
+    {
+        return view('pages.authentication.forgot');
+    }
 }
diff --git a/resources/views/pages/authentication/forgot.blade.php b/resources/views/pages/authentication/forgot.blade.php
new file mode 100644
index 0000000..1c71992
--- /dev/null
+++ b/resources/views/pages/authentication/forgot.blade.php
@@ -0,0 +1,55 @@
+@extends('layouts.base')
+
+@section('content')
+    <div class="fluid-container h-100">
+        <div class="row no-margin" style=" min-height: 100%; ">
+            <div class="col no-padding" style="background-image: url({{asset('images/shipping_bg.jpeg')}}); background-position: center; background-size: cover;">
+                <div class="w-100 h-100 bg-primary" style="position: absolute; opacity: 0.1;"></div>
+            </div>
+            <div class="col-4 padding-50 bg-white">
+                <div class="row m-t-50">
+                    <div class="col m-t-50 p-l-0">
+                        <img src="{{asset('images/logo.png')}}" alt="logo" height="35">
+                    </div>
+                </div>
+                <div class="row m-t-50">
+                    <div class="col">
+                        <div class="inline v-align-middle">
+                            <h4 class="font-heading no-margin lh-28">Forget Your Password</h4>
+                            <p class="no-margin hint-text lh-18">Reset it using your credentials</p>
+                        </div>
+                    </div>
+                </div>
+                <div class="row m-t-10">
+                    <div class="col">
+                        <div class="row">
+                            <div class="col">
+                                @if($errors->any())
+                                    @foreach ($errors->all() as $error)
+                                        <div class="error">{{ $error }}</div>
+                                    @endforeach
+                                @endif
+                            </div>
+                        </div>
+                        <!-- START Login Form -->
+                        <form method="post" id="form-login" class="p-t-15" action="{{route('auth.forgot')}}">
+                            <div class="form-group form-group-default">
+                                <label>Username</label>
+                                <div class="controls">
+                                    <input name="email" placeholder="Email Address" class="form-control">
+                                </div>
+                            </div>
+                            <div class="row justify-content-end align-items-end">
+                                <div class="col-auto">
+                                    {{ csrf_field() }}
+                                    <button class="btn btn-primary btn-cons m-t-10 pull-right m-r-0">Reset</button>
+                                </div>
+                            </div>
+
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index ffcba5a..17ba750 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,6 +1,7 @@
 <?php
 
 Route::get('/', 'Auth\LoginController@showLoginForm')->name('login');
+Route::get('/forgot', 'Auth\ForgotPasswordController@showForgotForm')->name('login');
 
 Route::group(['prefix' => 'auth'], function () {
     Route::post('/login', 'Auth\LoginController@login')->name('auth.login');
@@ -9,6 +10,8 @@ Route::group(['prefix' => 'auth'], function () {
 
     Route::post('/registration/create', 'Account\RegisterAccountController@register')->name('auth.registration.create');
 
+    Route::post('/forgot', 'Account\ForgotAccountController@forgot')->name('auth.forgot');
+
     Route::get('/logout', 'Auth\LoginController@logout')->name('auth.logout');
 });
 

From 0eda89eb26c63716bfe3da7bf797ba85b87a06fa Mon Sep 17 00:00:00 2001
From: Kawlll Maxso <muhdazreen12@gmail.com>
Date: Mon, 25 Mar 2019 16:03:01 +0800
Subject: [PATCH 2/3] Forgot and change password

---
 resources/views/pages/authentication/forgot.blade.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/resources/views/pages/authentication/forgot.blade.php b/resources/views/pages/authentication/forgot.blade.php
index 1c71992..3dba811 100644
--- a/resources/views/pages/authentication/forgot.blade.php
+++ b/resources/views/pages/authentication/forgot.blade.php
@@ -52,4 +52,8 @@
             </div>
         </div>
     </div>
-@endsection
\ No newline at end of file
+<<<<<<< Updated upstream
+@endsection
+=======
+@endsection
+>>>>>>> Stashed changes

From 4f36e4909a36b7e79e2a3356fb475253bc974565 Mon Sep 17 00:00:00 2001
From: Kawlll Maxso <muhdazreen12@gmail.com>
Date: Thu, 28 Mar 2019 16:16:28 +0800
Subject: [PATCH 3/3] Forgot and change password

---
 .../Auth/ForgotPasswordController.php         |   5 -
 .../pages/authentication/login.blade.php      |   2 +-
 .../authentication/password/change.blade.php  | 120 ++++++++++++++++++
 .../{ => password}/forgot.blade.php           |  51 ++++++--
 routes/web.php                                |  12 +-
 5 files changed, 172 insertions(+), 18 deletions(-)
 create mode 100644 resources/views/pages/authentication/password/change.blade.php
 rename resources/views/pages/authentication/{ => password}/forgot.blade.php (51%)

diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php
index 46cbf98..38e126f 100644
--- a/app/Http/Controllers/Auth/ForgotPasswordController.php
+++ b/app/Http/Controllers/Auth/ForgotPasswordController.php
@@ -28,9 +28,4 @@ class ForgotPasswordController extends Controller
     {
         $this->middleware('guest');
     }
-
-    public function showForgotForm()
-    {
-        return view('pages.authentication.forgot');
-    }
 }
diff --git a/resources/views/pages/authentication/login.blade.php b/resources/views/pages/authentication/login.blade.php
index d6d7809..f2579d6 100644
--- a/resources/views/pages/authentication/login.blade.php
+++ b/resources/views/pages/authentication/login.blade.php
@@ -60,7 +60,7 @@
                                     </div>
                                     <div class="row m-t-5">
                                         <div class="col no-padding">
-                                            <small class="text-complete">Forgot your password?</small>
+                                            <a href="{{ route("password.forgot") }}"><small class="text-complete">Forgot your password?</small></a>
                                         </div>
                                     </div>
                                 </div>
diff --git a/resources/views/pages/authentication/password/change.blade.php b/resources/views/pages/authentication/password/change.blade.php
new file mode 100644
index 0000000..949e9b4
--- /dev/null
+++ b/resources/views/pages/authentication/password/change.blade.php
@@ -0,0 +1,120 @@
+@extends('layouts.base')
+
+@section('content')
+    <div class="fluid-container h-100">
+        <div class="row no-margin" style=" min-height: 100%; ">
+            <div class="col no-padding" style="background-image: url({{asset('images/shipping_bg.jpeg')}}); background-position: center; background-size: cover;">
+                <div class="w-100 h-100 bg-primary" style="position: absolute; opacity: 0.1;"></div>
+            </div>
+            <div class="col-4 padding-50 bg-white">
+                <div class="row m-t-50">
+                    <div class="col m-t-50 p-l-0">
+                        <img src="{{asset('images/logo.png')}}" alt="logo" height="35">
+                    </div>
+                </div>
+                <div class="row m-t-50">
+                    <div class="col">
+                        <div class="inline v-align-middle">
+                            <h4 class="font-heading no-margin lh-28">Change Your Password</h4>
+                        </div>
+                    </div>
+                </div>
+                <div class="row m-t-10">
+                    <div class="col">
+                        <div class="row">
+                            <div class="col">
+                                @if($errors->any())
+                                    @foreach ($errors->all() as $error)
+                                        <div class="error">{{ $error }}</div>
+                                    @endforeach
+                                @endif
+                            </div>
+                        </div>
+                        <form method="post" id="form-login" class="p-t-15" action="{{ route('password.update') }}">
+                            @csrf
+                            <input type="hidden" name="token" value="{{ $token }}">
+                            <div class="form-group form-group-default">
+                                <label>Email</label>
+                                <div class="controls">
+                                    <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ $email ?? old('email') }}" placeholder="Your Email" required autofocus>
+                                </div>
+                            </div>
+                            <div class="form-group form-group-default">
+                                <label>Password</label>
+                                <div class="controls">
+                                    <input type="password" class="form-control" name="password" placeholder="Credentials" required>
+                                    @if ($errors->has('password'))
+                                        <span class="invalid-feedback" role="alert">
+                                        <strong>{{ $errors->first('password') }}</strong>
+                                    </span>
+                                    @endif
+                                </div>
+                            </div>
+                            <div class="form-group form-group-default">
+                                <label>Confirm Password</label>
+                                <div class="controls">
+                                    <input id="password-confirm" type="password" class="form-control" name="password_confirmation" placeholder="Credentials" required>
+                                </div>
+                            </div>
+                            <div class="row justify-content-end align-items-end">
+                                <div class="col-auto">
+                                    <button type="submit" class="btn btn-primary btn-cons m-t-10 pull-right m-r-0">Change</button>
+                                </div>
+                            </div>
+                        </form>
+
+                        {{--<form method="POST" action="{{ route('password.update') }}">--}}
+                            {{--@csrf--}}
+
+                            {{--<input type="hidden" name="token" value="{{ $token }}">--}}
+
+                            {{--<div class="form-group row">--}}
+                                {{--<label for="email" class="col-md-4 col-form-label text-md-right">{{ __('E-Mail Address') }}</label>--}}
+
+                                {{--<div class="col-md-6">--}}
+                                    {{--<input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ $email ?? old('email') }}" required autofocus>--}}
+
+                                    {{--@if ($errors->has('email'))--}}
+                                        {{--<span class="invalid-feedback" role="alert">--}}
+                                        {{--<strong>{{ $errors->first('email') }}</strong>--}}
+                                    {{--</span>--}}
+                                    {{--@endif--}}
+                                {{--</div>--}}
+                            {{--</div>--}}
+
+                            {{--<div class="form-group row">--}}
+                                {{--<label for="password" class="col-md-4 col-form-label text-md-right">{{ __('Password') }}</label>--}}
+
+                                {{--<div class="col-md-6">--}}
+                                    {{--<input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" required>--}}
+
+                                    {{--@if ($errors->has('password'))--}}
+                                        {{--<span class="invalid-feedback" role="alert">--}}
+                                        {{--<strong>{{ $errors->first('password') }}</strong>--}}
+                                    {{--</span>--}}
+                                    {{--@endif--}}
+                                {{--</div>--}}
+                            {{--</div>--}}
+
+                            {{--<div class="form-group row">--}}
+                                {{--<label for="password-confirm" class="col-md-4 col-form-label text-md-right">{{ __('Confirm Password') }}</label>--}}
+
+                                {{--<div class="col-md-6">--}}
+                                    {{--<input id="password-confirm" type="password" class="form-control" name="password_confirmation" required>--}}
+                                {{--</div>--}}
+                            {{--</div>--}}
+
+                            {{--<div class="form-group row mb-0">--}}
+                                {{--<div class="col-md-6 offset-md-4">--}}
+                                    {{--<button type="submit" class="btn btn-primary">--}}
+                                        {{--{{ __('Reset Password') }}--}}
+                                    {{--</button>--}}
+                                {{--</div>--}}
+                            {{--</div>--}}
+                        {{--</form>--}}
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection
\ No newline at end of file
diff --git a/resources/views/pages/authentication/forgot.blade.php b/resources/views/pages/authentication/password/forgot.blade.php
similarity index 51%
rename from resources/views/pages/authentication/forgot.blade.php
rename to resources/views/pages/authentication/password/forgot.blade.php
index 3dba811..b8d9336 100644
--- a/resources/views/pages/authentication/forgot.blade.php
+++ b/resources/views/pages/authentication/password/forgot.blade.php
@@ -1,6 +1,33 @@
 @extends('layouts.base')
 
 @section('content')
+    @if (session('status'))
+        <div class="fluid-container h-100">
+            <div class="row no-margin" style="min-height: 100%; ">
+                <div class="card no-margin" style="background-image: url({{asset('images/shipping_bg.jpeg')}}); background-position: center; background-size: cover;">
+                    <div class="card-body row align-items-center justify-content-center">
+                        <div class="col-5 padding-50 bg-white text-center">
+                            <div class="password_panel">
+                                <div class="password_desc">
+                                    <i class="text-success fs-40 block"></i>
+                                    <h5 class="font-heading bold">We just sent an email to reset your password</h5>
+                                    <p class="text-muted no-margin p-b-20">Click on the link we've sent you to reset your password.
+                                        if you have not received an email, Please check your spambox</p>
+                                </div>
+                                <div class="row">
+                                    <div class="col no-padding text-center">
+                                        <a href="{{ route('login') }}">
+                                            <button class="btn btn-primary">Back to Login</button>
+                                        </a>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    @else
     <div class="fluid-container h-100">
         <div class="row no-margin" style=" min-height: 100%; ">
             <div class="col no-padding" style="background-image: url({{asset('images/shipping_bg.jpeg')}}); background-position: center; background-size: cover;">
@@ -31,29 +58,35 @@
                                 @endif
                             </div>
                         </div>
-                        <!-- START Login Form -->
-                        <form method="post" id="form-login" class="p-t-15" action="{{route('auth.forgot')}}">
+                        <form method="POST" action="{{ route('password.email') }}">
+                            @csrf
+
                             <div class="form-group form-group-default">
                                 <label>Username</label>
                                 <div class="controls">
-                                    <input name="email" placeholder="Email Address" class="form-control">
+                                    <input name="email" placeholder="Email Address" id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" required>
+                                </div>
+                                <div class="col-md-6">
+
+                                    @if ($errors->has('email'))
+                                        <span class="invalid-feedback" role="alert">
+                                        <strong>{{ $errors->first('email') }}</strong>
+                                    </span>
+                                    @endif
                                 </div>
                             </div>
+
                             <div class="row justify-content-end align-items-end">
                                 <div class="col-auto">
                                     {{ csrf_field() }}
                                     <button class="btn btn-primary btn-cons m-t-10 pull-right m-r-0">Reset</button>
                                 </div>
                             </div>
-
                         </form>
                     </div>
                 </div>
             </div>
         </div>
     </div>
-<<<<<<< Updated upstream
-@endsection
-=======
-@endsection
->>>>>>> Stashed changes
+    @endif
+@endsection
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 17ba750..f990d7a 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,7 +1,6 @@
 <?php
 
 Route::get('/', 'Auth\LoginController@showLoginForm')->name('login');
-Route::get('/forgot', 'Auth\ForgotPasswordController@showForgotForm')->name('login');
 
 Route::group(['prefix' => 'auth'], function () {
     Route::post('/login', 'Auth\LoginController@login')->name('auth.login');
@@ -10,7 +9,14 @@ Route::group(['prefix' => 'auth'], function () {
 
     Route::post('/registration/create', 'Account\RegisterAccountController@register')->name('auth.registration.create');
 
-    Route::post('/forgot', 'Account\ForgotAccountController@forgot')->name('auth.forgot');
+    Route::get('password/forgot', function () {
+        return view('pages.authentication.password.forgot');
+    })->name('password.forgot');
+    Route::post('password/email', 'Auth\ForgotPasswordController@sendResetLinkEmail')->name('password.email');
+    Route::get('password/reset/{token}', function ($token){
+        return view('pages.authentication.password.change',['token' => $token]);
+    })->name('password.reset');
+    Route::post('password/update', 'Auth\ResetPasswordController@reset')->name('password.update');
 
     Route::get('/logout', 'Auth\LoginController@logout')->name('auth.logout');
 });
@@ -47,7 +53,7 @@ Route::group(['middleware' => ['secure', 'clearcache']], function (): void {
     Route::get('/order/profile', function(){
         return view('pages.orders.profile');
     })->name('order.profile');
-	
+
 });