From 00b238b3c681e53379fd7741e007fe9c6416617a Mon Sep 17 00:00:00 2001
From: Andy Heathershaw <andy@andys.eu>
Date: Tue, 6 Sep 2016 14:45:51 +0100
Subject: [PATCH] Added info messages when registering and activating accounts

---
 app/Http/Controllers/Auth/ActivateController.php   | 5 ++++-
 app/Http/Controllers/Auth/LoginController.php      | 6 ++++--
 app/Http/Controllers/Auth/RegisterController.php   | 3 ++-
 app/Http/Controllers/Gallery/DefaultController.php | 6 ++++--
 resources/lang/en/auth.php                         | 5 +++++
 resources/views/themes/base/layout.blade.php       | 8 ++++++++
 6 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/Auth/ActivateController.php b/app/Http/Controllers/Auth/ActivateController.php
index fbb4f23..63cabea 100644
--- a/app/Http/Controllers/Auth/ActivateController.php
+++ b/app/Http/Controllers/Auth/ActivateController.php
@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Auth;
 use App\Http\Controllers\Controller;
 use App\User;
 use Illuminate\Foundation\Auth\RedirectsUsers;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\App;
 
 class ActivateController extends Controller
@@ -28,7 +29,7 @@ class ActivateController extends Controller
         $this->middleware('guest');
     }
 
-    public function activate($token)
+    public function activate(Request $request, $token)
     {
         /** @var User $user */
         $user = User::where(['is_activated' => false, 'activation_token' => $token])->first();
@@ -43,6 +44,8 @@ class ActivateController extends Controller
         $user->activation_token = null;
         $user->save();
 
+        $request->session()->flash('info', trans('auth.account_activated_message'));
+
         return redirect($this->redirectPath());
     }
 }
\ No newline at end of file
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index c323e5f..462b176 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -54,8 +54,10 @@ class LoginController extends Controller
      *
      * @return \Illuminate\Http\Response
      */
-    public function showLoginForm()
+    public function showLoginForm(Request $request)
     {
-        return Theme::render('auth.login');
+        return Theme::render('auth.login', [
+            'info' => $request->session()->get('info')
+        ]);
     }
 }
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index dd4146b..05a6fd6 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -9,9 +9,9 @@ use App\Mail\UserActivationRequired;
 use App\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Mail;
-use Validator;
 use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\RegistersUsers;
+use Illuminate\Support\Facades\Validator;
 
 class RegisterController extends Controller
 {
@@ -109,6 +109,7 @@ class RegisterController extends Controller
         {
             // Send activation e-mail
             Mail::to($user)->send(new UserActivationRequired($user));
+            $request->session()->flash('info', trans('auth.activation_required_message'));
         }
 
         return redirect($this->redirectPath());
diff --git a/app/Http/Controllers/Gallery/DefaultController.php b/app/Http/Controllers/Gallery/DefaultController.php
index 300432a..9a33a4c 100644
--- a/app/Http/Controllers/Gallery/DefaultController.php
+++ b/app/Http/Controllers/Gallery/DefaultController.php
@@ -5,15 +5,17 @@ namespace App\Http\Controllers\Gallery;
 use App\Album;
 use App\Facade\Theme;
 use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
 
 class DefaultController extends Controller
 {
-    public function index()
+    public function index(Request $request)
     {
         $albums = Album::withCount('photos')->get()->sortBy('name');
 
         return Theme::render('gallery.index', [
-            'albums' => $albums
+            'albums' => $albums,
+            'info' => $request->session()->get('info')
         ]);
     }
 }
\ No newline at end of file
diff --git a/resources/lang/en/auth.php b/resources/lang/en/auth.php
index 02738a0..895be63 100644
--- a/resources/lang/en/auth.php
+++ b/resources/lang/en/auth.php
@@ -15,6 +15,11 @@ return [
     'failed' => 'These credentials do not match our records.',
     'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
 
+    // Added by Andy
+    'account_activated_message' => 'Your account has been activated successfully. Please login using the e-mail address ' .
+        'and password you provided when you registered.',
+    'activation_required_message' => 'An e-mail containing an activation link has been sent to the e-mail address you provided. ' .
+        'Please click the link in this e-mail to activate your account.',
     'forgot_password_link' => 'Forgotten your password?',
     'forgot_password_title' => 'Send password reset link',
     'login_page_title' => 'Login',
diff --git a/resources/views/themes/base/layout.blade.php b/resources/views/themes/base/layout.blade.php
index 52b2330..5614951 100644
--- a/resources/views/themes/base/layout.blade.php
+++ b/resources/views/themes/base/layout.blade.php
@@ -43,6 +43,14 @@
                 </div>
             @endif
 
+            @if (isset($info))
+                <div class="container">
+                    <div class="alert alert-info">
+                        <strong><i class="fa fa-info-circle fa-fw"></i></strong> {{ $info }}
+                    </div>
+                </div>
+            @endif
+
             @yield('content')
         </div>