From f9c11e67dbfee1afb1b26f4f239ed5769393ae8f Mon Sep 17 00:00:00 2001
From: Anders <anders164a@gmail.com>
Date: Tue, 28 Jul 2020 10:31:44 +0200
Subject: [PATCH] Error and succes messages when you change password as user

---
 skolehjem/app/Http/Controllers/UserController.php      | 10 +++++-----
 skolehjem/resources/views/app/users/editpass.blade.php |  2 ++
 skolehjem/resources/views/app/users/login.blade.php    |  1 +
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php
index 7d76618..46cdd6e 100644
--- a/skolehjem/app/Http/Controllers/UserController.php
+++ b/skolehjem/app/Http/Controllers/UserController.php
@@ -166,16 +166,16 @@ class UserController extends Controller
                 //$user->save();
             } else { // Else if you're not on the admin site (user site)
                 if ($request->input('password') != null) { // If you're editing the password
-                    if ($request->input('password') != $request->input('confirmpassword')) { // If new password and new password confirm is not the same, go back.
-                        return Response::detect("users.editpass");
-                    } elseif (!Hash::check($request->input('oldpassword'), $user->password)) { // If the written current password and current password in DB is not the same, go back.
-                        return Response::detect("users.editpass");
+                    if ($request->input('password') != $request->input('confirmpassword')) { // If new password and new password confirm is not the same, go back with fail message.
+                        return redirect()->route("users.accounteditpass")->with('error#notsamepass', '<p class="text-center">Der stod ikke det samme i `Nyt Password` & `Bekræft Nyt Password`!</p>');
+                    } elseif (!Hash::check($request->input('oldpassword'), $user->password)) { // If the written current password and current password in DB is not the same, go back with fail message.
+                        return redirect()->route("users.accounteditpass")->with('error#oldpass', '<p class="text-center">Det indtastede password i `Nuværende Password` er ikke dit nuværende password!</p>');
                     } else { // If new password and current password is the same AND current written and current DB password is the same. Then update and logout.
                         /** @var User $user */
                         $user->update($data);
                         Auth::logout();
 
-                        return redirect()->route("users.login");
+                        return redirect()->route("users.login")->with('success#passwordchange', '<p class="text-center">Dit password er hermed ændret!</p>');
                     }
                 } else { // Else if you're not editing the password but anything else (Email, Phone Number). Then update user.
                     $user->update($data);
diff --git a/skolehjem/resources/views/app/users/editpass.blade.php b/skolehjem/resources/views/app/users/editpass.blade.php
index e04e51c..4453086 100644
--- a/skolehjem/resources/views/app/users/editpass.blade.php
+++ b/skolehjem/resources/views/app/users/editpass.blade.php
@@ -16,6 +16,8 @@
             <input type="password" name="password" id="new" required>
             <span>Bekræft Nyt Password:</span>
             <input type="password" name="confirmpassword" id="confirm" required>
+            {!! session()->get('error#notsamepass') !!}
+            {!! session()->get('error#oldpass') !!}
             <button type="submit" class="btn text-center btn-sde-blue mt-1">Rediger</button>
         </form>
     </main>
diff --git a/skolehjem/resources/views/app/users/login.blade.php b/skolehjem/resources/views/app/users/login.blade.php
index 52c34cd..e13dc07 100644
--- a/skolehjem/resources/views/app/users/login.blade.php
+++ b/skolehjem/resources/views/app/users/login.blade.php
@@ -19,6 +19,7 @@
                     <span class="toggle__text text-white">Remember password</span>
                 </span>
             </label>
+            {!! session()->get('success#passwordchange') !!}
             <input class="btn btn-dark" type="submit" value="Sign in">
         </form>
         <a class="text-white text-center" href="{{ route('users.show-forgot') }}">Forgot password?</a>